new release

6 files changed, 86 insertions, 55 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 938601e6502e..b1e58cf584e0 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.79 2004/12/14 16:07:59 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.80 2004/12/18 17:50:25 foser Exp $
+
+*pango-1.8.0 (18 Dec 2004)
+
+  18 Dec 2004; foser <foser@gentoo.org> pango-1.8.0.ebuild :
+  New release, add USE static
 
   14 Dec 2004; Dylan Carlson <absinthe@gentoo.org> pango-1.6.0.ebuild:
   Stable on amd64.
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2ae665830895..be28c38ee894 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,14 +1,14 @@
-MD5 52d0bf15fbdc3194709361772412a2ce ChangeLog 9068
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 0d8448ba534b03d0c00997fd4906cc45 pango-1.4.0.ebuild 1080
-MD5 02be7fb9c5bdb8cf34aa95d858122a99 pango-1.4.1-r1.ebuild 1879
 MD5 b754ba96451c7a53a9c7ac57db9b3e47 pango-1.4.1.ebuild 1135
+MD5 3866f3e2a64d7d6717f42569a87acad4 pango-1.8.0.ebuild 1905
+MD5 02be7fb9c5bdb8cf34aa95d858122a99 pango-1.4.1-r1.ebuild 1879
+MD5 7921fc1e1e4e5ad0a6bb82ebbbc1fd45 ChangeLog 9185
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 57427bda5b6a40f74bc521393ec7fc97 pango-1.6.0.ebuild 2019
-MD5 e9f4296ef1d6b9bb32c33badffec7dc1 files/digest-pango-1.4.0 64
-MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1 64
+MD5 463aede5d5188445dc7786afceb65c3c files/pango-1.6.0-cjk_space_as_char.patch 1232
 MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
-MD5 e63307fbf2f7bf46a9b9e363d82e115c files/digest-pango-1.6.0 64
-MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
 MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
+MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
+MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1 64
+MD5 e63307fbf2f7bf46a9b9e363d82e115c files/digest-pango-1.6.0 64
+MD5 d2ae8f868bf8083914d10c79782f8a44 files/digest-pango-1.8.0 64
 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
-MD5 463aede5d5188445dc7786afceb65c3c files/pango-1.6.0-cjk_space_as_char.patch 1232
diff --git a/x11-libs/pango/files/digest-pango-1.4.0 b/x11-libs/pango/files/digest-pango-1.4.0
deleted file mode 100644
index 409e16c04c44..000000000000
--- a/x11-libs/pango/files/digest-pango-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b5d9a5dcce5b3899d401f9c2cd6873f pango-1.4.0.tar.bz2 921472
diff --git a/x11-libs/pango/files/digest-pango-1.8.0 b/x11-libs/pango/files/digest-pango-1.8.0
new file mode 100644
index 000000000000..a3a9fe87d318
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.8.0
@@ -0,0 +1 @@
+MD5 d11f9857df7216321163e14d66d0cab8 pango-1.8.0.tar.bz2 979183
diff --git a/x11-libs/pango/pango-1.4.0.ebuild b/x11-libs/pango/pango-1.4.0.ebuild
deleted file mode 100644
index 78536c6af888..000000000000
--- a/x11-libs/pango/pango-1.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.0.ebuild,v 1.14 2004/07/28 03:33:41 agriffis 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
-}
-
-DOCS="AUTHORS ChangeLog README INSTALL NEWS TODO*"
-
-src_install() {
-	gnome2_src_install
-	rm ${D}/etc/pango/pango.modules
-}
-
-pkg_postinst() {
-	einfo "Generating modules listing..."
-	pango-querymodules > /etc/pango/pango.modules
-}
diff --git a/x11-libs/pango/pango-1.8.0.ebuild b/x11-libs/pango/pango-1.8.0.ebuild
new file mode 100644
index 000000000000..12581b6c47f8
--- /dev/null
+++ b/x11-libs/pango/pango-1.8.0.ebuild
@@ -0,0 +1,70 @@
+# 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.8.0.ebuild,v 1.1 2004/12/18 17:50:25 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Text rendering and layout library"
+HOMEPAGE="http://www.pango.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2"
+
+LICENSE="LGPL-2 FTL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE="doc static"
+
+RDEPEND="virtual/x11
+	virtual/xft
+	>=dev-libs/glib-2.6
+	>=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
+	# 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*"
+
+G2CONF="${G2CONF} `use_enable static`"
+
+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..."
+		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
+
+}
+
+USE_DESTDIR="1"