Remove all overshadowed versions to fix broken deps by my x264 old versions removal.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 28 insertions, 254 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 2e6b93472c55..9da1323d9135 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.66 2012/05/05 08:58:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.67 2012/05/07 19:50:17 scarabeus Exp $
+
+  07 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -x264-encoder-0.0.20110825-r1.ebuild, -x264-encoder-0.0.20111017.ebuild,
+  -x264-encoder-0.0.20111218.ebuild:
+  Remove all overshadowed versions to fix broken deps by my x264 old versions
+  removal.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   x264-encoder-0.0.20110426.ebuild, x264-encoder-0.0.20110825-r1.ebuild,
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index c3ab008b8ed4..0419428392c7 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,17 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX x264-encoder-nolib-20110425.patch 1547 RMD160 ace0273445d751bf1b538abad364e3b738dad21c SHA1 2cdb96488785f1f355018d0b6727b3bd373d43a6 SHA256 124955cb5322d5f40771669798217991826dbc1f8ca9daac821d672238011c88
 AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
 DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb89d5c500ffebfb45 SHA1 b2aa061648354aa80adeeba33819d8b961185dbc SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc
-DIST x264-snapshot-20110825-2245-stable.tar.bz2 516879 RMD160 4f1e00ddd170c75c6d3e140085358ff95c8e861f SHA1 0e8fff6252397d453b0f38cc0fdaf9699558194d SHA256 ab0ed4046a36093f00dfa572d7234c59cec5f6cb674d8bb0fe4e6bdd7604efa0
-DIST x264-snapshot-20111017-2245.tar.bz2 525683 RMD160 c8758e99017bdb7c70991e0ba35c4c79e3b34232 SHA1 8a007bbe5720f74ecbcf9f4fb71ad8cc6bd974d4 SHA256 b1b9450835ffece5079c9167d92c20486b97bb14fc33b34b1faf7443728d4c2e
-DIST x264-snapshot-20111218-2245-stable.tar.bz2 531234 RMD160 b60e78475239d7e187576e48c03c9e580379f43d SHA1 ccf6720a0b8d4078b1babee40c8b1bbde5ea7dce SHA256 8dc5edd9aa7fb0247605ec7db1bd48013849ec200d420d78ad7bce427d0db866
 DIST x264-snapshot-20111220-2245.tar.bz2 532402 RMD160 3e9dce921fa8d7a9dadacd6e9cc0d9a1ec884860 SHA1 8e1958383ba08d9dc4b3e6c0e209243111a10c39 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a
 DIST x264-snapshot-20120327-2245.tar.bz2 551101 RMD160 c583500c6f4bbc711ba2ac4d103b53ca4a386438 SHA1 d600cf6e6561e71f5c5d2f4f92979d0338112f83 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe
 EBUILD x264-encoder-0.0.20110426.ebuild 1599 RMD160 d52f69f60169a7a59ce5296512d2a24c2da83b99 SHA1 aca92ac18298fa366a31bbded71de36026105f3f SHA256 c845fd4500e9d2288aed581e4aaabedea321f6b1cac9c8251630e3a0fb98de85
-EBUILD x264-encoder-0.0.20110825-r1.ebuild 2477 RMD160 2678064f571710e297699773c6366e7212caaab0 SHA1 6445fbe972491946b0bb939078e9bf39240214e6 SHA256 6ffd0dcd3605c017d0978db0e02093cda39c45c1b8ba2695e683241a2e371da4
-EBUILD x264-encoder-0.0.20111017.ebuild 2467 RMD160 8357a38e46b7dc524d621091ce7c883efc74c399 SHA1 bed33b278d4b6757d6387b9af1772f4c99b2bdd8 SHA256 f12a36376fb82f7e0cc6e039923651bad71280f7e0f97d472bcb206c7481c3a0
-EBUILD x264-encoder-0.0.20111218.ebuild 1983 RMD160 f44a2bc419dd744e0ce536e6033fb2dfc070bff3 SHA1 e11787632e729b677d36a38f4903de731a165069 SHA256 881bbaae74ddc5242263645f11dd304d25937317ccb0817d8ce03ee05e583bd6
 EBUILD x264-encoder-0.0.20111220.ebuild 2465 RMD160 1c38a194a93efdd8a70ee5d4f9375caf7f3688ea SHA1 292068044c46c36f19814480161b4fdd54f90de4 SHA256 fb2c612df6bc5e6c6fa18c3652d804c060f8780563f210b8703a8259b2bd0b71
 EBUILD x264-encoder-0.0.20120327.ebuild 2467 RMD160 267ef694648de39c8fc86e748dfefa86573162d2 SHA1 50f2e175f9ccf3492c55c4d6b7909822f472844d SHA256 b658c9c8fb9051fd8492bb7bfa64375bb80b819edee7e3c991369746a4b3321a
 EBUILD x264-encoder-9999.ebuild 1975 RMD160 7883d7e1b6a20a0a7ce3b02afdc816d25a9b7f89 SHA1 7b7ea28d500796d8042a4d8c135fd0cb487e8975 SHA256 44d866f5baed79b6e6002689c0f04c6a48eb3f7ab8be59255faeef4ff8beb72c
-MISC ChangeLog 11396 RMD160 f10ce3332f753454683f75454541c5c83c5526d5 SHA1 f042e75f38dacbac772c0a53093cc642314aa067 SHA256 13f688e88acd0756156c17473f03f3b8ab22b39aaaaa22686fec14a0cede1a7f
+MISC ChangeLog 11656 RMD160 d1e004584e7fce8ba958489248d5f8efbb56a999 SHA1 e779b3b508996a149fbfd09871f03ca9ae8a1ab5 SHA256 4ad8910b558e96e2d752984b79748fbe109b2c6742af0c9a82eca38ce89a7cf1
 MISC metadata.xml 518 RMD160 3440b9fcbcb5cf3ae84df312121c234cd798893d SHA1 7807975d69297fe975731d8626323abaeacb05e2 SHA256 3c234897ff680a5fe89179bd8da788695cee616a856c0e9fbc20eb6c388b01b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPqCgzAAoJEOSiRoyO7jvoN8gP+weqUwZCjhNzdeJnJ6UFqipu
+507f8EUofGgz0nEdjMJ713hOaSANhkS5WAO8zEqS/9luiu95m+tdGHYPfjrtkiwt
+0sP4+K3h1jl9R/3mMEbPmPpIxcXqGqaRDpXFhmiB5N3m/qgu4s6bAA8LoXOkF1Eu
+W0DccL5vc2wHWE/+YVHZEifIDJ2iGTeONlPex0Jw/H4rS7mZbb1WUgyjAuwDKcrR
+BW4OAfuqOfCBYPLChCAw32eII6MiIr2B/3wTVxsj4o/XKKb3gKRtncAvSuDg1TmD
+Lo0+5+sAWfTaLM18VPgbk70sJ0BPFlAdvTX1PIQeKQSem0A01mgRhWk6UwYvlQdp
+hN6d7IjEJ1644AzQkXf2ax3cc8Pi+VLvZEWFMoARx3hjrsymGcexLJ1X4f8F+Rt8
+gMhxLBneftqO5aOVaD/sVcOMoXGRO1fqrOibElXGjSfHYLqQeEX51qJbizigYuR/
+qxmrgefbR9+/36S/MuUyLWEc5022zFT3XQY6xxPrYE4zXWe0NYdaSztG+bW/+b/W
+HfBBPdPglEmpTJ+X5cVbuLl/l28p0uhB5qkPtfzcSSMkcODesyfje6X35dLlJnLF
+MCtbP/MuS6s0DhbxhvMgV9Tff8L5TjHn2P+RGN9ndniZd3SOcCMshxNSx03gfkt5
+DUquefxKr4W5c2bZssrN
+=GxOu
+-----END PGP SIGNATURE-----
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild
deleted file mode 100644
index 46b811c4808d..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild,v 1.2 2012/05/05 08:58:56 jdhore Exp $
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	V_ECLASS="git-2"
-else
-	V_ECLASS="versionator"
-fi
-
-inherit flag-o-matic multilib toolchain-funcs ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
-fi
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	EGIT_REPO_URI="git://git.videolan.org/x264.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="10bit custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.2 )
-	x86? ( >=dev-lang/yasm-0.6.2 )
-	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
-	virtual/pkgconfig"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S=${WORKDIR}/${MY_P}
-fi
-
-src_configure() {
-	tc-export CC
-
-	local myconf=""
-	use 10bit && myconf+=" --bit-depth=10"
-	use debug && myconf+=" --enable-debug"
-	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
-	use ffmpegsource || myconf+=" --disable-ffms"
-	use interlaced || myconf+=" --disable-interlaced"
-	use mp4 || myconf+=" --disable-gpac"
-	use threads || myconf+=" --disable-thread"
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-avs \
-		--system-libx264 \
-		--host="${CHOST}" \
-		${myconf} || die
-
-	# this is a nasty workaround for bug #376925 for x264 that also applies
-	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
-	if use custom-cflags; then
-		local cflags
-		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
-		cflags="${cflags//$(get-flag O)/}"
-		cflags="${cflags//-O? /$(get-flag O) }"
-		cflags="${cflags//-g /}"
-		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
-	fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20111017.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20111017.ebuild
deleted file mode 100644
index ba504306750a..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20111017.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20111017.ebuild,v 1.2 2012/05/05 08:58:56 jdhore Exp $
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	V_ECLASS="git-2"
-else
-	V_ECLASS="versionator"
-fi
-
-inherit flag-o-matic multilib toolchain-funcs ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-fi
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	EGIT_REPO_URI="git://git.videolan.org/x264.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="10bit custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.2 )
-	x86? ( >=dev-lang/yasm-0.6.2 )
-	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
-	virtual/pkgconfig"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S=${WORKDIR}/${MY_P}
-fi
-
-src_configure() {
-	tc-export CC
-
-	local myconf=""
-	use 10bit && myconf+=" --bit-depth=10"
-	use debug && myconf+=" --enable-debug"
-	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
-	use ffmpegsource || myconf+=" --disable-ffms"
-	use interlaced || myconf+=" --disable-interlaced"
-	use mp4 || myconf+=" --disable-gpac"
-	use threads || myconf+=" --disable-thread"
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-avs \
-		--system-libx264 \
-		--host="${CHOST}" \
-		${myconf} || die
-
-	# this is a nasty workaround for bug #376925 for x264 that also applies
-	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
-	if use custom-cflags; then
-		local cflags
-		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
-		cflags="${cflags//$(get-flag O)/}"
-		cflags="${cflags//-O? /$(get-flag O) }"
-		cflags="${cflags//-g /}"
-		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
-	fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20111218.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20111218.ebuild
deleted file mode 100644
index d7f88409ee62..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20111218.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20111218.ebuild,v 1.2 2012/05/05 08:58:56 jdhore Exp $
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	V_ECLASS="git-2"
-else
-	V_ECLASS="versionator"
-fi
-
-inherit multilib toolchain-funcs ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
-fi
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	EGIT_REPO_URI="git://git.videolan.org/x264.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="debug ffmpeg ffmpegsource mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	~media-libs/x264-${PV}
-"
-ASM_DEP=">=dev-lang/yasm-0.6.2"
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEP} )
-	x86? ( || ( ${ASM_DEP} dev-lang/nasm )
-		!<dev-lang/yasm-0.6.2 )
-	x86-fbsd? ( ${ASM_DEP} )
-	virtual/pkgconfig
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S=${WORKDIR}/${MY_P}
-fi
-
-src_configure() {
-	tc-export CC
-
-	local myconf=""
-	use debug && myconf+=" --enable-debug"
-	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
-	use ffmpegsource || myconf+=" --disable-ffms"
-	use mp4 || myconf+=" --disable-gpac"
-	use threads || myconf+=" --disable-thread"
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-avs \
-		--extra-asflags="${ASFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--host="${CHOST}" \
-		--system-libx264 \
-		${myconf} || die
-}