old

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 7 insertions, 111 deletions

diff --git a/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog b/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog
index f206d895223c..d39cfec11349 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog
+++ b/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-smartbookmark-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog,v 1.10 2012/04/17 07:15:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog,v 1.11 2012/04/17 07:38:15 ssuominen Exp $
+
+  17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-smartbookmark-plugin-0.4.2.ebuild,
+  -files/xfce4-smartbookmark-plugin-0.4.2-xfce48.patch,
+  -xfce4-smartbookmark-plugin-0.4.4-r1.ebuild:
+  old
 
 *xfce4-smartbookmark-plugin-0.4.4-r2 (17 Apr 2012)
 
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/files/xfce4-smartbookmark-plugin-0.4.2-xfce48.patch b/xfce-extra/xfce4-smartbookmark-plugin/files/xfce4-smartbookmark-plugin-0.4.2-xfce48.patch
deleted file mode 100644
index 510e8f4c2096..000000000000
--- a/xfce-extra/xfce4-smartbookmark-plugin/files/xfce4-smartbookmark-plugin-0.4.2-xfce48.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6939
-
---- configure.ac
-+++ configure.ac
-@@ -25,7 +25,7 @@
- dnl Check for required packages
- XDT_CHECK_LIBX11_REQUIRE()
- XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
- 
- XDT_FEATURE_DEBUG()
---- src/smartbookmark.desktop.in.in
-+++ src/smartbookmark.desktop.in.in
-@@ -1,8 +1,7 @@
- [Xfce Panel]
- Type=X-XFCE-PanelPlugin
--Encoding=UTF-8
- _Name=SmartBookmark
- _Comment=Query websites from the Xfce panel
- Icon=gtk-preferences
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
-+X-XFCE-Module=smartbookmark
- X-XFCE-Unique=false
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild
deleted file mode 100644
index 4a8d7d5e9803..000000000000
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild,v 1.5 2012/04/02 11:57:35 ssuominen Exp $
-
-EAPI=4
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
-
-COMMON_DEPEND=">=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-RDEPEND="${COMMON_DEPEND}
-	xfce-base/xfce-utils"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-xfce48.patch )
-
-	XFCONF=(
-		--disable-static
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README )
-}
-
-src_prepare() {
-	sed -i -e 's:bugs.debian:bugs.gentoo:g' src/smartbookmark.c || die
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.4-r1.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.4-r1.ebuild
deleted file mode 100644
index 9b7701dd6d0c..000000000000
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.4-r1.ebuild,v 1.3 2012/04/06 17:05:06 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
-
-COMMON_DEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/exo-0.6"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		--disable-static
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
-
-src_prepare() {
-	# http://bugzilla.xfce.org/show_bug.cgi?id=8642
-	sed -i \
-		-e 's:xfbrowser4:exo-open --launch WebBrowser:' \
-		-e 's:bugs.debian:bugs.gentoo:' \
-		src/smartbookmark.c || die
-
-	xfconf_src_prepare
-}