Link to libxfcegui4 (and fix missing AC_PROG_LIBTOOL in configure.in for libtool-2.2) wrt #331505 by Diego E. Pettenò.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 54 insertions, 7 deletions

diff --git a/xfce-extra/xfce4-diskperf-plugin/ChangeLog b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
index 42c64a9d1fce..9e42d5a4639b 100644
--- a/xfce-extra/xfce4-diskperf-plugin/ChangeLog
+++ b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-diskperf-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.2 2009/10/08 17:32:40 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.3 2010/08/07 13:50:35 ssuominen Exp $
+
+  07 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-diskperf-plugin-2.2.0.ebuild,
+  +files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch:
+  Link to libxfcegui4 (and fix missing AC_PROG_LIBTOOL in configure.in for
+  libtool-2.2) wrt #331505 by Diego E. Pettenò.
 
   08 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
   xfce4-diskperf-plugin-2.2.0.ebuild:
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch
new file mode 100644
index 000000000000..e75850c95752
--- /dev/null
+++ b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch
@@ -0,0 +1,38 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6609
+http://bugs.gentoo.org/show_bug.cgi?id=331505
+
+--- configure.in
++++ configure.in
+@@ -35,6 +35,7 @@
+ AC_PROG_CC()
+ AC_PROG_LD()
+ AC_PROG_INSTALL()
++AC_PROG_LIBTOOL()
+ AC_PROG_INTLTOOL()
+ 
+ dnl **********************************
+@@ -51,6 +52,7 @@
+ dnl *** Check for required packages ***
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
+ 
+ dnl ***********************************
+ dnl *** Check for debugging support ***
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -22,10 +22,12 @@
+ 	devperf.h
+ 
+ xfce4_diskperf_plugin_CFLAGS =					\
+-	$(LIBXFCE4PANEL_CFLAGS)
++	$(LIBXFCE4PANEL_CFLAGS)					\
++	$(LIBXFCEGUI4_CFLAGS)
+ 
+ xfce4_diskperf_plugin_LDADD=					\
+-	$(LIBXFCE4PANEL_LIBS)
++	$(LIBXFCE4PANEL_LIBS)					\
++	$(LIBXFCEGUI4_LIBS)
+ 
+ #
+ # Desktop file
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild
index a5d0d5566031..55f6ab01b3be 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.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-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild,v 1.2 2009/10/08 17:32:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild,v 1.3 2010/08/07 13:50:35 ssuominen Exp $
 
 EAPI=2
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="Disk usage and performance panel plugin"
@@ -14,13 +15,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
-RDEPEND=">=xfce-base/xfce4-panel-4.3.90"
+RDEPEND=">=xfce-base/libxfcegui4-4.3.90
+	>=xfce-base/xfce4-panel-4.3.90"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
+	PATCHES=( "${FILESDIR}"/${P}-link_to_libxfcegui4.patch )
 	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
+	DOCS="AUTHORS ChangeLog NEWS README"
 }