remove old

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

4 files changed, 9 insertions, 117 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/Manifest b/media-video/x264-encoder/Manifest
index dacbd7034bb5..ceb90a694932 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX x264-encoder-nolib-20090408.patch 1890 RMD160 9cf44cb1aafaa042fdc319276c027a8a2bb40757 SHA1 745546561f048f09646b4c4ff63896c44ecdbdc6 SHA256 78bfd1758c366e7c3101cdcc9f1cf60d7191205e45445a918edb29e33bdd9739
 AUX x264-encoder-nolib-20100605.patch 1454 RMD160 5789825fec4b49dd741ad37d0d1bc3b825338256 SHA1 ee5169d459ee51512580db1c35ffdcb550f12062 SHA256 b32c7e6e7651716a5c86d497690cac0c351308bb103f9942c418c1d64981ec25
 AUX x264-encoder-nolib-20101029.patch 1454 RMD160 4e30da33687891a518f750b9f6992391457a83b1 SHA1 da53f66fd795e16ea9960d57505f9a49c45f239a SHA256 a8285aa34c2d3bcaeeefb9ea6d2eeacffa05717e69b9edeb7a5cf3c97f57f873
 AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
-DIST x264-snapshot-20091021-2245.tar.bz2 2810743 RMD160 262098df8680d934f636b6a3f411c41ed94f8361 SHA1 880149600da36f5ca33e0bcfd08d623e5821d82a SHA256 d14b214bcf1cf832f8d2ec4a78630f7780b82877dbe959cf44c4d36c512535c8
 DIST x264-snapshot-20100605-2245.tar.bz2 422713 RMD160 379b728d53b642bb5ac6d82765325f4c2bbcec00 SHA1 d923e2168d9e4e3f339bfa1588b8d5d748a9a1ba SHA256 29d01cf362770658caea4aa7c9a62319053b113d25d0cbbd4e5b0a697284d692
 DIST x264-snapshot-20101029-2245.tar.bz2 449078 RMD160 65691ea49254ac769a1dde5c03bbe190d7758390 SHA1 3153e901b69acbfcade2af9a59b52d357166ece0 SHA256 d6d1ac9450e2e345d6a4bf7e62a9b03256b10da8e4d62c829ba683a7566711f3
-EBUILD x264-encoder-0.0.20091021.ebuild 1551 RMD160 e69e8478e3422cdf0b2deef424ff83cb7a03cb32 SHA1 724b3ef48facfe1bd27d7e606f588ebdede9ece6 SHA256 8ac3eaf2712557ff94c26de5988c4b0cf515eecce35db3cc228df5ff4f1c0065
 EBUILD x264-encoder-0.0.20100605.ebuild 1590 RMD160 870e6805fe8bf1b1226896ce51785991d62725a9 SHA1 665addf72170aa8ee51cc8ff2553106e53b6e052 SHA256 9f3f1381c4ae5546ed6ece5dbc7a3be0a97f46cb2509327e786633d51792f119
 EBUILD x264-encoder-0.0.20101029.ebuild 1608 RMD160 02d6998072b2f5834f930ba03756f6e88020149b SHA1 bf0bf238ec4d7300f9d8a4b66f692cb6b88b67a8 SHA256 8cbc0450c417fdead9c3e3a3bb52b7723effbfb30868ffdd4e03a388a38ca6d8
-MISC ChangeLog 7372 RMD160 b1ddf301a0637521a2ae6726c3f8802775065f7c SHA1 09a49de58765b9dda2c6675acc31cf01cf3c2ac2 SHA256 e2ceec110026b2bc79afdfdb837f27a22663544801e1257413103084ef1bcf24
+MISC ChangeLog 7520 RMD160 ce6cc7be76a3fbaa3784121505ceacde55fd2ea9 SHA1 4cf56d125b573ee3952ccc4e97757516f877bb33 SHA256 e1e992f02a6c602a7982cda1698612346bcf54e574876ce2e24d9bb7bcba6909
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0A/jsACgkQG4/rWKZmVWk25gCfSRM/AB1pLm7ZLOPks1HJzZqL
-WeIAn3czx+l4GyfIZzLfsjgda3xflfiT
-=1dBC
+iEYEARECAAYFAk0RXgEACgkQvFcC4BYPU0oDkQCfZQaAD/DosZn1qRZtUMasFBnB
+kkEAoKOQjUBB67/e1k9fQmOg6bLbceBv
+=JSW5
 -----END PGP SIGNATURE-----
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
-}