New bug fix release: Fix crasher when a PangoFcFontMap was freed before its fonts; Fix font description parsing to better handle "normal"

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 89 insertions, 2 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 94566c4e40a8..e489eb9f3628 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # 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.231 2008/10/21 00:25:35 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.232 2008/10/31 00:10:31 leio Exp $
+
+*pango-1.22.2 (31 Oct 2008)
+
+  31 Oct 2008; Mart Raudsepp <leio@gentoo.org> +pango-1.22.2.ebuild:
+  New bug fix release: Fix crasher when a PangoFcFontMap was freed before
+  its fonts; Fix font description parsing to better handle "normal"
 
 *pango-1.22.1 (21 Oct 2008)
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index fb473ae421b7..1d2719a3f6d4 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,10 +4,12 @@ DIST pango-1.18.4.tar.bz2 1406821 RMD160 73213249d86f9344572d27ce0720ee574b8cdec
 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
 DIST pango-1.22.1.tar.bz2 1462348 RMD160 e9ac4c637f7134ad158a099403a99fea368a304f SHA1 bd3806980a185aa67a411fcd84a45e0d2732f8f1 SHA256 fd7d5a08745bbc20677660840b8d848867dae35aab761492faf79adb6b5afa66
+DIST pango-1.22.2.tar.bz2 1462487 RMD160 355a8743f8a98d6780c6464acdf9d2c4037ad601 SHA1 d1a3368ffdb29a239c41498bedbee6bac222d77a SHA256 4b32a435c93ce60ea3ff289fa7d2439f242f2d51c5b315e0c8371683491fb1b9
 EBUILD pango-1.16.5.ebuild 1589 RMD160 c95c901c5c23a43de8a60e779c80be31f092aecb SHA1 6656cd4d3e7a7ac319d7c8ba70ed107f753fd84d SHA256 f9b7c3926e449352d5ff1d402dcf024e15754a8c9634c68c4da3229f2a184729
 EBUILD pango-1.18.4.ebuild 1593 RMD160 2c51fc550d5ab5eb932666ee59fb762fba7061f6 SHA1 6a89b9975eb768ca0bf0f6f71b9b1c4cc433de0f SHA256 02131a3356fa9d58ff07a2cb849a34d455dfdcdfe48d98df0caa0d48ef604646
 EBUILD pango-1.20.3.ebuild 1771 RMD160 34a147a7b75d694b36f9f13715902b37d91f7a9a SHA1 09d6377330318cd54322d6724c7b5188762d1b70 SHA256 5b62d87825b2ce417684306b91ab6b0419bbff68b9d0a3ed7b5529bcfc3fb478
 EBUILD pango-1.20.5.ebuild 1766 RMD160 fd7d45515f9c4f33a90d824620d406c924491e83 SHA1 735d71bc0044e53b6269e6007e5b4e2bca020120 SHA256 6dc5d4a5b2cc7487118408e2ce1c2316be9cf6c29d07b0aee593d2c8bfcf7d7f
 EBUILD pango-1.22.1.ebuild 1812 RMD160 f929287e6e1741d21274d212b44bc7bbbb43d1d1 SHA1 3acff6f38e7f2f084dda1bcbafe61627b3f17e76 SHA256 e58136f49c910ac518996c6fa67d2b04bf9990c3540ecf25e3f7b8424baed336
-MISC ChangeLog 28214 RMD160 100bdc56f3dbd4d23ae3469597262e2d60fb39f0 SHA1 4e3693aa0edf3cef4d7c18b9db10a517def38a47 SHA256 f205420dc26060ae9e858d1008fb259010d6bbd4a671b9ef0b91fa7218596c88
+EBUILD pango-1.22.2.ebuild 1812 RMD160 7013ac55c7314ba2e2c0473fc04d297a4f13461f SHA1 8120dd5142f1ca7a93f55caffc9d6f7b9989ddb9 SHA256 9fd4c9ea0d951729a3a8f7ea87867214be02519e1c887df93f9ffa20f8875d0a
+MISC ChangeLog 28455 RMD160 6c0e9912265d3cb5848bfb8986aeb4b53c53092d SHA1 b2fc43f7c381cdee99d8991ced73af6c86c25180 SHA256 40e9a1d0cc35bd7533cc718d5c4f578dc9de185d21aa4ebcb90228f96fa9024c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/x11-libs/pango/pango-1.22.2.ebuild b/x11-libs/pango/pango-1.22.2.ebuild
new file mode 100644
index 000000000000..dcead428781e
--- /dev/null
+++ b/x11-libs/pango/pango-1.22.2.ebuild
@@ -0,0 +1,79 @@
+# 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.22.2.ebuild,v 1.1 2008/10/31 00:10:31 leio 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 debug doc"
+
+RDEPEND=">=dev-libs/glib-2.17.3
+		 >=media-libs/fontconfig-1.0.1
+		 >=media-libs/freetype-2
+		 >=x11-libs/cairo-1.7.6
+		 X? (
+				x11-libs/libXrender
+				x11-libs/libX11
+				x11-libs/libXft
+			)"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9
+		doc? (
+				>=dev-util/gtk-doc-1
+				~app-text/docbook-xml-dtd-4.1.2
+			 )
+		X? ( x11-proto/xproto )"
+
+DOCS="AUTHORS ChangeLog* NEWS README TODO*"
+
+function multilib_enabled() {
+	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
+}
+
+pkg_setup() {
+	# Do NOT build with --disable-debug/--enable-debug=no
+	if use debug ; then
+		G2CONF="${G2CONF} --enable-debug=yes"
+	fi
+
+	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
+}
+
+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
+}