Version bump.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

3 files changed, 98 insertions, 12 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index fc5fe9d5611e..cd4a70055624 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.277 2009/11/01 12:53:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.278 2009/11/21 09:35:37 mrpouet Exp $
+
+*pango-1.26.1 (21 Nov 2009)
+
+  21 Nov 2009; Romain Perier <mrpouet@gentoo.org> +pango-1.26.1.ebuild:
+  Version bump.
 
   01 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org> pango-1.26.0.ebuild:
   Add missing gtk-doc-am to DEPEND, bug #291119.
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index efd41c540d17..4e61059ab7e2 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pango-1.2.5-lib64.patch 1117 RMD160 3bab94ba930665dd8d4159f77ac8409d16340f02 SHA1 c7e9b0dc73110910dd75d6afbaa0df8cdbfb44be SHA256 a6a58d965fef42e5d4820d8292a4c7cde4aff3cfddaf184499d3bdae78a3f3db
 AUX pango-1.26.0-fix-parallel-build.patch 995 RMD160 cc0b8a0e1bcf6a1bfc145ee0a68f5d9dc867bd62 SHA1 b689b5d8c3515bef85b49bf475392301742b8880 SHA256 d5869732d30f74cfbb1cbab0da0fd262f82f987a4706fbc0031ec452a696ac2f
 AUX pango-1.26.0-introspection-automagic.patch 8078 RMD160 1958beb426c8b7128231c1b5e9bb43bacaa402ac SHA1 2a16f0a8215249b1ef9ed1d8c3ba4f9568d00a0b SHA256 f9bc4093c6932838d7a673ac0c2c29a9dc4c888fbb1cee488176514352f88a20
 AUX pango-1.26.0-lib64.patch 499 RMD160 0056b738ff517c2b1eb1a6b8e8173d91af0ebeaf SHA1 d514148e6ffced2b4f350abe25cd41282dbb3aae SHA256 1bb2671d49c54caf70e9df104ca26af4e76a536db14150a472b093d05d9f6347
 DIST pango-1.24.5.tar.bz2 1519944 RMD160 7e436752734c55950ad5feced7c7d5c3f040a1b4 SHA1 a5aa40b78546a7ee59f21804b172e5d47ef776ad SHA256 0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e
 DIST pango-1.26.0.tar.bz2 1535736 RMD160 b3b64d6af1eb9cc27d23a7e58d118df8fed25502 SHA1 567f9ace5a8384b3a59dbf95304dc8b1a271d5b6 SHA256 e1bfaefd2614ff86d531152f31fbf4a61aea723eef19b132733ccd3eb8d9a6c3
+DIST pango-1.26.1.tar.bz2 1538050 RMD160 cc9e3bd5d4cdfcb9c2298b75c4b02fee31816184 SHA1 d4891a34a46ddc9a6e37bcdf0fef4cbab7391b7b SHA256 e0254e979bf0fac305de596997cabda83e26c713b666bc582aa9e4b70cb0920d
 EBUILD pango-1.24.5-r1.ebuild 1806 RMD160 f6b2472f8d5b3d4c62c0043cfd4f09344ec7cb73 SHA1 3bde582ad1278b0ae98c5dd550e2323941055d86 SHA256 e67c56a243302ab456446726ee310c22db2316751e2b9f88668a3c4fed6f3342
 EBUILD pango-1.26.0.ebuild 2282 RMD160 f2359276b445a700ff2979e6934645cc0bbbbb1c SHA1 dc5ea5dc3756e335fcf37fca847dcb6bab5e3218 SHA256 d0eca495d936cfe9599ea3e91475810eb5fbdbdd5184316de1bf79ea085d0786
-MISC ChangeLog 34557 RMD160 9ccdae155a24dd974171f408c3fa6a5ec30812e7 SHA1 a2fdcd10ea740ab65f3e003ba8ea01ab0b14b58e SHA256 a7432b64228be57e4c4ad1c307828fd8f7ca4b7c7e4fd491588218f577d9bb2c
+EBUILD pango-1.26.1.ebuild 2191 RMD160 29a594c7729ec8ff0e808d04f5d6ba0754646894 SHA1 1e00641c2824af8188ef13e81079f637a77607e0 SHA256 0e402c88ffbc76864afdd237ede51e270ad3b09d080c08b237695fc388a7d41d
+MISC ChangeLog 34679 RMD160 99d6d5e1af789ece079db00ade44e7d98a708a9c SHA1 884a6a5c636add84fe661be1b7f900e2e8a48469 SHA256 5878dadbd046655ba510ca82d5950687026735daf904f5f7a48652d4dcd06069
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrthMYACgkQ1fmVwcYIWAZ5JwCgojiyPfHyg1ZUFfr2YC5dRx8N
-4uAAoOkdz8aEdrUCfdAwSwjNI8h9O+Qe
-=4bRm
------END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.26.1.ebuild b/x11-libs/pango/pango-1.26.1.ebuild
new file mode 100644
index 000000000000..601d7e3ea7d5
--- /dev/null
+++ b/x11-libs/pango/pango-1.26.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.26.1.ebuild,v 1.1 2009/11/21 09:35:37 mrpouet Exp $
+
+EAPI="2"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2 multilib
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2 FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc test"
+
+RDEPEND=">=dev-libs/glib-2.17.3
+	>=media-libs/fontconfig-2.5.0
+	media-libs/freetype:2
+	>=x11-libs/cairo-1.7.6[X?]
+	X? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	dev-util/gtk-doc-am
+	doc? (
+		>=dev-util/gtk-doc-1
+		~app-text/docbook-xml-dtd-4.1.2
+		x11-libs/libXft )
+	test? (
+		>=dev-util/gtk-doc-1
+		~app-text/docbook-xml-dtd-4.1.2
+		x11-libs/libXft )
+	X? ( x11-proto/xproto )"
+
+DOCS="AUTHORS ChangeLog* NEWS README THANKS"
+
+function multilib_enabled() {
+	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
+}
+
+pkg_setup() {
+	# XXX: DO NOT add introspection support, collides with gir-repository[pango]
+	G2CONF="${G2CONF}
+		--disable-introspection
+		$(use_with X x)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# make config file location host specific so that a 32bit and 64bit pango
+	# wont fight with each other on a multilib system.  Fix building for
+	# emul-linux-x86-gtklibs
+	if multilib_enabled ; then
+		epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch"
+	fi
+
+	# gtk-doc checks do not pass, upstream bug #578944
+	sed -e 's:TESTS = check.docs: TESTS = :g' \
+		-i docs/Makefile.am || die "sed failed"
+
+	# Fix introspection automagic.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=596506
+	epatch "${FILESDIR}/${PN}-1.26.0-introspection-automagic.patch"
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" ] ; then
+		einfo "Generating modules listing..."
+
+		local PANGO_CONFDIR=
+
+		if multilib_enabled ; then
+			PANGO_CONFDIR="/etc/pango/${CHOST}"
+		else
+			PANGO_CONFDIR="/etc/pango"
+		fi
+
+		mkdir -p ${PANGO_CONFDIR}
+
+		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
+	fi
+}