From: Yuta Satoh <nigoro@gentoo.org>
Date: Sat, 22 Oct 2005 15:11:38 +0000 (+0000)
Subject: also fixes #109089 of 2.6.x
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c7a51f933cf227559860c30ca669fe46243ded2d;p=gentoo.git

also fixes #109089 of 2.6.x
Package-Manager: portage-2.0.53_rc5
---

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index c2bb83824c38..246f68715e4e 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.191 2005/10/19 13:24:54 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.192 2005/10/22 15:11:38 nigoro Exp $
+
+  22 Oct 2005; Yuta SATOH <nigoro@gentoo.org> gtk+-2.6.8.ebuild,
+  gtk+-2.6.10.ebuild:
+  also fixes #109089 of 2.6.x
 
   19 Oct 2005; Yuta SATOH <nigoro@gentoo.org> gtk+-2.8.6.ebuild:
   Fixes #109089 by not applying the patch which fixes the problem of the
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 49f92f31e712..ecb837d08ba1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 abd3bedd6e1736cdd4892959c4350bf4 ChangeLog 27424
+MD5 7a2ce75b96aa64baf6e39ce1f966db20 ChangeLog 27542
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
@@ -15,14 +15,14 @@ MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
 MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
-MD5 d9750f9180ebd11501fbbe1768786b73 gtk+-2.6.10.ebuild 2826
-MD5 84922ae73641da1e89dc052f5fe89c9c gtk+-2.6.8.ebuild 2838
+MD5 7facb5274a3cb2576a7ef26c1d24f0cb gtk+-2.6.10.ebuild 2870
+MD5 5033b22f68c770cc1738680edc951abf gtk+-2.6.8.ebuild 2884
 MD5 0932776d5ee1eee66db5c66f4421b82c gtk+-2.8.6.ebuild 3342
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDVklV60LfUIagIAkRAuHYAKDzBycN7XBzHdswsBeSEgKMoQddhwCfTWRf
-zddVczVhynZ/S/ums97UP2k=
-=ymT3
+iD8DBQFDWlbN60LfUIagIAkRAp1QAJ92eY8zkLY71ugDPmvWtL1asrsS6wCfedlk
+0JLFj06XRWKe6tfZO4x3ZeY=
+=jSNw
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.6.10.ebuild b/x11-libs/gtk+/gtk+-2.6.10.ebuild
index ffc989be6b1b..b6f19f878fc1 100644
--- a/x11-libs/gtk+/gtk+-2.6.10.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10.ebuild,v 1.2 2005/08/19 17:23:31 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10.ebuild,v 1.3 2005/10/22 15:11:38 nigoro Exp $
 
 inherit flag-o-matic eutils
 
@@ -54,8 +54,8 @@ src_unpack() {
 	# easier, so even this should be amd64 specific.
 	use x86 && [ "$(get_libdir)" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
 
-	# patch for ppc64 (#64359)
-	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
+	# patch for ppc64 (#64359,#109089)
+	use ppc64 && ! has_version '>=dev-libs/glib-2.8' && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
 	use ppc64 && append-flags -mminimal-toc
 
 	autoconf || die
diff --git a/x11-libs/gtk+/gtk+-2.6.8.ebuild b/x11-libs/gtk+/gtk+-2.6.8.ebuild
index ef60326df8ef..f4160a3bc6dc 100644
--- a/x11-libs/gtk+/gtk+-2.6.8.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.8.ebuild,v 1.12 2005/10/10 21:04:44 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.8.ebuild,v 1.13 2005/10/22 15:11:38 nigoro Exp $
 
 inherit flag-o-matic eutils
 
@@ -55,8 +55,8 @@ src_unpack() {
 	# easier, so even this should be amd64 specific.
 	use x86 && [ "$(get_libdir)" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
 
-	# patch for ppc64 (#64359)
-	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
+	# patch for ppc64 (#64359,#109089)
+	use ppc64 && ! has_version '>=dev-libs/glib-2.8' && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
 	use ppc64 && append-flags -mminimal-toc
 
 	autoconf || die