Update x11-libs/pango based on static version in portage

2 files changed, 33 insertions, 39 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 0232739..668fbd2 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,3 +1,3 @@
 AUX pango-1.2.5-lib64.patch 1117 RMD160 3bab94ba930665dd8d4159f77ac8409d16340f02 SHA1 c7e9b0dc73110910dd75d6afbaa0df8cdbfb44be SHA256 a6a58d965fef42e5d4820d8292a4c7cde4aff3cfddaf184499d3bdae78a3f3db
-EBUILD pango-9999.ebuild 1929 RMD160 c3625c79a58534cac326734bd396802ac3e1d7ef SHA1 33b7e14c78d2c6a7c25d2847a58cb59070a177b4 SHA256 c2ea1c6c1e3a5b207ff7e1c1f53e2e1b17791c38e9d1b8506242c65c6184aca6
+EBUILD pango-9999.ebuild 1930 RMD160 8ebeda7f83f4432d4e2188b7b09165a290ea61ea SHA1 36a56dfa8db080954fb5676bfffc4732878e21b5 SHA256 715785fd3a3396f72866be153a032a524ce5ba0e1a1e5b1c9a179b4b55c96d82
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index db511ec..3c524c9 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -1,53 +1,52 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.22.3.ebuild,v 1.2 2008/12/07 12:13:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.24.4.ebuild,v 1.2 2009/07/09 17:32:31 mrpouet Exp $
 
-inherit autotools eutils gnome2 multilib git
+EAPI="2"
+
+inherit autotools gnome2 multilib git
 
 DESCRIPTION="Text rendering and layout library"
 HOMEPAGE="http://www.pango.org/"
 EGIT_REPO_URI="git://git.gnome.org/${PN}"
+#EGIT_BOOTSTRAP="autogen.sh"
 SRC_URI=""
 
 LICENSE="LGPL-2 FTL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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
-			)"
+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-0.9
-		doc? (
-				>=dev-util/gtk-doc-1
-				~app-text/docbook-xml-dtd-4.1.2
-			 )
-		X? ( x11-proto/xproto )"
+	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 TODO*"
+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)"
 }
 
-src_unpack() {
-	git_src_unpack
+src_prepare() {
+	./autogen.sh
+	eautoreconf
+	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
@@ -56,18 +55,13 @@ src_unpack() {
 		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
 	fi
 
-	# cd "${S}"
-	touch ChangeLog
-	./autogen.sh
-}
-
-src_install() {
-	gnome2_src_install
-	rm "${D}/etc/pango/pango.modules"
+	# 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
+	if [ "${ROOT}" = "/" ] ; then
 		einfo "Generating modules listing..."
 
 		local PANGO_CONFDIR=