remove old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 10 insertions, 167 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index fa54af4a0174..7d55367d4f91 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2010/06/06 10:37:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.36 2010/07/17 08:46:07 aballier Exp $
+
+  17 Jul 2010; Alexis Ballier <aballier@gentoo.org>
+  -x264-encoder-0.0.20100118.ebuild, -x264-encoder-0.0.20100423.ebuild,
+  -files/x264-encoder-nolib-20100118.patch:
+  remove old
 
 *x264-encoder-0.0.20100605 (06 Jun 2010)
 
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 851173a25f7c..55e603ccedb7 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -2,23 +2,18 @@
 Hash: SHA1
 
 AUX x264-encoder-nolib-20090408.patch 1890 RMD160 9cf44cb1aafaa042fdc319276c027a8a2bb40757 SHA1 745546561f048f09646b4c4ff63896c44ecdbdc6 SHA256 78bfd1758c366e7c3101cdcc9f1cf60d7191205e45445a918edb29e33bdd9739
-AUX x264-encoder-nolib-20100118.patch 1531 RMD160 9587441127f9c1771d7d41a16b10a65fd5839241 SHA1 38f40edc75b815167f869cf892185013468ea0a0 SHA256 8e252a5f156cba9fd1623322e7a1ea144cd4ca89febb170ac859a450d4f0d565
 AUX x264-encoder-nolib-20100605.patch 1454 RMD160 5789825fec4b49dd741ad37d0d1bc3b825338256 SHA1 ee5169d459ee51512580db1c35ffdcb550f12062 SHA256 b32c7e6e7651716a5c86d497690cac0c351308bb103f9942c418c1d64981ec25
 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-20100118-2245.tar.bz2 394748 RMD160 5411ce096e3170a4ea252605e4c376feefa4c7c3 SHA1 25881740d1202113ebaeee5a00ea1fa78a5f2b3d SHA256 bcf31a67575fc6b27753081e4d440d242f6509cd9aaf9fcb1ef6659ef09e69f7
-DIST x264-snapshot-20100423-2245.tar.bz2 415839 RMD160 c6c5241a2506230d50158ffe12b25e9b49310b24 SHA1 a1a410ccfce2c4186d555071a4ee03ba18bf6ac9 SHA256 eb3a5b0e0705bcbd9ce9808fb509eaac3e4fbc0a593b5bd359c4d1cb896b5e1f
 DIST x264-snapshot-20100605-2245.tar.bz2 422713 RMD160 379b728d53b642bb5ac6d82765325f4c2bbcec00 SHA1 d923e2168d9e4e3f339bfa1588b8d5d748a9a1ba SHA256 29d01cf362770658caea4aa7c9a62319053b113d25d0cbbd4e5b0a697284d692
 EBUILD x264-encoder-0.0.20091021.ebuild 1551 RMD160 e69e8478e3422cdf0b2deef424ff83cb7a03cb32 SHA1 724b3ef48facfe1bd27d7e606f588ebdede9ece6 SHA256 8ac3eaf2712557ff94c26de5988c4b0cf515eecce35db3cc228df5ff4f1c0065
-EBUILD x264-encoder-0.0.20100118.ebuild 1597 RMD160 ab281ee79e718203744084c2f618c415cf2a281c SHA1 1002feb939133743ac365e68924597e4f616383d SHA256 efd2999c60222f42577260438cf18db337baf7f197f6e23c05e2f9edfb833cda
-EBUILD x264-encoder-0.0.20100423.ebuild 1597 RMD160 16c5b853b49cda109b8eb20d9afae15e7acbedc2 SHA1 e4cc069597e5721cb266e228b91d63b7f7e60c11 SHA256 76f810546a00d432d31e0cab2291fc285150ce86b0099fcdd71d6598c1d6edfc
 EBUILD x264-encoder-0.0.20100605.ebuild 1597 RMD160 f991b37d60d33c9a8d6d8c034c0f291029263dc6 SHA1 9ea967ed60c4e2a6ec3922b98aac7da82baa3ce6 SHA256 8cddd21320c4715e14bf06d157028c22bfdc8202f8ecc64008e2bdb800140739
-MISC ChangeLog 6000 RMD160 c1c6f6ecff4d101e01841c6a38b189b76b63b680 SHA1 d283290b51d7417ea12ccbae4e07b2bd2212961e SHA256 b9d4f6e4dce0efdb453d1773a4046a0d567da62c6ed597afacb387d9dc8101e5
+MISC ChangeLog 6182 RMD160 7d56c2378828564a057ce3c41544659013bcdaf9 SHA1 75603329fa597dad41273e0f5300a43658d74caa SHA256 1d21999fb26cd7cebde47d9fb6568800619febf39e725dcf25b78cfccd9da34d
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwLeokACgkQvFcC4BYPU0rzuwCeO4PHnFENQxznelEXRU0LG5sG
-u7wAn1NtCgvmwlI5zoIiLcHEMrtaqlJT
-=7JF7
+iEYEARECAAYFAkxBbdAACgkQvFcC4BYPU0rSKgCgy3ttF+HlChIPHu5hlnnMjYGn
+D9oAoK7F06FadRiyfyYhJLv8LBNbelE0
+=xKG8
 -----END PGP SIGNATURE-----
diff --git a/media-video/x264-encoder/files/x264-encoder-nolib-20100118.patch b/media-video/x264-encoder/files/x264-encoder-nolib-20100118.patch
deleted file mode 100644
index 1268d05be22c..000000000000
--- a/media-video/x264-encoder/files/x264-encoder-nolib-20100118.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: x264-snapshot-20100118-2245/Makefile
-===================================================================
---- x264-snapshot-20100118-2245.orig/Makefile
-+++ x264-snapshot-20100118-2245/Makefile
-@@ -123,8 +123,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
- $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
- 
--x264$(EXE): $(OBJCLI) libx264.a
--	$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
-+x264$(EXE): $(OBJCLI)
-+	$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI) `pkg-config --libs x264`
- 
- checkasm: tools/checkasm.o libx264.a
- 	$(CC) -o $@ $+ $(LDFLAGS)
-@@ -189,21 +189,9 @@ distclean: clean
- 	rm -f config.mak config.h x264.pc
- 	rm -rf test/
- 
--install: x264$(EXE) $(SONAME)
--	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)
-+	install -d $(DESTDIR)$(bindir)
- 	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
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20100118.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20100118.ebuild
deleted file mode 100644
index ad3d8abde403..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20100118.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.20100118.ebuild,v 1.1 2010/01/19 11:39:50 aballier 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 ffmpeg +mp4 +threads"
-
-RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	~media-libs/x264-${PV}
-	ffmpeg? ( media-video/ffmpeg )"
-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-20100118.patch
-}
-
-src_configure() {
-	tc-export CC
-
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--disable-avs-input \
-		$(use_enable ffmpeg lavf-input) \
-		$(use_enable mp4 mp4-output) \
-		$(use_enable threads pthread) \
-		--extra-asflags="${ASFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--host="${CHOST}" \
-		${myconf} \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20100423.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20100423.ebuild
deleted file mode 100644
index 07c312a2bb44..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20100423.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.20100423.ebuild,v 1.1 2010/04/24 15:47:25 aballier 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 ffmpeg +mp4 +threads"
-
-RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	~media-libs/x264-${PV}
-	ffmpeg? ( media-video/ffmpeg )"
-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-20100118.patch
-}
-
-src_configure() {
-	tc-export CC
-
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--disable-avs-input \
-		$(use_enable ffmpeg lavf-input) \
-		$(use_enable mp4 mp4-output) \
-		$(use_enable threads pthread) \
-		--extra-asflags="${ASFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--host="${CHOST}" \
-		${myconf} \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}