Fix deps for ffmpeg wrt bug #228833.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

5 files changed, 12 insertions, 134 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index f9f4b24c5060..c70aab36528b 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.211 2008/05/24 02:47:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.212 2008/06/29 14:49:10 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> transcode-1.0.4.ebuild,
+  transcode-1.0.4-r2.ebuild, -transcode-1.0.5-r2.ebuild:
+  Fix deps for ffmpeg wrt bug #228833.
 
   24 May 2008; Steve Dibb <beandog@gentoo.org>
   transcode-1.0.6_rc2-r1.ebuild:
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 50c88290a02a..dbcaca148fb4 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,13 +1,11 @@
 AUX transcode-1.1.0_alpha7-new-ffmpeg-headers.patch 5813 RMD160 9e6b58aacf837da0a05b210a881b8aa258f7b163 SHA1 856ba86777eaaf5b570b94586ab21b84b577d0cd SHA256 a93406412689c17089539cde6114d362379adab21e9c66a94aa7c1af43368290
 DIST transcode-1.0.4.tar.bz2 1989649 RMD160 e0a1ee700cfbfe13d343329e84cb09c29a147562 SHA1 2ff8ddf6b63a184d61fd0f840d647aad707aa970 SHA256 61f5fde9b4fcdb61092e438ef20a595a1c7fe668c361fc09dea42016c4fcec73
-DIST transcode-1.0.5.tar.bz2 1989934 RMD160 7f335fa3f3df4f178b82314bfe661aa34f75e693 SHA1 96f8746a8d54c3ed78f0b5eb32ff7c72313e8e6b SHA256 2545d5139c0e0d690b6f09e18005cfd31d63fe3b6e79f48329219aa3c68471c5
 DIST transcode-1.0.6rc2.tar.bz2 1960362 RMD160 3a42d3c13b83ced77eb0cb147aeeacc68d27b4a4 SHA1 69bfd0cf8cd47e60e9d4782d4c3a8b031b27a612 SHA256 08d0749d545dc54a12d11d632283b57ce214bc2603fc99202641f6f65123ad49
 DIST transcode-1.1.0alpha7.tar.bz2 2038848 RMD160 fc805be1aa95f49feb2a574bc1cfb7d8c8614cab SHA1 0f329d33cf1fcf5d16ea727087740c25a7664ed2 SHA256 f7e380b220f0202c259af4ad794c27c37b98f9a946d0b435eae0296d88ad3ffe
-EBUILD transcode-1.0.4-r2.ebuild 3806 RMD160 e2c73d319bde9dfb7c9da7cd7629b827eb7fb59b SHA1 96ebfd932a5a8d0e9d284f465240ee003e7f0bcc SHA256 0a72b4bb00268a9c52558c307b8fc9bf1a04ba4d1d79474c0ba6f3a063c7a64c
-EBUILD transcode-1.0.4.ebuild 3894 RMD160 ac76be605112438e794cb0a90a95f3f014674bce SHA1 13a243d33b0ce0329ee7461f943e5df6b2456476 SHA256 5d3355b5659232b4c401842188bcf8adfc7f88574adf867377ed4c900e6608bf
-EBUILD transcode-1.0.5-r2.ebuild 3821 RMD160 72c98fb2191943187ddba977f10bc8b463936d07 SHA1 f11c109b101923762fc16faa09fc00a8dcd56deb SHA256 19d0a2687f6c29e8100885930d9a8462b476909229aae443d3ddc4f04f3bcf78
+EBUILD transcode-1.0.4-r2.ebuild 3805 RMD160 59f8cb4ea04520a29259ed9c9e57e2b37c425a2f SHA1 112f0077352ffc1bc23d388905ca0cd7f62e6134 SHA256 33a3833161cc651a3b8e43be73c9f2c793370d95fdb5ee953cecaf9db0e93562
+EBUILD transcode-1.0.4.ebuild 3890 RMD160 592e2fc20db6df91f2263948870ee9d5a78ebf08 SHA1 812a26556605b1c696c89e87de1d2524b1a44d65 SHA256 6efac087483834d8d7e2e2f24e62a335783553d4907bf9182e07404ca8ba73be
 EBUILD transcode-1.0.6_rc2-r1.ebuild 4310 RMD160 410f85ff2780b5b64c4612e3c6dfb8ba5f98a7e1 SHA1 66c33d4996c1b786f14d9a10f8c3c62bd2a7c49b SHA256 bdcd90f83e26d7f18ccd7f00425c0e309f2032d286c0439696e570199abf643a
 EBUILD transcode-1.1.0_alpha7-r1.ebuild 3964 RMD160 3fc590ab9f77231c30636077657f17438b195304 SHA1 759b42b5828530802baba6b3675dc2cc08430d65 SHA256 05b72d57cd7e3526357e966d76f17195d6913baa488047e020a57c1972a42888
 EBUILD transcode-1.1.0_alpha7.ebuild 3797 RMD160 36ead8011f68b0748e20158794d3f6919e73ee74 SHA1 591726a59537f3fdd80a848831724df1f4d3e03c SHA256 e0e12261d9f4cabbe2af982b77723dab569d8071541b0451b27726cb4162c56c
-MISC ChangeLog 36783 RMD160 a1b62154ecf17a22d01dd84802d291c26a72fa09 SHA1 bb3ff906646a29004704580e7f318ecb6ffa259f SHA256 49a62262210532011ae270f4d568854bf5f6745ad1d8d9013e023b6f7a7bee5b
+MISC ChangeLog 36958 RMD160 a6da0fac427c23c5c56c55b32fcfea7f67c3f5a0 SHA1 6428ce8ae4c8a6c6419b83dacdd6d721ba036b86 SHA256 60209efdc14ada0f8bb9e4e03e7bc15b6881441bdef67aaf15c4dfa52102b0a8
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/transcode/transcode-1.0.4-r2.ebuild b/media-video/transcode/transcode-1.0.4-r2.ebuild
index 850a68437407..4c2c96cb18b1 100644
--- a/media-video/transcode/transcode-1.0.4-r2.ebuild
+++ b/media-video/transcode/transcode-1.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.4-r2.ebuild,v 1.3 2008/01/15 08:23:48 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.4-r2.ebuild,v 1.4 2008/06/29 14:49:10 loki_val Exp $
 
 WANT_AUTOMAKE="1.8"
 
@@ -35,7 +35,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	theora? ( media-libs/libtheora )
 	jpeg? ( media-libs/jpeg )
 	truetype? ( >=media-libs/freetype-2 )
-	>=media-video/ffmpeg-0.4.9_p20050226-r3
+	<media-video/ffmpeg-0.4.9_p20080326
 	|| ( sys-libs/glibc dev-libs/libiconv )
 	>=media-libs/libmpeg2-0.4.0b
 	xml? ( dev-libs/libxml2 )
diff --git a/media-video/transcode/transcode-1.0.4.ebuild b/media-video/transcode/transcode-1.0.4.ebuild
index 1f4a55f1bb20..d65dc4de3cab 100644
--- a/media-video/transcode/transcode-1.0.4.ebuild
+++ b/media-video/transcode/transcode-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.4.ebuild,v 1.7 2008/01/13 01:38:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.4.ebuild,v 1.8 2008/06/29 14:49:10 loki_val Exp $
 
 WANT_AUTOMAKE="1.8"
 
@@ -36,7 +36,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	theora? ( media-libs/libtheora )
 	jpeg? ( media-libs/jpeg )
 	truetype? ( >=media-libs/freetype-2 )
-	>=media-video/ffmpeg-0.4.9_p20050226-r3
+	<media-video/ffmpeg-0.4.9_p20080326
 	|| ( sys-libs/glibc dev-libs/libiconv )
 	>=media-libs/libmpeg2-0.4.0b
 	xml? ( dev-libs/libxml2 )
diff --git a/media-video/transcode/transcode-1.0.5-r2.ebuild b/media-video/transcode/transcode-1.0.5-r2.ebuild
deleted file mode 100644
index dfff0aa6720a..000000000000
--- a/media-video/transcode/transcode-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,124 +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/transcode/transcode-1.0.5-r2.ebuild,v 1.1 2008/02/18 19:28:00 beandog Exp $
-
-WANT_AUTOMAKE="1.8"
-
-inherit libtool flag-o-matic eutils multilib autotools
-
-DESCRIPTION="Utilities for transcoding video, audio and container formats."
-HOMEPAGE="http://www.transcoding.org/cgi-bin/transcode"
-SRC_URI="http://fromani.exit1.org/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X 3dnow a52 altivec dv dvdread extrafilters mp3 fame truetype iconv
-imagemagick jpeg lzo mjpeg mpeg mmx network nuv ogg oss vorbis quicktime sdl sse sse2 theora v4l2 xvid xml"
-
-RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
-	dv? ( >=media-libs/libdv-0.99 )
-	dvdread? ( >=media-libs/libdvdread-0.9.0 )
-	xvid? ( >=media-libs/xvid-1.0.2 )
-	mjpeg? ( >=media-video/mjpegtools-1.6.2-r3 )
-	lzo? ( =dev-libs/lzo-1* )
-	fame? ( >=media-libs/libfame-0.9.1 )
-	imagemagick? ( >=media-gfx/imagemagick-5.5.6.0 )
-	mpeg? ( media-libs/libmpeg3 )
-	mp3? ( >=media-sound/lame-3.93 )
-	sdl? ( media-libs/libsdl )
-	quicktime? ( >=media-libs/libquicktime-0.9.8 )
-	vorbis? ( media-libs/libvorbis )
-	ogg? ( media-libs/libogg )
-	nuv? ( =dev-libs/lzo-1* )
-	theora? ( media-libs/libtheora )
-	jpeg? ( media-libs/jpeg )
-	truetype? ( >=media-libs/freetype-2 )
-	>=media-video/ffmpeg-0.4.9_p20050226-r3
-	|| ( sys-libs/glibc dev-libs/libiconv )
-	>=media-libs/libmpeg2-0.4.0b
-	xml? ( dev-libs/libxml2 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXv )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
-		"${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \
-		"${S}"/docs/release-notes/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-
-	strip-flags
-
-	if use ppc || use ppc64 ; then
-		append-flags -U__ALTIVEC__
-	fi
-
-	append-flags -DDCT_YUV_PRECISION=1
-
-	use xvid && myconf="${myconf} --with-default-xvid=xvid4"
-	# Follow upstreams suggestion about a52, libac3 is deprecated
-	use a52 && myconf="${myconf} --enable-a52 --enable-a52-default-decoder"
-	myconf="${myconf} \
-		$(use_enable mmx) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
-		$(use_enable 3dnow) \
-		$(use_enable altivec) \
-		$(use_enable network netstream) \
-		$(use_enable truetype freetype2) \
-		$(use_enable v4l2 v4l) \
-		$(use_enable mp3 lame) \
-		$(use_enable nuv) \
-		$(use_enable ogg) \
-		$(use_enable oss) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable dvdread libdvdread) \
-		$(use_enable dv libdv) \
-		$(use_enable quicktime libquicktime) \
-		$(use_enable lzo) \
-		$(use_enable iconv) \
-		$(use_enable mpeg libmpeg3) \
-		$(use_enable xml libxml2) \
-		$(use_enable mjpeg mjpegtools) \
-		$(use_enable sdl) \
-		$(use_enable fame libfame) \
-		$(use_enable imagemagick) \
-		$(use_enable jpeg libjpeg) \
-		$(use_with X x) \
-		--with-mod-path=/usr/$(get_libdir)/transcode \
-		--with-libpostproc-builddir=/usr/$(get_libdir) \
-		--disable-avifile \
-		--disable-xio"
-	econf ${myconf} || die "econf died"
-
-	emake all || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install died"
-
-	#do not install the filters that make dvdrip hang unless we ask for them
-	if ! use extrafilters ; then
-		rm "${D}"/usr/$(get_libdir)/transcode/filter_logo.*
-		rm "${D}"/usr/$(get_libdir)/transcode/filter_compare.*
-	fi
-
-	dodoc AUTHORS ChangeLog README TODO README-1.0.1
-	dodoc docs/*.txt docs/README.* docs/OPTIMIZERS docs/faq
-	dohtml docs/html/*
-	doman docs/man/*.1
-}