old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

9 files changed, 8 insertions, 521 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 3c0c26832a3d..e1a8ab271b8a 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.77 2014/07/24 12:26:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.78 2014/07/24 13:07:09 ssuominen Exp $
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/x264-encoder-nolib-20110425.patch, -files/x264-encoder-nostrip.patch,
+  -x264-encoder-0.0.20111220.ebuild, -x264-encoder-0.0.20120327.ebuild,
+  -x264-encoder-0.0.20120707.ebuild, -x264-encoder-0.0.20130506.ebuild,
+  -x264-encoder-0.0.20130731.ebuild, -x264-encoder-0.0.20130912.ebuild:
+  old
 
   24 Jul 2014; Pacho Ramos <pacho@gentoo.org> x264-encoder-0.0.20140308.ebuild:
   amd64/x86 stable, bug #517924
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20110425.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20110425.patch
deleted file mode 100644
index fabf7c747370..000000000000
--- a/media-video/x264-encoder/files/x264-encoder-nolib-20110425.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: x264-snapshot-20110425-2245/Makefile
-===================================================================
---- x264-snapshot-20110425-2245.orig/Makefile
-+++ x264-snapshot-20110425-2245/Makefile
-@@ -146,8 +146,8 @@ $(LIBX264): .depend $(OBJS) $(OBJASM)
- $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
- 	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
- 
--x264$(EXE): $(OBJCLI) $(LIBX264)
--	$(LD)$@ $+ $(LDFLAGSCLI) $(LDFLAGS)
-+x264$(EXE): $(OBJCLI)
-+	$(LD)$@ $+ $(LDFLAGSCLI) $(LDFLAGS) `pkg-config --libs x264`
- 
- checkasm: tools/checkasm.o $(LIBX264)
- 	$(LD)$@ $+ $(LDFLAGS)
-@@ -209,22 +209,7 @@ distclean: clean
- 
- install: x264$(EXE) $(SONAME)
- 	install -d $(DESTDIR)$(bindir)
--	install -d $(DESTDIR)$(includedir)
--	install -d $(DESTDIR)$(libdir)
--	install -d $(DESTDIR)$(libdir)/pkgconfig
--	install -m 644 x264.h $(DESTDIR)$(includedir)
--	install -m 644 x264_config.h $(DESTDIR)$(includedir)
--	install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
--	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- 	install x264$(EXE) $(DESTDIR)$(bindir)
--	$(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
--ifeq ($(SYS),WINDOWS)
--	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
--else
--	$(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
--	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
--endif
--	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
- 
- uninstall:
- 	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(includedir)/x264_config.h $(DESTDIR)$(libdir)/libx264.a
diff --git a/media-video/x264-encoder/files/x264-encoder-nostrip.patch b/media-video/x264-encoder/files/x264-encoder-nostrip.patch
deleted file mode 100644
index b4e2689a18e6..000000000000
--- a/media-video/x264-encoder/files/x264-encoder-nostrip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: x264-svn/configure
-===================================================================
---- x264-svn.orig/configure
-+++ x264-svn/configure
-@@ -374,11 +374,6 @@ if [ "$pic" = "yes" ] ; then
-     ASFLAGS="$ASFLAGS -D__PIC__"
- fi
- 
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
--    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
--    LDFLAGS="$LDFLAGS -s"
--fi
--
- if [ "$debug" = "yes" ]; then
-     CFLAGS="-O1 -g $CFLAGS"
- else
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild
deleted file mode 100644
index 9feb123e1e1d..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20111220.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.20111220.ebuild,v 1.4 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.20120327.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20120327.ebuild
deleted file mode 100644
index c544085dcaf8..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20120327.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.20120327.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.20120707.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20120707.ebuild
deleted file mode 100644
index 3f63f2f52aa0..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20120707.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 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.20120707.ebuild,v 1.2 2013/01/17 10:23:12 lu_zero 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 )
-	~media-libs/x264-${PV}
-	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.20130506.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild
deleted file mode 100644
index 71c4343b5598..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 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.20130506.ebuild,v 1.3 2013/06/26 04:40:11 chutzpah Exp $
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.videolan.org/x264.git"
-	SRC_URI=""
-else
-	inherit versionator
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
-	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-	virtual/pkgconfig"
-
-src_configure() {
-	tc-export CC
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--system-libx264 \
-		--host="${CHOST}" \
-		$(usex 10bit "--bit-depth=10" "") \
-		$(usex avs "" "--disable-avs") \
-		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
-		$(usex ffmpegsource "" "--disable-ffms") \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex mp4 "" "--disable-gpac") \
-		$(usex threads "" "--disable-thread") || 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.20130731.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20130731.ebuild
deleted file mode 100644
index 588501904c9a..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20130731.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 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.20130731.ebuild,v 1.1 2013/08/01 17:41:09 aballier Exp $
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.videolan.org/x264.git"
-	SRC_URI=""
-else
-	inherit versionator
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
-	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-	virtual/pkgconfig"
-
-src_configure() {
-	tc-export CC
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--system-libx264 \
-		--host="${CHOST}" \
-		$(usex 10bit "--bit-depth=10" "") \
-		$(usex avs "" "--disable-avs") \
-		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
-		$(usex ffmpegsource "" "--disable-ffms") \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex mp4 "" "--disable-gpac") \
-		$(usex threads "" "--disable-thread") || 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.20130912.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20130912.ebuild
deleted file mode 100644
index 9db23aa6234e..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20130912.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 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.20130912.ebuild,v 1.1 2013/09/13 13:03:25 lu_zero Exp $
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.videolan.org/x264.git"
-	SRC_URI=""
-else
-	inherit versionator
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
-	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-	virtual/pkgconfig"
-
-src_configure() {
-	tc-export CC
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--system-libx264 \
-		--host="${CHOST}" \
-		$(usex 10bit "--bit-depth=10" "") \
-		$(usex avs "" "--disable-avs") \
-		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
-		$(usex ffmpegsource "" "--disable-ffms") \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex mp4 "" "--disable-gpac") \
-		$(usex threads "" "--disable-thread") || 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
-}