Pull revisions that cause havoc with GCC 4.5; these should never be stabled.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 9 insertions, 143 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index e9db26d76b07..d69b2b97f7ad 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.144 2010/04/25 18:53:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.145 2010/04/25 18:57:31 chainsaw Exp $
+
+  25 Apr 2010; <chainsaw@gentoo.org> -tar-1.22.ebuild, -tar-1.23.ebuild:
+  Pull revisions that cause havoc with GCC 4.5; these should never be
+  stabled.
 
 *tar-1.22-r1 (25 Apr 2010)
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 9b37d563bf9b..184361522708 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -14,15 +14,13 @@ DIST tar-1.23.tar.bz2 2189324 RMD160 e79062b7f69d80b734445306f69fb8b96801e909 SH
 EBUILD tar-1.20.ebuild 1654 RMD160 b7bb0fc7bdcfbf33d00fc8a337e8c15c9a801147 SHA1 d80c6ea3d8e71e2a3c8eed9f652ac88babd17dec SHA256 1ba966014de965854cbd2a98aebb899392e889512492a5b5507c57fe59dba496
 EBUILD tar-1.21-r1.ebuild 1782 RMD160 b720a7bd217875e8c03b0b41b460a35a28bcf49c SHA1 489f1d5205b3587d44d8b44c628c7da5525b519b SHA256 c6cc9ba591d974f1911b67e058fdc39fb5b598f031d9e717363ed30cea96e7b9
 EBUILD tar-1.22-r1.ebuild 1783 RMD160 63e68ca7d7e3e9ea66de96000eb87417f4c1f393 SHA1 79751f031b9dabc55ee749122d120085264b22f1 SHA256 253d53116b0a87c712aef285d55ee09dd9b68d213e73ecaaece9bdf597b9a500
-EBUILD tar-1.22.ebuild 1729 RMD160 0f54056f5863afc1cdb87ace86712a36933b3e29 SHA1 58b1d09e17c7c0157d5a0a52a43e2493c80b3066 SHA256 51f382602aad242486d56fcd715a855ef80e5a3db0729d5b2f2438913577fff4
 EBUILD tar-1.23-r1.ebuild 1718 RMD160 ff1571a774e125fcad74d5f1bad2e977f4786953 SHA1 ffc3192881ff573d35c3b581c8881764cf48d302 SHA256 ab5f9599221a0159706943f800b349827a478ddf52b69f8d68ff1188ffe1925c
-EBUILD tar-1.23.ebuild 1663 RMD160 f54f04ef4da24ed97afe7a26aa6e775e5563fe1d SHA1 9c22cb430e703495be53a8d9b91dfc31ec5844fc SHA256 910f5402d7ec00820439cfeb4136f3ccf94cb22653479c9a5375b8fac120cea2
-MISC ChangeLog 21637 RMD160 200de1bd6b67724cf9a021fc01db53b7d60047bc SHA1 3137fb442e85a4579955c314a62c3f7ecd454086 SHA256 7f4783e5243361855bd5c2eb04a54880a559fd8a64cc3f7d77637de45f7d779e
+MISC ChangeLog 21792 RMD160 9884fca97aa7a2fe3d73f89a4ab77c545251405b SHA1 73c0b1480f96523ac7c0f0cfa2e3963cb2a16200 SHA256 a36dfba8568d2a6bb159b705b7689de848cb3fb0834856ca8e2176685d42e68e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvUj/sACgkQp5vW4rUFj5rQ8wCfcssrc7a7JWgJEcC0NJOy2X6t
-mG0AniUrlV4ArydoEsvHweteUTdEe7Me
-=U7jE
+iEYEARECAAYFAkvUkN4ACgkQp5vW4rUFj5rejwCePHf2/2R2imSD/Xqed2zJNu9g
+EiMAoKDjuwUDAYxNSqXIb00T3d+Biwy+
+=JR73
 -----END PGP SIGNATURE-----
diff --git a/app-arch/tar/tar-1.22.ebuild b/app-arch/tar/tar-1.22.ebuild
deleted file mode 100644
index fcb79ed26e37..000000000000
--- a/app-arch/tar/tar-1.22.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.22.ebuild,v 1.1 2009/03/05 08:09:44 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	ftp://alpha.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls static userland_GNU"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.21-revert-pipe.patch #252680
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use static && append-ldflags -static
-	use userland_GNU || myconf="--program-prefix=g"
-	# Work around bug in sandbox #67051
-	gl_cv_func_chown_follows_symlink=yes \
-	econf \
-		--enable-backup-scripts \
-		--bindir=/bin \
-		--libexecdir=/usr/sbin \
-		$(use_enable nls) \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	local p=""
-	use userland_GNU || p=g
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt || die
-	fi
-
-	dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
-	newman "${FILESDIR}"/tar.1 ${p}tar.1
-	mv "${D}"/usr/sbin/${p}backup{,-tar}
-	mv "${D}"/usr/sbin/${p}restore{,-tar}
-
-	rm -f "${D}"/usr/$(get_libdir)/charset.alias
-}
diff --git a/app-arch/tar/tar-1.23.ebuild b/app-arch/tar/tar-1.23.ebuild
deleted file mode 100644
index b9cf4c59f05e..000000000000
--- a/app-arch/tar/tar-1.23.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23.ebuild,v 1.1 2010/03/10 13:55:50 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	ftp://alpha.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls static userland_GNU"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use static && append-ldflags -static
-	use userland_GNU || myconf="--program-prefix=g"
-	# Work around bug in sandbox #67051
-	gl_cv_func_chown_follows_symlink=yes \
-	econf \
-		--enable-backup-scripts \
-		--bindir=/bin \
-		--libexecdir=/usr/sbin \
-		$(use_enable nls) \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	local p=""
-	use userland_GNU || p=g
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt || die
-	fi
-
-	dodoc AUTHORS ChangeLog* NEWS README* THANKS
-	newman "${FILESDIR}"/tar.1 ${p}tar.1
-	mv "${D}"/usr/sbin/${p}backup{,-tar}
-	mv "${D}"/usr/sbin/${p}restore{,-tar}
-
-	rm -f "${D}"/usr/$(get_libdir)/charset.alias
-}