Add new version for Gnome 2.30, clean old testing versions.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 17 insertions, 112 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index fa5ff6313170..5738f0a172b6 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.283 2010/06/04 19:43:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.284 2010/06/13 15:30:04 pacho Exp $
+
+*pango-1.28.0 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> -pango-1.26.0.ebuild,
+  -pango-1.26.1.ebuild, +pango-1.28.0.ebuild:
+  Add new version for Gnome 2.30, clean old testing versions.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> pango-1.26.2.ebuild:
   x86 stable, bug #314899
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index dcf9ade8f387..477e1f6862d8 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -6,19 +6,17 @@ AUX pango-1.26.0-fix-parallel-build.patch 995 RMD160 cc0b8a0e1bcf6a1bfc145ee0a68
 AUX pango-1.26.0-introspection-automagic.patch 8078 RMD160 1958beb426c8b7128231c1b5e9bb43bacaa402ac SHA1 2a16f0a8215249b1ef9ed1d8c3ba4f9568d00a0b SHA256 f9bc4093c6932838d7a673ac0c2c29a9dc4c888fbb1cee488176514352f88a20
 AUX pango-1.26.0-lib64.patch 499 RMD160 0056b738ff517c2b1eb1a6b8e8173d91af0ebeaf SHA1 d514148e6ffced2b4f350abe25cd41282dbb3aae SHA256 1bb2671d49c54caf70e9df104ca26af4e76a536db14150a472b093d05d9f6347
 DIST pango-1.24.5.tar.bz2 1519944 RMD160 7e436752734c55950ad5feced7c7d5c3f040a1b4 SHA1 a5aa40b78546a7ee59f21804b172e5d47ef776ad SHA256 0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e
-DIST pango-1.26.0.tar.bz2 1535736 RMD160 b3b64d6af1eb9cc27d23a7e58d118df8fed25502 SHA1 567f9ace5a8384b3a59dbf95304dc8b1a271d5b6 SHA256 e1bfaefd2614ff86d531152f31fbf4a61aea723eef19b132733ccd3eb8d9a6c3
-DIST pango-1.26.1.tar.bz2 1538050 RMD160 cc9e3bd5d4cdfcb9c2298b75c4b02fee31816184 SHA1 d4891a34a46ddc9a6e37bcdf0fef4cbab7391b7b SHA256 e0254e979bf0fac305de596997cabda83e26c713b666bc582aa9e4b70cb0920d
 DIST pango-1.26.2.tar.bz2 1536011 RMD160 6613bddf643d5c912e6656d84c6671aa6ce88a9d SHA1 051b6f7b5f98a4c8083ef6a5178cb5255a992b98 SHA256 3b85879e5d8794555d10a2b79428071c99a93b7502ccbef50360ae44c77c3e08
+DIST pango-1.28.0.tar.bz2 1500538 RMD160 f5fb75ad47f20569081e95441d226f1570725ad9 SHA1 b77fd452a59e4e11ee8b97193344c945250d5d37 SHA256 68480485b714e3570a58c270add9e9785fa78068f7410949b478e8a9d3f5bc40
 EBUILD pango-1.24.5-r1.ebuild 1803 RMD160 c7465bb78db73e8b12e8cd38a030add0d944da8d SHA1 9e5c0b1e9113d45c00a604604c57cda4fd50828a SHA256 188431199fc5dac7f0a2384b945259fd765c49bd7edd144034721585f2e7eb9a
-EBUILD pango-1.26.0.ebuild 2283 RMD160 4d1531ef2ece5a20fa1614f67a0ff47ff480386c SHA1 4006e3b35853d5d8c3882dee5929190f2c2e1b94 SHA256 9e619259ce69794a8500dd499e90274876250b8416d7f373b17eb72aa1ef09ed
-EBUILD pango-1.26.1.ebuild 2191 RMD160 29a594c7729ec8ff0e808d04f5d6ba0754646894 SHA1 1e00641c2824af8188ef13e81079f637a77607e0 SHA256 0e402c88ffbc76864afdd237ede51e270ad3b09d080c08b237695fc388a7d41d
 EBUILD pango-1.26.2.ebuild 2219 RMD160 b1b3438ab70e6a89e2c894f569e75c2f14d3d843 SHA1 d136a8881640b362f82c660b615b39859437b8e2 SHA256 b873b434f4c93397c8971a839d2378c2495577e4d3448a11a3cb7a1d687a7f9e
-MISC ChangeLog 35300 RMD160 e14bb0726ea11ed1e830fa510e6adeb694cf7f9b SHA1 84db7b49ca68ba469d5cd78f7b8bffefacd846fb SHA256 f1052cbfeef177445c250886d14e0c4e3bdfba2169252c5435fad379ae296fc6
+EBUILD pango-1.28.0.ebuild 1929 RMD160 913ed0b787a99e66a6ad2a8f0e4c7293500dc1a8 SHA1 dd5ef1a90bb384f8aba34c0dc623cff38b0e4ca3 SHA256 1c6b4593af15e22a137c777042af3a47ef0c0b516705e50b3bc843f31cc24819
+MISC ChangeLog 35505 RMD160 844de1ff3f7457f7bd0a6a151687287ebd5f4002 SHA1 4b95418237f1d4d97d3cacf8d5bf2017b73710b4 SHA256 80dc75bc7ba7a5f98a51a57e0edf294083f62fe0642d8693ca7e33a9955dae91
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJVxAACgkQkKaRLQcq0GLHVgCfX5jklnxecZhbJYDgMnK90UkU
-wNgAoJpZMEjx00sIo8FVcPkHeEcU5J8s
-=8WFB
+iEYEARECAAYFAkwU+YIACgkQCaWpQKGI+9RMEQCfVUAXAONdDpn/v6vaEz6/hbT3
+UcMAn2p5d2z0NmaKUwSeoLM/D2flv8SL
+=O2g5
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.26.0.ebuild b/x11-libs/pango/pango-1.26.0.ebuild
deleted file mode 100644
index 8b3846585dbc..000000000000
--- a/x11-libs/pango/pango-1.26.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.26.0.ebuild,v 1.5 2009/11/28 17:39:38 remi Exp $
-
-EAPI="2"
-GCONF_DEBUG="yes"
-
-inherit autotools 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 test"
-
-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
-	dev-util/gtk-doc-am
-	doc? (
-		>=dev-util/gtk-doc-1
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	test? (
-		>=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() {
-	# XXX: DO NOT add introspection support, collides with gir-repository[pango]
-	G2CONF="${G2CONF}
-		--disable-introspection
-		$(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.26.0-lib64.patch"
-	fi
-
-	# gtk-doc checks do not pass, upstream bug #578944
-	sed -e 's:TESTS = check.docs: TESTS = :g' \
-		-i docs/Makefile.am || die "sed failed"
-
-	# Fix introspection automagic.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=596506
-	epatch "${FILESDIR}/${PN}-1.26.0-introspection-automagic.patch"
-
-	# Fix parallel build, bug 287825
-	epatch "${FILESDIR}/${PN}-1.26.0-fix-parallel-build.patch"
-
-	eautoreconf
-}
-
-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.26.1.ebuild b/x11-libs/pango/pango-1.28.0.ebuild
index 601d7e3ea7d5..443b19b88d7a 100644
--- a/x11-libs/pango/pango-1.26.1.ebuild
+++ b/x11-libs/pango/pango-1.28.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.26.1.ebuild,v 1.1 2009/11/21 09:35:37 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.0.ebuild,v 1.1 2010/06/13 15:30:04 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="yes"
 
-inherit autotools eutils gnome2 multilib
+inherit autotools eutils gnome2 multilib toolchain-funcs
 
 DESCRIPTION="Internationalized text layout and rendering library"
 HOMEPAGE="http://www.pango.org/"
@@ -43,6 +43,7 @@ function multilib_enabled() {
 }
 
 pkg_setup() {
+	tc-export CXX
 	# XXX: DO NOT add introspection support, collides with gir-repository[pango]
 	G2CONF="${G2CONF}
 		--disable-introspection
@@ -59,14 +60,6 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch"
 	fi
 
-	# gtk-doc checks do not pass, upstream bug #578944
-	sed -e 's:TESTS = check.docs: TESTS = :g' \
-		-i docs/Makefile.am || die "sed failed"
-
-	# Fix introspection automagic.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=596506
-	epatch "${FILESDIR}/${PN}-1.26.0-introspection-automagic.patch"
-
 	eautoreconf
 }