New version for GNOME 2.26. Change font loading API to allow lazy loading, optimize HarfBuzz number of malloc calls and more. Clean up old revisions.

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

4 files changed, 51 insertions, 100 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 08d78a19eab5..5208c7e47756 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,13 @@
 # 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.248 2009/04/27 19:11:30 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.249 2009/05/04 21:57:34 eva Exp $
+
+*pango-1.24.1 (04 May 2009)
+
+  04 May 2009; Gilles Dartiguelongue <eva@gentoo.org> -pango-1.18.4.ebuild,
+  -pango-1.20.5.ebuild, +pango-1.24.1.ebuild:
+  New version for GNOME 2.26. Change font loading API to allow lazy loading,
+  optimize HarfBuzz number of malloc calls and more. Clean up old revisions.
 
 *pango-1.22.4-r1 (27 Apr 2009)
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d8f55b434479..7a06f32c9a1f 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pango-1.2.5-lib64.patch 1117 RMD160 3bab94ba930665dd8d4159f77ac8409d16340f02 SHA1 c7e9b0dc73110910dd75d6afbaa0df8cdbfb44be SHA256 a6a58d965fef42e5d4820d8292a4c7cde4aff3cfddaf184499d3bdae78a3f3db
 AUX pango-1.22.4-special-chars-crash.patch 1893 RMD160 57dec485892a5924122e3319b654b6907e4fc6a6 SHA1 0ca6982bb8623327fe6b306b5560a52d353c5aa9 SHA256 03030a0cf5a0871cc7ecb7c583a7104efe308be3e8b0606b8405469a6a79bf24
-DIST pango-1.18.4.tar.bz2 1406821 RMD160 73213249d86f9344572d27ce0720ee574b8cdecd SHA1 6a72db90bf82b151e18bd83d25f0844129cc93d6 SHA256 6fd3c82eb7aa1fd410cde21189b005095e882d8ab381a5b85bb7483ab7e7efdd
-DIST pango-1.20.5.tar.bz2 1420306 RMD160 ac249d353253998696b98a3a48e51503c8170ef4 SHA1 745469b2168df0bbb86eb4a849e8f2230ed11197 SHA256 86f5a94bad18a24c32d6c95f4aad0de643189471825d07e1c1bcaf7cc5a8fab2
 DIST pango-1.22.4.tar.bz2 1496168 RMD160 118986ea419d22937dd5e2b033f46f34a45f24e3 SHA1 d39a8ce9ed7dd57407a04ad3996b9cc1106cfd7d SHA256 ff47d7ed8360ebef5fa4b8d3ccf45e014bc8793743bca2a96635a3c34eeaa534
-EBUILD pango-1.18.4.ebuild 1593 RMD160 2c51fc550d5ab5eb932666ee59fb762fba7061f6 SHA1 6a89b9975eb768ca0bf0f6f71b9b1c4cc433de0f SHA256 02131a3356fa9d58ff07a2cb849a34d455dfdcdfe48d98df0caa0d48ef604646
-EBUILD pango-1.20.5.ebuild 1767 RMD160 7fcc9a05448cd56ceb4923c8c98494cd3b629ae1 SHA1 1be7225ce33f3d1d878dd660e96408d8f3cd9267 SHA256 de5c3f872949abafe1e0e6fcb63abcf473a79640b32336f42fdbcdefdd78e903
+DIST pango-1.24.1.tar.bz2 1526008 RMD160 8924a2ef039c2bf71e185cad96e87e8c973a59c0 SHA1 917ad4559cceaf27adbfddee11a833c3e536d4a9 SHA256 e00c343dd14c23b89a6767f87d31d4246c14739c57c0174008a86b33174b9ab2
 EBUILD pango-1.22.4-r1.ebuild 1945 RMD160 acad270e8eb0de0f67969b21dcf9c932c9e06fe5 SHA1 eab224cd5138c9dcff58304c2b3ca51f0592661d SHA256 ff28f02e51cedae24fc9f1c96a94f4f3b28886e37ae562cb9158fa53560c34bc
 EBUILD pango-1.22.4.ebuild 1807 RMD160 18e6858bba99b32edd8cf14437dc36fef055ca1d SHA1 adb908afb94e434b53fd4207588771fb616de360 SHA256 326cda030d5a6fcd7977cbfc7df8f821005e4db586ac495fbd57434f4bcf3c4a
-MISC ChangeLog 30542 RMD160 032fce50c96e884ea6650961654cf18773c3bef9 SHA1 ff2189b2dee2704d9d52069ee8e7622d03239e8b SHA256 31e9ac68ff884f5e5c7e5b0a000dd1f26763560acb73c66c35b7ee3a79da6f85
+EBUILD pango-1.24.1.ebuild 2007 RMD160 4a010c483b01392b10d333252b4026e46282ea2e SHA1 95d9e060a68f9e70fbfd3d79fe9aadfb5c855160 SHA256 365050a170eaa28861c7e3ff2d791d7ff84b63dfd2b91be8a7c3a629b90c194e
+MISC ChangeLog 30839 RMD160 9279544ad761854e0bbecc46cf0f39ae06fcb910 SHA1 47f19e69503ea692ac337f0820f345942bbc5943 SHA256 02e04ffedf1e2a8f1de21595bc5261671de33c4238e9aa88e332a6c591091ae7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn/ZNQACgkQ1fmVwcYIWAb4UQCgpUSg757xZ5uT8E0dQPivokLI
+MRMAnirAtacws6I+7DDDWva0JC7CLzMf
+=QxoK
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.18.4.ebuild b/x11-libs/pango/pango-1.18.4.ebuild
deleted file mode 100644
index 3d85c5ede5d4..000000000000
--- a/x11-libs/pango/pango-1.18.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.18.4.ebuild,v 1.8 2008/04/13 22:47:58 vapier 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="doc"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXft
-	>=dev-libs/glib-2.14
-	>=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2
-	>=x11-libs/cairo-1.2.6"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	x11-proto/xproto
-	doc? (
-			>=dev-util/gtk-doc-1
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
-}
-
-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
-}
diff --git a/x11-libs/pango/pango-1.20.5.ebuild b/x11-libs/pango/pango-1.24.1.ebuild
index ad15b4dc9b95..9526ba0f3fff 100644
--- a/x11-libs/pango/pango-1.20.5.ebuild
+++ b/x11-libs/pango/pango-1.24.1.ebuild
@@ -1,6 +1,6 @@
 # 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.20.5.ebuild,v 1.8 2009/02/25 18:29:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.24.1.ebuild,v 1.1 2009/05/04 21:57:34 eva Exp $
 
 inherit eutils gnome2 multilib
 
@@ -9,34 +9,37 @@ 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
-			)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X debug doc"
+
+# FIXME: add gobject-introspection dependency when it is available
+RDEPEND=">=dev-libs/glib-2.17.3
+	>=media-libs/fontconfig-2.5.0
+	>=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
-		X? ( x11-proto/xproto )
-		doc? (
-				>=dev-util/gtk-doc-1
-				~app-text/docbook-xml-dtd-4.1.2
-			 )"
+	>=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"
+DOCS="AUTHORS ChangeLog* NEWS README THANKS"
 
 function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
+	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)"
 }
 
@@ -50,7 +53,9 @@ src_unpack() {
 		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
 	fi
 
-	epunt_cxx
+	# 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"
 }
 
 src_install() {
@@ -59,7 +64,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ "${ROOT}" == "/" ]] ; then
+	if [ "${ROOT}" = "/" ] ; then
 		einfo "Generating modules listing..."
 
 		local PANGO_CONFDIR=
@@ -75,3 +80,4 @@ pkg_postinst() {
 		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
 	fi
 }
+