Remove slot operators from || () block where they are broken.

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

4 files changed, 29 insertions, 13 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 05f92354602a..58ab58003200 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.174 2015/01/07 11:33:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.175 2015/07/05 14:47:44 mgorny Exp $
+
+  05 Jul 2015; Michał Górny <mgorny@gentoo.org> octave-3.8.1-r1.ebuild,
+  octave-3.8.2.ebuild:
+  Remove slot operators from || () block where they are broken.
 
   07 Jan 2015; Jeroen Roovers <jer@gentoo.org> octave-3.8.1-r1.ebuild,
   octave-3.8.2.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index bc669454a633..66b170abb184 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -19,15 +19,27 @@ DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c63
 DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
 EBUILD octave-3.6.4-r1.ebuild 3546 SHA256 1e303b6d0b5dae850e83a12cfdf2c48f856d9eedf619a8eef4538ae811b8c591 SHA512 c5740862f898795f7f69af11da70ee479e610002385bfe2d46b6ded46e7e7e8eef772bd3e21db00da148065672d6cd58cf6484d80a2b759324f1d1f7805c9d36 WHIRLPOOL 46b56b068c35bad96c458e86c87feb14b7998a7ebf05a17fb9dba31631f0dd1e7b570852c393010f925a356091e312a765e5d50fbb4fb8de7cec1f35ef8e26f9
 EBUILD octave-3.6.4.ebuild 3481 SHA256 33e2e2bc509d636036b854b1db531daaf8cbd245740696c9fbed5d7bdd632e0e SHA512 c03a63c4cec131a9384d5eacc67f8724b102e48a4356318a89b8eec2c34b2da9c19e903e2e0a2f1b408803044c7689078aaadf527b90bcd3a6c0b6b8f619ae13 WHIRLPOOL c14ff910f1bab7362fc95d4730a3a752abfc011b5d7ce655afd9bafbdac7c1dfc989a7b0286a4dbd54836cb15522149561ebaffe77c99c58762c824dfc1dc873
-EBUILD octave-3.8.1-r1.ebuild 4520 SHA256 fb0c863949e6382260cb8f219fa48f3a0f498d7a087af4be52e6885678f75853 SHA512 c442b35cb334a97061de6f89bb75bac0dc7c393652ec35a4c94f5bd3d6f799a6576ec74e33235a2426cd19219ee5e2a3410e5ac01176724de6c4be5f0460161c WHIRLPOOL 806a58ad40f5d6bdde583fbb83b901fe29ee5fc184e9b343873b53a8682ecbce33c79500518ddcaf338841f3217e595c4f124a3259abe66ab8012977a044fc99
+EBUILD octave-3.8.1-r1.ebuild 4519 SHA256 30cfada63bfaa601367b739cffd36df3e13b6d1fa39f292a1aa25d6b3d5d17a9 SHA512 aaca4a89bafe619962ea5403f8aa0b8ce90da8cf43e9d6b8c95b3c98d6807914ead63b2b800350d5835ddddecec7b2b959ab73020bd1a09d7df16ad52a0d1b24 WHIRLPOOL 62ba0afb2b8c42f49c72fc220a25e4b31182c821bec17ae9a1a68b276325914ef09635c4c9fbb1b2b27845b337d49fae985f136c697fffa33919ef7a4cdf486f
 EBUILD octave-3.8.1.ebuild 6049 SHA256 5f08e2c56c2e40c6846fd3dcebd27921ee8ebb28bf878ea64743b8294daeb4fd SHA512 655f708231bc01c6732430c74db5ade1eae602cf4b6637f506c717bc6a779659f78fde3be392493efea33fdb44dae75798711c394bea0a27a9eef06331aa59bf WHIRLPOOL 74bb7716722259ac405bcf5adb9b0d31608811c5220db6d941eef3388f6c30b5e29564c293a8180242785bfd18e6e7119ff687ffe85f198f0c01a0b797f4d674
-EBUILD octave-3.8.2.ebuild 4515 SHA256 665cd27d052780631d4158328cbd2e5d46ac5a96b3a6171f79fef919f73f247d SHA512 84ddff153e24cb865a5cabb8257d6ce53c8b6606927afe640a21467888c5050ffdbe80c89c6bc71e6363f495f714b92b4c7f115b4eca9d30da0d3b722fb9aec1 WHIRLPOOL 8f57eee6f3b4cbc7cf186b4fe84df7ff7e71ac74110a70780608c8dc6567d919cbc1d59e16917455e37c05a601b9086586f31b878f3ba2b461483e07f3fd2894
-MISC ChangeLog 40091 SHA256 e99e6080b0da55f1011967bfa422b23d11943eb8ef218dcc6fca179effe23d36 SHA512 58a0f42d66dc96a05624b150ca8523d08339edb6d3be191d68a5b12698ddc642fa7f793188772aeb7b63d344391f1a4e1558769920ec420d66d2f7375c9d96a5 WHIRLPOOL 4543a72f500e3a57121a3bc150b92a4edd1df51a3a785e01fccde5ba3c30dcb20f5d36d3337cc5e2fd6fcf531744ff612997eda001f69a76db53b9659200ec59
+EBUILD octave-3.8.2.ebuild 4514 SHA256 142d69377e138fb5356c267ad71ed7d428279cf53edc8fa51df9347ac05592c2 SHA512 e91be365b42247a58e9aae420128a9a61f17b790abd7f572b710a35c261c64ad142489c0bc1d7e09ca70856660a42156c1ef718ac8778c4bc41e7370486d9700 WHIRLPOOL 78384387554cb8e8c954a12cb7677cbfd1ae07a740c50eb812c3319da3aba7d3206eaacd90f5672e214cb0cd9232a9e9c67878cbd06c48cd8d789deb5faa644a
+MISC ChangeLog 40256 SHA256 5dd66527af4d0d858f35046f479212a4cd9a74ad66953e9fb5cb71f405b32dcb SHA512 36a2d39098c94eecbda2e6dd19891429c6ef4066aec65e4cf9e4e0ff4f4e076d70b546cf285ce749764b4d7a6281e0aad20ac500fbec63485564a8bb3b24d1e8 WHIRLPOOL e2de2f5d268509bba0246f67a64676b0260ebc032f6edf5073b2db007c496277c51ab2e6da2c6d9772d73865e9114d6ba1a7035f98d2cdfa79d4d81784e7bf0e
 MISC metadata.xml 1066 SHA256 e334e61be56a49bc98ef4c043256f1dacd978bff38870acbcefa7188eda0d4ff SHA512 a807577947d366ddcdd0d828e5fac276e8a1060752350f7dd680f415f56b9c50d1e2a69191ef0c55400944552181a97370f7c64c91ba1697fc4a9bd60e97b1d1 WHIRLPOOL d4d7d934483435c88c474b547d39e9153da6f1a2c31f8a6702fa2398b2104bb3ec1492ba38093f340cd3be48da42758e853db9e8e246a304b4f582ed0b2194bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlStGYQACgkQVWmRsqeSphPOewCeI1dfvPMKLtER6x9h8kdjHzMx
-s34An2qcQ7QcWOZll6DhbNJ0Ccj5pu0c
-=W+Vk
+iQJ8BAEBCABmBQJVmUOTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3xAP/3gSoZkXHgNk3C2ak9Jf22Vr
+uUmqN8CGf9Lm6ZOs9fXvTn0dYcfdr/YfyEpriR6aMM9fSVkGSk3dNtXQ0bdgTHoL
+Qh+25qUeWyDt2hBAfYa5+9kR24gjs07TaMqpXfwkR+EyKy4d4mb9Xo56eHy5r0/0
+RNo5/9I9172XXkqqG0bmHeuVlnjdh8fjw5lucYl8Z0C+pn/xI8EzMg/PgYJWNHlT
+aAKW7GNEEV2CS3xmPN0eBAmEu/L5m4yHIz7JNZFkBMMhFZXfMx6vM2YsE7tu5wTj
+hy4yreowP1n1L7v2zMnmiUCuoRHH1Q7h+w3gbxm2A0PXR51zXZ7fo4l/JNLnlBFE
++eLxsG2epetc5/7Ouql7Hblb+F0fNXyM8EuPyMZrsRKVV5Ya7ioFI94vPQIceWgY
+QnQ81Q4r6r2RLfW1AgkDedzNuym29NcNhMiDIOn9FztDXPbdmdg/OJ4djctBki1H
+vz70UouZTxiScny2Rhn6OVkr7Jkb1SCy+dk2eGS7Sk504yl6Y5oe+mwjhBNICQ+u
+WismZxt39QZUllz6XLk9w+xqVxFml5LMDyQawh/sQ9Jtt1yo+GMhKRW9a81cRraT
+GZgd13hg0ef8BY4DHdPnO2cqJIRxQFemMLPSW1TLAhskdlcWaHfYGnnA5zNy/WlV
+Lrnz8d80WEfjSK3M0yju
+=f3f0
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.8.1-r1.ebuild b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
index d29b439f6c69..41bd7cbba23a 100644
--- a/sci-mathematics/octave/octave-3.8.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.6 2015/01/07 11:33:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.7 2015/07/05 14:47:44 mgorny Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@ RDEPEND="
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
 	imagemagick? ( || (
-			media-gfx/graphicsmagick:=[cxx]
-			media-gfx/imagemagick:=[cxx] ) )
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx] ) )
 	java? ( >=virtual/jre-1.6.0 )
 	jit? ( <sys-devel/llvm-3.5 )
 	opengl? (
diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild
index be674ccb9a71..d3c0b0c9f4c9 100644
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.8 2015/01/07 11:33:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.9 2015/07/05 14:47:44 mgorny Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@ RDEPEND="
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
 	imagemagick? ( || (
-			media-gfx/graphicsmagick:=[cxx]
-			media-gfx/imagemagick:=[cxx] ) )
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx] ) )
 	java? ( >=virtual/jre-1.6.0 )
 	jit? ( <sys-devel/llvm-3.5:0= )
 	opengl? (