Remove support for system ffmpeg. Directly fixes bug #483518 by fuzzyray. See also bug #480936 by floppym and bug #466010 by cmuelle8.

Package-Manager: portage-2.1.12.2/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

7 files changed, 53 insertions, 83 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e47ab0c1dd39..e6ef128f870d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.941 2013/09/04 02:04:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.942 2013/09/05 03:44:01 phajdan.jr Exp $
+
+  05 Sep 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-29.0.1547.57.ebuild, chromium-29.0.1547.65.ebuild,
+  chromium-30.0.1599.22.ebuild, chromium-31.0.1612.0.ebuild,
+  chromium-9999-r1.ebuild:
+  Remove support for system ffmpeg. Directly fixes bug #483518 by fuzzyray. See
+  also bug #480936 by floppym and bug #466010 by cmuelle8.
 
 *chromium-29.0.1547.65 (04 Sep 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 28461310dcd7..3401db91d705 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -32,19 +32,19 @@ DIST chromium-30.0.1599.22-testdata.tar.xz 108830984 SHA256 1ab444494ee0123a8dfd
 DIST chromium-30.0.1599.22.tar.xz 158904708 SHA256 284aa90162c66ed10bc5e8c92c885554d2570f4e1722d5973dd959f3ddc1a524 SHA512 c6308f6f821ce4bbb1f2e6f5d5af56bde72b4d32e5891eb201dab27b9ddd0aac96aa6fdd3834bcfda75fa5e2a023048569f6c23cf89255fe7c61c4c1575017e8 WHIRLPOOL 632da1d6d4915cd97fd78a3cb0a4e653676a12636b869f7ff37cd734b994425177a4eede5c27e61980bbb46d1b350a8663ed9df577629468c83e5f9ddf8068af
 DIST chromium-31.0.1612.0-testdata.tar.xz 108847484 SHA256 c992e31d226f99eb5bca16715f5ad15d1660f61e84b7145e693522232b868933 SHA512 4d72a5f3c9efac22604de0384711d193a77b6d26aade9a9907144807608a9d9712e51a26fd9e2d2f3056ea46ba4092124f0ef0271a594636ae864312a1f1a780 WHIRLPOOL 0f66b1463c941194d3e67eca2b230198bf4769652123ff69ae33985319d6772ba12c3e2fd3af3649a21a708a786dc66fccbb7c7c87ef64ae96485b5357c06a9b
 DIST chromium-31.0.1612.0.tar.xz 163612784 SHA256 bc50d6bb7ff8357cb4eb48fa24e36ddec24713c232cd8bb0dfeb5fdb248a06a6 SHA512 280d9315025e888c31695c0268b182b1c699006635f7bfc48d7268898ee3c492661a68b74b1247d26f3846aa8bf1db03cb94ec3666888391f5a2d6834c026912 WHIRLPOOL 6551359986d48f73ed8dc919f804dac527af2a6241cc6e0da48169af177c72d0a37d43d186b917ee1750c2ff8d42dbf85786236e2142bce516d9283b33341d0a
-EBUILD chromium-29.0.1547.57.ebuild 17318 SHA256 9752b28fb54bc748fafdb9d1cd91dfc44d9b203ee18c02b5312cb7848d32fac8 SHA512 d97f15043883bb9285a5e9444ec5c89ba30d3201045f2fce3241eb15d60d45f0949dee8155728857d0a443bee0c64a3d55c33f5a65cf7005b19339167d81e205 WHIRLPOOL ff57e9c23813318d1236c854820b0a89c029b118654e94f020b372e90c70b48c45a67fc664e27e3ecc4fc212f9523b722d595adb6ddc296969f4a410d261495c
-EBUILD chromium-29.0.1547.65.ebuild 17301 SHA256 316cf73a7b43bef557142bbf12f4f8273b44b7cf6555554b14f958d6ae873e68 SHA512 fc04c74c27134b824d9c3658fdea0adfaa807fd6a6ed04ee37808cb4b539dd674794d6afe810a01ed11d6cc9191186c211a7010e51fc9f08aa485550ea6e492b WHIRLPOOL ca41e1e547eddf3089e740400353e9a0a516a45ac70139f778e4a0a494c22abe1066831506ef39e441fded32d0526469ef3b7ee642dedc05cc28453ff58dcf90
+EBUILD chromium-29.0.1547.57.ebuild 17013 SHA256 81b965e2163ae7e3717ae4ef1a85f64ad5d438fedf1ceb5c40c5f86ea8e44b67 SHA512 044b3dd4151d0699df624e9115da67b9c2763852586538782af031e60d12e88df5bacfd57c6ea72f3021ac60b17d238e48780a1e1ec403e4f3906a07bbea4a82 WHIRLPOOL b2ea156efb5d458d323c34de006057b1cd260a7a3ba80e240a67650499ff139e34c256fd1a4cf9275eb82e42a2ae1db32625a0a1eef68955c54c4031b8d5e05e
+EBUILD chromium-29.0.1547.65.ebuild 16992 SHA256 f3ae1013c9b920b893168d6fe7c4f867c23e9f1a56dcd1dcef3de4b070811c63 SHA512 949b4b88ec3baa6073020a53453b1b76acb0130bad1c2251e2e40e300c03b08110a179a8908be7f53625703e8725edc5c6a9345dbff42b3b6899c722e31487de WHIRLPOOL 44728abe81f256754f265da32301003d427a25384f42093524cb5816ec71f6036fcd662d501f4d5b8a0b5748c8010e78cbe4f44954442ac158130311dfa7d3b6
 EBUILD chromium-30.0.1599.15.ebuild 17764 SHA256 fb6ab6673f206e64dc0a886711f22df49d73f8962f1f695c0b657a2f1ba1b9d5 SHA512 b8720cac2c9b868798e4cb252752e685a89d20bf1ba7c9158c0d170611c18166c5467478b7190add7b307870c57b1ee95d16e76a4ebdb0adbb24046e1b935a32 WHIRLPOOL 87e34b0084247d23fe0670677ad71de9066ddaf4bbe42c0dadb2136836c3f87d5a65f75ec07545b195e5a6155bfef0d9c165036fc5a30f209a27dd094e6cd187
-EBUILD chromium-30.0.1599.22.ebuild 17764 SHA256 45e694ce4c8ce98403f52ff79f32d7c65dc9270606f139d8245b3201afee3f40 SHA512 8658eb6eadc861b60284b5eaa7df7846bc1546d3cc175060e74043976fd3fbb14de5f147ae6464637a1b375d66de79948684066f0689e3781b25e836c37e9e50 WHIRLPOOL 2705e6798b1fda9fa87bb894e41c3a5f98263c91e675c67cb567852b2619bd2ce5700bf0446e582c3083e5959c80ef9ece04bdca5a8e034168e94d43155d1d43
-EBUILD chromium-31.0.1612.0.ebuild 17794 SHA256 d546e83b9b00b114a0fd8f736a425948da506b70a1b16d12e9675c67c3cb3c48 SHA512 dc9cb98969f794acc19fa46986e9ed48fd41d51ce42feea5eb0cccf9e59b2ef116b46cf4566a99b66f36635604183f206c0720c3ecf7874213dc0296ce9215e9 WHIRLPOOL 19381b000ded3f011c42ce3ad2a7a906393b5289103efaffdbfdad81f929c7a0e41b75e4ba5e34f612d598b5541097500cb8535e855392f8c09f5487f6c2b8d1
-EBUILD chromium-9999-r1.ebuild 19833 SHA256 8cd6b452742237dfa7e79fd250eec6a03251c8990e8b3932fd3adb0cd37ba6df SHA512 0a2fd03dfb8acbc44921970b83538bf2c5a54153f7aca3c0cbc89edfee9e0ee2255900e86d38078eb67c1995311380a9a964bab5ce0fc9c1f0c415f022a9cba7 WHIRLPOOL 94ab22bcab2ae06e373c4dceb1b711d245a409d4e430d5e4632ea464dcd8fab1c63ceac7062b9e40e02d7ec9b4932e0cc211bc10ee58dcf5239be094678c9fd7
-MISC ChangeLog 80675 SHA256 960da9d2db62c7613a0b6e7c4381ac035b3b21c70af53dbe95fe159140a96689 SHA512 fb1db72eba2c8f6733c93916988ac0c272b2dcdbb80424906681611a0f1b5f277468e91b229d03f80f34b0a5f9edf200d9815ccae5c480b92124f56dc8a4eda7 WHIRLPOOL c7fa2c86a2ca797f9b751fb61663343ac0e98d72c249f5545c37d28a4f2a3c1ecf5a375cb2aff5b9aacf20ca2040c4e3c7a36c73e6eab8b44ae8eafb428f3d94
+EBUILD chromium-30.0.1599.22.ebuild 17497 SHA256 523475c4db144e73081606c62e26a7e06539b7e21556a68b1ed47553a40447a0 SHA512 d90a488bc496590026bebf7bee2afa570dd81dedd9c6f49ee8ba154321fd1cca6cbfe01dca4f17754ee8036f49f38af6352c889d99502e6331f78666640d671b WHIRLPOOL 3559b1ce031f3108794aa87953925592544f962c212818d92f8264cf5ede83110441db9d23d0a3663b9301e5cadc9ac4fbdf5e58ada90f7fe8f02c51265dade7
+EBUILD chromium-31.0.1612.0.ebuild 17524 SHA256 7fe843618b794ab18af09c61acbbf36d489e85cbb7fb4b067c9471e53c00e541 SHA512 4154d0da00e939a9cc98253d6079f9c1122480ff7f3b929566205f400c19b9595bcc6205f438c6f1a2ef272e623a41e177615d64df71d2e0e490e0bc5244191b WHIRLPOOL 906e8760e3ef3a387463a6042617784ca209df80ea0e69b4b7d97f1afb5c2692b8d889a07314dfd2e91d4bdcf0a62a4ca63275ab58a1605617f75f341c17d75f
+EBUILD chromium-9999-r1.ebuild 19562 SHA256 35db88d793406ae1b8f8cb8c7270affe3677216528ad39447d0001cec550e1ff SHA512 16677f357e2d23d818ba228d68daa65dd50d75061a9f68b79e30e6d32aacdf8f03af7694ef0f941e179fbd552d7857b13f6e8a5ac25fb478628291158f4272d0 WHIRLPOOL c87d848c1e517f327c08cb7a79d06f36f7c6bfc92e3d093d2c480ae518baefd3741a35ccb9dfbab344ae64b519140270fcfc7d3df995408feff97cd582fe7c67
+MISC ChangeLog 81023 SHA256 182bcf11a9fac28f3b53974cf1c717a983f23411b9d7c9a7e917b59ce8ca9148 SHA512 7ed935a7d8a21c76b5a28a00a74bb0dfae06f9e3cd8c98202eae79c36b5329fc7216d366134412c2dbf0f00ec1f8e73b65de5d07ac990757943815a2496f200e WHIRLPOOL 6f98c6b324a4f6e80c740c3a54285140c52ef773c424e56636ba09e8af56400578e29edbce60d9d69e597ff8fc3acb962b75fa4b9624af9a8d0513b160da01a6
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlImlRsACgkQC77qH+pIQ6RvogEArbojE8ewlxmuTgeJry78/c6b
-i6WEgVLNZSEumxqJfTMBAJOVru8amqLzHK1W+197lWdmXv+B9hMmYprrX0h2wpJl
-=W3H8
+iEYEAREIAAYFAlIn/moACgkQuUQtlDBCeQKvFwCfURKHochWIQ14eXn9hMs7FbKU
+bDkAn31Xe0ajPo3IdDjD2tdeEvzwpBbw
+=zPvO
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-29.0.1547.57.ebuild b/www-client/chromium/chromium-29.0.1547.57.ebuild
index 63251745a882..aac7597677ba 100644
--- a/www-client/chromium/chromium-29.0.1547.57.ebuild
+++ b/www-client/chromium/chromium-29.0.1547.57.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.57.ebuild,v 1.3 2013/08/21 21:39:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.57.ebuild,v 1.4 2013/09/05 03:44:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -63,10 +63,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( || (
-		>=media-video/ffmpeg-1.0:0=[opus]
-		>=media-video/libav-9.5:=[opus]
-	) )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -118,10 +114,9 @@ pkg_setup() {
 
 	chromium_suid_sandbox_check_kernel_config
 
-	if use bindist && ! use system-ffmpeg; then
+	if use bindist; then
 		elog "bindist enabled: H.264 video support will be disabled."
-	fi
-	if ! use bindist; then
+	else
 		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
 	fi
 }
@@ -136,7 +131,6 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.patch"
 
 	epatch_user
 
@@ -246,8 +240,7 @@ src_configure() {
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1
-		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+		-Duse_system_zlib=1"
 
 	# TODO: patch gyp so that this arm conditional is not needed.
 	if ! use arm; then
@@ -305,7 +298,7 @@ src_configure() {
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"
 
-	if ! use bindist && ! use system-ffmpeg; then
+	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
 		myconf+=" -Dffmpeg_branding=Chrome"
 	fi
@@ -524,9 +517,7 @@ src_install() {
 	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
-	if ! use system-ffmpeg; then
-		doexe out/Release/libffmpegsumo.so || die
-	fi
+	doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/chromium/chromium-29.0.1547.65.ebuild b/www-client/chromium/chromium-29.0.1547.65.ebuild
index 3e9dde5b6f74..7faf1d24ae2f 100644
--- a/www-client/chromium/chromium-29.0.1547.65.ebuild
+++ b/www-client/chromium/chromium-29.0.1547.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.65.ebuild,v 1.1 2013/09/04 02:04:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.65.ebuild,v 1.2 2013/09/05 03:44:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -62,10 +62,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( || (
-		>=media-video/ffmpeg-1.0:0=[opus]
-		>=media-video/libav-9.5:=[opus]
-	) )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -117,10 +113,9 @@ pkg_setup() {
 
 	chromium_suid_sandbox_check_kernel_config
 
-	if use bindist && ! use system-ffmpeg; then
+	if use bindist; then
 		elog "bindist enabled: H.264 video support will be disabled."
-	fi
-	if ! use bindist; then
+	else
 		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
 	fi
 }
@@ -135,7 +130,6 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.patch"
 
 	epatch_user
 
@@ -245,8 +239,7 @@ src_configure() {
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1
-		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+		-Duse_system_zlib=1"
 
 	# TODO: patch gyp so that this arm conditional is not needed.
 	if ! use arm; then
@@ -304,7 +297,7 @@ src_configure() {
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"
 
-	if ! use bindist && ! use system-ffmpeg; then
+	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
 		myconf+=" -Dffmpeg_branding=Chrome"
 	fi
@@ -523,9 +516,7 @@ src_install() {
 	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
-	if ! use system-ffmpeg; then
-		doexe out/Release/libffmpegsumo.so || die
-	fi
+	doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/chromium/chromium-30.0.1599.22.ebuild b/www-client/chromium/chromium-30.0.1599.22.ebuild
index ec5e0e0e4f3c..dd9f6d44fbc6 100644
--- a/www-client/chromium/chromium-30.0.1599.22.ebuild
+++ b/www-client/chromium/chromium-30.0.1599.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1599.22.ebuild,v 1.1 2013/09/02 01:41:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1599.22.ebuild,v 1.2 2013/09/05 03:44:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -63,7 +63,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.0.1:0=[opus] )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -113,10 +112,9 @@ pkg_setup() {
 
 	chromium_suid_sandbox_check_kernel_config
 
-	if use bindist && ! use system-ffmpeg; then
+	if use bindist; then
 		elog "bindist enabled: H.264 video support will be disabled."
-	fi
-	if ! use bindist; then
+	else
 		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
 	fi
 }
@@ -131,7 +129,6 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.patch"
 	epatch "${FILESDIR}/${PN}-system-ply-r0.patch"
 
 	epatch_user
@@ -244,8 +241,7 @@ src_configure() {
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1
-		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+		-Duse_system_zlib=1"
 
 	# TODO: patch gyp so that this arm conditional is not needed.
 	if ! use arm; then
@@ -302,7 +298,7 @@ src_configure() {
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"
 
-	if ! use bindist && ! use system-ffmpeg; then
+	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
 		myconf+=" -Dffmpeg_branding=Chrome"
 	fi
@@ -534,9 +530,7 @@ src_install() {
 	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
-	if ! use system-ffmpeg; then
-		doexe out/Release/libffmpegsumo.so || die
-	fi
+	doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/chromium/chromium-31.0.1612.0.ebuild b/www-client/chromium/chromium-31.0.1612.0.ebuild
index 4cc23bec6ae9..25a3bc0d88c1 100644
--- a/www-client/chromium/chromium-31.0.1612.0.ebuild
+++ b/www-client/chromium/chromium-31.0.1612.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-31.0.1612.0.ebuild,v 1.1 2013/08/31 03:27:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-31.0.1612.0.ebuild,v 1.2 2013/09/05 03:44:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -63,7 +63,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.0.1:0=[opus] )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -116,10 +115,9 @@ pkg_setup() {
 
 	chromium_suid_sandbox_check_kernel_config
 
-	if use bindist && ! use system-ffmpeg; then
+	if use bindist; then
 		elog "bindist enabled: H.264 video support will be disabled."
-	fi
-	if ! use bindist; then
+	else
 		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
 	fi
 }
@@ -134,7 +132,6 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.patch"
 	epatch "${FILESDIR}/${PN}-system-ply-r0.patch"
 
 	epatch_user
@@ -261,8 +258,7 @@ src_configure() {
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1
-		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+		-Duse_system_zlib=1"
 
 	# TODO: patch gyp so that this arm conditional is not needed.
 	if ! use arm; then
@@ -319,7 +315,7 @@ src_configure() {
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"
 
-	if ! use bindist && ! use system-ffmpeg; then
+	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
 		myconf+=" -Dffmpeg_branding=Chrome"
 	fi
@@ -551,9 +547,7 @@ src_install() {
 	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
-	if ! use system-ffmpeg; then
-		doexe out/Release/libffmpegsumo.so || die
-	fi
+	doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index e762554ffb4e..6351a4bb12be 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.212 2013/08/31 03:27:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.213 2013/09/05 03:44:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,7 +19,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src"
 LICENSE="BSD"
 SLOT="live"
 KEYWORDS=""
-IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -62,7 +62,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.0.1:0=[opus] )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -183,10 +182,9 @@ pkg_setup() {
 
 	chromium_suid_sandbox_check_kernel_config
 
-	if use bindist && ! use system-ffmpeg; then
+	if use bindist; then
 		elog "bindist enabled: H.264 video support will be disabled."
-	fi
-	if ! use bindist; then
+	else
 		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
 	fi
 }
@@ -200,8 +198,6 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.patch"
-
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -330,8 +326,7 @@ src_configure() {
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1
-		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+		-Duse_system_zlib=1"
 
 	# TODO: patch gyp so that this arm conditional is not needed.
 	if ! use arm; then
@@ -388,7 +383,7 @@ src_configure() {
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"
 
-	if ! use bindist && ! use system-ffmpeg; then
+	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
 		myconf+=" -Dffmpeg_branding=Chrome"
 	fi
@@ -622,9 +617,7 @@ src_install() {
 	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
-	if ! use system-ffmpeg; then
-		doexe out/Release/libffmpegsumo.so || die
-	fi
+	doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
 	local branding size