Remove unneeded versions, fix autotools mess in -r3 and -r7. Thanks to Seemant for reporting.

(Portage version: 2.1.2_pre1-r1)
 (Signed Manifest commit)

5 files changed, 22 insertions, 184 deletions

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index e46bbebe8be3..ea1f92ffab30 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX flac-1.1.1-libtool.patch 4041 RMD160 318f565de47c8ebc013138ab88ede143cea5fa21 SHA1 0ccf6de2bff39202291c041a55d76109adc797a1 SHA256 57547acadd1945360b594661f98ed8aabea2648b9ab19010da489adc7f18da16
 MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
 RMD160 318f565de47c8ebc013138ab88ede143cea5fa21 files/flac-1.1.1-libtool.patch 4041
@@ -10,33 +13,23 @@ DIST flac-1.1.1-altivec.patch.gz 5705 RMD160 a020226ab80cf26817becdbd53ad7ee9794
 DIST flac-1.1.1.tar.gz 1467204 RMD160 2bf336514bf76d7d12279a896deb919a4194b36c SHA256 fb8d5df895e785e8eb1687cc532faf8f5bc41c84e67b4f1c143786df698bcd03
 DIST flac-1.1.2.tar.gz 1516235 RMD160 58656837b02e211eaed5010d84c4ed59841c82d3 SHA1 65501f3547df99b153951edb2ee7bfc13dd56946 SHA256 ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 DIST flac-patches-1.tar.bz2 4083 RMD160 859ec8552b285a7e1eb21692c423b0f5c4262b7d SHA1 a083757aaddbf932d3755ca8c12fe4eec0ed7d0a SHA256 96f8a55fb220164c3d0a09467947a50b5d6ab475fdd7304c099e6416d37963d7
-DIST flac-patches-3.tar.bz2 5210 RMD160 44992428e32a31abace836d6a7d3b58513fbefef SHA1 878dc1d649a10ece5ae6eb23e7bb0b52636101c5 SHA256 a4e5f7146f8f7ba75ea6a9e760890c1fbc378c77415a5f8e7a87f3afc5055436
-DIST flac-patches-6.tar.bz2 6902 RMD160 bdceb952a30a28729cf0400516c209d0b99e03fb SHA1 8cbe60b7717329a626d919b354b2fea8fc094f2a SHA256 65c71e294ac521c5f1b6cb7dfc9df7a69e716711d79ea3a58bbbeaa43862b419
 DIST flac-patches-7.tar.bz2 7151 RMD160 f1a4b07588026928ec66ae68fd94ed21ba944bb9 SHA1 d400aefc171f04a0f2a50be0630af912d70d52fd SHA256 78e024d1d2598a9fb1735db55ae9497aec58b70eea4be9f876a727d553f13630
 EBUILD flac-1.1.1.ebuild 1688 RMD160 3598eb48f04ae1a175638ea098b601005112bf24 SHA1 810009a56a7d865ecc51d89c5e5148a60f16e87b SHA256 6e6841883977b43220c2e583631026d89ec12e56b7a680313bd9d141d91ebf8b
 MD5 362483021f51dc2248f95b0ffda1aaf4 flac-1.1.1.ebuild 1688
 RMD160 3598eb48f04ae1a175638ea098b601005112bf24 flac-1.1.1.ebuild 1688
 SHA256 6e6841883977b43220c2e583631026d89ec12e56b7a680313bd9d141d91ebf8b flac-1.1.1.ebuild 1688
-EBUILD flac-1.1.2-r3.ebuild 1770 RMD160 328aafe49e37ad28e9db38cb9df5f65b2d8c0713 SHA1 f225916eb9f98c4cd78cd83485f2d45f2b0e346e SHA256 c7f7849df4ee7ff7ec224b52da38812358646b2ebd732f3c6acffc6f9e8153ef
-MD5 18d66db71acc0333f3f3138e7bede999 flac-1.1.2-r3.ebuild 1770
-RMD160 328aafe49e37ad28e9db38cb9df5f65b2d8c0713 flac-1.1.2-r3.ebuild 1770
-SHA256 c7f7849df4ee7ff7ec224b52da38812358646b2ebd732f3c6acffc6f9e8153ef flac-1.1.2-r3.ebuild 1770
-EBUILD flac-1.1.2-r4.ebuild 1807 RMD160 7b0cedb8784a603e3bf2dd0e8e2a014b700d29b9 SHA1 842501d6733d6dfabe848fdb2a63459d165d1c06 SHA256 4241e620af7f041958c81f0b6e5dcbed377cfa25504549a48c7cf7d9d9197273
-MD5 4e34838e16cc684bc320e0a3234594d6 flac-1.1.2-r4.ebuild 1807
-RMD160 7b0cedb8784a603e3bf2dd0e8e2a014b700d29b9 flac-1.1.2-r4.ebuild 1807
-SHA256 4241e620af7f041958c81f0b6e5dcbed377cfa25504549a48c7cf7d9d9197273 flac-1.1.2-r4.ebuild 1807
-EBUILD flac-1.1.2-r6.ebuild 1956 RMD160 bd23d996ae5e2d779bc0fd5ffb209bee78b39a3e SHA1 14c85c4d364651b66ea72c45a085b3d999f5b1da SHA256 92dcbad099db052b6e80083376ed4be36a6e6b4becda6eeb1139636cf7b4c714
-MD5 ba892d6322947f4e3bb373643b8f1b49 flac-1.1.2-r6.ebuild 1956
-RMD160 bd23d996ae5e2d779bc0fd5ffb209bee78b39a3e flac-1.1.2-r6.ebuild 1956
-SHA256 92dcbad099db052b6e80083376ed4be36a6e6b4becda6eeb1139636cf7b4c714 flac-1.1.2-r6.ebuild 1956
-EBUILD flac-1.1.2-r7.ebuild 1942 RMD160 187a2bf5a1becaf5fd518ad2de69736edad7f81b SHA1 4d9b51bc6a29861cc6aea3728b2aadc6d6717631 SHA256 8547416e7f4143eb2057b6a4077db0b662d78e25cdcdc419269d776daeec0504
-MD5 6af5ab85a453686d0521ed978d2e655c flac-1.1.2-r7.ebuild 1942
-RMD160 187a2bf5a1becaf5fd518ad2de69736edad7f81b flac-1.1.2-r7.ebuild 1942
-SHA256 8547416e7f4143eb2057b6a4077db0b662d78e25cdcdc419269d776daeec0504 flac-1.1.2-r7.ebuild 1942
-MISC ChangeLog 12651 RMD160 f419c4270abfc29a37f8a6606dca0c7f6ed88ff7 SHA1 d6f63faae84d3d7ef976739b139bbe5ed26eea90 SHA256 6543242bde1b567fad09701917922efca8a73d461c000d01ed2869b1a3d1401f
-MD5 cc9762e4503c17d254961d2cd3c2b640 ChangeLog 12651
-RMD160 f419c4270abfc29a37f8a6606dca0c7f6ed88ff7 ChangeLog 12651
-SHA256 6543242bde1b567fad09701917922efca8a73d461c000d01ed2869b1a3d1401f ChangeLog 12651
+EBUILD flac-1.1.2-r3.ebuild 1724 RMD160 ff83ba2bfd4bad493a04ecf4379468939b188bc4 SHA1 59d38ac8fc30a53aba4ac1c68d69d3872609dcf1 SHA256 4e44104723dbc32ed5ae7a71d2a85d8292a949ee5d0fd42da2b36bdd5d59af10
+MD5 b2c92bf8ca684dd01af156c4bcadbc3c flac-1.1.2-r3.ebuild 1724
+RMD160 ff83ba2bfd4bad493a04ecf4379468939b188bc4 flac-1.1.2-r3.ebuild 1724
+SHA256 4e44104723dbc32ed5ae7a71d2a85d8292a949ee5d0fd42da2b36bdd5d59af10 flac-1.1.2-r3.ebuild 1724
+EBUILD flac-1.1.2-r7.ebuild 1989 RMD160 872740fd4edb17f5bacbf40bef1f9c120d79ce00 SHA1 4a83f6d4e2a7987d20dff13f454b3584080df325 SHA256 510d21f6751c17b871ebf06eadaadf5703a8f5f0e9fb66b0fe9f6e8251ebe69f
+MD5 73b8f9b3c57177f52655e5b4ac3bdde7 flac-1.1.2-r7.ebuild 1989
+RMD160 872740fd4edb17f5bacbf40bef1f9c120d79ce00 flac-1.1.2-r7.ebuild 1989
+SHA256 510d21f6751c17b871ebf06eadaadf5703a8f5f0e9fb66b0fe9f6e8251ebe69f flac-1.1.2-r7.ebuild 1989
+MISC ChangeLog 12899 RMD160 49862da6fd7d15b3f7497f9e0375940ae6ea4657 SHA1 17e671141806665626dc4dc6cc6a272779bcb2f9 SHA256 a96479c70f7c890f1a818dfc457ee901ed96eb8d7cb6d22b9ef78a54fa36ff8d
+MD5 4038ae34e1d689e0fb9370924319cd3e ChangeLog 12899
+RMD160 49862da6fd7d15b3f7497f9e0375940ae6ea4657 ChangeLog 12899
+SHA256 a96479c70f7c890f1a818dfc457ee901ed96eb8d7cb6d22b9ef78a54fa36ff8d ChangeLog 12899
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -47,12 +40,13 @@ SHA256 22a63a509fe9dd279963847c1eb9bfe7350a4ef687fc61d16ce8f87b686ab207 files/di
 MD5 007bfb6b2c1e1a5d4ef0551529585e69 files/digest-flac-1.1.2-r3 476
 RMD160 8f61eb9255e7ea8c81d35bf7e5c9061e6bd7f9fd files/digest-flac-1.1.2-r3 476
 SHA256 396d9bdb5eba67bf7f988987bb9ba317315f61ed33f14c0f9cfd0fb04095521f files/digest-flac-1.1.2-r3 476
-MD5 d8454b5b6b0774213bd25822250a7e9d files/digest-flac-1.1.2-r4 476
-RMD160 ed539ac12e4bbc0bfac7d336e68ff4e45c95e62e files/digest-flac-1.1.2-r4 476
-SHA256 7c4fedcf63476ab168d8ca96abdf7c8e50cf8be873fb4a85f2e12185fdbc8549 files/digest-flac-1.1.2-r4 476
-MD5 da0013e62175cb5892ee96097825842d files/digest-flac-1.1.2-r6 476
-RMD160 f32afe6f8dd6b648cd5b9b5206c66af7c0727455 files/digest-flac-1.1.2-r6 476
-SHA256 46ef7bc46233aa1a54d707db6f95c12e6fc529d1efc56a381af68b13c82e8c94 files/digest-flac-1.1.2-r6 476
 MD5 01cbd09d219268d6cd59de8ddc4d9aa4 files/digest-flac-1.1.2-r7 476
 RMD160 fe237652ef51b5ca8a381383be92330a46b5ee06 files/digest-flac-1.1.2-r7 476
 SHA256 adc4a73bd3ead2878287ed8fb713f824f110744445857ca78116e8fd0d3bb9da files/digest-flac-1.1.2-r7 476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFFr4cAiZjviIA2XgRAs5ZAKDNEG6nj3MWDQAF1kP+g++fLBbfwQCfQJYQ
+yhXn4zGVZludNfZdARiMha0=
+=oYSi
+-----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/digest-flac-1.1.2-r4 b/media-libs/flac/files/digest-flac-1.1.2-r4
deleted file mode 100644
index 53810f5ecdb7..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.2-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
-RMD160 58656837b02e211eaed5010d84c4ed59841c82d3 flac-1.1.2.tar.gz 1516235
-SHA256 ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0 flac-1.1.2.tar.gz 1516235
-MD5 97765c778dacdbd423587d070ab61bb5 flac-patches-3.tar.bz2 5210
-RMD160 44992428e32a31abace836d6a7d3b58513fbefef flac-patches-3.tar.bz2 5210
-SHA256 a4e5f7146f8f7ba75ea6a9e760890c1fbc378c77415a5f8e7a87f3afc5055436 flac-patches-3.tar.bz2 5210
diff --git a/media-libs/flac/files/digest-flac-1.1.2-r6 b/media-libs/flac/files/digest-flac-1.1.2-r6
deleted file mode 100644
index 1945bb5a0f85..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.2-r6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
-RMD160 58656837b02e211eaed5010d84c4ed59841c82d3 flac-1.1.2.tar.gz 1516235
-SHA256 ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0 flac-1.1.2.tar.gz 1516235
-MD5 6aacde3b8444b503c9ad97b52aa3ecef flac-patches-6.tar.bz2 6902
-RMD160 bdceb952a30a28729cf0400516c209d0b99e03fb flac-patches-6.tar.bz2 6902
-SHA256 65c71e294ac521c5f1b6cb7dfc9df7a69e716711d79ea3a58bbbeaa43862b419 flac-patches-6.tar.bz2 6902
diff --git a/media-libs/flac/flac-1.1.2-r4.ebuild b/media-libs/flac/flac-1.1.2-r4.ebuild
deleted file mode 100644
index 872d3413686b..000000000000
--- a/media-libs/flac/flac-1.1.2-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r4.ebuild,v 1.5 2006/05/26 17:21:14 flameeyes Exp $
-
-inherit libtool eutils flag-o-matic autotools
-
-PATCHLEVEL="3"
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="3dnow debug doc ogg sse xmms"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )
-	xmms? ( media-sound/xmms )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable ogg) \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		--disable-dependency-tracking || die
-
-	# the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-
-	# FIXME parallel make seems to mess up the building of the xmms input plugin
-	local makeopts
-	use xmms && makeopts="-j1"
-
-	emake ${makeopts} || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		install || die "make install failed"
-	dodoc AUTHORS README
-
-	doman man/{flac,metaflac}.1
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of flac, you may need to re-emerge"
-	ewarn "packages that linked against flac by running:"
-	ewarn "revdep-rebuild"
-}
-
-# see #59482
-src_test() { :; }
diff --git a/media-libs/flac/flac-1.1.2-r6.ebuild b/media-libs/flac/flac-1.1.2-r6.ebuild
deleted file mode 100644
index 4b70f31ebbbb..000000000000
--- a/media-libs/flac/flac-1.1.2-r6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r6.ebuild,v 1.1 2006/05/29 00:14:30 flameeyes Exp $
-
-inherit libtool eutils flag-o-matic autotools
-
-PATCHLEVEL="6"
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="3dnow debug doc ogg sse xmms"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )
-	xmms? ( media-sound/xmms )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Enable only for GCC 4.1 and later
-	[[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] || \
-		export EPATCH_EXCLUDE="130_all_visibility.patch"
-
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable ogg) \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		--disable-dependency-tracking || die
-
-	# the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-
-	# FIXME parallel make seems to mess up the building of the xmms input plugin
-	local makeopts
-	use xmms && makeopts="-j1"
-
-	emake ${makeopts} || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		install || die "make install failed"
-	dodoc AUTHORS README
-
-	doman man/{flac,metaflac}.1
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of flac, you may need to re-emerge"
-	ewarn "packages that linked against flac by running:"
-	ewarn "revdep-rebuild"
-}
-
-# see #59482
-src_test() { :; }