Drop ffmpeg useflag, as ffmpeg is mandatory. Bug #118963.

Package-Manager: portage-2.1_pre6-r2

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 7712f57282d338bc0d17aefae0198c90321c382d..413cfa35df8b7b5dbf09f06b91b406053022b050 100644 (file)
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.138 2006/01/31 13:59:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.139 2006/03/14 23:51:54 flameeyes Exp $
+
+  14 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-1.0.2-r1.ebuild, transcode-1.0.2-r2.ebuild:
+  Drop ffmpeg useflag, as ffmpeg is mandatory. Bug #118963.
 
   31 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   transcode-1.0.2-r2.ebuild:

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index c630bf018da7546a5bc878d29bf2859774e14d0e..4448421970b3ff24f98f4cd06b54bf0369c8d84a 100644 (file)
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0afb5b3811e25d0b6b647ab63e591d98 ChangeLog 25709
-RMD160 42a230298df81be917b000605313e18594f9ae16 ChangeLog 25709
-SHA256 6f9fbe2e9c78842783c6ad6edbcb3e4f39186074d08f1ba11ecaa1dc05d1100e ChangeLog 25709
+MD5 8de903c7f3bcf6ca62c1b843b277c17b ChangeLog 25879
+RMD160 7a458215f024500d2d4c3865c3e9b65e0be26bff ChangeLog 25879
+SHA256 1d6ca111330fdb9a9d8a19699d428ac6c3c3027d53152a3673484533cd02772e ChangeLog 25879
 MD5 8e1251c76b508dfdfe0e4f0c0b166540 files/digest-transcode-0.6.14-r2 144
 RMD160 8f8d40b9c1343a02f9002185540bd6c455750940 files/digest-transcode-0.6.14-r2 144
 SHA256 007a460fcd8420b02d0c87b58f2fd999a592307ba37d9579571e6fa1a9e0d0d0 files/digest-transcode-0.6.14-r2 144
@@ -31,16 +31,16 @@ SHA256 a1d5239584c4307eafd424689f6f8f6e878babc45657c11ea2c1276e9ff42599 transcod
 MD5 c95ca22041e03805b95c4a7a5f7d2009 transcode-0.6.14-r3.ebuild 3567
 RMD160 0bbef741c82150ce612125261200f43a4ed566c5 transcode-0.6.14-r3.ebuild 3567
 SHA256 e67739d145b19d10610775f0ad20de2b00592dadfd473cffcf5bcbac6ed11d21 transcode-0.6.14-r3.ebuild 3567
-MD5 b15cb6b73f828461bd418ff5faf8194c transcode-1.0.2-r1.ebuild 3789
-RMD160 e1094b4825fa82976c2fb8b2264eaad4db8a65ab transcode-1.0.2-r1.ebuild 3789
-SHA256 c8a42864ca7c34b5b4ab79028221717da1e921e305dd50010efa17503ce37731 transcode-1.0.2-r1.ebuild 3789
-MD5 453b5e0517ac1438d746e876daa4186a transcode-1.0.2-r2.ebuild 4002
-RMD160 301a45295aab644c32e08878a9c6501fde26eca3 transcode-1.0.2-r2.ebuild 4002
-SHA256 89577ad2a37f66f993b89371ca3a110f326b604c4dbbaa444f691221f6fd1361 transcode-1.0.2-r2.ebuild 4002
+MD5 f8df3f99ee57f3e6dcf44af305c2ab2a transcode-1.0.2-r1.ebuild 3758
+RMD160 0ad229f92a352dcaccfbea259516c1cbefbb08aa transcode-1.0.2-r1.ebuild 3758
+SHA256 455d692c2393278d9110d279ec3a1ccbdacb6533b6d2a168f0cc855479940b1a transcode-1.0.2-r1.ebuild 3758
+MD5 bcd15e80700fc898d3d43b8d237c7544 transcode-1.0.2-r2.ebuild 3974
+RMD160 fbc068275cf2481e1983225f3312416f81952fdb transcode-1.0.2-r2.ebuild 3974
+SHA256 5a2735403b6ca01dfb4dbff6cb2fc718447daf990d7cf56ea64e8b71b068fb82 transcode-1.0.2-r2.ebuild 3974
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD6tKB2+ySkm8kpY0RAnchAJ4sPnvMApkNFkO36fuZQbAcuDE1TgCgxpOt
-hxucEkhstYkG7iE+HO5y0gI=
-=715h
+iD8DBQFEF1cnAiZjviIA2XgRApfDAJ4sFb1nQz2ymX1yHTds9OF+cmrtEQCfZBNx
+OHIWJO5ptnNfM4f4QSmzI/A=
+=IvY0
 -----END PGP SIGNATURE-----

diff --git a/media-video/transcode/transcode-1.0.2-r1.ebuild b/media-video/transcode/transcode-1.0.2-r1.ebuild
index 91ebb506085a59046ac131ca3d3bc0bdf47e30f0..1dc5266b40d2056b4afaf4b2bef48fe6d3f16f20 100644 (file)
--- a/media-video/transcode/transcode-1.0.2-r1.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r1.ebuild,v 1.6 2006/01/10 11:18:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r1.ebuild,v 1.7 2006/03/14 23:51:54 flameeyes Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="X 3dnow a52 altivec dv dvdread mp3 fame truetype gtk imagemagick jpeg
 lzo mjpeg mpeg mmx network ogg vorbis quicktime sdl sse sse2 theora v4l2
-xvid xml2 ffmpeg"
+xvid xml2"
 
 RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
        dv? ( >=media-libs/libdv-0.99 )
@@ -36,7 +36,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
        jpeg? ( media-libs/jpeg )
        gtk? ( =x11-libs/gtk+-1.2* )
        truetype? ( >=media-libs/freetype-2 )
-       ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r3 )
+       >=media-video/ffmpeg-0.4.9_p20050226-r3
        || ( sys-libs/glibc dev-libs/libiconv )
        >=media-libs/libmpeg2-0.4.0b
        xml2? ( dev-libs/libxml2 )
@@ -121,8 +121,8 @@ src_compile() {
                $(use_enable jpeg libjpeg) \
                --with-mod-path=/usr/$(get_libdir)/transcode \
                $(use_with X x) \
-               $(use_with ffmpeg libpostproc-builddir "${ROOT}/usr/$(get_libdir)") \
                ${myconf} \
+               --with-libpostproc-builddir="${ROOT}/usr/$(get_libdir)" \
                --with-lzo-includes=/usr/include/lzo \
                --disable-avifile \
                || die

diff --git a/media-video/transcode/transcode-1.0.2-r2.ebuild b/media-video/transcode/transcode-1.0.2-r2.ebuild
index 715bb8da6ec036b6dceea5e50ae3fc32bfb6f806..34b6e7160a47ee2b57a2115e101c1b88ed8651ba 100644 (file)
--- a/media-video/transcode/transcode-1.0.2-r2.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r2.ebuild,v 1.6 2006/02/09 05:25:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r2.ebuild,v 1.7 2006/03/14 23:51:54 flameeyes Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X 3dnow a52 altivec dv dvdread extrafilters mp3 fame truetype gtk imagemagick jpeg
 lzo mjpeg mpeg mmx network ogg vorbis quicktime sdl sse sse2 theora v4l2
-xvid xml2 ffmpeg"
+xvid xml2"
 
 RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
        dv? ( >=media-libs/libdv-0.99 )
@@ -37,7 +37,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
        jpeg? ( media-libs/jpeg )
        gtk? ( =x11-libs/gtk+-1.2* )
        truetype? ( >=media-libs/freetype-2 )
-       ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r3 )
+       >=media-video/ffmpeg-0.4.9_p20050226-r3
        || ( sys-libs/glibc dev-libs/libiconv )
        >=media-libs/libmpeg2-0.4.0b
        xml2? ( dev-libs/libxml2 )
@@ -117,8 +117,8 @@ src_compile() {
                $(use_enable jpeg libjpeg) \
                --with-mod-path=/usr/$(get_libdir)/transcode \
                $(use_with X x) \
-               $(use_with ffmpeg libpostproc-builddir "${ROOT}/usr/$(get_libdir)") \
                ${myconf} \
+               --with-libpostproc-builddir="${ROOT}/usr/$(get_libdir)" \
                --with-lzo-includes=/usr/include/lzo \
                --disable-avifile \
                || die