Link to libxfcegui4 wrt #331497 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 54 insertions, 12 deletions

diff --git a/xfce-extra/xfce4-netload-plugin/ChangeLog b/xfce-extra/xfce4-netload-plugin/ChangeLog
index a253a8cd4a9c..e0c04a59e9ed 100644
--- a/xfce-extra/xfce4-netload-plugin/ChangeLog
+++ b/xfce-extra/xfce4-netload-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-netload-plugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.10 2010/01/19 00:20:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.11 2010/08/09 11:04:06 ssuominen Exp $
+
+  09 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-netload-plugin-0.4.0-r1.ebuild,
+  +files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch:
+  Link to libxfcegui4 wrt #331497 by Diego E. Pettenò.
 
   19 Jan 2010; Jeroen Roovers <jer@gentoo.org>
   xfce4-netload-plugin-0.4.0-r1.ebuild:
diff --git a/xfce-extra/xfce4-netload-plugin/Manifest b/xfce-extra/xfce4-netload-plugin/Manifest
index 6c655d6c727b..1e159c0ccd75 100644
--- a/xfce-extra/xfce4-netload-plugin/Manifest
+++ b/xfce-extra/xfce4-netload-plugin/Manifest
@@ -1,6 +1,7 @@
 AUX xfce4-netload-plugin-0.4.0-asneeded.patch 549 RMD160 1df5c37d045b17c9986d933ce72e6bc27f88e368 SHA1 203831bf57c2b988b8afc1cbb80533d8a5a8ac0d SHA256 9e8893efa3dda39b099d542367aaa3e99e5e7c3fa3521a0a6f1777b314e6bbe8
 AUX xfce4-netload-plugin-0.4.0-fix-tooltips-gtk2.16.patch 3646 RMD160 cf7cad4ae00f359d2c775e6d90ae49ca440dd416 SHA1 bccd31d88623624d661fa2f523c5f72bd344f1a3 SHA256 c5ee9f480964a43a497e01808325b79bc208e981656d54e8da424f3cc7fab39c
+AUX xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch 802 RMD160 52cf6cfcecc6192f00c1ed7feb20f9d637296ff5 SHA1 92fdf13d57e60f78c1fbe9e816ca2b9c6a7222d8 SHA256 a9aac57a6c0ddb206f4486061135596e3d35defa97428385aa5b94b57cbe4c10
 DIST xfce4-netload-plugin-0.4.0.tar.bz2 125046 RMD160 47d8183da3885b6a476504fd8d5762be7d4fffac SHA1 197231f99773f4e299c64125dd0d1a25bfb533bb SHA256 debcc2793b3f42556fc0a58e69bb46925880791eff60f3231f27ec5a5359a191
-EBUILD xfce4-netload-plugin-0.4.0-r1.ebuild 1045 RMD160 ebb60b91fea209c20c7aa85bb2c4c8e3bc0a2df7 SHA1 795a096fbbcec3c708a13e440efc70dd0170979e SHA256 310b9178236ae0e0f3e650190bb378b09c14d041e69064901cedaf58e5433392
-MISC ChangeLog 1741 RMD160 c019b34c1c0b524590e3bc23295ead70f24fb938 SHA1 d8d115b6a88e3e6f77b52797d4d5bc9c5569b32d SHA256 c757ed24678c59a202fa29981d7ffdb28e0345338dfa0336347dfd6379eeff9a
+EBUILD xfce4-netload-plugin-0.4.0-r1.ebuild 1126 RMD160 b3eb487d59917f73bb450864adac755d7bfe3f8e SHA1 1051e2f4989dd8b0f4ba8e56a6684f45bb24b639 SHA256 0fb26a8bd8b6493b5af267c2b107cd75a61bb81b456b9d463fd6d413b91864d1
+MISC ChangeLog 1961 RMD160 fdd3008a70d69fd15d06ed5ca2fe5404743c3993 SHA1 ff8c413ef4091fd361289cb52725a9285f322d1a SHA256 e3d8ee54764543ab0a15df366dc774ed0f58f059a1fb98b80d155fb4838dfe1b
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch
new file mode 100644
index 000000000000..585534572524
--- /dev/null
+++ b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch
@@ -0,0 +1,31 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6622
+http://bugs.gentoo.org/show_bug.cgi?id=331497
+
+--- configure.ac
++++ configure.ac
+@@ -53,6 +53,7 @@
+ 
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
+ 
+ dnl Check for i18n support
+ XDT_I18N([ca de fr ko lt pl uk])
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -16,11 +16,13 @@
+ 
+ xfce4_netload_plugin_CFLAGS =						\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@						\
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_netload_plugin_LDADD =						\
+ 	@SOLLIBS@                                   			\
+-	@LIBXFCE4PANEL_LIBS@
++	@LIBXFCE4PANEL_LIBS@						\
++	@LIBXFCEGUI4_LIBS@
+ 
+ # .desktop file
+ #
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild
index 189acb3dbadb..f7beec485419 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild,v 1.9 2010/01/19 00:20:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild,v 1.10 2010/08/09 11:04:06 ssuominen Exp $
 
+EAPI=2
 EAUTORECONF=yes
 EINTLTOOLIZE=yes
-EAPI=2
 inherit xfconf
 
 DESCRIPTION="Netload plugin for Xfce4 panel"
@@ -16,21 +16,26 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
-RDEPEND=">=xfce-base/xfce4-panel-4.3.20"
+RDEPEND=">=xfce-base/libxfcegui4-4.3.20
+	>=xfce-base/xfce4-panel-4.3.20"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
-	PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
-		"${FILESDIR}/${P}-fix-tooltips-gtk2.16.patch" )
-	DOCS="AUTHORS ChangeLog README"
+	PATCHES=(
+		"${FILESDIR}"/${P}-asneeded.patch
+		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
+		"${FILESDIR}"/${P}-fix-tooltips-gtk2.16.patch
+		)
 	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
+	DOCS="AUTHORS ChangeLog README"
 }
 
 src_prepare() {
-	sed -i -e "/^AC_INIT/s/netload_version()/netload_version/" configure.ac \
-		|| die "sed failed"
+	sed -i \
+		-e '/^AC_INIT/s/netload_version()/netload_version/' \
+		configure.ac || die
 	xfconf_src_prepare
 }