remove old

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

7 files changed, 8 insertions, 392 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 7bbe12ef535f..cc7d34089467 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.16 2008/12/30 00:31:36 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.17 2009/01/03 13:09:37 aballier Exp $
+
+  03 Jan 2009; Alexis Ballier <aballier@gentoo.org>
+  -files/x264-encoder-nolib-20080406.patch, -files/x264-encoder-nolib.patch,
+  -x264-encoder-0.0.20070924.ebuild, -x264-encoder-0.0.20080301.ebuild,
+  -x264-encoder-0.0.20080406.ebuild, -x264-encoder-0.0.20080819.ebuild:
+  remove old
 
   30 Dec 2008; Ben de Groot <yngwin@gentoo.org>
   x264-encoder-0.0.20070924.ebuild, x264-encoder-0.0.20080301.ebuild,
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch
deleted file mode 100644
index 845e0743e50c..000000000000
--- a/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -rub x264.orig/configure x264/configure
---- x264.orig/configure	2008-04-07 22:20:37.000000000 +0200
-+++ x264/configure	2008-04-07 22:34:00.000000000 +0200
-@@ -465,7 +465,6 @@
-         echo "SONAME=libx264.so.$API" >> config.mak
-         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
-     fi
--    echo 'default: $(SONAME)' >> config.mak
-     if [ "$gtk" = "yes" ]; then
-         echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
-     fi
-diff -rub x264.orig/gtk/Makefile x264/gtk/Makefile
---- x264.orig/gtk/Makefile	2008-04-07 22:22:20.000000000 +0200
-+++ x264/gtk/Makefile	2008-04-07 22:34:08.000000000 +0200
-@@ -46,14 +46,14 @@
- 
- X264GTK_PC = x264gtk.pc
- 
--EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
-+EXTERNAL_DEPS= ../muxers.o ../matroska.o
- 
- 
- all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
- 
- # Already provides iconv/intl
- CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
--LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
-+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
- 
- 
- # gettext rules
-diff -rub x264.orig/Makefile x264/Makefile
---- x264.orig/Makefile	2008-04-07 22:20:23.000000000 +0200
-+++ x264/Makefile	2008-04-07 22:33:49.000000000 +0200
-@@ -78,10 +78,10 @@
- $(SONAME): .depend $(OBJS) $(OBJASM)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
- 
--x264$(EXE): $(OBJCLI) libx264.a 
--	$(CC) -o $@ $+ $(LDFLAGS)
-+x264$(EXE): $(OBJCLI)
-+	$(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
- 
--libx264gtk.a: muxers.o libx264.a
-+libx264gtk.a: muxers.o
- 	$(MAKE) -C gtk
- 
- checkasm: tools/checkasm.o libx264.a
-@@ -148,21 +148,10 @@
- 	rm -rf test/
- 	$(MAKE) -C gtk distclean
- 
--install: x264$(EXE) $(SONAME)
-+install: x264$(EXE)
- 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
- 	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
--	install -m 644 x264.h $(DESTDIR)$(includedir)
--	install -m 644 libx264.a $(DESTDIR)$(libdir)
--	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- 	install x264$(EXE) $(DESTDIR)$(bindir)
--	ranlib $(DESTDIR)$(libdir)/libx264.a
--ifeq ($(SYS),MINGW)
--	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
--else
--	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
--	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
--endif
--	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
- 
- install-gtk: libx264gtk.a
- 	$(MAKE) -C gtk install
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib.patch b/media-video/x264-encoder/files/x264-encoder-nolib.patch
deleted file mode 100644
index 20ae0cc2b40a..000000000000
--- a/media-video/x264-encoder/files/x264-encoder-nolib.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: x264-svn/Makefile
-===================================================================
---- x264-svn.orig/Makefile
-+++ x264-svn/Makefile
-@@ -75,10 +75,10 @@ libx264.a: .depend $(OBJS) $(OBJASM)
- $(SONAME): .depend $(OBJS) $(OBJASM)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
- 
--x264$(EXE): $(OBJCLI) libx264.a 
--	$(CC) -o $@ $+ $(LDFLAGS)
-+x264$(EXE): $(OBJCLI) 
-+	$(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
- 
--libx264gtk.a: muxers.o libx264.a
-+libx264gtk.a: muxers.o
- 	$(MAKE) -C gtk
- 
- checkasm: tools/checkasm.o libx264.a
-@@ -142,16 +142,10 @@ distclean: clean
- 	rm -rf test/
- 	$(MAKE) -C gtk distclean
- 
--install: x264 $(SONAME)
-+install: x264 
- 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
- 	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
--	install -m 644 x264.h $(DESTDIR)$(includedir)
--	install -m 644 libx264.a $(DESTDIR)$(libdir)
--	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- 	install x264 $(DESTDIR)$(bindir)
--	ranlib $(DESTDIR)$(libdir)/libx264.a
--	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
--	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
- 
- install-gtk: libx264gtk.a
- 	$(MAKE) -C gtk install
-Index: x264-svn/configure
-===================================================================
---- x264-svn.orig/configure
-+++ x264-svn/configure
-@@ -423,7 +423,6 @@ cp config.mak gtk/config.mak
- if [ "$shared" = "yes" ]; then
-     API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
-     echo "SONAME=libx264.so.$API" >> config.mak
--    echo 'default: $(SONAME)' >> config.mak
-     if [ "$gtk" = "yes" ]; then
-         echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
-     fi
-Index: x264-svn/gtk/Makefile
-===================================================================
---- x264-svn.orig/gtk/Makefile
-+++ x264-svn/gtk/Makefile
-@@ -46,14 +46,14 @@ SOURCES_ALL = $(OBJECTS_ALL:%.o=%.c)
- 
- X264GTK_PC = x264gtk.pc
- 
--EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
-+EXTERNAL_DEPS= ../muxers.o ../matroska.o 
- 
- 
- all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
- 
- # Already provides iconv/intl
- CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
--LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
-+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
- 
- 
- # gettext rules
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20070924.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20070924.ebuild
deleted file mode 100644
index 25b8e18e52da..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20070924.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 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.20070924.ebuild,v 1.2 2008/12/30 00:31:36 yngwin Exp $
-
-inherit multilib eutils toolchain-funcs versionator
-
-X264_SVN_P="x264-svn-$(get_version_component_range 3)"
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-SRC_URI="mirror://gentoo/${X264_SVN_P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug mp4 gtk threads"
-
-RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	gtk? ( >=x11-libs/gtk+-2.6.10 >=dev-libs/glib-2.10.3 )
-	~media-libs/x264-${PV}"
-
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.0 )
-	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
-	x86-fbsd? ( dev-lang/nasm )
-	dev-util/pkgconfig"
-
-# Block older than 0.6.2 versions of yasm
-# It generates incorect pic code and will cause segfaults
-# See http://www.tortall.net/projects/yasm/ticket/114
-DEPEND="${DEPEND}
-	x86? ( !<dev-lang/yasm-0.6.2 )"
-
-S="${WORKDIR}/x264-svn"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-nolib.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-	./configure --prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--enable-pic --enable-shared \
-		"--extra-cflags=${CFLAGS}" \
-		"--extra-ldflags=${LDFLAGS}" \
-		"--extra-asflags=${ASFLAGS}" \
-		${myconf} \
-		$(use_enable threads pthread) \
-		$(use_enable mp4 mp4-output) \
-		$(use_enable gtk) \
-		|| die "configure failed"
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20080301.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20080301.ebuild
deleted file mode 100644
index 5698645edb77..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20080301.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 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.20080301.ebuild,v 1.2 2008/12/30 00:31:36 yngwin Exp $
-
-inherit multilib eutils toolchain-funcs versionator
-
-X264_SVN_P="x264-svn-$(get_version_component_range 3)"
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-SRC_URI="mirror://gentoo/${X264_SVN_P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug mp4 gtk threads"
-
-RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	gtk? ( >=x11-libs/gtk+-2.6.10 >=dev-libs/glib-2.10.3 )
-	~media-libs/x264-${PV}"
-
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.0 )
-	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
-	x86-fbsd? ( dev-lang/nasm )
-	dev-util/pkgconfig"
-
-# Block older than 0.6.2 versions of yasm
-# It generates incorect pic code and will cause segfaults
-# See http://www.tortall.net/projects/yasm/ticket/114
-DEPEND="${DEPEND}
-	x86? ( !<dev-lang/yasm-0.6.2 )"
-
-S="${WORKDIR}/x264-svn"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-nolib.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-	./configure --prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--enable-pic --enable-shared \
-		"--extra-cflags=${CFLAGS}" \
-		"--extra-ldflags=${LDFLAGS}" \
-		"--extra-asflags=${ASFLAGS}" \
-		${myconf} \
-		$(use_enable threads pthread) \
-		$(use_enable mp4 mp4-output) \
-		$(use_enable gtk) \
-		|| die "configure failed"
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild
deleted file mode 100644
index 69a237002183..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20080406.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 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.20080406.ebuild,v 1.3 2008/12/30 00:31:36 yngwin Exp $
-
-EAPI="1"
-inherit multilib eutils toolchain-funcs versionator
-
-MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-SRC_URI="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug gtk +mp4 +threads"
-
-RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	gtk? ( >=x11-libs/gtk+-2.6.10 >=dev-libs/glib-2.10.3 )
-	~media-libs/x264-${PV}"
-
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.0 )
-	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
-	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
-	dev-util/pkgconfig"
-
-# Block older than 0.6.2 versions of yasm
-# It generates incorect pic code and will cause segfaults
-# See http://www.tortall.net/projects/yasm/ticket/114
-DEPEND="${DEPEND}
-	x86? ( !<dev-lang/yasm-0.6.2 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-nolib-20080406.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-	./configure --prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--enable-pic --enable-shared \
-		"--extra-cflags=${CFLAGS}" \
-		"--extra-ldflags=${LDFLAGS}" \
-		"--extra-asflags=${ASFLAGS}" \
-		${myconf} \
-		$(use_enable threads pthread) \
-		$(use_enable mp4 mp4-output) \
-		$(use_enable gtk) \
-		|| die "configure failed"
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS doc/*.txt
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20080819.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20080819.ebuild
deleted file mode 100644
index 101ff0765198..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20080819.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 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.20080819.ebuild,v 1.5 2008/12/30 00:31:36 yngwin Exp $
-
-EAPI="1"
-inherit multilib eutils toolchain-funcs versionator
-
-MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-SRC_URI="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug gtk +mp4 +threads"
-
-RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	gtk? ( >=x11-libs/gtk+-2.6.10 >=dev-libs/glib-2.10.3 )
-	~media-libs/x264-${PV}"
-
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.0 )
-	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) )
-	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
-	dev-util/pkgconfig"
-
-# Block older than 0.6.2 versions of yasm
-# It generates incorect pic code and will cause segfaults
-# See http://www.tortall.net/projects/yasm/ticket/114
-DEPEND="${DEPEND}
-	x86? ( !<dev-lang/yasm-0.6.2 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-nolib-20080406.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-	./configure --prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--enable-pic --enable-shared \
-		"--extra-cflags=${CFLAGS}" \
-		"--extra-ldflags=${LDFLAGS}" \
-		"--extra-asflags=${ASFLAGS}" \
-		${myconf} \
-		$(use_enable threads pthread) \
-		$(use_enable mp4 mp4-output) \
-		$(use_enable gtk) \
-		|| die "configure failed"
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS doc/*.txt
-}