Fix deps for ffmpeg wrt bug #228833.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

4 files changed, 9 insertions, 129 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/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
-}