Remove := subslot operator from || () block since it is meaningless and broken.

Package-Manager: portage-2.2.11_p178/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

13 files changed, 87 insertions, 44 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index 8ddac3ebfcfe..3eb972d6b850 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.22 2014/08/10 20:59:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.23 2014/09/01 16:47:50 mgorny Exp $
+
+  01 Sep 2014; Michał Górny <mgorny@gentoo.org> handbrake-0.9.9-r1.ebuild,
+  handbrake-0.9.9.ebuild, handbrake-9999.ebuild:
+  Remove := subslot operator from || () block since it is meaningless and
+  broken.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> handbrake-0.9.9-r1.ebuild,
   handbrake-0.9.9.ebuild, handbrake-9999.ebuild:
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 8024b965585a..94786197893c 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -11,15 +11,27 @@ AUX handbrake-9999-remove-faac-dependency.patch 3697 SHA256 05af966252b8b6e50d3c
 AUX handbrake-9999-use-older-libmkv.patch 583 SHA256 17e15eccc630bf5dfcd66609d19bdcf57c731fba6c314af3a5a6d083de80ba7c SHA512 6ebcf55ffaab20301da1ceb2d993580a6b875676b65ee2d61d3fcaedf9e5a3b7e52128dae30363923218ba2e6f4510232c0e7738343e35c4c95048d35ff3933b WHIRLPOOL 075f604ec3c48345f435b3b2cd39b7d175c7df69600e5ca9438cd6d6a380673ff8848a2bf111cfe8fb3dff21ad33e822fbf7b45a3e547da8a0d9170a933e78d3
 AUX handbrake-9999-use-unpatched-a52.patch 944 SHA256 b8ccdecb0a70650af162fa649a323dd1c31268efe7c9ace58a89d70eab984c80 SHA512 aff9da64a434946600d1683f101bea1024319a418c57b0dbe9a8c287c72edf91d18102d51b817d9cea6e825d3a945741893956c55df16bf8f61b415a50dbeab4 WHIRLPOOL 97cf18bb453b435f88a60ed6417811eb8ce5c7af68f4e3d12316a72ac1594637f288511b54aee2b50fc04c356a0dba23dcf71b5712e9520371ab112f99b4f90f
 DIST handbrake-0.9.9.tar.bz2 9315199 SHA256 a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 SHA512 c891e78f5fbc62fd46055bf6cd62e631bc181a2a21167dcf3fe18cbc4b57bb36c11d52dcf39b3c923b807160e79fb2b1f3c36d60f3024149206a86e7bd6d5b68 WHIRLPOOL edcb7758ba68e35b70700bbf484ac7794739a14302d205c080ad4fdf3151b460ee54b0c8dfffd68bca2ccb1a7d4379c9bbb7c3a9939c6bd6a06e1be95f09169e
-EBUILD handbrake-0.9.9-r1.ebuild 4521 SHA256 f8086ffb8df7cdce1aa58f0de9e5cf25a9e039f76a36881090db2525b75e3d70 SHA512 4de596ef5a0990f7c3fb85bf8167236c80774a55eb34a0a0d81f09785a305911277310a905e9fd0b91be52240afe0a390685d259e68ceee274ef97ed306273bb WHIRLPOOL f146822d3898fdd4800a9225d30f6e5e1191a31d07d5387cf0ace1495fa5860293a457af0ec0459625c83114112d379a7c5961bcd564682b63c9bceae45e7a12
-EBUILD handbrake-0.9.9.ebuild 4304 SHA256 ee0a34962029eaabe59c0eeae2176e3676aff119aef4376dc75ca5681d60aa80 SHA512 f55935290f1d020b6fa081cc4fcdc5a49a4808f1ed6518f971096a0ba932374b1f571f22a2d2df789debb01cf638038c2efd97771917f75813390db4bed4a5ba WHIRLPOOL 6c7db9b1ba5d816e47765d832d4ddb86951264966db96212e7641f8f1bedee67cf23645423c96399ef08031fd167fbec39000c7f426aebf83f660774720d8275
-EBUILD handbrake-9999.ebuild 5366 SHA256 dc1f648a56374c5b4daa2c54e53227e4a9546074c9b02af67e194cda9b77a2b8 SHA512 10bd0a6409975f4e9271d3478ecefa85a768d3280cffb7672bdce319b8acace4b358ba9a2a19140c283b25747bac709481964777c85828faa1f082912b105ded WHIRLPOOL db8ec1a2ab86c6eeccbdd19c98de0200ca8a8675279638e9766b8f23a371253fc7397ffaca29135e5a2f202893dc67dea1cebafba126bd9c231e60f7b69aff39
-MISC ChangeLog 6314 SHA256 b3cac59ccf05d5cf6eaace25d626e14d2c7d43357b0b93f22ea37a37bb71f63a SHA512 42620cf64a44ab101b19d9cc03410183cf8ee5b7746588b540ded5b4f6d07dcdb28b44b6d01141a91f41333777c209efbb0b42ded131e14ad42bd5b9afe46633 WHIRLPOOL 38c5a23eb2fd163c6e786a383dec28aaba2493369f9b8d04f156a701de3a35044f2785f1a0e3f5a206db414654b3f656582da328635f308dffb0b70e890eede3
+EBUILD handbrake-0.9.9-r1.ebuild 4518 SHA256 024380ce825648de94df184e8929ec6fa6e4ef50a5d8fa8163396f8b11b732aa SHA512 bfb8c19a94b988c14644f2b6e88fdc43c1afdf93c019005357682a3001e246d463233c513bb13a30242c59f05f322b47ab6654f5f96f49db9fc3877b15cc07db WHIRLPOOL d6f472b54e52b4ed05c70920111500c3632953e0d11df0598fbb26ad4d6ab05e6e383d005dc920a6e144560638691becbbcf7600878d0b4e2eb0959542fdb488
+EBUILD handbrake-0.9.9.ebuild 4301 SHA256 3f55334c74bb7a8d79dba45da90c869c91b5a9bb9eae0479a102958584abefe6 SHA512 12cde78f67a03ec27e876284a622076bd7d2be88b6920db2bda6d09ea33d15478881f5f881109c48f43dbe16f0e78e7a1dde3c942c6a4fbc022f8f5ddbb0ec92 WHIRLPOOL e5938f6c28882941af71f5287ad0e3b989dda1396f873f3b6b8c7eb71493505ad17c90feedd00e618e05a6389f67f5c98762cd04aad9d0e29f7fe4247ee1d9e5
+EBUILD handbrake-9999.ebuild 5363 SHA256 a5a494ef9033cc3b7f38786b4b09362120618f0e035d7debfc4a4f02446c54df SHA512 7a3816826e46f40a181c7021f6e563571c28fab17a8a35d0f384e728201c0a1e200bb01bca8931d5d0b28776078b39fe28c573c253dcb07b8c73c928747b6f27 WHIRLPOOL 6e52ae4ed58c7e9996413e48b3774c72551cb666c357e4e5423d29d10eb22aade0ef534db8ae231675644af58b661b31f29996eac28b3852c403688912d1d901
+MISC ChangeLog 6525 SHA256 a0b07e260bd7c96230eb11d449ae56b187a064dd950bded7a8f099476ec4afac SHA512 cd1b9e471d53391b95fed84b6348449659e9fc68898dc04d340c56f2a37171084f110d817b297737d1b055aade91434923733b38974b1570101706e791df97cf WHIRLPOOL 2942a8558ad962189fd2ef27c7eec069a10148e33612515e3443201727c8f6bac0f41f4c746727122fe8a7d01895a53b869e6d6612b3a7137a7e7f27a3b2f70e
 MISC metadata.xml 949 SHA256 0c2dea9a78292e142a185934a0dd7652f713b4ee68935de6e03a73e43074acfc SHA512 ed66b0375be0c9c07f06222a9de970e60446f543de10fe24e6430c687bae088858d926b2121095bc42fe2e9e6c940d459ad4936285a3291982e01e6e4e71c8b2 WHIRLPOOL 6942dd6c1cab7dfd58a65d2c7ad56e1372a6a7b03e525c027de015ef5ebf1d3a7823d202afa16f867f413ff0255bcd0e13f2d4a3ec19d362ee40db8262a2bfeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn3TkACgkQcaHudmEf86o+EQCfbkR7GWR3iivU4dL2JQxOUq62
-paAAnRa6c/auM5YEgP5Q0dtNIN9IVSvg
-=tm9k
+iQJ8BAEBCABmBQJUBKM4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOg7wP/joLvHY6nPLLnfFGUaeujm09
+L4QIk9LZfPYJdGrNFcNE84wGzlEWDRpowHKWVFC8ELUtrGcLRSdtQEe1WG5FSU8V
+SVDHbbslEx/8I4Lg6suqgQn07VMhVyeTPVFfWc1DkUWMVbkC4E7/z4y3n4YHg9IY
+WS86BNKpArm6qaZ62/LGEqcN5ZgSCDL6/jY3f3eRsqKgiwRu6Yc9E87tZacyb6Qn
+2Vbt8rWR49X+skBeRwziCA2m5p5WrxHpIdfYnubfJs6n4kG89w0POqGRsAj9OqRb
+Ob8WhqDvxZHdd6lhkEXTlQEOSV+TmAdaBpSYLozqOQfBPBgiCAeQVhJQVsASRTZK
+d3JbUr5R1s3mf2uJ+L44bebcvWe87BTWvkwGu1Y1s2ZvgS7ZQ0czQiiLanpChLuI
+qQ0xhYtohZdfrzKHX7Q0KuQI25pQQGrFojjWzfd2HaHxZLd9z/7XyYAzK/gazSnZ
+UaxFmLnmKBdrURrWJPaSEb0zYYMN3mmJgZ6AryK3mKX94wjpxVRiv3oke45VelqT
+TkhoAlpsBZUMDiaayvJUFBmIwQsYSzFjmFpM6VwumKAFtoAoynFOaUx2/8CU7QxR
+6F+dgO+RB52oJZ8uQ0MNBc8ZNwHCvkhBnlmncr1a0o5jc6EqGoLxpbJPpMRXIugb
+lXvpaKDu8NiAG9iFLKyC
+=nOoo
 -----END PGP SIGNATURE-----
diff --git a/media-video/handbrake/handbrake-0.9.9-r1.ebuild b/media-video/handbrake/handbrake-0.9.9-r1.ebuild
index 7820a75d9d88..e87a0acd8930 100644
--- a/media-video/handbrake/handbrake-0.9.9-r1.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9-r1.ebuild,v 1.3 2014/08/10 20:59:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9-r1.ebuild,v 1.4 2014/09/01 16:47:50 mgorny Exp $
 
 EAPI="5"
 
@@ -42,7 +42,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264:=
 	media-sound/lame
-	ffmpeg? ( || ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) )
+	ffmpeg? ( || ( >=media-video/libav-9 >=media-video/ffmpeg-1.2.1:0 ) )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.9.9.ebuild
index 4239e6b91124..e096f5d18b57 100644
--- a/media-video/handbrake/handbrake-0.9.9.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.15 2014/08/10 20:59:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.16 2014/09/01 16:47:50 mgorny Exp $
 
 EAPI="5"
 
@@ -42,7 +42,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264:=
 	media-sound/lame
-	ffmpeg? ( || ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) )
+	ffmpeg? ( || ( >=media-video/libav-9 >=media-video/ffmpeg-1.2.1:0 ) )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index feb000397df7..f350995bb2f6 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.19 2014/08/10 20:59:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.20 2014/09/01 16:47:50 mgorny Exp $
 
 EAPI="5"
 
@@ -49,7 +49,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264:=
 	media-sound/lame
-	ffmpeg? ( || ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) )
+	ffmpeg? ( || ( >=media-video/libav-9 >=media-video/ffmpeg-1.2.1:0 ) )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2aa58a51ca40..0cc7dc01916a 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.923 2014/07/31 10:39:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.924 2014/09/01 16:47:04 mgorny Exp $
+
+  01 Sep 2014; Michał Górny <mgorny@gentoo.org> mplayer-1.2_pre20130729.ebuild,
+  mplayer-9999.ebuild:
+  Remove := subslot operator from || () block since it is meaningless and
+  broken.
 
   31 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.2_pre20130729.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 91e37a1223d1..1624fbf69d29 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -19,19 +19,27 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 DIST mplayer-1.2_pre20130729.tar.xz 5358436 SHA256 9928cd6d0d765eb38f2824c501b94e5b6e0a2ec6e39a0c788654c5508c9eb9ab SHA512 e76ae7a1aeca9e853edf5403f3e3ae60dace980076a12160c501e18d019184af08256829f8e657b9fdbf549126bf518cf5dbe2860eda906e6fcd3ccc44a5f5a5 WHIRLPOOL b4007e4a00fd8b0b2d75a6d375f3b334b3251ea8dd677a5c1d562e4997fbbee81981bbbde9a88a61dc83bfc2d3e5dac6f93e7ff882088ba8b0c3df7c2cd9a6bd
 EBUILD mplayer-1.1.1-r1.ebuild 18277 SHA256 9c3f60a9f4ab017547f99cb2d3124d30de1928696c669d6133e0af70e0beca55 SHA512 e5b60bef7740831b45eac20ee1e8d2c0186d991ccf76f3a9df6726cea6cda06727fdc7ca0c4f35564662ad2b11510248c025426b8474ba0f642db1b8dbac794e WHIRLPOOL d97cdde7cd10ec5f2fb34fd67bebc5d8d0d3975e006cbd468bf8ac88064261f625db0a32cc06e2f3f6ff9b60c5dfa9de60e4a6c217fc8fa21da1b8cd93f7d539
-EBUILD mplayer-1.2_pre20130729.ebuild 17335 SHA256 c1e8427ba87500993671584e25dcdf58e42c0a3d06b6e11ca40f9204ae59d9db SHA512 fe53247055f728ebdc274a283ce80e4dceaf33b107d092e568c82356223d26a42440c50ec417eff346423b1edbefe8508dcc81e03e66f4392e0a8732f21d0357 WHIRLPOOL be740b043221152c938e4e62e95e6edcd80f798f30ff1555c590025b285c90cf78409d806ec393b1a49b1571c934b2097dd6ef491bf8ea8767cc5474d6906847
-EBUILD mplayer-9999.ebuild 17253 SHA256 9b6e486479191ed39a2795acbd631086bab240d4feb3392d6188c9d484bcc54a SHA512 0c44e61252f2f3a278e93d9b6d9ba16eb808d7380b1d6620f67a758be6867f6ebb2e8d871013182640040097b30dbc05b70fb1e1acd64a262b6939247b7c4b19 WHIRLPOOL 1cba0f5abeafd1374aab1654871b50c51db6434ac84e222fb011f6424efda7ead82c316bfa3a98903cf1cce1e4ea85b961ec756850e92eb7caf30b6526a52afa
-MISC ChangeLog 52732 SHA256 a71df8befc1ee27d3225d2e78d6ef651972a028fd15fca6abddad546f8d58dac SHA512 059d011916cfdb7fea8651ee462266251443cacb4f119a7d50f4e0d8c4667fd01ee104537ec1fd4a527b3dc349daa857a4ddd83997d23df80050c46fff553182 WHIRLPOOL 202f1e2c5058bef6c46172b9ec4dddbaf1e19a29f9b02f1908beacc787406aed62f79275c86d1149a17a27f0078405f28e8022de35e9824a18239dd2fc19f994
+EBUILD mplayer-1.2_pre20130729.ebuild 17329 SHA256 9a7170e841410deb8b28842570f20e56874574c76cb070ff4720b4e787ee85ef SHA512 26484bb7658602782cea8b6b7477f830fbcaa4adc48aeb51e1031fe576dd5d7066cd233bffb9b028f1b5898499dbd51f426c6d3b9f575d132858b53fcc3f3e2a WHIRLPOOL dabffe86d1611e4433fd5237e1a68508ea15adae15b1c740970d84335ae37dee24e584c6a62e8aaaf24f3654ba2322f17f95c80d0f0c188fb9a5721c12620f80
+EBUILD mplayer-9999.ebuild 17251 SHA256 37d3dd4c0d70e27f54e20e8536fac9ed043476f25f5af4618308958b561706b4 SHA512 7661479f54af1611a222b9a65c2eaeccb29dd15e337740f3d5423a4b2af54b7933c4f35d8538d1c3cd8d22ee2206299387ed04c83623140457f12a9ba00b9f1b WHIRLPOOL cad842e351d25883a95568bb025e4b0661c7a2768711ef495e64a19db4f6ff76544312f538a7a277cf8818e18165516565aefea03c60e73d5df5c5dec9cc6f6e
+MISC ChangeLog 52919 SHA256 55594100e4cbe7f3add2fbd998511ee3d92a7d828468706ce1c64f862383e6dd SHA512 4b5966bd5672716a102a13b420f434e97ad16cceec7b81235135a5fd3ce5c37d3ea99d64b839943a258d1e688d97ec5b877f4fa762e4ebd07539d800c49cd831 WHIRLPOOL 581c1b0aaf8ac449f1efa8b422cbc31cce394234fb057797a8d0080d4595fbfe15e63a10834acdcbfc68d68b2dc63bd9fcd45892c41720c8ab03363b0fd30d33
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 2825 SHA256 1cfceed0df46a651a5236072ab550073f468a0f9c3aef51c943f1536cc898bac SHA512 7fcf38fdc415346b4576f2e078cd8014905be1269febbc5e574e5f6c44620e239506a63b530d2b8f1b271edf3e6a2b6791dd5fd45ec5d3d1518b0d46c3dde710 WHIRLPOOL 15aa6e751c8b80a033b61b66e3ba0e3d118efe433c620126323c2a87edf6834a60762af0fee1bbe19c406fe3c9b699c9c2b7b2837b9d3b50f2132ba07479e9ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT2hzmAAoJEEdUh39IaPFNhcUH/31vG9DtsD53aBSQdBt4lSbu
-td2o+mHGAZ6r+97O1mCrWBYnK1dv2+N9qLTAKBu+mDcTL0OLqS3YuwXXmuirmMYW
-+IppKlqzcxgeFeOIGBzMv0xsDk4CATNletE8BJzU8YAbAYc01XQMjoOPUVja8WpI
-SnpDceiM9zzkh1jVmFoT7FmUjL0ogJupQh1MU4vx59yzGNEeYrX+upUhNAKS7Nk2
-0MmpjEx0UOMMDLMSzrJcOKKiAfwwL2jTyklTZHTB0qqt0IFrEuTheRwNIc7iOxcO
-d3lKTS2GVlXcvF9/CjTqx3P/wfpcXCsCoXM+cA9Cg+DXRacHNf0v4Y5oQjndaGs=
-=WC1K
+iQJ8BAEBCABmBQJUBKMKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvmgP/RzWD4hJnqyeRweNRSLw96BC
+YTdGjpJjy1JMPl1FWA5h/d2bgFQg7DsoW5cY7MeQEklQOUJGsa9qVLFi6M32l2Lq
+NYN8SfJiVOEooayIv/lSn6sXXZvzmZhuBWX1AVsgZtMHPxPVi8+Trg7NFqE3x4cd
+xVTq9mVGbmafyjqI84waXjNhtm+psa4+N/3Ihob1EccUCq9xQh2y3FEsP0q4A48v
+8IvCZlQ2LJeMOVXMxSmidscDNNN8DGZNhEfJ8zc5EBrXP1olFiJX4Udcn98bu44E
+AvI3eeVt8vF/VBtUYoPXcpqqNtcmHCBAII+CHemsk/nrzia2m72Av8MjYs4bIyRJ
+XKLLuEnWNE9123HxADjgetX7zbqPmV/jumiojZDlXS5CmHiK0yxUqMMkrpgSDphy
+Ho8A6bvdqdPHfheMa2wxR1Nsd56rY6XRDeOuTOW23tW1Cfw7jFXRwHLTyiINmvL5
+6i5W31gC4nvEpWz5muyzStiyfJvs5mAaHFqQAUgwFc2n1jrBOxPRqrf6c/XMOxH+
+YRGCd/WhawV/AYDedzx+Tf1MZEp0pRwFj2/fApWpCFf+vjb6ZBfPQjGnOtkbmacX
+GuoQuJT1hTMHHnGbTZmv4xfhs2RlYnhjL2/F0hYIRakVuL0N+tW4qCfJMbR6p8Tj
+iqLRoxIcqkNlv49a0T8b
+=JjRD
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index 6ba1acd87e97..cebe5729c932 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.13 2014/07/31 10:39:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.14 2014/09/01 16:47:04 mgorny Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ RDEPEND+="
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-1.2.1:0= >=media-video/libav-9.8:= )
+	|| ( >=media-video/ffmpeg-1.2.1:0 >=media-video/libav-9.8 )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index ca3207d5bf29..fbb01af2d75f 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.161 2014/07/27 11:12:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.162 2014/09/01 16:47:04 mgorny Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ RDEPEND+="
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-2.0:0= >=media-video/libav-9:= )
+	|| ( >=media-video/ffmpeg-2.0:0 >=media-video/libav-9 )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index a9f9e6453724..3fd6772bc8b5 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.187 2014/08/22 21:50:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.188 2014/09/01 16:45:35 mgorny Exp $
+
+  01 Sep 2014; Michał Górny <mgorny@gentoo.org> xine-ui-0.99.8.ebuild,
+  xine-ui-0.99.9.ebuild:
+  Remove := subslot operator from || () block since it is meaningless and
+  broken.
 
 *xine-ui-0.99.9 (22 Aug 2014)
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 05903fc5a6c9..f61b920ea2e9 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -6,18 +6,26 @@ DIST xine-ui-0.99.7.tar.xz 1752328 SHA256 9d8cdfd1c5c84251d6978765b059adf57099ff
 DIST xine-ui-0.99.8.tar.xz 1758372 SHA256 1ac5a9fc8dbf81f12a8677108bf2b623e70d7adbb83b83912b9cdf00bc78b2a7 SHA512 a2d11b0c512b9d485e0bbe418b36fb5fd52fe1a9c68cdb865771fc580b30bff513825f3e24ef85a902669c2c1ea8947512dd9abe4c12fdef94b8852cc8588da3 WHIRLPOOL c7d67f94422dfdbd609b3e2d880134a2e2d414981d229870157c10f5c54928101336f83f70d6c56c8da238fd25933b4490958e379d2d0a64721553f3fd7d6638
 DIST xine-ui-0.99.9.tar.xz 1759568 SHA256 8dd180219f546a7be0a5651370996b95b3a38ec97bf01b57d2bd1cb966e591a2 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7 WHIRLPOOL 7bce787c8718e057a33af2ad33efc2ab1ed4358181f2b626e871f79c396b6b900ccf3631a302463f93951199eeae19887fb2c7d4a5eddf137c85664b99424b8a
 EBUILD xine-ui-0.99.7.ebuild 2051 SHA256 ee9cea3d3256d9d856b4640e97a86e957fd5ef9804393c393d3e1ff34c12bb01 SHA512 d202fd31dda7f206c72120a755c9754d156171e43290e7b91e2e23197b01dc3fd24b0eb1edff4e6bafe35f9c337b32903888f4a78162e3617f9d55a72b8f5ae6 WHIRLPOOL e0a8b122737f54f701fcb09239c02dac87692facea08572fe51007d533dd5e4945e10fb3560939e878a10e8a71f84996e4cbb5ad3e1792f612742f9f920f38a2
-EBUILD xine-ui-0.99.8.ebuild 2156 SHA256 e72ff019f3e670b2e2af75e3fb400c2491a82c5f39631279aba8e4c5092180df SHA512 4d195e8e204d42c61a77abe94ae5b1117359fd97dc3dc3d65dae52f56543ca24be020bbaff1a22b46090beb706204cd8f598a4e0f13097247909f10f4bfd8d9f WHIRLPOOL 0aa7efa2a6d8b56e7e37cff59b947b8cda65769cbb00da8dd0131610cda505bd341d794c4794756b8c13f2a22d030c826eca5950d336cad612642ffef90dfe12
-EBUILD xine-ui-0.99.9.ebuild 2103 SHA256 fcde2b434c782880efecd056fb4e774208646d78b4699451b5ffa2f7bce9631c SHA512 99b9cadc91245bcf4fdbbb22f4c70d1fe88745d29d3091c03c6cfdced66402e7814950c886bf344a6a967a39f3a50a6d86c0238e06b2ff1aafeae4389be03a49 WHIRLPOOL 6c07e09c0529710a45a679306bf0ddd0babcffa1fdb0f706d31e265b8564597466d98f0ac249bd07a712b3c96018fd3420a11b06f53ae784fa893406104bcf90
-MISC ChangeLog 28491 SHA256 cf9f616853908dc5b681ef9794c9479db98b243ac39f3083c2dd7be0573b27d9 SHA512 ba2850652fcfa59ca6fb1974125315d845ec0ead5ae5e5e3a197811f98f67f07fc72b200fcc2a27d57304a3327510ed4014bbae815d26c44b298aa8e74493aa7 WHIRLPOOL a45edbab00f613b1e6b889d7667558349c6cc8cf186be34a0bebe053ef4fd628b42c0c63a82fc910f836a111de30b6599110e57e706a2b8e98b54bcd2296ea16
+EBUILD xine-ui-0.99.8.ebuild 2151 SHA256 b49c7288b55e3038e1bc5cfbc8c6d491ae7c42f7ab9262f67bed9bd49db758da SHA512 2a65c88bb9172d14c1631328c44a7f0c1442483ef0020e6db439e6eaea245f0f35398fda44b6f8f8c7274c808aeaa4da2bbd3ebfaabefa03067d201150d12ce3 WHIRLPOOL 5d6e31e23c5678fe02fa7f3900c6a443099e72143821dba91b31610e94cbafd67c027007684e5dfff5a1049fe51ae2b324621a02b14a958622397a892f408c35
+EBUILD xine-ui-0.99.9.ebuild 2098 SHA256 1b66021ef1f8b2f7efd30405f071ecd42efb4e68137acaa6712180762d76de34 SHA512 b4192cb8dce924c5754e4a14ecf133007d30e6068fe879217e091bcc73b5d84e8ad986de08f20498cd4d4f96b9696aaf6ce3b4c4dc9dfa44baff3c9651e20dcc WHIRLPOOL 8f2138a128def6e9b517f0dc855d9915f4ae8734ca636818286fd682a07190ec7ac6e4b8c2fe3c038b33514f3379215f49a78f85cfb34fb74f3c0c1789de8839
+MISC ChangeLog 28671 SHA256 f83c327c33abe9ee302608a471d9163cd82440816164232becc3c74d73deeb70 SHA512 94da9c5ca9ebb3dab1cc17d33e4bd04e0f139e5ac52fa7e8c6655573504feda32747ad3117790348d03d980fa95da30cbceeba98c65edcb4acf867bdf614c310 WHIRLPOOL d0704652ee8420ca0c9a3beb70e59c9db58e5ee670e9d7e7ade387feca5a8e205730ca26f47f87ae42694687218ffd2e93a0d609ebbebc0a4b42190dd9b57fde
 MISC metadata.xml 314 SHA256 7d249cbdf83d624b16eca3d7a1dd04db70b4f168197c904397d76f86200e96da SHA512 8aa906e5cfe4f604362647beaff9e710ae8f0dced03916b232d5aeea60bb606354abd059b15a20d1efe638a67b4f23d9731acaff7043856072772077144ddef8 WHIRLPOOL 003b90a77ac20b2bbb2a97abb0da5cfbb39ae34f6c07078a784652a95f8b36283d0f124ec9c912654e00b41d96297ab87209ab24089195a80e1eb5ac92a5ff0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT97rGAAoJEEdUh39IaPFNHkAIAKTw6wGLZDRUxt+NCg26O12G
-FS2Fm3AX9vVTiNZBRXTtklw8yMDKZpjpTHs7+QJjtd/1yxQt1EDFodSVQMCoNxj+
-8bGRzcX94ksxI5DcMw5gbS0qkoBVMNZNSPXPfBNj3/grng9jtliyHJ3DlOfU4jRt
-a5S1XrX0psA2UstsvVxCm+QjRR3H7oiFbUc/3/kNqcdhAFIeeczHFeOX+LhGN2nZ
-aKKOakBq/FvlmKwtJtcyscU/qAm1kZPQkv/Vkxxx2AOIAEhy6CbSGI+uHVF4sype
-uEpGrCs1QSenfl/r3qEV3wAClinIHJXNF/QqVSJBWOGsUiNKxqh0597rZbEregE=
-=S1dy
+iQJ8BAEBCABmBQJUBKKwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOrCUP/2nSr1VFFAJpLSoFLB1eWlLF
+gIZJ8yLuWtfFV/pmd3lNYeXmL1vV7Cr2s0+rDeMERWnufEW6wem/Rn1IqcVW6XKR
+FqNQFeCPyNxcJtGm2w9K7G4/JvqSpQIVaN8NQvvTXyK6TpwVOu4qHcd0SuaHcz6o
+riSHmdBtDQgUmyGNIPzhX+2E4wv6k4XrOQ3gkp+kunDxNkpNC0/SErxxKa2pz34u
+4WrzdVz2muMr3ZbiqIrgrCNv4oPlKenoIwrJSthNO+OCKIWJxOoiYMjLP6g+sutl
+UXitTLGcDipM1nsKkEb4ugvRJbA4TAZ4H7rnIuyStcDrvWrTiKIMUgEi4TBWFvs+
+0zMnJ7+tbH8h4PAZuY2B9Gip6y2ly0Lc8DyRNNMBNblHyPhGxENBEip4K1h1km3z
+VS88Md5Iwa7RyGD6VM8ygAT7rGdnnSBywbKVVzLl51kdy5j3Ac6rIbDddpizQMg/
+tC1e3dSuWZK++cqqQDB3LZXpka1/2RQU8de77rPzYofNJ8NVDGePgrxvTVTdDEPw
+m2uFwKzgyRSroklyAU8b8+Knj5JEWXji5zzBHDhj8rPpe6qXinFnbXGPijTnBlyg
+TBm72IoCw6L+OZ+dGuxUnhbeuMC6YH/YUyh9esu72vBitxeKGkeytDSVHClVt0MJ
+u8GG1FDnnuICnLlMp2aR
+=NlsA
 -----END PGP SIGNATURE-----
diff --git a/media-video/xine-ui/xine-ui-0.99.8.ebuild b/media-video/xine-ui/xine-ui-0.99.8.ebuild
index c4dd691f4170..e49a00619950 100644
--- a/media-video/xine-ui/xine-ui-0.99.8.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.8.ebuild,v 1.1 2014/07/25 19:25:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.8.ebuild,v 1.2 2014/09/01 16:45:35 mgorny Exp $
 
 EAPI=5
 inherit eutils fdo-mime gnome2-utils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
-RDEPEND="|| ( app-arch/tar app-arch/libarchive:= )
+RDEPEND="|| ( app-arch/tar app-arch/libarchive )
 	media-libs/libpng:0=
 	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
 	virtual/jpeg:0
diff --git a/media-video/xine-ui/xine-ui-0.99.9.ebuild b/media-video/xine-ui/xine-ui-0.99.9.ebuild
index 7d24f5e691e1..a7dd566bfac5 100644
--- a/media-video/xine-ui/xine-ui-0.99.9.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.9.ebuild,v 1.1 2014/08/22 21:50:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.9.ebuild,v 1.2 2014/09/01 16:45:35 mgorny Exp $
 
 EAPI=5
 inherit fdo-mime gnome2-utils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
-RDEPEND="|| ( app-arch/tar app-arch/libarchive:= )
+RDEPEND="|| ( app-arch/tar app-arch/libarchive )
 	media-libs/libpng:0=
 	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
 	virtual/jpeg:0