Link to libxfcegui4 and fix .desktop entry to be compatible with xfce4-panel >= 4.7.0.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 53 insertions, 14 deletions

diff --git a/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog b/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog
index 86b18da70684..962fdcf64a75 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog,v 1.2 2009/10/08 17:44:11 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog,v 1.3 2011/01/29 16:07:54 ssuominen Exp $
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-smartbookmark-plugin-0.4.2.ebuild,
+  +files/xfce4-smartbookmark-plugin-0.4.2-xfce48.patch:
+  Link to libxfcegui4 and fix .desktop entry to be compatible with xfce4-panel
+  >= 4.7.0.
 
   08 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
   xfce4-smartbookmark-plugin-0.4.2.ebuild:
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index 454d7fa46ab4..ada2d47f2c58 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -1,4 +1,5 @@
+AUX xfce4-smartbookmark-plugin-0.4.2-xfce48.patch 755 RMD160 31bb04a2eb80a553bc1c9ed5c5152a374eb5c09b SHA1 59d23e868d7c41eeb56d7e15f9e844998132f3be SHA256 d2f78274fcd85be9543e27035faf9c099f44e18996575724e9a21c0c509f89bf
 DIST xfce4-smartbookmark-plugin-0.4.2.tar.gz 365592 RMD160 9c6e1c80d30bb19b5e4e9248bfde3f126c967fe7 SHA1 18ec35f91b244a07f663b3180baa129d75e2fb2b SHA256 853880f357cd672a96c902de4560e97bdbd4ba7672bd2357a529e7850db4bb94
-EBUILD xfce4-smartbookmark-plugin-0.4.2.ebuild 981 RMD160 b64b24f3adb611b0c36bed5c80457f5b77e5d63c SHA1 f9a51739ed1488455b3d0373ce7d02b82aff8dbe SHA256 ea423f1481f36bcf1a2d611032121967a1a31414284f087c0bfa699522ab039e
-MISC ChangeLog 602 RMD160 82d900490b114335825a1b09322c5e8328be6c29 SHA1 019b6728d467d9909320b5fe82ea8b8caac04c94 SHA256 fb495232190456b37e3da217f71355edd86cdd0c36d1ca244a78ec405065fb3e
+EBUILD xfce4-smartbookmark-plugin-0.4.2.ebuild 1158 RMD160 1e02dab305ba7506e07eb8d6fa663a995618b143 SHA1 5b95e28fba3fb4b8759587fc10c2079cd60b23e7 SHA256 962b97bde35764728d8607b6a96c6d5afb595370af7f8ed8ba80677116c7eda9
+MISC ChangeLog 848 RMD160 0f2804268299a0825434b925fcb093a0891726f3 SHA1 b6d3b93e4a3120b45ab275d94b5cea7934afd336 SHA256 0f1b0de28f2fbf20840f3569fe0f7ad43f86dbf3a66330b946ebc1b87d989863
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
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
new file mode 100644
index 000000000000..510e8f4c2096
--- /dev/null
+++ b/xfce-extra/xfce4-smartbookmark-plugin/files/xfce4-smartbookmark-plugin-0.4.2-xfce48.patch
@@ -0,0 +1,25 @@
+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
index 56b1cffc6419..55d45da293a3 100644
--- 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
@@ -1,12 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.2 2009/10/08 17:44:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild,v 1.3 2011/01/29 16:07:54 ssuominen Exp $
 
-EAPI=2
+EAPI=3
+EAUTORECONF=yes
 inherit xfconf
 
-DESCRIPTION="Xfce panel smart-bookmark plugin"
-HOMEPAGE="http://www.xfce.org/"
+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}/0.4/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -14,7 +15,8 @@ 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/xfce4-panel-4.3.20"
+COMMON_DEPEND=">=xfce-base/libxfcegui4-4.2
+	>=xfce-base/xfce4-panel-4.3.20"
 RDEPEND="${COMMON_DEPEND}
 	xfce-base/xfce-utils"
 DEPEND="${COMMON_DEPEND}
@@ -22,13 +24,18 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-xfce48.patch )
+
+	XFCONF=(
+		--disable-dependency-tracking
+		--disable-static
+		$(xfconf_use_debug)
+		)
+
 	DOCS="AUTHORS ChangeLog README"
-	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
 }
 
 src_prepare() {
-	sed -i -e 's:bugs.debian:bugs.gentoo:g' \
-		src/smartbookmark.c || die "sed failed"
+	sed -i -e 's:bugs.debian:bugs.gentoo:g' src/smartbookmark.c || die
 	xfconf_src_prepare
 }