added a patch that changes the pango config file location to /etc/pango/${CHOST} on amd64 to help the 64bit and 32bit pango co-exist in a multilib environment.

5 files changed, 100 insertions, 1 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 83029a76d8a6..be0129ce19da 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,14 @@
 # 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.71 2004/08/14 19:58:47 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.72 2004/08/19 20:56:01 lv Exp $
+
+*pango-1.4.1-r1 (19 Aug 2004)
+
+  19 Aug 2004; Travis Tilley <lv@gentoo.org> +files/pango-1.2.5-lib64.patch,
+  +pango-1.4.1-r1.ebuild:
+  added a patch that changes the pango config file location to
+  /etc/pango/${CHOST} on amd64 to help the 64bit and 32bit pango co-exist in a
+  multilib environment.
 
   14 Aug 2004; Stephen P. Becker <geoman@gentoo.org> pango-1.4.1.ebuild:
   Stable on mips - bug 59692
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 332275dc6fe6..0a47e81cb761 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,8 +1,11 @@
 MD5 b754ba96451c7a53a9c7ac57db9b3e47 pango-1.4.1.ebuild 1135
 MD5 0d8448ba534b03d0c00997fd4906cc45 pango-1.4.0.ebuild 1080
+MD5 8fc3b5a6a08ffbf3ddce434e25b8100e pango-1.4.1-r1.ebuild 1419
 MD5 698ef00b03a9d37e1b370ac887499b0d ChangeLog 7886
 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 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
diff --git a/x11-libs/pango/files/digest-pango-1.4.1-r1 b/x11-libs/pango/files/digest-pango-1.4.1-r1
new file mode 100644
index 000000000000..5b3ca96872f2
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.4.1-r1
@@ -0,0 +1 @@
+MD5 39868e0da250fd4c00b2970e4eb84389 pango-1.4.1.tar.bz2 914710
diff --git a/x11-libs/pango/files/pango-1.2.5-lib64.patch b/x11-libs/pango/files/pango-1.2.5-lib64.patch
new file mode 100644
index 000000000000..7d0ae17bbabf
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.2.5-lib64.patch
@@ -0,0 +1,30 @@
+--- pango-1.2.5/pango/Makefile.am.lib64	2003-08-25 10:12:45.000000000 -0400
++++ pango-1.2.5/pango/Makefile.am	2003-12-08 18:43:51.000000000 -0500
+@@ -16,6 +16,7 @@
+ 	-DPANGO_ENABLE_BACKEND				\
+ 	-DPANGO_ENABLE_ENGINE				\
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DLIBDIR=\"$(libdir)\"				\
+ 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
+ 	-DG_DISABLE_DEPRECATED				\
+--- pango-1.2.5/pango/modules.c.lib64	2002-12-06 19:54:27.000000000 -0500
++++ pango-1.2.5/pango/modules.c	2003-12-08 18:43:51.000000000 -0500
+@@ -353,6 +353,7 @@
+ 
+   if (!file_str)
+     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
++				 HOST,
+ 				 "pango.modules",
+ 				 NULL);
+ 
+--- pango-1.2.5/pango/Makefile.in.lib64	2003-12-09 10:48:24.000000000 -0500
++++ pango-1.2.5/pango/Makefile.in	2003-12-09 10:48:32.000000000 -0500
+@@ -135,6 +135,7 @@
+ 	-DPANGO_ENABLE_BACKEND				\
+ 	-DPANGO_ENABLE_ENGINE				\
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DLIBDIR=\"$(libdir)\"				\
+ 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
+ 	-DG_DISABLE_DEPRECATED				\
diff --git a/x11-libs/pango/pango-1.4.1-r1.ebuild b/x11-libs/pango/pango-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..53ad17e309bd
--- /dev/null
+++ b/x11-libs/pango/pango-1.4.1-r1.ebuild
@@ -0,0 +1,57 @@
+# 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.1 2004/08/19 20:56:01 lv Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Text rendering and layout library"
+HOMEPAGE="http://www.pango.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
+
+LICENSE="LGPL-2 FTL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa amd64 ~ia64 ~ppc64"
+IUSE="doc"
+
+RDEPEND="virtual/x11
+	virtual/xft
+	>=dev-libs/glib-2.4
+	>=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Some enhancements from Redhat
+	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
+	epatch ${FILESDIR}/${PN}-1.2.2-slighthint.patch
+	# 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
+}
+
+DOCS="AUTHORS ChangeLog README INSTALL NEWS TODO*"
+
+src_install() {
+	gnome2_src_install
+	rm ${D}/etc/pango/pango.modules
+	use amd64 && 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
+	fi
+}
+
+USE_DESTDIR="1"