diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-08-22 23:01:58 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-08-22 23:01:58 +0000 |
| commit | 315eb0077c2dbbc9209c507ca9b7462e2354f0ab (patch) | |
| tree | d8c1a80a801c8900a868d96a85600ae680583a2c /x11-libs/pango | |
| parent | Stable on sparc. (Manifest recommit) (diff) | |
| download | gentoo-2-315eb0077c2dbbc9209c507ca9b7462e2354f0ab.tar.gz gentoo-2-315eb0077c2dbbc9209c507ca9b7462e2354f0ab.tar.bz2 gentoo-2-315eb0077c2dbbc9209c507ca9b7462e2354f0ab.zip | |
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.
Diffstat (limited to 'x11-libs/pango')
| -rw-r--r-- | x11-libs/pango/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.4.1-r1.ebuild | 15 |
2 files changed, 15 insertions, 7 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/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 } |