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

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

4 files changed, 52 insertions, 11 deletions

diff --git a/xfce-extra/xfce4-cpugraph-plugin/ChangeLog b/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
index 25b48e729e71..d753f9eb5c65 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-cpugraph-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/ChangeLog,v 1.2 2009/10/08 17:29:12 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/ChangeLog,v 1.3 2010/08/30 14:44:21 ssuominen Exp $
+
+  30 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-cpugraph-plugin-0.4.0.ebuild,
+  +files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch:
+  Link to libxfcegui4 wrt #334891 by Diego E. Pettenò.
 
   08 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
   xfce4-cpugraph-plugin-0.4.0.ebuild:
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index ad5a8566ca7f..efbd55caaf6c 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,5 +1,6 @@
 AUX xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch 414 RMD160 9513912020d53108755e3211bc2ab701d1f8d5fe SHA1 97bf81fd7a18b50cc87d645ad9b570b040b1b77f SHA256 84c2e4607f9f7077befbf1bb9d78e7d05ad624bf140aed94c41bddc6b7b44a3a
+AUX xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch 1180 RMD160 d29be255be7d0cc1a1cf6e1a3e9cce34b4ca4d35 SHA1 b1eb78593ece63ab6e6bd3e977596a09f6ce3839 SHA256 6dc0475fbdd0761f03a326aefa51dad95e3372ab7a628b285952c29ec23161e2
 DIST xfce4-cpugraph-plugin-0.4.0.tar.gz 150149 RMD160 a8576727fbd2751bca26b838dfb09371d5e74730 SHA1 a4edf76119b053a5d7aa3c04a272d0dda31e2f71 SHA256 095888f7a3cd2067f7a9b8540a78c7a348275d2c1b127440c418f759f7e6d9c0
-EBUILD xfce4-cpugraph-plugin-0.4.0.ebuild 838 RMD160 d3f5928d24ea8afe00fae7d5ab2e56a17a48e9d8 SHA1 8643d88e1e52055b1b1e7c296e58ff910c792222 SHA256 2bee9cacc2e1636b080267560632945ad98c0e4dcd28f1b13dba68630fe8a4a2
-MISC ChangeLog 628 RMD160 d35fb6df424556aa811a4fe71d40dfb7b2f160c4 SHA1 dd319c20496dadd6817b3d682d5ac1a8368abe78 SHA256 e76ae3d21bb0b6e9e3b3ece1572ef26cbcc1aef4007a1b490572310d1ef7bafa
+EBUILD xfce4-cpugraph-plugin-0.4.0.ebuild 957 RMD160 dc0f9fc1eba766cebd030b794410f8a581c349e3 SHA1 1c014fbdbeab6525cf9dd35051e1378170db3183 SHA256 01f141f134f07958c98e105de6be7ba1f7d7f4357ddad74e9019765b8b1574df
+MISC ChangeLog 842 RMD160 d7199b518a7ad553e07b9f97c03dcf4fb25d2704 SHA1 daac01c4fcb952e5d7baa30e78448e7c70405188 SHA256 ede2075d2af357ae4ed94d8e6e534b108433a5450eccaffc22ae7325b5ea6402
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
new file mode 100644
index 000000000000..b8bd1f9257ab
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
@@ -0,0 +1,29 @@
+diff -ur xfce4-cpugraph-plugin-0.4.0.orig/configure.ac xfce4-cpugraph-plugin-0.4.0/configure.ac
+--- xfce4-cpugraph-plugin-0.4.0.orig/configure.ac	2007-11-22 07:42:28.000000000 +0200
++++ xfce4-cpugraph-plugin-0.4.0/configure.ac	2010-08-30 17:40:40.000000000 +0300
+@@ -31,6 +31,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 translations
+ XDT_I18N([be ca cs en_GB eu fr hu nb_NO pl pt_PT sq uk])
+diff -ur xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/Makefile.am xfce4-cpugraph-plugin-0.4.0/panel-plugin/Makefile.am
+--- xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/Makefile.am	2007-11-22 09:13:34.000000000 +0200
++++ xfce4-cpugraph-plugin-0.4.0/panel-plugin/Makefile.am	2010-08-30 17:41:07.000000000 +0300
+@@ -3,10 +3,12 @@
+ 
+ xfce4_cpugraph_plugin_CFLAGS =					\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@					\
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_cpugraph_plugin_LDADD =					\
+-	@LIBXFCE4PANEL_LIBS@
++	@LIBXFCE4PANEL_LIBS@					\
++	@LIBXFCEGUI4_LIBS@
+ 
+ xfce4_cpugraph_plugin_SOURCES =					\
+ 	mode.c		\
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild
index f34180a81b10..a5e9c01a4c61 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild,v 1.3 2009/10/08 17:29:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild,v 1.4 2010/08/30 14:44:21 ssuominen Exp $
 
 EAPI=2
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="CPU load panel plugin"
@@ -14,14 +15,19 @@ 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/xfce4-panel-4.3.20
+	>=xfce-base/libxfcegui4-4.3.20"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-util/intltool"
+	dev-util/intltool
+	sys-devel/gettext"
 
 pkg_setup() {
-	PATCHES=( "${FILESDIR}/${P}-free_and_realloc.patch" )
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	PATCHES=(
+		"${FILESDIR}"/${P}-free_and_realloc.patch
+		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
+		)
 	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }