Block old sys-devel/autoconf versions to prevent upgrade problems like bug #368333. Remove old.

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

5 files changed, 14 insertions, 180 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 0354e24f3ce9..6dd6eb98a5a9 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.318 2011/04/29 00:54:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.319 2011/06/05 13:01:59 pacho Exp $
+
+  05 Jun 2011; Pacho Ramos <pacho@gentoo.org> -pango-1.28.1.ebuild,
+  -pango-1.28.3.ebuild, pango-1.28.4.ebuild:
+  Block old sys-devel/autoconf versions to prevent upgrade problems like bug
+  #368333. Remove old.
 
   29 Apr 2011; Jeroen Roovers <jer@gentoo.org> pango-1.28.4.ebuild:
   Marked ~hppa (bug #364693).
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 4708382c05ca..03de98da96e0 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,19 +4,16 @@ Hash: SHA1
 AUX pango-1.26.0-lib64.patch 499 RMD160 0056b738ff517c2b1eb1a6b8e8173d91af0ebeaf SHA1 d514148e6ffced2b4f350abe25cd41282dbb3aae SHA256 1bb2671d49c54caf70e9df104ca26af4e76a536db14150a472b093d05d9f6347
 AUX pango-1.28.3-heap-corruption.patch 1554 RMD160 a18ea9747315f936ce5067c84c969eb221d54c3d SHA1 e287ff68f2e430d4b5b54a22f9418eb44d580642 SHA256 5973c66fcae43d5ba9cd55b966f79fd265ae6068d817ff0a0857e2e20093787d
 AUX pango-1.28.3-malloc-failure.patch 6282 RMD160 5161f148cc68b35863ad846bb5bf208509e2b82f SHA1 43d5bcfc1df3e5651c3e4f3804e386e69a57d654 SHA256 6838d7a2aaf81b1434135254f6309e82f9b09292a6d5b00eb0f336e020b825cb
-DIST pango-1.28.1.tar.bz2 1483961 RMD160 04531a54148a22dfcf7f3060501a0126f701ee18 SHA1 2d5907f0ff108cb9c27f69d8e4de564ff3d30221 SHA256 8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2
 DIST pango-1.28.3.tar.bz2 1509501 RMD160 cdfd6d695b169e15801956fbfd54438c109f7a61 SHA1 e72887d6e147b9abf54628c003836e61d97767a1 SHA256 5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632
 DIST pango-1.28.4.tar.bz2 1503441 RMD160 e9dc19b62263fdbd5b58c00092220af87ed929df SHA1 e715954a5a3b358889d15b6235e1965303dbb622 SHA256 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f
-EBUILD pango-1.28.1.ebuild 1934 RMD160 a7ece8083c7bef285a4c4d7d971e237efa099b2b SHA1 fdddcdd729f8752e4ecff7952064f1c51aaa621c SHA256 dbdc2360e95c760fe05bbb35677078f5a2e3f716fdf5cb08309afa11a3545f90
 EBUILD pango-1.28.3-r1.ebuild 2597 RMD160 4297f20432da43a62fe20260e645783575de57e0 SHA1 94b5384023256d77dc14bb01d7dbeb48bd7f8cbc SHA256 5834d1f33837b7eb43d9a0ab6eb79f9180d50205879f93b6cb1e3b3382579cd7
-EBUILD pango-1.28.3.ebuild 2052 RMD160 d7dc94789a01fbeef7c2fbe0c77aac0e17e6714e SHA1 4d9e82629154a28d33189b04602621fc915f026a SHA256 4f12f900bb5cf6c6d6c7741e8f42946f4bafc9670347de1b7b24978e706efe47
-EBUILD pango-1.28.4.ebuild 2244 RMD160 0f331f8d0e9be77e4d69e35ed7566a1ac9cc66b4 SHA1 79f24160deca46352c95ee28711f000e0cf93778 SHA256 063d60425333f222f687a94062fd0c2500dcc73c9dda81565421f3b23f9ee794
-MISC ChangeLog 39746 RMD160 413858b00554e8eaef88e57673e629bb8e9a2ea6 SHA1 72bd847589fe2651457928f0ddb03976c9072d7b SHA256 15270f5559ea6d13453916f12e82d8903c264452d56a30646fa5088a55a422fd
+EBUILD pango-1.28.4.ebuild 2273 RMD160 b3523017d27fcc877dc0be210d19c763447fe7dd SHA1 8ca9b49578bd3563addfc1e1bc280daf605335d0 SHA256 68fd90d10496aa1cb3105c5079983a129cdd2a8b00e97b058689b88d405349c7
+MISC ChangeLog 39962 RMD160 319e11de3aafa3d489df30c1ec4721ce21fa942b SHA1 f6a1a659c81b143ce5fb0481f6e9daa781743154 SHA256 ff6082dfa41cc4f3f40458964aa60b2a2103d81f8efb7afd1f2f4269f99295d6
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk26DEgACgkQVWmRsqeSphOMaACfShPG875361JFCcpyQh5Zm9va
-Ak8AniyWRt9n5ZxkI815eX67GELsEJ8M
-=mhJv
+iEYEARECAAYFAk3rfk0ACgkQCaWpQKGI+9TkjgCdEfY5fzS7+D2JuQP5F8VrQKp2
+iN0Ani1l+FAHShjQII8tXogHFe31UiBZ
+=gw6h
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.28.1.ebuild b/x11-libs/pango/pango-1.28.1.ebuild
deleted file mode 100644
index 5d8ac4071dc7..000000000000
--- a/x11-libs/pango/pango-1.28.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.28.1.ebuild,v 1.10 2010/10/09 16:39:50 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-
-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 +introspection 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-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~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() {
-	tc-export CXX
-	G2CONF="${G2CONF}
-		$(use_enable 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
-
-	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.28.3.ebuild b/x11-libs/pango/pango-1.28.3.ebuild
deleted file mode 100644
index 54945658259e..000000000000
--- a/x11-libs/pango/pango-1.28.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.3.ebuild,v 1.6 2011/03/22 19:50:35 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-
-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 +introspection 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-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~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() {
-	tc-export CXX
-	G2CONF="${G2CONF}
-		$(use_enable 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
-
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}/usr/$(get_libdir)/pango/1.6.0/modules" -name "*.la" -delete || die
-}
-
-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.28.4.ebuild b/x11-libs/pango/pango-1.28.4.ebuild
index c2d41b87d398..d06c39b77976 100644
--- a/x11-libs/pango/pango-1.28.4.ebuild
+++ b/x11-libs/pango/pango-1.28.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.4 2011/04/29 00:54:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.5 2011/06/05 13:01:59 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -36,7 +36,8 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.13
 		~app-text/docbook-xml-dtd-4.1.2
 		x11-libs/libXft )
-	X? ( x11-proto/xproto )"
+	X? ( x11-proto/xproto )
+	!~sys-devel/autoconf-2.63"
 
 function multilib_enabled() {
 	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )