Remove old.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

3 files changed, 9 insertions, 94 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 49fe6a23865c..d2856146fa4e 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.196 2013/09/28 10:39:42 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.197 2013/09/28 10:41:56 billie Exp $
+
+  28 Sep 2013; Daniel Pielmeier <billie@gentoo.org>
+  -mjpegtools-2.0.1_rc1-r1.ebuild:
+  Remove old.
 
 *mjpegtools-2.1.0 (28 Sep 2013)
 
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index d799e709ee52..98579a903f4e 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -5,17 +5,15 @@ AUX mjpegtools-2.0.0-gcc470.patch 253 SHA256 5852687afff431b26fc1832fb32098ad790
 AUX mjpegtools-2.0.0-sdlgfx-automagic.patch 1620 SHA256 11f914d0f17700b8e02a4bca447fc44c7b8b73e1bef7358057ff25a0155afbd6 SHA512 e20e478c0c1e058369f1a4b19a62e16586f67a0ffb69c8c3d42a23c66469e169697a9d7e5147c191e3532c1f61cc54b8b282682e7da5ab444636b7a39b524d7a WHIRLPOOL d5c8d754017e1798dd4a55855388b0cb0724b3f9ad53c6a969bcbfa49eb941ebb4b273f16ea0a97323a2625454cf282b9b5bec8899cd2e3d3830fd6ad5efc6d2
 AUX mjpegtools-2.0.0-stream-params-include.patch 410 SHA256 ad4e939f0b43568c4a4507e57ded540da3656683db9d58227df09d2d8c39de58 SHA512 4de9fec8e7339f7b1c3a3de3ada976540a03fa2d82cba019fd5df7206a2f939465b683a292ca40b7abe44ee29a02a8be619cff6a640e11becda12dc1ad43e599 WHIRLPOOL 0bc1f8178b72900976dad74360169496ec3cdbc369d3745086ca2df3b2b3341f9f13e419dfd217b905778668d30492fd609c4d0404ba856735b3ec8efa2d8a4a
 DIST mjpegtools-2.0.0.tar.gz 1749671 SHA256 bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97 SHA512 1b666293f55b10869e959305d9b3b2ab0388292498f49ba791439ae167f1d8c8921457e0e5312b74d53f61a68fc13da0222f1f83aced5fe5b04768be0cce07ad WHIRLPOOL df385ee5df0275a82b3fc9662d60d5bf10216b5cafe2d433902884476df2edaf46ec59d8129228e03d45cb74b3bd579002068af1ce243e4a14892dd7a51a9757
-DIST mjpegtools-2.0.1RC1.tar.gz 2428085 SHA256 8c8a9d7f47e5ab1c05dec34b74f220c0e6abba82989bac65fe0ced8ac393057b SHA512 0f2dda69c4df1e1bb9a88c66fc58f6bc5cb15da172f80f3295fb994083351e55dbac6590420c5baccdb27c13f932adb1bb772540b3b491ff25e2247997525103 WHIRLPOOL 1256d1234a234c0d03167b4b604f1089ff062b5e3b2e02561f3907e84f93a12c7fc0897c52e6fc8a018e12d2f265f8fbf833f293577fe8eff4a0ac3be212580b
 DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9
 EBUILD mjpegtools-2.0.0-r3.ebuild 2605 SHA256 4288f3afb6a0d6122d53a0e7336f871341cd1597ac9e38cd11f8aa483ad3b603 SHA512 46fb79f0a1e52b000978e05834db7496f22bfdff794cfe084767519676a651e98c200d3885d23aebde89800d4dff6308e5bba018738c2fef3cb1912fcae5eea9 WHIRLPOOL 84e91546cca61c6239066a90d9037edf0c6e084a8636509ad1a7736c26feff805210641a8b363aa2eb3c2376b6457e0421e68031e8870c5217b6e0de77c4d3a9
-EBUILD mjpegtools-2.0.1_rc1-r1.ebuild 2350 SHA256 640b920966cb9b529891e08c8a8aa99b5f63ce28d4739beb84bfa865613dfa8c SHA512 98a26558d98eea79ce9d36fc8f421db2a4083a08d753137d7171d1764155910cabb52809f3d9b5d6a5fddca35573bce6512a7ce090ffc782c63927af12f9ab92 WHIRLPOOL 23d74610ca52d290b93d6439040c99665f4a9ed2e8401200725994202432ff0aa72086de8e8546afc64f6da4468b206208b10ec317a1fee6ae32d244906860e9
 EBUILD mjpegtools-2.1.0.ebuild 2298 SHA256 b2f416362eabf518b8e233738b445597bc4628b74b0693b22dc4a91002901f4d SHA512 1519b345d5c35d7e6ab5369d3d4b39d3604fffca5d5c82e9d4db77b3dedaa4b0b2517dac09acad60cd9a6f3caa655bf1d0e170e6b15769558dce3365b66c00ef WHIRLPOOL 7699b378725ca940080b66bb3457ee830d3f9668988ae71aab2070a66758a4bd9cea3c55f8575a143d53e2db74e18e1a8196be7773069c92ebd91bbd636d4346
-MISC ChangeLog 33541 SHA256 cd312055cab563fef9ebcfa1c567fdacf0f979ae693faf8227c842781723bb4c SHA512 e6d69b276e127c4a73bbb56709c5e7961fddbfa8b3bceae82ba4a0cf989af4eb1daf56702ffd2dc682a6e0b0daade54bf6c2a74db8333481b2d80514d602bbfb WHIRLPOOL 989941cb92f5eb0622d78460fb1035c107ea1044b0ea1a7f857d2d3259ee1611db1990f11a3528a9fe6eeb6f2316a8bea03e2dd1683c76d5c24bcb924eab7ca8
+MISC ChangeLog 33643 SHA256 034109a18e811cc5129344cf49005d7e0c01a7be8a1c38c13ee6507dc39914e0 SHA512 17152d3c872519cc43eef9742a5bd8b97a62988cadda0c20929efc0f699f5b8070844ffc7da897cf8c99ee304e4841a6ac67b634a952a4eb0732534560ce4884 WHIRLPOOL cf1608b32a6adc40f60bd12d5b62fd337735a5cfde4eeccaed70dcbb9fe8a32711a9e791658cfd1bed544a24b3a724b09956915f786e8d759e68e57afae7e02d
 MISC metadata.xml 372 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7 SHA512 a1b0beff78a45667fb4095c203c59c0a63f262ac486b98858f7432fe1f4295f51e9c59c056149c1408e413c5e975abb41b971d1036179ecdea48772a04a5b222 WHIRLPOOL 90544f87533aaf15dba62efcea8ebf4039f29e6e3fef86a5a6907e2245c1f443132f967d65a6651393ad3e64ecedc1b0b73365662d2e770cb74f3abe1fa09b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlJGsfMACgkQlcuUeyFa0U3mmACbBEpowM3Xy6j0EN55EEUJaSoH
-3DAAoMKcZCk+Dfjkw6Ux8jm0esQNX9jR
-=8wGP
+iEYEAREIAAYFAlJGsnUACgkQlcuUeyFa0U0sYACg5+4gE9pANPxVRwP/VcF6vJZT
+RCoAoM+4BnSWkpDOkuvK+Lo0tAO3gAe3
+=++ju
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild
deleted file mode 100644
index b4e041402bc7..000000000000
--- a/media-video/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild
+++ /dev/null
@@ -1,87 +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/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild,v 1.1 2013/04/06 09:58:44 billie Exp $
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-RDEPEND="virtual/jpeg
-	quicktime? ( media-libs/libquicktime )
-	dv? ( >=media-libs/libdv-0.99 )
-	png? ( media-libs/libpng:0= )
-	dga? ( x11-libs/libXxf86dga )
-	gtk? ( x11-libs/gtk+:2 )
-	sdl? ( >=media-libs/libsdl-1.2.7-r3
-		x11-libs/libX11
-		x11-libs/libXt
-		sdlgfx? ( media-libs/sdl-gfx )
-	 )"
-
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
-	>=sys-apps/sed-4
-	virtual/awk
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has_version ">=sys-kernel/linux-headers-2.6.38" && use v4l; then
-		ewarn "Current versions of mjpegtools only support V4L1 which is not available"
-		ewarn "for kernel versions 2.6.38 and above. V4L1 will be disabled."
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-src_configure() {
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	econf \
-		--enable-compile-warnings \
-		$(use_enable mmx simd-accel) \
-		$(use_enable static-libs static) \
-		--enable-largefile \
-		$(use_with quicktime libquicktime) \
-		$(use_with dv libdv) \
-		$(use_with png libpng) \
-		$(use_with dga) \
-		$(use_with gtk) \
-		$(use_with sdl libsdl) \
-		$(use_with sdlgfx) \
-		$(use_with v4l) \
-		$(use_with sdl x)
-}
-
-src_install() {
-	default
-
-	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
-
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "mjpegtools installs user contributed scripts which require additional"
-		elog "dependencies not pulled in by the installation."
-		elog "These have to be installed manually."
-		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
-		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
-	fi
-}