Remove tests workaround, unnecessary since 1.24.2. Tweak short description to match upstream DOAP one. Tweak dependencies, including removal of gracious cairo-svg dependency

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64

3 files changed, 82 insertions, 12 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 39e58f417078..5c7244f2ef20 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.263 2009/07/24 17:20:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.264 2009/09/19 15:07:43 leio Exp $
+
+*pango-1.24.5-r1 (19 Sep 2009)
+
+  19 Sep 2009; Mart Raudsepp <leio@gentoo.org> +pango-1.24.5-r1.ebuild:
+  Remove tests workaround, unnecessary since 1.24.2. Tweak short description
+  to match upstream DOAP one. Tweak dependencies, including removal of
+  gracious cairo-svg dependency
 
   24 Jul 2009; Daniel Gryniewicz <dang@gentoo.org> pango-1.24.2.ebuild:
   pango needs libXft for testing; bug #277489
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 487cf810b300..5044be680402 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pango-1.2.5-lib64.patch 1117 RMD160 3bab94ba930665dd8d4159f77ac8409d16340f02 SHA1 c7e9b0dc73110910dd75d6afbaa0df8cdbfb44be SHA256 a6a58d965fef42e5d4820d8292a4c7cde4aff3cfddaf184499d3bdae78a3f3db
 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
@@ -9,13 +6,7 @@ DIST pango-1.24.5.tar.bz2 1519944 RMD160 7e436752734c55950ad5feced7c7d5c3f040a1b
 EBUILD pango-1.24.2.ebuild 1933 RMD160 13d19eecc08d3ae5530cc2476d3b25ac50aa8c54 SHA1 c5dfd5133aa505a6cf96520c9c7fe8227a1c1c69 SHA256 30711020c0c5615cd5462f962fdaa5d18e49f9af076e98398eb13e2efbd56b87
 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
+EBUILD pango-1.24.5-r1.ebuild 1724 RMD160 504fce934840ed4cf3ef0db325a044cda770f56f SHA1 32271d825dd7b9659cedd86ad6aa02d405c6a847 SHA256 e53a23312fde8957fc9e2434e3d6879229b3a7e3d74dfd7b99c6117f02db40ee
 EBUILD pango-1.24.5.ebuild 1829 RMD160 371cd48220b5a1b2d568493f9bedbfd9c2575aff SHA1 bca70a7cc9a73535509bcb6c6593f375c0f89a35 SHA256 bd024a33e4ee528d17881fd6b96a27b23d9427fd29dbcd4a5acccc8af05e5c2e
-MISC ChangeLog 32576 RMD160 93d21a1bd713718ab50c977fa8de80099a519795 SHA1 9bac87ffa9abaef7fafbaedebc79095cb14e147f SHA256 948a93b023943b5126a83fa4eb5b35da6f15cb5c4ebf1e59d997d92d991e30a5
+MISC ChangeLog 32861 RMD160 25d5354d3843cd5acba12d31cfb0756cacbcff7f SHA1 8d9778eb61aca8936bbe7a85999e9e6b45eb488e SHA256 963b0d59633259b27ce9b9ea8a6ad8b7db2dab0fbf418d028f04d3001f905ac5
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iD8DBQFKae2RomPajV0RnrERAnW/AJ94AVWfnxnxyOePHtlkNZonNEufYQCfbjyG
-lo9IJA5XjVxyVvBhNcFdavM=
-=By+Y
------END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.24.5-r1.ebuild b/x11-libs/pango/pango-1.24.5-r1.ebuild
new file mode 100644
index 000000000000..e1562fbc4c5e
--- /dev/null
+++ b/x11-libs/pango/pango-1.24.5-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-r1.ebuild,v 1.1 2009/09/19 15:07:43 leio Exp $
+
+EAPI="2"
+GCONF_DEBUG="yes"
+
+inherit 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"
+
+# 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?]
+	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
+		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() {
+	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
+}
+
+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
+}