remove old

(Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

3 files changed, 5 insertions, 110 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 5e9d03c3e162..3b25c848992c 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.45 2010/12/09 16:05:09 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.46 2010/12/22 02:10:03 aballier Exp $
+
+  22 Dec 2010; Alexis Ballier <aballier@gentoo.org>
+  -x264-encoder-0.0.20091021.ebuild, -files/x264-encoder-nolib-20090408.patch:
+  remove old
 
   09 Dec 2010; Richard Freeman <rich0@gentoo.org>
   x264-encoder-0.0.20101029.ebuild:
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20090408.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20090408.patch
deleted file mode 100644
index 1e452a868b2d..000000000000
--- a/media-video/x264-encoder/files/x264-encoder-nolib-20090408.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: x264-snapshot-20090408-2245/Makefile
-===================================================================
---- x264-snapshot-20090408-2245.orig/Makefile
-+++ x264-snapshot-20090408-2245/Makefile
-@@ -80,8 +80,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
- $(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`
- 
- checkasm: tools/checkasm.o libx264.a
- 	$(CC) -o $@ $+ $(LDFLAGS)
-@@ -143,21 +143,9 @@ distclean: clean
- 	rm -f config.mak config.h x264.pc
- 	rm -rf test/
- 
--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.$(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)$(libdir)/libx264.a
-Index: x264-snapshot-20090408-2245/configure
-===================================================================
---- x264-snapshot-20090408-2245.orig/configure
-+++ x264-snapshot-20090408-2245/configure
-@@ -458,7 +458,6 @@ if [ "$shared" = "yes" ]; then
-         echo "SONAME=libx264.so.$API" >> config.mak
-         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
-     fi
--    echo 'default: $(SONAME)' >> config.mak
- fi
- 
- ./version.sh
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild
deleted file mode 100644
index cba190d19cb5..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 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.20091021.ebuild,v 1.7 2010/01/31 17:32:11 armin76 Exp $
-
-EAPI=2
-inherit eutils multilib 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug +mp4 +threads"
-
-RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	~media-libs/x264-${PV}"
-DEPEND="${RDEPEND}
-	amd64? ( >=dev-lang/yasm-0.6.2 )
-	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
-		!<dev-lang/yasm-0.6.2 )
-	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-nostrip.patch \
-		"${FILESDIR}"/${PN}-nolib-20090408.patch
-}
-
-src_configure() {
-	tc-export CC
-
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--disable-avis-input \
-		$(use_enable mp4 mp4-output) \
-		$(use_enable threads pthread) \
-		--enable-pic \
-		--enable-shared \
-		--extra-asflags="${ASFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--host="${CHOST}" \
-		${myconf} \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}