we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore

Package-Manager: portage-2.1.2-r9

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f8e31a6a3066ea2f5e2a74f6e9ac5cc0f10dae94..409f2954bed91ba2a9c1118a7737d76520c6cebe 100644 (file)
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.298 2007/01/25 17:44:43 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.299 2007/02/21 12:54:25 blubb Exp $
+
+  21 Feb 2007; Simon Stelling <blubb@gentoo.org> gtk+-2.10.6.ebuild,
+  gtk+-2.10.9.ebuild:
+  we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore
 
 *gtk+-2.10.9 (25 Jan 2007)
 

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 22a3ee32dbd1fea1bb6d4b54694af7fbc3465b71..c21af129bdded1f24cb694727f4b8951c4101ef2 100644 (file)
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a files/gtk+-1.2-locale_fix.patch 419
@@ -59,18 +56,18 @@ EBUILD gtk+-1.2.10-r12.ebuild 2319 RMD160 c1e42732cfe898710723ad432e224e914892d6
 MD5 45e4f70fc1f7c9ba9b4619ed742d9fe3 gtk+-1.2.10-r12.ebuild 2319
 RMD160 c1e42732cfe898710723ad432e224e914892d679 gtk+-1.2.10-r12.ebuild 2319
 SHA256 97f42788bb05fa6611b9422027f0eb8635b79b7429cc99aeabd9d5295d213da1 gtk+-1.2.10-r12.ebuild 2319
-EBUILD gtk+-2.10.6.ebuild 4213 RMD160 8da78b250d71afcb67a1c19fd22bfda6dfde2ff5 SHA1 9e059acf1a56b80d6646e071161a7ea3932559a4 SHA256 83ef0fbf6d980fe819a1e6f334ee9a47b47003166121ea37d3732e38aaf33349
-MD5 6a921b1351508252ca5d484ae1d4738f gtk+-2.10.6.ebuild 4213
-RMD160 8da78b250d71afcb67a1c19fd22bfda6dfde2ff5 gtk+-2.10.6.ebuild 4213
-SHA256 83ef0fbf6d980fe819a1e6f334ee9a47b47003166121ea37d3732e38aaf33349 gtk+-2.10.6.ebuild 4213
+EBUILD gtk+-2.10.6.ebuild 3893 RMD160 354ee4716b84f28df1320538e8c94a8c6dd3c7d7 SHA1 098f51da4dbea131ca8ea881f2636476f9f64971 SHA256 e4ca6e74b371da926c6588fef80cb7490f0e624016f07c80c4819078cea51b29
+MD5 290fbdb32a07b1b65df99e5bb523e1c8 gtk+-2.10.6.ebuild 3893
+RMD160 354ee4716b84f28df1320538e8c94a8c6dd3c7d7 gtk+-2.10.6.ebuild 3893
+SHA256 e4ca6e74b371da926c6588fef80cb7490f0e624016f07c80c4819078cea51b29 gtk+-2.10.6.ebuild 3893
 EBUILD gtk+-2.10.7-r1.ebuild 4474 RMD160 17660ab3339b9ec888bd723fb619e270fc02e9f5 SHA1 1138599ea1e6a6874707ff50c6fdccfc3a45f1a1 SHA256 abb4e8250d8e9ea8159296f19a79f5519498d50a707cef7c2da99ac0a0578aa6
 MD5 79d0efb82e95365d2b1e966df6049bc7 gtk+-2.10.7-r1.ebuild 4474
 RMD160 17660ab3339b9ec888bd723fb619e270fc02e9f5 gtk+-2.10.7-r1.ebuild 4474
 SHA256 abb4e8250d8e9ea8159296f19a79f5519498d50a707cef7c2da99ac0a0578aa6 gtk+-2.10.7-r1.ebuild 4474
-EBUILD gtk+-2.10.9.ebuild 4366 RMD160 fdf5d2fb3cae5670f6d979f96585b77a36f1fbd9 SHA1 348412c7c32b69773646bfbbf97efecc92321d76 SHA256 441a0a75ef15c43ac626f5d47c4919cd0de8000e89026428c4e5d333c048602d
-MD5 b2aace4da99e92c2f9aa8c64264f5864 gtk+-2.10.9.ebuild 4366
-RMD160 fdf5d2fb3cae5670f6d979f96585b77a36f1fbd9 gtk+-2.10.9.ebuild 4366
-SHA256 441a0a75ef15c43ac626f5d47c4919cd0de8000e89026428c4e5d333c048602d gtk+-2.10.9.ebuild 4366
+EBUILD gtk+-2.10.9.ebuild 4051 RMD160 e4cc892d7058dab5ab369a9f6921e2a904585218 SHA1 8b74e4d0fed5814ee26c2420da882868010e27af SHA256 1425b9a4268490b0236905457264e26b4d5fee0de3a13d94dfbd5373497e9f41
+MD5 c408dabf9fad1dbf00801aba78915922 gtk+-2.10.9.ebuild 4051
+RMD160 e4cc892d7058dab5ab369a9f6921e2a904585218 gtk+-2.10.9.ebuild 4051
+SHA256 1425b9a4268490b0236905457264e26b4d5fee0de3a13d94dfbd5373497e9f41 gtk+-2.10.9.ebuild 4051
 EBUILD gtk+-2.6.10-r1.ebuild 3455 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba SHA1 4c472888cd0f1dc1b43c3e4c3167e2941ae1c39e SHA256 d58bd7ffe27a02b4c4cf71dd16dcc6c7116723b36df0d15519846b19549ade2e
 MD5 16ca62398139ea671319657720b6fc8b gtk+-2.6.10-r1.ebuild 3455
 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba gtk+-2.6.10-r1.ebuild 3455
@@ -83,10 +80,10 @@ EBUILD gtk+-2.8.20-r1.ebuild 4092 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe7
 MD5 cd6eb30366994c8450fa9359d2d4fcd5 gtk+-2.8.20-r1.ebuild 4092
 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe71 gtk+-2.8.20-r1.ebuild 4092
 SHA256 10933d9f04fc0124a446e88fd29892fdb9c2c737b0604d74eae3df8bc4d8b4e1 gtk+-2.8.20-r1.ebuild 4092
-MISC ChangeLog 42292 RMD160 cf41eade8550f320ec044c0367c3c3d41b868782 SHA1 8873292ad5564d36144537be8ccf08661be0af5f SHA256 4e1f4e71616e65f094613dfc970b2115748405e03063b8d1390a503b6cb04ed5
-MD5 6a0850000a641876a02c1398462c9fac ChangeLog 42292
-RMD160 cf41eade8550f320ec044c0367c3c3d41b868782 ChangeLog 42292
-SHA256 4e1f4e71616e65f094613dfc970b2115748405e03063b8d1390a503b6cb04ed5 ChangeLog 42292
+MISC ChangeLog 42451 RMD160 aa872cf39f24728ec4b6007ceee974feb8e6d50e SHA1 f0e212fa02f0df8fc1b7b930fb4db2d6806f9031 SHA256 474f20c2cdc7c74b38b01bdb13cfa929e82814105a1f1c1fd6a3bc843ed8608e
+MD5 aae213d95a697df146cf58ba18cb1a84 ChangeLog 42451
+RMD160 aa872cf39f24728ec4b6007ceee974feb8e6d50e ChangeLog 42451
+SHA256 474f20c2cdc7c74b38b01bdb13cfa929e82814105a1f1c1fd6a3bc843ed8608e ChangeLog 42451
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -112,10 +109,3 @@ SHA256 0be521aa113e9334cffe0bb4078bd8a363029c2a8ddae0b8005bbf2e3eb69f09 files/di
 MD5 5987bda64cc0a2c5d968d200029e4f26 files/digest-gtk+-2.8.20-r1 244
 RMD160 ef26312aa81fad817ff4350262c7675927298af6 files/digest-gtk+-2.8.20-r1 244
 SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/digest-gtk+-2.8.20-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFuOyVkeYb6olFHJcRAqN6AKCT4O/15c/oAyhwswShYu7XsVpR4gCeP15R
-UFu53wJXtDh3I0OsiW4oQTs=
-=xNPL
------END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+/gtk+-2.10.6.ebuild b/x11-libs/gtk+/gtk+-2.10.6.ebuild
index ffe4ecfad22bf09e52ef67d6c8adf631459b178f..ef12f770cb5536a29e79533981264e7f160826d3 100644 (file)
--- a/x11-libs/gtk+/gtk+-2.10.6.ebuild
+++ b/x11-libs/gtk+/gtk+-2.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.6.ebuild,v 1.13 2007/01/05 04:07:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.6.ebuild,v 1.14 2007/02/21 12:54:25 blubb Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -56,7 +56,6 @@ pkg_setup() {
 set_gtk2_confdir() {
        # An arch specific config directory is used on multilib systems
        has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-       use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
        GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
 }
 
@@ -71,12 +70,6 @@ src_unpack() {
        # dont clash on multilib systems
        has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
 
-       # and this line is just here to make building emul-linux-x86-gtklibs a bit
-       # easier, so even this should be amd64 specific.
-       if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-               epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-       fi
-
        # -O3 and company cause random crashes in applications. Bug #133469
        replace-flags -O3 -O2
        strip-flags

diff --git a/x11-libs/gtk+/gtk+-2.10.9.ebuild b/x11-libs/gtk+/gtk+-2.10.9.ebuild
index b81a00727f63eb6cb1cb011edcbcda3350a60e4c..2bf934ba4c6074f50707d4d8822e6013be179872 100644 (file)
--- a/x11-libs/gtk+/gtk+-2.10.9.ebuild
+++ b/x11-libs/gtk+/gtk+-2.10.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.9.ebuild,v 1.1 2007/01/25 17:44:43 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.9.ebuild,v 1.2 2007/02/21 12:54:25 blubb Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -56,7 +56,6 @@ pkg_setup() {
 set_gtk2_confdir() {
        # An arch specific config directory is used on multilib systems
        has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-       use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
        GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
 }
 
@@ -71,12 +70,6 @@ src_unpack() {
        # dont clash on multilib systems
        has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
 
-       # and this line is just here to make building emul-linux-x86-gtklibs a bit
-       # easier, so even this should be amd64 specific.
-       if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-               epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-       fi
-
        # Revert DND change that makes mozilla products DND broken
        EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"
 

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index a7c19c7e46f469a3120cea8f30b208067e5d5391..d9b6a9abbc8fbc4dc9f39fd8db3822b608e24fd5 100644 (file)
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.163 2007/02/04 03:12:33 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.164 2007/02/21 12:49:26 blubb Exp $
+
+  21 Feb 2007; Simon Stelling <blubb@gentoo.org> pango-1.14.9.ebuild,
+  pango-1.14.10.ebuild:
+  we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore
 
   04 Feb 2007; Mart Raudsepp <leio@gentoo.org> pango-1.14.10.ebuild:
   Some QA fixes, bug 164686

diff --git a/x11-libs/pango/pango-1.14.10.ebuild b/x11-libs/pango/pango-1.14.10.ebuild
index 53163f0e706c67ff5155f2b72247027fbdb698c2..c7653071c4c5b8501faa9dac68e4e7a7ff0adf78 100644 (file)
--- a/x11-libs/pango/pango-1.14.10.ebuild
+++ b/x11-libs/pango/pango-1.14.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.14.10.ebuild,v 1.2 2007/02/04 03:12:33 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.14.10.ebuild,v 1.3 2007/02/21 12:49:26 blubb Exp $
 
 inherit eutils gnome2
 
@@ -41,10 +41,6 @@ src_unpack() {
        # wont fight with each other on a multilib system
        use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
 
-       # and this line is just here to make building emul-linux-x86-gtklibs a bit
-       # easier, so even this should be amd64 specific.
-       use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
-
        epunt_cxx
 }
 
@@ -53,7 +49,6 @@ pkg_postinst() {
                einfo "Generating modules listing..."
 
                use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
-               use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
 
                PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango}
                mkdir -p ${PANGO_CONFDIR}

diff --git a/x11-libs/pango/pango-1.14.9.ebuild b/x11-libs/pango/pango-1.14.9.ebuild
index 24fde1540cff811d6b4c4bba6d5a46acd9aa5e7f..0aa45ce59c68d80e56fe83b0151e533da0065e4d 100644 (file)
--- a/x11-libs/pango/pango-1.14.9.ebuild
+++ b/x11-libs/pango/pango-1.14.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.14.9.ebuild,v 1.2 2006/12/09 21:31:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.14.9.ebuild,v 1.3 2007/02/21 12:49:26 blubb Exp $
 
 inherit eutils gnome2
 
@@ -41,10 +41,6 @@ src_unpack() {
        # wont fight with each other on a multilib system
        use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
 
-       # and this line is just here to make building emul-linux-x86-gtklibs a bit
-       # easier, so even this should be amd64 specific.
-       use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
-
        epunt_cxx
 }
 
@@ -59,7 +55,6 @@ pkg_postinst() {
                einfo "Generating modules listing..."
 
                use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
-               use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
 
                PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango}
                mkdir -p ${PANGO_CONFDIR}