Fixes for gtk+-2.8.

(Portage version: 1.589-cvs)

6 files changed, 48 insertions, 20 deletions

diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index 4c898b6492be..ffccebc48991 100644
--- a/xfce-base/libxfcegui4/ChangeLog
+++ b/xfce-base/libxfcegui4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/libxfcegui4
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.56 2005/10/06 06:23:02 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.57 2005/10/11 03:41:39 bcowan Exp $
+
+*libxfcegui4-4.2.2-r2 (11 Oct 2005)
+
+  11 Oct 2005; Brad Cowan <bcowan@gentoo.org> libxfcegui4-4.2.2-r1.ebuild,
+  +libxfcegui4-4.2.2-r2.ebuild:
+  -m Fix silly mistake with gtk-2.8 patch.
 
   06 Oct 2005; Brad Cowan <bcowan@gentoo.org> libxfcegui4-4.2.2-r1.ebuild:
   Xfce builds for new eclass and modular Xorg.
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index 90fed50a7a1e..1c8270251c65 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,9 +1,11 @@
-MD5 3099cf079904e926ecab99dea9aed8be libxfcegui4-4.2.2-r1.ebuild 699
+MD5 934d7fbce052bd8a60142243f08f9cd4 libxfcegui4-4.2.2-r1.ebuild 505
 MD5 4c0aa9e2cb3327324da76d4c3aee9bce libxfcegui4-4.2.1.ebuild 419
-MD5 34eac986bdc866f50828fd58cc12778b ChangeLog 6964
-MD5 71b5bf09ddc03cca09d1d0f43b426559 libxfcegui4-4.2.2.ebuild 407
+MD5 3099cf079904e926ecab99dea9aed8be libxfcegui4-4.2.2-r2.ebuild 699
+MD5 f8f8f840d43b5256582007496f811f9f ChangeLog 7152
+MD5 66e03067c3b652dc6efc79c402b2de6c libxfcegui4-4.2.2.ebuild 427
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 d07a25a965ca8315611ea916b2d60f3d files/digest-libxfcegui4-4.2.1 69
 MD5 daed0f9e9ebfcfd09728f348e74eb1b2 files/digest-libxfcegui4-4.2.2 69
 MD5 a1dfdce2e330255275e6bc6aa4a640f4 files/taskbar-gtk-2.8.patch 875
 MD5 daed0f9e9ebfcfd09728f348e74eb1b2 files/digest-libxfcegui4-4.2.2-r1 69
+MD5 daed0f9e9ebfcfd09728f348e74eb1b2 files/digest-libxfcegui4-4.2.2-r2 69
diff --git a/xfce-base/libxfcegui4/files/digest-libxfcegui4-4.2.2-r2 b/xfce-base/libxfcegui4/files/digest-libxfcegui4-4.2.2-r2
new file mode 100644
index 000000000000..aea7028a85bd
--- /dev/null
+++ b/xfce-base/libxfcegui4/files/digest-libxfcegui4-4.2.2-r2
@@ -0,0 +1 @@
+MD5 e88d6e8379eae60cee6dd6122bf3ae59 libxfcegui4-4.2.2.tar.gz 853844
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
index d254b4efd795..d90ba777426e 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
@@ -1,25 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild,v 1.3 2005/10/06 18:41:10 bcowan Exp $
-
-inherit xfce42 eutils
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild,v 1.4 2005/10/11 03:41:39 bcowan Exp $
 
 DESCRIPTION="Libraries for Xfce 4"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM )
-	virtual/x11 )
-	x11-libs/startup-notification
-	~xfce-base/libxfce4util-${PV}"
-DEPEND="${RDEPEND}
-	|| ( ( x11-libs/libXt
-	x11-proto/xproto )
-	virtual/x11 )"
+RDEPEND="~xfce-base/libxfce4util-${PV}"
 
-core_package
+inherit xfce4 eutils
 
 src_unpack() {
 	unpack ${A}
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r2.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r2.ebuild
new file mode 100644
index 000000000000..397f5c869333
--- /dev/null
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r2.ebuild,v 1.1 2005/10/11 03:41:39 bcowan Exp $
+
+inherit xfce42 eutils
+
+DESCRIPTION="Libraries for Xfce 4"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	x11-libs/startup-notification
+	~xfce-base/libxfce4util-${PV}"
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libXt
+	x11-proto/xproto )
+	virtual/x11 )"
+
+core_package
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/taskbar-gtk-2.8.patch
+}
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.2.2.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.2.2.ebuild
index 957b86c11abf..df0fe7fe7d10 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.2.2.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.2.2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.2.ebuild,v 1.9 2005/07/12 12:42:07 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.2.ebuild,v 1.10 2005/10/11 03:41:39 bcowan Exp $
 
 DESCRIPTION="Libraries for Xfce 4"
 LICENSE="LGPL-2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="~xfce-base/libxfce4util-${PV}"
+RDEPEND="<x11-libs/gtk+-2.8
+	~xfce-base/libxfce4util-${PV}"
 
 inherit xfce4