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

Package-Manager: portage-2.1.2-r9

3 files changed, 8 insertions, 14 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index a7c19c7e46f4..d9b6a9abbc8f 100644
--- 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 53163f0e706c..c7653071c4c5 100644
--- 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 24fde1540cff..0aa45ce59c68 100644
--- 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}