Remove old versions and put an error message when trying to build with GCC 3.3.

(Portage version: 2.1.1_pre3-r5)
 (Signed Manifest commit)

5 files changed, 14 insertions, 216 deletions

diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 580153e7910e..0bf996612da4 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -10,29 +10,21 @@ MD5 0aeab3ed1e4787b66ada984cdd7ea8ec files/libmpeg3-1.5.2-gnustack.patch 726
 RMD160 27aa188aef63042b4f47f54ab0a9427728cfc6fb files/libmpeg3-1.5.2-gnustack.patch 726
 SHA256 29658f031e529a2c287d0dae4140c18f619ea494011b005010dd2a715863003b files/libmpeg3-1.5.2-gnustack.patch 726
 DIST libmpeg3-1.5.2-src.tar.bz2 625682 RMD160 3198e42f529c5699dc7cf376d100831d0648f10f SHA1 bb7efb0ac5548302c02923e05ad5ce16da83aac6 SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba
-DIST libmpeg3-1.5.2-textrel-fix.patch.bz2 6386 RMD160 6547523cac00f1035505f40ce1eb720d5c6e04ac SHA256 b241e5bd5c05c90ec28ee6fdab33956ad51869ee506bf8b5e76f7f2f362b09dd
+DIST libmpeg3-1.5.2-textrel-fix.patch.bz2 6386 RMD160 6547523cac00f1035505f40ce1eb720d5c6e04ac SHA1 901fbbb0ae0b21f1a0c26cf62bdba3ec8d8ffce6 SHA256 b241e5bd5c05c90ec28ee6fdab33956ad51869ee506bf8b5e76f7f2f362b09dd
 DIST libmpeg3-patches-1.tar.bz2 4176 RMD160 becd106794d2302e6edd703c2a2b026800028a36 SHA1 7c74c7b02f5e318dff437b21c306e8118ae1cf95 SHA256 2d7ec6defe6fe83000ac68f794259dfdde1d74f3a4dd88b3e80a27dca9561e44
-DIST libmpeg3-patches-3.tar.bz2 4251 RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186
-EBUILD libmpeg3-1.5.2-r1.ebuild 2611 RMD160 d6c5f36ebb80eb0eb9ee3f2af8de253e39ca4dd0 SHA1 6d24e6b02f5ce665d7598b1e10be5ed18d9a1822 SHA256 05b5b516868400e1456349eec1e47567e4a6a0eaae192d4686a323c7e1edf05d
-MD5 116d5918c4dc0b76e0b82da0185afffa libmpeg3-1.5.2-r1.ebuild 2611
-RMD160 d6c5f36ebb80eb0eb9ee3f2af8de253e39ca4dd0 libmpeg3-1.5.2-r1.ebuild 2611
-SHA256 05b5b516868400e1456349eec1e47567e4a6a0eaae192d4686a323c7e1edf05d libmpeg3-1.5.2-r1.ebuild 2611
-EBUILD libmpeg3-1.5.2-r2.ebuild 2610 RMD160 babb4aa25f3e5dac0ed8dcb7bc8404c9a1e099c4 SHA1 2ac5bee69e9523cdba950129c3fe1320dee43d57 SHA256 49f05d4fdebd8f30705714e04f67b2eadb8ea4fc0d5e7dbd015fd89effc458e0
-MD5 730caa4f16fc47c0c379a4b1e8c87baf libmpeg3-1.5.2-r2.ebuild 2610
-RMD160 babb4aa25f3e5dac0ed8dcb7bc8404c9a1e099c4 libmpeg3-1.5.2-r2.ebuild 2610
-SHA256 49f05d4fdebd8f30705714e04f67b2eadb8ea4fc0d5e7dbd015fd89effc458e0 libmpeg3-1.5.2-r2.ebuild 2610
-EBUILD libmpeg3-1.5.2-r3.ebuild 2052 RMD160 cc41040a7d1f3d9bffa821c8ffacd6d2f923bbd0 SHA1 e579671ea6d2acda4e8dc91bb4d0e016eb4da676 SHA256 ccb4458beddb13476da613191b443d61f67b91ece3c5e1986e735d03c67934ae
-MD5 cf4239714ebbca9f28cc4ddd4cc3de91 libmpeg3-1.5.2-r3.ebuild 2052
-RMD160 cc41040a7d1f3d9bffa821c8ffacd6d2f923bbd0 libmpeg3-1.5.2-r3.ebuild 2052
-SHA256 ccb4458beddb13476da613191b443d61f67b91ece3c5e1986e735d03c67934ae libmpeg3-1.5.2-r3.ebuild 2052
+DIST libmpeg3-patches-3.tar.bz2 4251 RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 SHA1 7ee89ad5766637da12cd1870f207e1a2e5c900de SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186
+EBUILD libmpeg3-1.5.2-r3.ebuild 2370 RMD160 33dccd58742bdf790186d6ec4fe4808ccd2e365a SHA1 3d1d72ff189bab2b6a51348838166c4751ba8b5a SHA256 589cee728f698d8a502aba1cf660f92984b836f93469792b57bdf1aa19531ed0
+MD5 b1fc5bce8c0f68ab7cee628829f677a1 libmpeg3-1.5.2-r3.ebuild 2370
+RMD160 33dccd58742bdf790186d6ec4fe4808ccd2e365a libmpeg3-1.5.2-r3.ebuild 2370
+SHA256 589cee728f698d8a502aba1cf660f92984b836f93469792b57bdf1aa19531ed0 libmpeg3-1.5.2-r3.ebuild 2370
 EBUILD libmpeg3-1.5.2.ebuild 2008 RMD160 c68202364954b2d073a6a61cdacae9b5d60827b1 SHA1 133c215fc9a547e17fc3296ade596a08548aacf4 SHA256 9a258c25505a73d5a924f972b8d0eecfacfb5132495ef072cc863b1131ba617d
 MD5 c6c6825ba565aae9d3a5d7399745e98f libmpeg3-1.5.2.ebuild 2008
 RMD160 c68202364954b2d073a6a61cdacae9b5d60827b1 libmpeg3-1.5.2.ebuild 2008
 SHA256 9a258c25505a73d5a924f972b8d0eecfacfb5132495ef072cc863b1131ba617d libmpeg3-1.5.2.ebuild 2008
-MISC ChangeLog 7584 RMD160 7c6c97f576600c2de23c8472a3f9b99e362ae94e SHA1 e843a2a1445c310be5d1696a0478b2bba4e2c43c SHA256 43821a200fabbb511102adab185f3cfdb75df68e72b6af51670d07cbce38ebe7
-MD5 47160dbf202f4ee29f533b9f068bf5b7 ChangeLog 7584
-RMD160 7c6c97f576600c2de23c8472a3f9b99e362ae94e ChangeLog 7584
-SHA256 43821a200fabbb511102adab185f3cfdb75df68e72b6af51670d07cbce38ebe7 ChangeLog 7584
+MISC ChangeLog 7805 RMD160 c05d460d439b28dc3886a64359d8f6c9096491a9 SHA1 6ec9cce1a7608caf2edd32c3e6b2aca3a0bf13bc SHA256 b430918023f203deddff87eaff83f65b874b473d3b95ac08bf1ddcf48b8b1e59
+MD5 dcfec072386f098d4f7e1c9d2416ed5d ChangeLog 7805
+RMD160 c05d460d439b28dc3886a64359d8f6c9096491a9 ChangeLog 7805
+SHA256 b430918023f203deddff87eaff83f65b874b473d3b95ac08bf1ddcf48b8b1e59 ChangeLog 7805
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -40,19 +32,13 @@ SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata
 MD5 25db10887390623b15bd5be3ba4fc313 files/digest-libmpeg3-1.5.2 512
 RMD160 bb01910bbadd6b05c61fb894c78b6683961eb5c5 files/digest-libmpeg3-1.5.2 512
 SHA256 d78c2a1eb9e0280818e896831666a985d9d869cb007adb3e30e4ece4d36099f7 files/digest-libmpeg3-1.5.2 512
-MD5 25db10887390623b15bd5be3ba4fc313 files/digest-libmpeg3-1.5.2-r1 512
-RMD160 bb01910bbadd6b05c61fb894c78b6683961eb5c5 files/digest-libmpeg3-1.5.2-r1 512
-SHA256 d78c2a1eb9e0280818e896831666a985d9d869cb007adb3e30e4ece4d36099f7 files/digest-libmpeg3-1.5.2-r1 512
-MD5 652f940c23f681542d125f3b67d215f4 files/digest-libmpeg3-1.5.2-r2 512
-RMD160 573794a437d10297f713321e47cc622e51d551f0 files/digest-libmpeg3-1.5.2-r2 512
-SHA256 03fa862c63807b3b16bbc35844b17048cdadc729742d7dc9f3a0c6474f4c977c files/digest-libmpeg3-1.5.2-r2 512
 MD5 0f096fadc78614069fc77718d8707b55 files/digest-libmpeg3-1.5.2-r3 795
 RMD160 416f71a53fc054577e37f7c3399ec315cd813712 files/digest-libmpeg3-1.5.2-r3 795
 SHA256 268817d6fddb4be51d6e5c8c4f414a76583228e864ea8f0326c62dc3c86aaff1 files/digest-libmpeg3-1.5.2-r3 795
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEvNkbkT4lNIS36YERAmkmAJ9m1qj9ziN8la5VFiQiFUhoZL6LpwCgsslK
-Fix0mzUpmGQIfiqe9ivbbi8=
-=8p41
+iD8DBQFEya5fAiZjviIA2XgRAqA4AKCEgkMyx1HXwj0M69SyNfV0198/8QCfbH+Y
+yv9yP9mWEAz3eXW+8wol/w8=
+=Tadp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
deleted file mode 100644
index e5aa7fd44e12..000000000000
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
-RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
-SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
-MD5 2ae9393b4a201b0d6416cb8d3d338b9d libmpeg3-patches-1.tar.bz2 4176
-RMD160 becd106794d2302e6edd703c2a2b026800028a36 libmpeg3-patches-1.tar.bz2 4176
-SHA256 2d7ec6defe6fe83000ac68f794259dfdde1d74f3a4dd88b3e80a27dca9561e44 libmpeg3-patches-1.tar.bz2 4176
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2
deleted file mode 100644
index 21d1de144fcb..000000000000
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
-RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
-SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
-MD5 84f32e19c88437cbb043367cdc87d2c4 libmpeg3-patches-3.tar.bz2 4251
-RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 libmpeg3-patches-3.tar.bz2 4251
-SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186 libmpeg3-patches-3.tar.bz2 4251
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
deleted file mode 100644
index 3941b2cebcaf..000000000000
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,88 +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/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.10 2006/03/06 15:58:58 flameeyes Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-PATCHLEVEL="1"
-DESCRIPTION="An mpeg library for linux"
-HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="mmx"
-
-RDEPEND="sys-libs/zlib
-	media-libs/jpeg
-	media-libs/a52dec"
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# The Makefile is patched to install the header files as well.
-	# This patch was generated using the info in the src.rpm that
-	# SourceForge provides for this package.
-	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] || \
-		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
-	[ "`gcc-major-version`" -ge 4 ] || \
-		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 09_all_gcc4.patch"
-
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
-
-	# remove a52 crap
-	echo > Makefile.a52
-	rm -rf a52dec-0.7.3/*
-	ln -s /usr/include/a52dec a52dec-0.7.3/include
-	local libs
-	libs=" -la52"
-	if ! [ -f "${ROOT}/usr/$(get_libdir)/liba52.so" ]; then
-		if grep -q djbfft ${ROOT}/usr/$(get_libdir)/liba52.a; then
-			libs="${libs} -ldjbfft"
-		fi
-	fi
-	sed -i "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) ${libs}:" Makefile
-
-	if ! use mmx || has_pic ; then
-		sed -i -e 's:^NASM =.*:NASM =:' \
-			-e 's|^HAVE_NASM :=.*|HAVE_NASM=n|' \
-			-e 's|USE_MMX = 1|USE_MMX = 0|' \
-			Makefile
-	fi
-}
-
-src_compile() {
-	local obj_dir=$(uname --machine)
-
-	rm -f ${obj_dir}/*.o &> /dev/null
-
-	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.a || die "Failed libmpeg3.a"
-	rm -f ${obj_dir}/{video/,audio/,}*.o
-
-	# x86 asm is not pic safe
-	if ! use mmx || has_pie; then
-		append-flags -fPIC
-	fi
-
-	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.so || die "Failed libmpeg3.so"
-
-	# This would add -fno-pie to CFLAGS, so don't change to it! --eradicator
-	# filter-flags -fPIC
-	CFLAGS=${CFLAGS//-fPIC/}
-
-	touch ${obj_dir}/libmpeg3.a
-	make CC="$(tc-getCC)" || die "Failed to build utilities"
-}
-
-src_install() {
-	# This patch patches the .h files that get installed into /usr/include
-	# to show the correct include syntax '<>' instead of '""'  This patch
-	# was also generated using info from SF's src.rpm
-	epatch ${WORKDIR}/${PV}/gentoo-p2.patch
-	make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die
-	dohtml -r docs
-}
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r2.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r2.ebuild
deleted file mode 100644
index 6090f2eab367..000000000000
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,88 +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/libmpeg3/libmpeg3-1.5.2-r2.ebuild,v 1.3 2006/03/06 15:58:58 flameeyes Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-PATCHLEVEL="3"
-DESCRIPTION="An mpeg library for linux"
-HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="mmx"
-
-RDEPEND="sys-libs/zlib
-	media-libs/jpeg
-	media-libs/a52dec"
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# The Makefile is patched to install the header files as well.
-	# This patch was generated using the info in the src.rpm that
-	# SourceForge provides for this package.
-	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] || \
-		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
-	[ "`gcc-major-version`" -ge 4 ] || \
-		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 09_all_gcc4.patch"
-
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
-
-	# remove a52 crap
-	echo > Makefile.a52
-	rm -rf a52dec-0.7.3/*
-	ln -s /usr/include/a52dec a52dec-0.7.3/include
-	local libs
-	libs=" -la52"
-	if ! [ -f "${ROOT}/usr/$(get_libdir)/liba52.so" ]; then
-		if grep -q djbfft ${ROOT}/usr/$(get_libdir)/liba52.a; then
-			libs="${libs} -ldjbfft"
-		fi
-	fi
-	sed -i "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) ${libs}:" Makefile
-
-	if ! use mmx || has_pic ; then
-		sed -i -e 's:^NASM =.*:NASM =:' \
-			-e 's|^HAVE_NASM :=.*|HAVE_NASM=n|' \
-			-e 's|USE_MMX = 1|USE_MMX = 0|' \
-			Makefile
-	fi
-}
-
-src_compile() {
-	local obj_dir=$(uname --machine)
-
-	rm -f ${obj_dir}/*.o &> /dev/null
-
-	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.a || die "Failed libmpeg3.a"
-	rm -f ${obj_dir}/{video/,audio/,}*.o
-
-	# x86 asm is not pic safe
-	if ! use mmx || has_pie; then
-		append-flags -fPIC
-	fi
-
-	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.so || die "Failed libmpeg3.so"
-
-	# This would add -fno-pie to CFLAGS, so don't change to it! --eradicator
-	# filter-flags -fPIC
-	CFLAGS=${CFLAGS//-fPIC/}
-
-	touch ${obj_dir}/libmpeg3.a
-	make CC="$(tc-getCC)" || die "Failed to build utilities"
-}
-
-src_install() {
-	# This patch patches the .h files that get installed into /usr/include
-	# to show the correct include syntax '<>' instead of '""'  This patch
-	# was also generated using info from SF's src.rpm
-	epatch ${WORKDIR}/${PV}/gentoo-p2.patch
-	make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die
-	dohtml -r docs
-}