Version bump from upstream

(Portage version: 2.1_pre5-r3)

4 files changed, 103 insertions, 4 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index a35b8c17a3c7..2e724f6cb71b 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.122 2006/02/06 22:27:30 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.123 2006/03/05 05:20:52 compnerd Exp $
+
+*pango-1.10.4 (05 Mar 2006)
+
+  05 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +pango-1.10.4.ebuild:
+  Version bump from upstream
 
 *pango-1.10.3 (06 Feb 2006)
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 0d64d6d7b322..0001706b89ef 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,6 @@
-MD5 da35fd6938f2d77f911a2868a5ddb82a ChangeLog 13860
-RMD160 3c8a1f4415ff9e5fb390a39d1409043d113f52ab ChangeLog 13860
-SHA256 3c292cb277de9f078492812e41e7c3f524670615eac5ff012204ce4a9867ed8c ChangeLog 13860
+MD5 6dbd5c71dd54b3535603c4575c8861c2 ChangeLog 13999
+RMD160 cedd201709e1ae1073e28a9f0c8118dc341dc629 ChangeLog 13999
+SHA256 ebbbdad00240b1624bd4c489238be03b8be736330a702bfc8ae57901c694d1d8 ChangeLog 13999
 MD5 ef459214ef4d92e406c804188498edfb files/digest-pango-1.10.1 244
 RMD160 046a0eac491b52175547abdd22d3490ed1213fac files/digest-pango-1.10.1 244
 SHA256 884885f6711f7733fee8363cf0fd6ca7f95edec365f7aaccdd6cbcd64bcd2769 files/digest-pango-1.10.1 244
@@ -10,6 +10,9 @@ SHA256 3b89c920bc21c7a75d182a6252ffa846593268e0b16c3438a75e1b1b01c913ad files/di
 MD5 7b17d0236d7f1c0ea7e206d11f63a7fd files/digest-pango-1.10.3 244
 RMD160 2a258362ac733e9f7c6143ef058e5a05c5eb71bb files/digest-pango-1.10.3 244
 SHA256 9e3230ade79a310d573a44529714d62720c026a5ceaea1005d47e5f6ff0e21eb files/digest-pango-1.10.3 244
+MD5 cd0d6a962ed64f778f4f9c2267c267c3 files/digest-pango-1.10.4 244
+RMD160 d43488239f06b16574656fbbcf02e1666466d31c files/digest-pango-1.10.4 244
+SHA256 9a9fc2b059be620d2e71d4add4b39895849313e67bdc571cc1c1e6ceb7d4fbf8 files/digest-pango-1.10.4 244
 MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
 RMD160 871f55706279c715c6015cd0cc01a2a25e451447 files/digest-pango-1.4.1-r1 64
 SHA256 a8551ed9250790e91f7c22592c144c3a9b4376c3ccb42848c380063593fdf94e files/digest-pango-1.4.1-r1 64
@@ -49,6 +52,9 @@ SHA256 fc1105eaeaccd56f81aa59f6cb42bfdddc115e3892a3583163ca64168fd7c103 pango-1.
 MD5 d1d5719536067de0156a754e31bf7bd0 pango-1.10.3.ebuild 2167
 RMD160 6cb6b10f7661dc10f6590586325c74f83d387233 pango-1.10.3.ebuild 2167
 SHA256 74c5ba04b59e458b5ec6bc55244ec53ab5ce8ccf7d9557843c9e90e0c629c2a4 pango-1.10.3.ebuild 2167
+MD5 84f15ee19bdacf744a79fe41ac7a649c pango-1.10.4.ebuild 2168
+RMD160 dddb9716ba501c0544360d5bfd5e66fd5cba5b3b pango-1.10.4.ebuild 2168
+SHA256 254c0f66cdaf9f44bc4cfbfb50ee77d449eff9606981e0e8e6201185d3e63ed2 pango-1.10.4.ebuild 2168
 MD5 c05eedb951eabcb1ac4993e76d4e6144 pango-1.4.1-r1.ebuild 1974
 RMD160 7ff17e4514f45bbb7af5e8ed05a6b96ed94394e5 pango-1.4.1-r1.ebuild 1974
 SHA256 4fa219d84193b155e4a069368e03b0fdea4e5cf01cab8229c59b9e8f268750ca pango-1.4.1-r1.ebuild 1974
diff --git a/x11-libs/pango/files/digest-pango-1.10.4 b/x11-libs/pango/files/digest-pango-1.10.4
new file mode 100644
index 000000000000..1282b0d51e7a
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.10.4
@@ -0,0 +1,3 @@
+MD5 d7eeb0f995a93534be8e7c687b465a0c pango-1.10.4.tar.bz2 1184862
+RMD160 2b7e9771fb4dc71076f58566e3ad962c8d506e1b pango-1.10.4.tar.bz2 1184862
+SHA256 c2e92e373e374c730a11dbe9a3d2ada01a20e6973863debfaf6f7295002e6b25 pango-1.10.4.tar.bz2 1184862
diff --git a/x11-libs/pango/pango-1.10.4.ebuild b/x11-libs/pango/pango-1.10.4.ebuild
new file mode 100644
index 000000000000..eabc98f20fe4
--- /dev/null
+++ b/x11-libs/pango/pango-1.10.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.4.ebuild,v 1.1 2006/03/05 05:20:52 compnerd Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Text rendering and layout library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2 FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="|| ( (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt
+		)
+	virtual/x11 )
+	virtual/xft
+	>=dev-libs/glib-2.5.7
+	>=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2
+	>x11-libs/cairo-0.5.2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	|| ( x11-proto/xproto virtual/x11 )
+	doc? (
+		>=dev-util/gtk-doc-1
+		~app-text/docbook-xml-dtd-4.1.2 )"
+
+DOCS="AUTHORS ChangeLog* NEWS README TODO*"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	if ! built_with_use -a x11-libs/cairo png X; then
+		einfo "Please re-emerge x11-libs/cairo with the png and X USE flags set"
+		die "cairo needs png and X flags set"
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Some enhancements from Redhat
+	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
+	epatch ${FILESDIR}/${PN}-1.10.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
+
+	epunt_cxx
+}
+
+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
+
+}