remove old

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 9 insertions, 631 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0d05f30ac5a1..d1d42187650e 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.799 2014/10/31 10:53:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.800 2014/10/31 10:57:36 aballier Exp $
+
+  31 Oct 2014; Alexis Ballier <aballier@gentoo.org> -ffmpeg-1.0.8.ebuild,
+  -ffmpeg-1.0.9.ebuild:
+  remove old
 
   31 Oct 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   add xcb useflag
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 8ee974c05a9a..bb1748e82a6c 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,8 +9,6 @@ AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b8
 AUX ladspadl.patch 723 SHA256 b660bef2bdd4ecba5c3ec04fccee16f4ed3eab0dc7f125f19ab004274df7d17a SHA512 fa2022e2ac73cdf63a7ebdcc71672123adf223b4eca4ee027974a3de380f54378d063166c7048c243ccfb2a95b8ebbd1115f010fe9e491bbdcee7896c523d790 WHIRLPOOL c2d175d1e953117365a929ba85d75b0fc5e60ae4e23a00a2998c6f62c00084a3d78becf027ef2710f8768cd7528b333dfad9dbfea049a7d2f45b5b66751e16a4
 DIST ffmpeg-0.10.15.tar.bz2 5785998 SHA256 8b6dbf73c192d2217e6ded8e0dd560c678f362e373d87c28ed9fc8eb52293d5d SHA512 0fb719847bfdc16d17c64b1be607427557c63cdf7a8a637231b1dbaac38bfc3dc3ff8f69d51a6c0305d05b2b186ecfcf5e6d2a5f3192f015be9751e0481e429e WHIRLPOOL 69798dcdc0a37d837840bfc2e5cb37177f8ddaf47153c25a5c24726723fa6ca7b39e0940eb2133ee4715e855d7dd08f05dd7252f94a48424909ac799d1900cdb
 DIST ffmpeg-1.0.10.tar.bz2 6443581 SHA256 1dbde434c3b5c573d3b2ffc1babe3814f781c10c4bc66193a4132a44c9715176 SHA512 0fcc0541db6cdbf044dbb000a214194b0bfc67f4ac3e5c6efb2207c84bb11f6c6c3cf245ea67e1912256d1e1a98cf336a6f548d154393c36e266d92093006ff7 WHIRLPOOL 50c75a41747394aa2629cdfc6bd631e0207194c87ecdda120032f42e0d04327443fb13ea2b00ed52212da30992b01318846da0a0a594bac7d5757bccb525f32c
-DIST ffmpeg-1.0.8.tar.bz2 6452144 SHA256 8580a317aa09fdabdcf5119c87f59fd3baa4df0f636aac4d3dfeb86c572277aa SHA512 5fc6caf20c016e9d8ff41175d3bb5bf6d4a2c25c65ea8630d45ef8d9a16ee53120d76e4bc220b4f4462618e5c731114182776d7193e9d085332cf087038f3488 WHIRLPOOL 6a6b80a5aa44ee1a1c0af61bdf95659eb319ae48b690c2c1b9dd5291ad3b6f5ab52884c835d925da88dd2467f49ec2198cb78c2ef78af4f2e372c6364c769f6e
-DIST ffmpeg-1.0.9.tar.bz2 6449857 SHA256 98b3c35bcc602ab1e236fa64da8ead3deae7a5f9c958c572b46fb299260d1034 SHA512 323764f40a03ec339e1743a57ba545c74b7a58fad7c2db29c252dd276a74e761f00649aa560415cd38e80db51d34037c66c8aaae6971f35d83f7d1943d1e7109 WHIRLPOOL e4ba2ce05f76a2414a46fbd04d50c1d1f7638b43fee718ab60d56f8ef5fbe367f33d992c3a6b3802cde9cfeb0252c4112a0f0e1c56c4fd10d76ead424f3c0ab1
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-1.2.7.tar.bz2 5969563 SHA256 669b59483773b5b58d63b65e12749d68428729eaa6978c5acc6c82a60a2ed28e SHA512 b23800b1f7de5ab3ee473931f4d8791e4927b8d248df66c36ade54001365438eb7424ec2ee9e018ab37b76a9551457efdec019ea8356f8e59f1055fe1096f88b WHIRLPOOL d28a3c4bd7c67847d21c71f33b7fce0760136881ca2228c18ae41d5dc6ead2a50d9cbcf3d6593a82e51e666428389fce0c546f711b13bae530c464de2ac3101d
 DIST ffmpeg-1.2.8.tar.bz2 5970565 SHA256 429b5904abca0bc443bcc06358988aab9169683021aac21a306de28f329d2e59 SHA512 caa13a44d25c9d51f96c33b0e920a42fe899736cedf89c13513850fc1d0d81a6f67ce7391f98480e9283c8ca01be01e8fc43243a5a49519873df8a06d6083d8c WHIRLPOOL 23ca014f5f13060c220ce61b4e22a6207c4194607763ed2e77071bec8617644e4065cb8e42ba8b05a8b4802ccd5a9a3ed8510791c7eb09a57bec60f1ec360ab6
@@ -24,8 +22,6 @@ DIST ffmpeg-2.4.1.tar.bz2 7367864 SHA256 b4aecfce2c41ea4a21320dad818aa9a365b09a9
 DIST ffmpeg-2.4.2.tar.bz2 7367100 SHA256 974f90a9d7bde835213ab970c2190402e5d6566e47a7bb657d756ee92540fa7e SHA512 a5ed325f63dddbadff17291b8fbff4c6055a736c6ff9431c63c5e304510189e90110c36ae4a186954b8b9fdb76ac11f0a8435c13dfe54675eca6d7e2acd85fa3 WHIRLPOOL 22f0e49fc59fd88dad4fc44ccb38c2af7eb8364ebc0e3a9d6274f5dc5cc1d13036a0c65e618bf7e90757b8e69bc6b17e48f8298798b00c37643be5057bb406ab
 EBUILD ffmpeg-0.10.15.ebuild 9938 SHA256 d4c3b812f56c3c610c42709836c2263912b4118c86b1953289ba44493c5b511b SHA512 b04f03badab825c227af90d7986bb6b46b7b8b4ed20ef6de04d8429cf630ba96d36981b951c13443b48c6ff49a4e21f1d8c17108ce7862d2a41ce80386d42dc5 WHIRLPOOL 7188c3419031aa6a74cec9549a2dde10a88bc7c224160fc68121dc8b82e4b8fee14dfd065676274f9ec194251a092545dab2fd7d9c16a22e0dde9f8ecece8d2d
 EBUILD ffmpeg-1.0.10.ebuild 9661 SHA256 8e268c28be34d501171171af761494f37a26a8fe84293e9b8a05cf8bfd56ac76 SHA512 79781c15c09bff885f6f193e361bf8f929eca66903575fdfdb1188afc5d69c3bb6d0bd232d5eced7f4ac4a9c2f3aaff59a4164024e38bbd7f4c0a2c4a074c008 WHIRLPOOL 84e24bfc65736aa714a5506c9e8b1fa9e6ddc91e0c06e991e4598cdf1b85c1da68317fded1374fbfa6076f7a81c0da0cded87d7e3e9f2a1427d5218a59482fcf
-EBUILD ffmpeg-1.0.8.ebuild 9652 SHA256 1def1e010712626f090b7945a3fdd7134d39a6fbef32b589681675d5d9c41ec1 SHA512 5980171b00391cd8911c8a8e0e23648ee7bca693e6304b9440c81dba27cb8be7729e5dc32c3ecd52d95a683519e89b059ac235226a5e79bddb72e5c412fa8d3f WHIRLPOOL 6ce5c315b8fab1e2f9d7ddf322075cbf03f1cbbac4e189fc6642e859b0167dd0146084396fea2948c4feca625680a7db55d1c924dac3c1539bfb9e6b9a24f45c
-EBUILD ffmpeg-1.0.9.ebuild 9660 SHA256 e0ced5226a124b248e69a5203e03b94c32857b653d95e1ae04fcdd645b9497c0 SHA512 560d050a1fc529c8d662e06d84a3a8ee7eed4a9914d6499f0a3798be28bbb7939e20703156b0516da7afde802218f3ad971ab7d525edb73554a298bbea9dd021 WHIRLPOOL c8438ee1fae964cd0f1f7f6c61d089fa4336488b2e11ed6c34df47cb330e0265df338ea1133bc323c7869b4828f5dc00423ae945d13a54083627dd967451092e
 EBUILD ffmpeg-1.2.6-r1.ebuild 10971 SHA256 744922812b304456ca62be21ba8241ad45508cb2ece3421a65874f48c8da54e1 SHA512 52473418fb4eb13735ff2a69f1771d5371ade710fe1cd3c4578e1fe3231165ab5774ad23681aa1f083e396282d0690a3fb09ece623feff39786bdcc6177eb952 WHIRLPOOL 73bc7685d5fd0d6e68f4914e246f6de991cd826ea4e952320450aaecd803ec873606e27495ce3892ef78de777f0d7292dfcd4e42873be2a7712df09a1fe11918
 EBUILD ffmpeg-1.2.6.ebuild 8997 SHA256 04e7bc631ea399188fd9bed00c2d6c78e0113b1b197f55c31a1da002f92275de SHA512 3347cf697f21917b4bb4b669bc7da888d1e1d2207192e8a692d6f13eed2d091a6da85c44ef15592e12a3dbced218c5269bc8058da44c7b872882b21a71f3919f WHIRLPOOL 957a847757ca8fc032236fb5a97769a0a0aa2ed55a62913098fd8a915426ddf87fd4850d5c716222923d3f6564a0833f079de7e36faa4fdbfb9f0f7801476b0e
 EBUILD ffmpeg-1.2.7.ebuild 10927 SHA256 f93cbe16de7d436740fa321a3fb0522a3f0253aa55b14e520b40649da4120a93 SHA512 51bee7cb143fc16ab8bc5ddd7c0654db6d4de2831ac1c72ab816bc065e7f2768e162768c12ef78431534f97e0ab8687fe3225f288ada28ff530b3c9701adc922 WHIRLPOOL 4c4cfe485e234675b1dcb6dbfffff00f6c0016284b31d5d028ba44320819e75f0c9526cb17f38570bf638f72f8ad4a34c2a145df00692794497f91ddb3619cf1
@@ -39,12 +35,12 @@ EBUILD ffmpeg-2.3.4.ebuild 12854 SHA256 6a88d47b94a025f85cc007f2b07b99f4b4987d53
 EBUILD ffmpeg-2.4.1.ebuild 12968 SHA256 8c6b5bb57fae211e6247f24bf297add8fd59a32fb32bfefa44a2a5f6e6de7f54 SHA512 b6cd190c7967686a0ded66f17d7914632564e24db6dc41f365affa92317172e5557ea6e6d07799e778e42d3abc8438660a3cdf229e2c6e8b353cda3b16d0b2fa WHIRLPOOL 63f1c1643d5830cd1c71663ce7b6718dff31d1546f9e53120efd04d33f4ec47608cf67fdcfbda88b8b082b625d446fc1aaf3c41c84e2cf0b8875beec67d0f66b
 EBUILD ffmpeg-2.4.2.ebuild 12968 SHA256 2bd75fd3f786bcf41bf254583758fce36532f6c46bdfac4a05dcc53184d5fdaa SHA512 463e55cbd3b59196b425ceab6c56e8e1d7f0dfc4b948ef14494a15c35a624c6cc9a3dd98c56fd67193760d5de06cd3bb2f902f5e2e52e2347e1297954c441faa WHIRLPOOL 6680008c6927698de77609084450d8be9f6b3f8e7af5b326cab85f7b100662df8b5dd1582aaa69c8d5dee2ecc795a1a0e33706768163645d56abfce19ff5c91a
 EBUILD ffmpeg-9999.ebuild 13063 SHA256 8ebf2e94213d0a65bbe839d45b847d936cfbf16a468fa098a68b027b89fc42e7 SHA512 980dcba3010aa58a8aa4aa3b12aac3e6ea38f7ebdad6b80a139f2b344e09e947ea1c31f7a627a63a757cde9a9802ad6d765f53fea9518b13b6297209afcb2d61 WHIRLPOOL 21ef569e95c8c601bf19e8376d5ed6b97afba05d0f5917289ea5fb2a9ded8a837a3aa4ef3db180a6a176e0395330e1f4a3957a1353fd969ecd1cfc8cd1eb555d
-MISC ChangeLog 110628 SHA256 ccb6f9fbf2383dbf85890e2e87a8ab9d3d13921b6901fee01e197f0184139963 SHA512 2dd378e64f9138fbbddc904978be595d343da2b440aca6de201df0e36051f39a0557f1c925baed969f751e11884bd46b792725e7e5fc8e75ec4806b4e222a0b5 WHIRLPOOL fd0c002979cfea0da98b2161fc69db776ff5cfd0bebaf5d9df4805609acd413ef5b072df420ebd510d7af4a1f86c0fc8ec70fb642f75ed9964768e09027a08b6
+MISC ChangeLog 110740 SHA256 27f86da90f56c7cad0f50cfac35d0a910fe3aabe5bb84d60fc3273507b39a773 SHA512 ad9614cff3a8e5bb7d5ba9d03b68b5db919806ec25eb703dbc00723ef4c586d67fdb1b94d6455a1cd6080cb5f2e82110b0bb683385ed0e4166eb37f0032d1183 WHIRLPOOL 4957b58f01b9bf0b1dd3ccb97b00b34b61c139fd43c95783b4372fee84dd311b14c91c6e30e1a13041cbf699c554bdbada3cd5b1a40f7a507490fd6eff1b64ed
 MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRTajkACgkQvFcC4BYPU0qYrQCfV6wAyHO21AWMfJrhDRv8fZPn
-KKQAoKG7QpI26wMRbOs9xcslHgTu0f0G
-=kbd8
+iEYEAREIAAYFAlRTayEACgkQvFcC4BYPU0qR2gCgiSbOoYnBeb0Tq9SUQSKVeJjs
+iBAAoJUKYxDdkSiljjFTATjUe4kMAEMe
+=hKaf
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
deleted file mode 100644
index c56c8f58d35b..000000000000
--- a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.14 2014/08/10 20:58:53 slyfox Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
-	libv4l modplug mp3 +network openal openssl opus oss pic pulseaudio rtmp
-	schroedinger sdl speex static-libs test theora threads truetype twolame v4l
-	vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bluray? ( media-libs/libbluray )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	celt? ( >=media-libs/celt-0.11.1 )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		twolame? ( media-sound/twolame )
-		x264? ( >=media-libs/x264-0.0.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	flite? ( app-accessibility/flite )
-	fontconfig? ( media-libs/fontconfig )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gnutls? ( >=net-libs/gnutls-2.12.16 )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
-	libass? ( media-libs/libass )
-	libcaca? ( media-libs/libcaca )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	openssl? ( dev-libs/openssl )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( >=x11-libs/libva-0.32 )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
-			configure libavdevice/libcdio.c || die
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.0.8-freetype251.patch
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-	# Set to --enable-version3 if (L)GPL-3 is required
-	local version3=""
-
-	# enabled by default
-	for i in debug doc network vaapi vdpau zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use cpudetection || myconf="${myconf} --disable-runtime-cpudetect"
-	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
-	for i in gnutls ; do
-		use $i && myconf="${myconf} --enable-$i"
-	done
-
-	# Encoders
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
-		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
-		for i in theora twolame x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
-		done
-		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
-		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
-		use fdk && myconf="${myconf} --enable-libfdk-aac --enable-nonfree"
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	for i in cdio iec61883 ; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	use libcaca && myconf="${myconf} --enable-libcaca"
-	use openal && myconf="${myconf} --enable-openal"
-	# Indevs
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-	use pulseaudio && myconf="${myconf} --enable-libpulse"
-	use libv4l && myconf="${myconf} --enable-libv4l2"
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-	# libavfilter options
-	for i in frei0r fontconfig libass ; do
-		use ${i} && myconf="${myconf} --enable-${i}"
-	done
-	use truetype && myconf="${myconf} --enable-libfreetype"
-	use flite    && myconf="${myconf} --enable-libflite"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
-
-	# Decoders
-	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
-	done
-	if use pic ; then
-		myconf="${myconf} --enable-pic"
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		${version3}
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		${myconf}"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-
-	cd "${S}"
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake V=1
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			emake V=1 tools/$i
-		fi
-	done
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r doc/examples/*
-	fi
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			dobin tools/$i
-		fi
-	done
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil:${S}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-1.0.9.ebuild b/media-video/ffmpeg/ffmpeg-1.0.9.ebuild
deleted file mode 100644
index d4ee37be2bb4..000000000000
--- a/media-video/ffmpeg/ffmpeg-1.0.9.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.9.ebuild,v 1.3 2014/08/10 20:58:53 slyfox Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
-	libv4l modplug mp3 +network openal openssl opus oss pic pulseaudio rtmp
-	schroedinger sdl speex static-libs test theora threads truetype twolame v4l
-	vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bluray? ( media-libs/libbluray )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	celt? ( >=media-libs/celt-0.11.1 )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		twolame? ( media-sound/twolame )
-		x264? ( >=media-libs/x264-0.0.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	flite? ( app-accessibility/flite )
-	fontconfig? ( media-libs/fontconfig )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gnutls? ( >=net-libs/gnutls-2.12.16 )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
-	libass? ( media-libs/libass )
-	libcaca? ( media-libs/libcaca )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	openssl? ( dev-libs/openssl )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( >=x11-libs/libva-0.32 )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
-			configure libavdevice/libcdio.c || die
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.0.8-freetype251.patch
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-	# Set to --enable-version3 if (L)GPL-3 is required
-	local version3=""
-
-	# enabled by default
-	for i in debug doc network vaapi vdpau zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use cpudetection || myconf="${myconf} --disable-runtime-cpudetect"
-	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
-	for i in gnutls ; do
-		use $i && myconf="${myconf} --enable-$i"
-	done
-
-	# Encoders
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
-		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
-		for i in theora twolame x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
-		done
-		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
-		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
-		use fdk && myconf="${myconf} --enable-libfdk-aac --enable-nonfree"
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	for i in cdio iec61883 ; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	use libcaca && myconf="${myconf} --enable-libcaca"
-	use openal && myconf="${myconf} --enable-openal"
-	# Indevs
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-	use pulseaudio && myconf="${myconf} --enable-libpulse"
-	use libv4l && myconf="${myconf} --enable-libv4l2"
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-	# libavfilter options
-	for i in frei0r fontconfig libass ; do
-		use ${i} && myconf="${myconf} --enable-${i}"
-	done
-	use truetype && myconf="${myconf} --enable-libfreetype"
-	use flite    && myconf="${myconf} --enable-libflite"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
-
-	# Decoders
-	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
-	done
-	if use pic ; then
-		myconf="${myconf} --enable-pic"
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		${version3}
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		${myconf}"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-
-	cd "${S}"
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake V=1
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			emake V=1 tools/$i
-		fi
-	done
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r doc/examples/*
-	fi
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			dobin tools/$i
-		fi
-	done
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil:${S}/libavresample" \
-		emake V=1 fate
-}