Version bump to 1.24.5 . Fix two crashes and one invalid weak reference

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

3 files changed, 83 insertions, 2 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index d28cbd9052f3..c97b756bd1a3 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.260 2009/07/09 17:32:31 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.261 2009/07/21 19:49:04 mrpouet Exp $
+
+*pango-1.24.5 (22 Jul 2009)
+
+  22 Jul 2009; Romain Perier <mrpouet@gentoo.org> +pango-1.24.5.ebuild:
+  Version bump to 1.24.5 . Fix two crashes and one invalid weak reference
 
   09 Jul 2009; Romain Perier <mrpouet@gentoo.org>
   pango-1.24.4.ebuild:
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d589b524e650..bd2ec71f8902 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,8 +2,10 @@ AUX pango-1.2.5-lib64.patch 1117 RMD160 3bab94ba930665dd8d4159f77ac8409d16340f02
 DIST pango-1.24.2.tar.bz2 1528238 RMD160 948bee4fa9725330e3f041758ef321d618bbdb9e SHA1 dbc418be727d522720cd280e4368ff5ba3133852 SHA256 f3617f8f32c45c57f19c0aa1d7334e1dc979b9b54e5bb4e78fba8ec80193c23c
 DIST pango-1.24.3.tar.bz2 1505848 RMD160 1fe1837e9f8b080260ae3766682d9e4692654ae1 SHA1 9ae5c85d66a1aae75642414a24b258b29adf1b3a SHA256 f7729e7c133d1ba24e28d63da71c1902f17f4563ca31555d99d8e5a25aaa9309
 DIST pango-1.24.4.tar.bz2 1521044 RMD160 9a175bbe0d9393ede373d00c922a5b3ec9597935 SHA1 2cf84b735d48b573ad083af8c8688b5bbab940c8 SHA256 adbd11f182ec63939d6364cbb59e86991a48582e7d3641cda80529b40b399559
+DIST pango-1.24.5.tar.bz2 1519944 RMD160 7e436752734c55950ad5feced7c7d5c3f040a1b4 SHA1 a5aa40b78546a7ee59f21804b172e5d47ef776ad SHA256 0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e
 EBUILD pango-1.24.2.ebuild 1918 RMD160 f8d3ef34a663d8f3ed2ce5ae1763b7b8f8eb0352 SHA1 c80747a9684afe928c1f0b3a81ba0ab4f3d88335 SHA256 6b2d3d0d710424dc8704f5f2a3af0b089d9a97ae3395b35208b494ffa4dcd1b5
 EBUILD pango-1.24.3.ebuild 1925 RMD160 1380ee9008afa3a488e7b98915a8b5e7200658ae SHA1 2bd89ab9d5e82fa56876b68d446b75bf57ba3c3e SHA256 ce902d6f6d7ebaeafa7ae55dd9d39cf6bcb040c327523c743b609a6d2dec4b49
 EBUILD pango-1.24.4.ebuild 1814 RMD160 2e05a879911b797a2eb19c34f58653b1b3fdb99d SHA1 0bd0f32082c04a290cf1cd1daaec47d41478ba2a SHA256 497b59d835d223769d2ebcd84f8b47015acc2143256f1bd9bce7584386cf9a39
-MISC ChangeLog 32165 RMD160 2eb4b77b0777fc745f7e3f45424e56d918acf6bd SHA1 a96f3fa47220fb19869fc2124142b6d0d85173bc SHA256 69cfdc993cd023173d89d0f927c22d2c65d7bae58348f8436292f84d37d851fb
+EBUILD pango-1.24.5.ebuild 1814 RMD160 51c5eaeeb56c0f5d4a7e84434c3c0de1887f8359 SHA1 bc4749b8236598125aca36a1eb90fbed95ac72ea SHA256 b6cc296445b1309278a94a9de8c1d4a8c08fc1125539acffad9d5859e4ec7b66
+MISC ChangeLog 32341 RMD160 fb04eb013027ec0fc374013e8e39c0681c9a3bcb SHA1 1558ca22ea485ad76ae292e07708735677006a9f SHA256 77062ba93ad572daeed478d106c7e5accff862c7675e8258d03229a5ff5a1cf8
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/x11-libs/pango/pango-1.24.5.ebuild b/x11-libs/pango/pango-1.24.5.ebuild
new file mode 100644
index 000000000000..b77a31ec7cba
--- /dev/null
+++ b/x11-libs/pango/pango-1.24.5.ebuild
@@ -0,0 +1,74 @@
+# 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.24.5.ebuild,v 1.1 2009/07/21 19:49:04 mrpouet Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 multilib
+
+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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc"
+
+# FIXME: add gobject-introspection dependency when it is available
+RDEPEND="dev-libs/glib:2
+	>=media-libs/fontconfig-2.5.0
+	media-libs/freetype:2
+	>=x11-libs/cairo-1.7.6[X?,svg]
+	X? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1
+		~app-text/docbook-xml-dtd-4.1.2 )
+	X? ( x11-proto/xproto )"
+
+DOCS="AUTHORS ChangeLog* NEWS README THANKS"
+
+function multilib_enabled() {
+	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(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.2.5-lib64.patch"
+	fi
+
+	# gtk-doc checks do not pass, upstream bug #578944
+	sed 's:TESTS = check.docs: TESTS = :g'\
+		-i docs/Makefile.am docs/Makefile.in || die "sed failed"
+}
+
+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
+}