bump to 1.20.5. fix a crasher bug with Linux-Libertine font.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

3 files changed, 96 insertions, 2 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index c587490dff70..eb68fc2443cd 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.220 2008/06/30 16:15:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.221 2008/07/02 21:47:31 eva Exp $
+
+*pango-1.20.5 (02 Jul 2008)
+
+  02 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> +pango-1.20.5.ebuild:
+  bump to 1.20.5. fix a crasher bug with Linux-Libertine font.
 
   30 Jun 2008; Jeroen Roovers <jer@gentoo.org> pango-1.20.3.ebuild:
   Stable for HPPA (bug #227679).
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 6e0287061f3f..945c753effdc 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 1107 RMD160 1a0ceb7f6b0cbf7c1a62ad9920fa91713a767809 SHA1 1df21274d31a5281aafc236312415f4cca02e578 SHA256 010aa771c0662b056e1668d0607397f670cb030da252d7d95a9eea270fbc9ec9
 DIST pango-1.16.5.tar.bz2 1345977 RMD160 98f38b2f8062e8f11e95a22824fa8c89664ffbb3 SHA1 a23899b16a95294dfa739825c81f3858787127e8 SHA256 78ffda1dd67b16c6f558c918d2473de284091bfab075777a4f81e33752bc444d
 DIST pango-1.18.3.tar.bz2 1394980 RMD160 f57f92e81ba279bb1bb456e0d6075d3b4bf0e3d3 SHA1 b7b9e8dee0111dc877ceec33b8a47e17d3466ce7 SHA256 a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
@@ -5,11 +8,20 @@ DIST pango-1.18.4.tar.bz2 1406821 RMD160 73213249d86f9344572d27ce0720ee574b8cdec
 DIST pango-1.20.0.tar.bz2 1412843 RMD160 e3d720cdd5cd08e9056d0cf07999e7d3bf8d228b SHA1 154e8d962d0eee83f58ec3bfee11902650e91da2 SHA256 3933d8fbfbc890ae29081a23e76be8da32024dd2a1bfe63c4cc77d607492e23b
 DIST pango-1.20.2.tar.bz2 1414871 RMD160 f6c8c4356eaed37e753600667d9838087f63631e SHA1 269390ec18f0323d712c2b50cfc030d15236d4d2 SHA256 d3abf17791f2634ba746f082b1697450ca3338a16891dfb7424d0d523985584e
 DIST pango-1.20.3.tar.bz2 1416615 RMD160 e6a6298c860f419de113fd7cfce8973c2aada0dc SHA1 bc4b12dd9cc8a963d796098a3708357237f3101f SHA256 d2bc95791c8fbfd174295a799e67fb92e82fffff363cc8f827fc0af4904de067
+DIST pango-1.20.5.tar.bz2 1420306 RMD160 ac249d353253998696b98a3a48e51503c8170ef4 SHA1 745469b2168df0bbb86eb4a849e8f2230ed11197 SHA256 86f5a94bad18a24c32d6c95f4aad0de643189471825d07e1c1bcaf7cc5a8fab2
 EBUILD pango-1.16.5.ebuild 1589 RMD160 c95c901c5c23a43de8a60e779c80be31f092aecb SHA1 6656cd4d3e7a7ac319d7c8ba70ed107f753fd84d SHA256 f9b7c3926e449352d5ff1d402dcf024e15754a8c9634c68c4da3229f2a184729
 EBUILD pango-1.18.3.ebuild 1590 RMD160 5b8dc8ea8894382683ad7059fbd0cd356a3765dd SHA1 f25bb48cb628c3a518cae37cda1621b2d444da1d SHA256 2f36920ca99b939dcba6ef3a7abd03fe3c5e8f44f7c5a87012dcc91d1309b520
 EBUILD pango-1.18.4.ebuild 1593 RMD160 2c51fc550d5ab5eb932666ee59fb762fba7061f6 SHA1 6a89b9975eb768ca0bf0f6f71b9b1c4cc433de0f SHA256 02131a3356fa9d58ff07a2cb849a34d455dfdcdfe48d98df0caa0d48ef604646
 EBUILD pango-1.20.0.ebuild 1695 RMD160 2a82e9daae475dfe1484175face26406c41fd5e3 SHA1 1d72ac18afbbdf24677d961167e70c1a05dbdf4c SHA256 01de7d4fd6e0813eb6fad53f179f3f5bc1b7fbd798ff7066ec0ad1fabe3fe99f
 EBUILD pango-1.20.2.ebuild 1780 RMD160 0aa04b8bacf6d1fdaae2a7d9bccfbbe2427f6323 SHA1 fe93abcd887371b0d84a2074f9fbdad6d31729ff SHA256 1706b33d1c3c6ab77f5b34c1141b769c102c25e55501e19e86245cedede86c03
 EBUILD pango-1.20.3.ebuild 1771 RMD160 34a147a7b75d694b36f9f13715902b37d91f7a9a SHA1 09d6377330318cd54322d6724c7b5188762d1b70 SHA256 5b62d87825b2ce417684306b91ab6b0419bbff68b9d0a3ed7b5529bcfc3fb478
-MISC ChangeLog 26596 RMD160 0e2605a7d33ab0cce4a6f1087425556951bcfd37 SHA1 4bbf42f1969d38e5c18aba2988893aca39dfe713 SHA256 c788774e53e5f50176804a0aa95ea59b4b0ddfd48d51fb0f68c9e5d79e30e202
+EBUILD pango-1.20.5.ebuild 1773 RMD160 99d19b063a9e5af6f04c34b5be0a3fd84313cfe8 SHA1 311b07169302400fc9a859bb36cc1b7f92459640 SHA256 8fc127d3837c608e3cf19a8361f394137f08a0fe161dffe8425e224c559f7a33
+MISC ChangeLog 26765 RMD160 9bf0516b36ab033efd68f807712aa0e2a5bb5e1e SHA1 de761e4c33c6ab33c85b04ac9bd06d16951ed9fc SHA256 a0a42081971c421604c8f43f1d1ce765027bb594e135c48ffc5a221738c97f43
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhr93gACgkQ1fmVwcYIWAbGpgCgg7ffACJWl9bK1tWAoF0a9y/M
+h/gAnAuIU1i8y/7OCZFe0WCxWURDWgzv
+=FKo/
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.20.5.ebuild b/x11-libs/pango/pango-1.20.5.ebuild
new file mode 100644
index 000000000000..bca4f558ac73
--- /dev/null
+++ b/x11-libs/pango/pango-1.20.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.20.5.ebuild,v 1.1 2008/07/02 21:47:31 eva Exp $
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc"
+
+# glib-2.16.3 dependency instead of 2.14 ensures Unicode 5.1 support on the system
+RDEPEND=">=dev-libs/glib-2.16.3
+		 >=media-libs/fontconfig-1.0.1
+		 >=media-libs/freetype-2
+		 >=x11-libs/cairo-1.2.6
+		 X? (
+				x11-libs/libXrender
+				x11-libs/libX11
+				x11-libs/libXft
+			)"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9
+		X? ( x11-proto/xproto )
+		doc? (
+				>=dev-util/gtk-doc-1
+				~app-text/docbook-xml-dtd-4.1.2
+			 )"
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+function multilib_enabled() {
+	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_with X x)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# 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
+
+	epunt_cxx
+}
+
+src_install() {
+	gnome2_src_install
+	rm "${D}/etc/pango/pango.modules"
+}
+
+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
+}