Version bump. Bug fixes.

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

3 files changed, 108 insertions, 2 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index cbd3dcbe0cd9..a719aa1d4cab 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.279 2009/11/28 17:39:38 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.280 2009/12/21 23:28:30 eva Exp $
+
+*pango-1.26.2 (21 Dec 2009)
+
+  21 Dec 2009; Gilles Dartiguelongue <eva@gentoo.org> +pango-1.26.2.ebuild:
+  Version bump. Bug fixes.
 
   28 Nov 2009; Rémi Cardona <remi@gentoo.org> pango-1.24.5-r1.ebuild,
   pango-1.26.0.ebuild:
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d4667a46fddb..37b871cff5d6 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -5,8 +8,17 @@ AUX pango-1.26.0-lib64.patch 499 RMD160 0056b738ff517c2b1eb1a6b8e8173d91af0ebeaf
 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
+DIST pango-1.26.2.tar.bz2 1536011 RMD160 6613bddf643d5c912e6656d84c6671aa6ce88a9d SHA1 051b6f7b5f98a4c8083ef6a5178cb5255a992b98 SHA256 3b85879e5d8794555d10a2b79428071c99a93b7502ccbef50360ae44c77c3e08
 EBUILD pango-1.24.5-r1.ebuild 1803 RMD160 c7465bb78db73e8b12e8cd38a030add0d944da8d SHA1 9e5c0b1e9113d45c00a604604c57cda4fd50828a SHA256 188431199fc5dac7f0a2384b945259fd765c49bd7edd144034721585f2e7eb9a
 EBUILD pango-1.26.0.ebuild 2283 RMD160 4d1531ef2ece5a20fa1614f67a0ff47ff480386c SHA1 4006e3b35853d5d8c3882dee5929190f2c2e1b94 SHA256 9e619259ce69794a8500dd499e90274876250b8416d7f373b17eb72aa1ef09ed
 EBUILD pango-1.26.1.ebuild 2191 RMD160 29a594c7729ec8ff0e808d04f5d6ba0754646894 SHA1 1e00641c2824af8188ef13e81079f637a77607e0 SHA256 0e402c88ffbc76864afdd237ede51e270ad3b09d080c08b237695fc388a7d41d
-MISC ChangeLog 34794 RMD160 47c36509a248fe9acaa0f5ec3333543fd14d8c64 SHA1 a21d41293bd3e95e2f9d69ce693d7f7d31135d85 SHA256 88d055b00a6d0b6432bf8a60053f8101ce9b74178853d976cf84ce029342a7bc
+EBUILD pango-1.26.2.ebuild 2187 RMD160 9d0f48987835f7fa635d84f40c4569bf1c32258f SHA1 a5d2594f0c9debef4d0d1d3f58b44b8681b926ad SHA256 a341c8d9fb382c248319abcbdc05c546fecd126a9f58362d0c628a346fd497f0
+MISC ChangeLog 34926 RMD160 e2cfed40a9878991237028e61b2db64812d2459a SHA1 9ad84f74e384b38ad44b73b25b2fb815b5dcdb90 SHA256 a870c1732c046cf6ac318c07ca6ab0fc4b15bdf261fe75db6b4ae398aed75c53
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkswBKQACgkQ1fmVwcYIWAZP+gCeNO1gldfhQMe15ZlSa2n/+D/g
+fIwAn3j8g34zhN3vTzJyzMuSTQ2hjnTQ
+=10jY
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.26.2.ebuild b/x11-libs/pango/pango-1.26.2.ebuild
new file mode 100644
index 000000000000..1ef825241e86
--- /dev/null
+++ b/x11-libs/pango/pango-1.26.2.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.2.ebuild,v 1.1 2009/12/21 23:28:30 eva 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
+}