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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 11 insertions, 104 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/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
 }