From c48553a23d74397bb2aa329df197f7e6ea8b0d34 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 1 Sep 2014 16:41:20 +0000
Subject: 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!
---
 sci-mathematics/glpk/ChangeLog        |  6 +++++-
 sci-mathematics/glpk/Manifest         | 24 ++++++++++++++++++------
 sci-mathematics/glpk/glpk-4.54.ebuild |  4 ++--
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 06c8f8b45743..99d9c0ced173 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/glpk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.71 2014/04/15 15:35:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.72 2014/09/01 16:41:18 mgorny Exp $
+
+  01 Sep 2014; Michał Górny <mgorny@gentoo.org> glpk-4.54.ebuild:
+  Remove := subslot operator from || () block since it is meaningless and
+  broken.
 
 *glpk-4.48 (15 Apr 2014)
 
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index dd5c604ca167..dc3e997f65d3 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -9,13 +9,25 @@ DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec
 DIST glpk-4.54.tar.gz 3098202 SHA256 ab72c8078402d34d176eda18c3f9a6ef006e223d530897a4d1d73fb4ad12f9a1 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070 WHIRLPOOL 56ff0baf5e98fdc8e12e4d4db664a4a287dc358dd75839d90d463c04e3e7d97b1023ea93217dd642f6737cccddecdb8f534980e48f8893aff395dc430622de69
 EBUILD glpk-4.45.ebuild 1562 SHA256 f5fc8e5aadca838bba0456123d322c3d98a38bfd822edb7a3b26994cedd8c13f SHA512 a1c9c8a388eac767748878f74cec7d82e7d18c0d6a78905b6101afad68f229792606b3ec99893f9f503cad0e34afec2715bcc290214df2d1cfa9b2ee833080d6 WHIRLPOOL b3cd55afcd07ebb4e839a72c7512b27687ba744ff8af1e49dc220e728a8234eeef6fbb894a4612497a288c33356a7ad40d1551a27cbce452ab09787076737d8a
 EBUILD glpk-4.48.ebuild 1357 SHA256 17a2eaababba4296afe23a42dcb31e1174cf28cfb9c1689bae4738efda529fd0 SHA512 98210ca4a6a2b5ad3dff4994deefcfa0fe93071b744814ef4f5f99038f6df799c5e221ced94de24c0d2499c3986f28a41c563c8ad5e0b2e0015bc67d97360be0 WHIRLPOOL c32aae7f99e1f19a064a59bae0cabd22dae91c6025a9e2db268abce233f8a685793f76794049836eb1db3652491fb39ad59809621b685ce0ab03425cf73b276b
-EBUILD glpk-4.54.ebuild 1500 SHA256 8c38347ce12196026ebfeac2b051a662b3e268cd4858eeed1988ec04d3a275a0 SHA512 94229c631a0bd679acc505012623f9a5f318324fdd8b353a07174f172b87c6834a5f1c898659cf0287d937d6971b22a41b2e472ec9b84303541a1b6a63690e89 WHIRLPOOL 444a719bc3c7e80bd20a8e7aa7e8ec8a77e0200c3351dd138bee798104408d17c76c934f175bc2c8fec554d48e0e55da0438c630d1b5435bb8caeb1ea0e9158d
-MISC ChangeLog 10463 SHA256 059d3ff56ec9b40818e99d7123fcce5789af2f4664bfafb557535f059fcc5181 SHA512 9306bbee28d9d91d9c6aab7e71bb972bfc3e12a45e60808fbedeae1e8a8762ee468a059dc4d5ddb3740cca1f72ef35f25c51d3dd10f28202b15e83105d0fcb3e WHIRLPOOL 389e69ead072fc864656c54ef7c966a6a84f531e0705b54b03fbb9e81c66f86f88198b6b228959e7950dd780975598b3e2cb9d7bc65775ac441872bce3c21e51
+EBUILD glpk-4.54.ebuild 1496 SHA256 9e50a6e3c38529915cdf50bf3e927cda247f04e48263781a5696ee0d29444c87 SHA512 029dbccd2d9d46a995fc385b381892ba784fca228bf61fee1a7ede7213882c33e4e9c87807bad24abd087e379f5bb345bbdc499df15fd28b1f5c09ce91e3a184 WHIRLPOOL 5c167dc4628468f6b7112c6ff12c96b54c8f12e09a74e9a88c2cfc794a1f76698af4654519c81e2d6f89cb6496ff3d6c5da14bca0ba3d4baf16b61f312023813
+MISC ChangeLog 10614 SHA256 a3d57b0e44b8a41e8430d4d5d60837fe8bf7d41b4bccfebf0f56e1ae8b50ad16 SHA512 840c4702d0f06adafada3c5f2e46bc17c8e6f5315cb7a88c96889d0205b9f6eb058007d78d048d1d675b5ac32079a4703d0627f4bd4727b778ac924bcc9871c8 WHIRLPOOL 6988ca4a904b150bf57606488483c1eec5fc6516a0d69c1ae956db91b1a53f8138cdab93096ccd581b6193f318338f579e27007b798671d4063d9fbb84b3477e
 MISC metadata.xml 539 SHA256 9852c32e609e676d105ea516f5295fda6be6a8f19fcb7e10e3dac775432a14dd SHA512 c9774b7447177264f04b2f16b68fad7b26c0e23d9d88a7b4f7eae646de1666c5ebc47ab98911c7e6e2fd6997e9ae46ee6fd2aee4d081200f5c6c643b85febb46 WHIRLPOOL 15b10e19d077f9eeaf7e5c65bbaa15d6f8852b27b4bb00c3e9d8969ae8e8e7409b99179ced297614dc305e2558c59a000ae007c28b9b3b02dc20c74bd4868753
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNNUa0ACgkQ1ycZbhPLE2DQdQCeNLYwHd5toIZzYuFKB+st+uaj
-Zb4An046ttnjt+ZpCK2uX4vWfS6rZTV1
-=Kzpe
+iQJ8BAEBCABmBQJUBKGvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOoWoQALg49MnyjZoIw3PVI1mZXp1d
+0LJtM6186ZoYo03B6JM2wfhIlCj1eZ+Om6fYngAFajUKr7N2Ws/1z7A6hAd9dsi5
+77rIjoRfQsUL0atmqwAPIgxsWGeU7gzJGNMd3x6ctOayp54URd7mAllR7McczcFO
+nRh66aU8/neTHhyF+xV+nOGXhhidYHwsXGf9P5Nk4MZsRkWt/8rz/ZLsV/Jr/iy6
+2d/YCYNztF43ZV9Ijy12in+x0RZEwvD+/0P1bR4uNw8H1uQt1MbGLgrbCs2t8Zqa
+UzgoudJU42s0YQFS6vCC9D3AYO6u5F3B3/SUBsMFpZcqWTLUffBGPivj5wRWzIe4
+CL/c5bFyhjB26hjryYl0ZreI2UKqlL/dzoLn9G+CsdHvO7UoUcgH8TlQ4yLR9Bo3
+sceCmsuhUHo1E8r+c7BW4d3/S1AmStak7PbKsX/POEKRBw7rFXR1o6XAy3Q+zl7J
+xs5S48ba5FBaCwUGcX1rF+gi1tLpc9np1kIn27ZepBJobboRLg8Y75olUjVtht1a
+cJzWfVxmXS1ty5OAaQ8HUc0kz4IfluXLjcpZDzwPeuqU5XmqSWUsmd0XpKuOlxSW
+pm64NtWpAaePo6w+of3bsFLMXkBz9ocGtfHlMfXOxnlag5+i8KNHZii1NR4skJrd
+iRizFnb7BmRu42qlcFCy
+=+QwP
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/glpk/glpk-4.54.ebuild b/sci-mathematics/glpk/glpk-4.54.ebuild
index b1fc60931b0a..e296bfce02ea 100644
--- a/sci-mathematics/glpk/glpk-4.54.ebuild
+++ b/sci-mathematics/glpk/glpk-4.54.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/sci-mathematics/glpk/glpk-4.54.ebuild,v 1.1 2014/04/05 21:32:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.54.ebuild,v 1.2 2014/09/01 16:41:18 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RDEPEND="
 	sys-libs/zlib:0=
 	gmp? ( dev-libs/gmp:0= )
 	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )"
+	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-- 
cgit v1.2.3-65-gdbad