made arch specific config file patch apply on x86 when CONF_LIBDIR=lib32. this is just to make building the emul-linux-x86-gtklibs package easier, and has no effect on x86 users in general.

3 files changed, 22 insertions, 14 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index b83932d260eb..722116782094 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.73 2004/08/21 01:29:01 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.74 2004/08/22 23:01:58 lv Exp $
+
+  22 Aug 2004; Travis Tilley <lv@gentoo.org> pango-1.4.1-r1.ebuild:
+  made arch specific config file patch apply on x86 when CONF_LIBDIR=lib32. this
+  is just to make building the emul-linux-x86-gtklibs package easier, and has no
+  effect on x86 users in general.
 
   20 Aug 2004; Tom Gall <tgall@gentoo.org> pango-1.4.1-r1.ebuild:
   stable on ppc64, bug #58191
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index a0b56da24901..c02baee901a7 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,11 +1,11 @@
-MD5 8bae624c600586fa1be156796aa7632f ChangeLog 8283
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 0d8448ba534b03d0c00997fd4906cc45 pango-1.4.0.ebuild 1080
 MD5 b754ba96451c7a53a9c7ac57db9b3e47 pango-1.4.1.ebuild 1135
-MD5 2a1e1c7936ae00fff4e7d57db664ac82 pango-1.4.1-r1.ebuild 1463
+MD5 0d8448ba534b03d0c00997fd4906cc45 pango-1.4.0.ebuild 1080
+MD5 4708ad353d961d103d12237782da2456 pango-1.4.1-r1.ebuild 1848
+MD5 b5ac6b8b35f818b85cee839cffc033f7 ChangeLog 8545
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
+MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
+MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
 MD5 e9f4296ef1d6b9bb32c33badffec7dc1 files/digest-pango-1.4.0 64
 MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1 64
-MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
-MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
-MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
diff --git a/x11-libs/pango/pango-1.4.1-r1.ebuild b/x11-libs/pango/pango-1.4.1-r1.ebuild
index d7d65a8b8726..21de45135d9f 100644
--- a/x11-libs/pango/pango-1.4.1-r1.ebuild
+++ b/x11-libs/pango/pango-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.4.1-r1.ebuild,v 1.2 2004/08/21 01:29:01 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.4.1-r1.ebuild,v 1.3 2004/08/22 23:01:58 lv Exp $
 
 inherit gnome2 eutils
 
@@ -33,6 +33,9 @@ src_unpack() {
 	# make config file location host specific so that a 32bit and 64bit pango
 	# 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
 }
 
 DOCS="AUTHORS ChangeLog README INSTALL NEWS TODO*"
@@ -41,16 +44,16 @@ src_install() {
 	gnome2_src_install
 	rm ${D}/etc/pango/pango.modules
 	use amd64 && mkdir ${D}/etc/pango/${CHOST}
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST}
 }
 
 pkg_postinst() {
 	if [ "${ROOT}" == "/" ] ; then
 		einfo "Generating modules listing..."
-		if use amd64 ; then
-			pango-querymodules > /etc/pango/${CHOST}/pango.modules
-		else
-			pango-querymodules > /etc/pango/pango.modules
-		fi
+		use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
+		use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
+		PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango/}
+		pango-querymodules > /${PANGO_CONFDIR}/pango.modules
 	fi
 }