Remove ipv6 useflag, it cannot be disabled separately anymore and is automatically enabled when available with USE=network, reported by marienz

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

4 files changed, 18 insertions, 23 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 92217a4181e4..d8923c582f80 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.342 2010/02/02 08:37:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.343 2010/02/04 19:54:28 aballier Exp $
+
+  04 Feb 2010; Alexis Ballier <aballier@gentoo.org>
+  ffmpeg-0.5_p21602.ebuild, ffmpeg-9999-r1.ebuild:
+  Remove ipv6 useflag, it cannot be disabled separately anymore and is
+  automatically enabled when available with USE=network, reported by marienz
 
 *ffmpeg-0.5_p21602 (02 Feb 2010)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c18e94c83f6d..671af71cc35c 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,14 +9,14 @@ DIST ffmpeg-0.5_p21602.tar.bz2 3212091 RMD160 af9abf8e67c95abf92f6651f8c7ccf6e5c
 EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 SHA1 1c2517f10be827668807cf051b7c595162534eb0 SHA256 84d0af467747bd359582c4e7e90e61edf6eb6857d87905228fc1411e7ce00630
 EBUILD ffmpeg-0.5_p20373.ebuild 7682 RMD160 b208ba9200fbbe8e620d522ad0c5b9da20bc7018 SHA1 ad08eecc6a8d1591dc396313d0ead7e46e19b037 SHA256 354f2fb18bbc8f91faf18c0e61de04dde638afd78542499565e8d03a180ff5d7
 EBUILD ffmpeg-0.5_p20601-r1.ebuild 7887 RMD160 b291765ffc2f18d08b7e28f8b33f88d4597dd90e SHA1 96836583d0824ddb24acbbbd7fe46ba5377db9e1 SHA256 5938dd35b44622801fe9bc0b87592e0b24e3605fe74d4eb55fc8e1393f9ccce7
-EBUILD ffmpeg-0.5_p21602.ebuild 7759 RMD160 64f1e27d806fed28124c242cb9a93195360d5a30 SHA1 21c72ff185cb8fbf66cf171b706215cd89788efa SHA256 d51d0da759fc83b13ef6a3592d0feb0185dc0f9a2f9eacb4d6bdb18ab6fdf762
-EBUILD ffmpeg-9999-r1.ebuild 7690 RMD160 4eb2870463b468d9a91ece45fc30e770b2e5e9c9 SHA1 60dab69394ca5768a9c91494f2494ef7f8a49867 SHA256 a73f8e63622a26a9222bd77634d71290099e408e8ea0b224879561fdd34565cd
-MISC ChangeLog 51082 RMD160 595e39c47ad81e848d22d0ceb2bf3db560b2e7db SHA1 07392da170fea7d681b52ec73a0af69691d95064 SHA256 9786e8cfec538b32a00956e58911bfbe8577cb90214378a6c4e698d1d97da426
+EBUILD ffmpeg-0.5_p21602.ebuild 7687 RMD160 ddcc28954fe809022c1c0e060f57fe7837e5c8f5 SHA1 df845463ef82a0e4b721c091b666f71d5133666e SHA256 6ce66370cad761c2a9b5f29dffa8f24e7d0222c61be18dc3cd16c86ea4dac084
+EBUILD ffmpeg-9999-r1.ebuild 7621 RMD160 40431f3ab44e12391340d4df642b16657ed10337 SHA1 9ae741dbd068d17bd3b710ef9b8855baf94d4760 SHA256 26c5812bd7278e64dd87438f82ac0019d114f747c277e1f2c21c3e3d1355afef
+MISC ChangeLog 51334 RMD160 adebc7062ebd846dcfdf64adaadae7a90a951d81 SHA1 028be8e748365247487797a5fc3affbe8264395f SHA256 a687fbc6e718cba516b9b08b0f1b282b598623fcd360b18ff22103ee8466a552
 MISC metadata.xml 1876 RMD160 3fed4cfedd4cd693c1053bd4ea90c75260aa2815 SHA1 827e1fc2f346f5c8695d45c4697dbcd4fbc47462 SHA256 a2b6f4fce6ae13c3cdc007124cea38857942efeb7fac9779487d087b6068ca52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktn5DIACgkQvFcC4BYPU0pguACgmn3RzOSSRj3Gp+dWm3DdHZCT
-SZAAn0pwRwOBqMpEKNfv0/B4DybGYU/9
-=Wz2q
+iEYEARECAAYFAktrJfoACgkQvFcC4BYPU0rCNgCgubtATdPzvFkp2hzjgr8Lo5qw
+IcIAn148eOYq3oW6SqZFPzhQkEd2nQ5H
+=An93
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild
index a2370bb69466..e7175b806273 100644
--- a/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild,v 1.1 2010/02/02 08:37:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild,v 1.2 2010/02/04 19:54:28 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -26,7 +26,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
-	  doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test
+	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
 	  theora threads x264 xvid network zlib sdl X mp3 opencore-amr
 	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
 	  speex +ssse3 jpeg2k vdpau"
@@ -87,12 +87,7 @@ src_configure() {
 	use debug || myconf="${myconf} --disable-debug"
 	use zlib || myconf="${myconf} --disable-zlib"
 	use sdl || myconf="${myconf} --disable-ffplay"
-
-	if use network; then
-		use ipv6 || myconf="${myconf} --disable-ipv6"
-	else
-		myconf="${myconf} --disable-network"
-	fi
+	use network || myconf="${myconf} --disable-network"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index aaf3974aea1e..ce887f5c0de6 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.28 2010/01/26 15:56:13 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.29 2010/02/04 19:54:28 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -26,7 +26,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
-	  doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test
+	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
 	  theora threads x264 xvid network zlib sdl X mp3 opencore-amr
 	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
 	  speex +ssse3 jpeg2k vdpau"
@@ -87,12 +87,7 @@ src_configure() {
 	use debug || myconf="${myconf} --disable-debug"
 	use zlib || myconf="${myconf} --disable-zlib"
 	use sdl || myconf="${myconf} --disable-ffplay"
-
-	if use network; then
-		use ipv6 || myconf="${myconf} --disable-ipv6"
-	else
-		myconf="${myconf} --disable-network"
-	fi
+	use network || myconf="${myconf} --disable-network"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"