Version BUmp, #532906; fix missing slot Operators and inherits

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 101 insertions, 33 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 50f44a8e15e9..ef9f9ec2f358 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/glpk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.73 2015/02/22 11:51:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.74 2015/02/27 14:14:35 jlec Exp $
+
+*glpk-4.55 (27 Feb 2015)
+
+  27 Feb 2015; Justin Lecher <jlec@gentoo.org> +glpk-4.55.ebuild,
+  glpk-4.45.ebuild, glpk-4.48.ebuild, metadata.xml:
+  Version BUmp, #532906; fix missing slot Operators and inherits
 
   22 Feb 2015; Michał Górny <mgorny@gentoo.org> glpk-4.54.ebuild:
   Drop ~alpha because of a number of non-keyworded deps.
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 505ba6d30a4f..895303d2732d 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX glpk-4.52.1-mariadb-5.5.patch 275 SHA256 9125267c1434e881a48f159db52009663b72155c648e77a5c153d3bdc1b06576 SHA512 32669b38d5ec7b1ae4d97e07cb9fa054952321e516a8a4cd9d64bc1237081bf14be031513cc2db96c142cdb01b2fe602f843eb51864ce71e106a4cff662903d0 WHIRLPOOL f77f9e0a18f1be010bab620ebbd4d7fc9ca6fd2312e03a993435dce829bd4297cc69fc1b03d9afae4a7ec6b3cc108dd4cb584fa8fea21dcacdc9a9552e7cfe4b
 AUX glpk-4.53-debundle-system-libs.patch 1686 SHA256 e9d65747f26a46cd12bafddf7eb976ba95a57f2daefa0b3ba9cd4f2ac2bfb7ba SHA512 424f475f9db47459ceb522b16030bae2ef262c95b5bfbe3a3fe0bd8aa09a1b28d3b5d0023bbf08ef96499d124fb11711da5e6e9624846000d5bc0e8e3134f06f WHIRLPOOL 82febf676ccb6bc4ef9d087ea27be3119edcc41b0f70839651afb6a0115f909160eb0de4dbc099c70e27bc08bf5d06d6f5c9e6f3f0861ad62c22eccd3451e93f
@@ -7,27 +7,29 @@ AUX glpk-4.54-debundle-system-libs.patch 1763 SHA256 9c442dcfe85ea68c63802502f9e
 DIST glpk-4.45.tar.gz 3132439 SHA256 9207cb613d4436d9a66bc1b1f2018176d106cef0e92a3a85500feeec373be98c SHA512 27089b760d89ee16c5a3332d319007af4b05e8d27df0b990311508f856a01461d8b7b40b111bbf1f3dd4d754af84000112f95349d5286e6d3e42e56226f98649 WHIRLPOOL 7c050210e29f4c13b39e85dc10c9aeed846d7ee912c7dac5a83d13b87648a4e4bf4dce365d2575b6ad7994c56570d74ec87c219f101aaccbec39fd0e14353182
 DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1 SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70 WHIRLPOOL c3e826d08cc6033e8553d7d1fb2a556d42622f38a184e8bbc18bf29d872103245218482b749bfb214cf707cc60eaaf54d7e6840537b483cf8e63c2d33b2c313d
 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
+DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5dc48a38b13d620bf2b1de7 SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689 WHIRLPOOL 4b3f543c862008dd09e867947c0383eb2f482f63b8fe30d9f682ccc7d0af1693af043c8cd63362be1bc736ef39393d59cdf0196326b08c7f48495bb5b5937487
+EBUILD glpk-4.45.ebuild 1566 SHA256 b10b28becfc140d9f0b3d83eec67e1f3de5f49c2df92fc8b0e8b2f2c0f535c4f SHA512 a2da5673a6910c7008c1b535a1aa7fafac892e16529ddfc9bf00f3250773accfc81ceceb1be7a9262801f78d02984bde66e47b9f67fd89d6a7850afbe07aa51c WHIRLPOOL d9c29c28f32847c9f325b1ae9a07b6a6f038b18c1ef657156b64c55e03320c71d865774345fe5c2fc6287d2bc6384341dfb7c1a2f81ea4e751cef15da60aa2bb
+EBUILD glpk-4.48.ebuild 1355 SHA256 40b80363376865d1ebcfd9cf61b6f92970a4bc6e803dbb2cb26363a60f082088 SHA512 8f976cfd75f15bbf9283a87d64f08418e39ea39c7069e1902b635a20cce4e2ce4a2365c46c8b7bf864fe7305cad3ad6bc531d031e7e6af5e3823e776be0b40b6 WHIRLPOOL 3d578ac0f1baa871048116ce54505d27f8a0e64530152129ad60b8877924a9794e4d07408c3c4150b9bbf7242f310a479775a4678f6576b61acb810d68894422
 EBUILD glpk-4.54.ebuild 1489 SHA256 96c5da76d3bbca5518fcfc9ac4b92552b8e9f891c29570fd6adf8857bcf98047 SHA512 8872b0269fad09579f3656d63a5e52e8eb5ca204cc77956524526a196f457a6e873c1d7df6eee22e8f1089138ff627da9ae33d8b5076e79eb2cca9d83524510a WHIRLPOOL e8ded5820c63a8b26e156ece31bbe256a8538d372f05d4830af8fbd6ba6c9fb73ae9240f465f4c0428cccacee94a0708d2abd4c454306f678e0487202c585fe8
-MISC ChangeLog 10740 SHA256 c1b1f66e3b199ada3b8fa0c09396f133046d7e0648353eaefc3681500aabf19e SHA512 96bb0eadf9627540297766e9d559b0eeada63b27cb9d696e0c47758f8b01046434c5394b40df155509984d295ea16d2f8fc6175c50d614bfa0a83abe881d199b WHIRLPOOL c61f56291ea1205dca32e1df2660082a79fe8974eb02a7511d798f58f7260e6a961b0d8ae79e54bb51523778b1407ac06fc700351850e7bcdf58916cec691dc4
-MISC metadata.xml 539 SHA256 9852c32e609e676d105ea516f5295fda6be6a8f19fcb7e10e3dac775432a14dd SHA512 c9774b7447177264f04b2f16b68fad7b26c0e23d9d88a7b4f7eae646de1666c5ebc47ab98911c7e6e2fd6997e9ae46ee6fd2aee4d081200f5c6c643b85febb46 WHIRLPOOL 15b10e19d077f9eeaf7e5c65bbaa15d6f8852b27b4bb00c3e9d8969ae8e8e7409b99179ced297614dc305e2558c59a000ae007c28b9b3b02dc20c74bd4868753
+EBUILD glpk-4.55.ebuild 1487 SHA256 708544d2a6b4aefcf8c458346e6569861961b4d61c35ad8b02c8f641ad423d77 SHA512 7a6eeb42325841a5f158aec53ce9a651ff29391ca0bed21dc7faf739ea534540ce153e346a9b5de34ed12e462a8bca32d0597df8a7031b994481aaf4a08ff3a5 WHIRLPOOL a38f2f42445de8447419397d15913a6420bfc10709ae63f0b55dffba94a38e2575e28d9370dc2e0e0d44b9cbd34f6628a3f719518e89ad3cce2f224eb671019a
+MISC ChangeLog 10948 SHA256 3cd708ddc758ef0fa8f193bae775f0fb9bb91e92029026f653f70c383fc7ea76 SHA512 4214d857fcd5240b291c87eeaa71ec9f9dd25e71f9a8fe773c472fdb0ae3ba7ec065878912de8c9a8edea2395155fbe5552256ce8f1ebd16e353d4f8f972e938 WHIRLPOOL 075af84f3f34b8445c9820b77d2576efe5ce030bbcdbfcc494e06928aaebd055b00569bc6abcc9d4608e67b6171f7256fe14a85ee5c7f4b76c2dfb7d5139d8ec
+MISC metadata.xml 549 SHA256 753cf339039b73d884a17c7950a4abbd7cf3641c7d595a9ca709dc37fb3bce65 SHA512 c432c77be004d43208802e8c8d63f5c498d29d565b75f339c81699c22a2acdc13c9f1c7aa25cad4a580d107b0c0415e99ee031db9eaa270f9cf62249793ee76c WHIRLPOOL c77e93b5f3728f4e3e36c58660edc90de23f2d9ab8e308b5323c7662d544047458a3230fa46c7d2f178dcf0654635cbfaa4e053ecf53510caf7344dedd42e33b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU6cLMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaKsP+wWtOUJRSdlBqJCI7954pfDz
-Z4wSU0zhLi83GRZGwN5j785K+usBLFZ6CCj0G5CKREjetyVsP6har1qtZFME+NiT
-qRD2GELudQNT/UsX7o+ZpwJnQZgmJ9/D2BFRk5dCxi2h8jf8cQN8OZ8RStht9U4M
-LoEs8JiWqtGxF3iupEOfXLcDDORDrH77XSb5ZsDDYiO5tMfWa/VBPSk5xDI4Tbk2
-3sN/qLE19/NM00Q6Fc1uKP3LR9TAFUi7evwbuH9LPv/3PIj4C9wTC7WIACd7l/z/
-jGOkHh/Ek31ML7xrSLTHrHVXL3PIfXaOB2EUSjwGQaYOETmRk/koRs9X9rBijcyk
-OSpIpfi0b5rrkn+8mUa0LdlPCwhnAzBSk7xKv0/Ew3PROEBJV+nKfpI+tBCxyC+w
-JGCHJG5JAI7wiVrX6KUT+Y6TrYKG4EOvm1DoUQ36QZsSFr0lQi4ONjK7lZL2Zoq0
-erBwa9jHnlvg7NGP80AD8wE7spoaHQIqVCycdmyGTH7rDByk85LKJoD0BudM0rxF
-EYbsy6+I3s1dJ851PO3wNQ6oCGOo3wyyPGwNFlSW1uWcuxzIOom7/v2InVfyCZH2
-+hGVIcAZ4KIePaMYM7j3tE2z+bl+csbFcQmfE1Pf+f5c81WJU58fX9MPBqtb+4pn
-HNHzVw4eVlGF3m2ihlkf
-=sciC
+iQJ8BAEBCgBmBQJU8HvMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirG9wP/1oTkEsTUzI6NrabLZJLlIIj
+BnD20puvk5VDsMt8hsjH+SzeUl8LAiyp8+dsVAF5vF132+3ZGYydU8rOLCOMF/Lr
+AGrwucmJWxkXjAcioafYmhpJ6WASa/TVOWzh1jTJKKNOF310LEnS+filEvnRQB0l
+dxCXaI+qIiUnbY47TQNQrQRP/bGw1xffAf9CRnG3cKmf6ie3nM5Z+c3u5CU9JPjT
+t8VHTwdPiSVubjvT7g15/v9pr/R4PRgJOqKbSLfUFLNOz8QtE3fCYy7+eOAVEgCv
+gEOOYaoNFh4jYpXT9nMRT3NpNFdOXaxJXXQqqDp3aUtFQAXm8q2mk77kS3DgobAL
+lzQ77MBsRZDpTnAbUEv9R3iu/n9H5yc6roK76B33Y4YoRYj0cO/klPeb0nlIvCOb
+PWjdFC4Jfq7GF5G2aoaG9AfFyJNAikFzPtoPVtf+2rLXYbTUnzB1ceOMgqEmdeop
+ZR3TE51wBQopGukQegnCAm2hGPLt358WutW/JvUwu2JczBNQ12SkbkoMZBCxBuiF
+gdfD7tpp65a91IjZ3CMEKbaHxBEiaBTqZMSQ0EHn4VteYN3JPtl4RBB1pScCCzmk
+u7/apet2PTz6PCaHEQh6jkYu9iEmCaUYVWy9l0PAk9VEagjXgv8F75TLDO2J76NT
+i7xnXG5VIyaAa9fwcHsl
+=8Rum
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/glpk/glpk-4.45.ebuild b/sci-mathematics/glpk/glpk-4.45.ebuild
index f6fc50a12975..e0f429ac5ca8 100644
--- a/sci-mathematics/glpk/glpk-4.45.ebuild
+++ b/sci-mathematics/glpk/glpk-4.45.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.45.ebuild,v 1.11 2014/02/05 21:54:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.45.ebuild,v 1.12 2015/02/27 14:14:35 jlec Exp $
 
 EAPI=2
-inherit flag-o-matic
+
+inherit eutils flag-o-matic
 
 DESCRIPTION="GNU Linear Programming Kit"
 LICENSE="GPL-3"
diff --git a/sci-mathematics/glpk/glpk-4.48.ebuild b/sci-mathematics/glpk/glpk-4.48.ebuild
index 88917494263a..77b8002e2292 100644
--- a/sci-mathematics/glpk/glpk-4.48.ebuild
+++ b/sci-mathematics/glpk/glpk-4.48.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.48.ebuild,v 1.5 2014/04/15 15:35:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.48.ebuild,v 1.6 2015/02/27 14:14:35 jlec Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ IUSE="doc examples gmp odbc mysql static-libs"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
-	gmp? ( dev-libs/gmp )
+	gmp? ( dev-libs/gmp:0 )
 	mysql? ( virtual/mysql )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )"
 DEPEND="${RDEPEND}
diff --git a/sci-mathematics/glpk/glpk-4.55.ebuild b/sci-mathematics/glpk/glpk-4.55.ebuild
new file mode 100644
index 000000000000..1795c6cedd7d
--- /dev/null
+++ b/sci-mathematics/glpk/glpk-4.55.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.55.ebuild,v 1.1 2015/02/27 14:14:35 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils flag-o-matic toolchain-funcs autotools-utils
+
+DESCRIPTION="GNU Linear Programming Kit"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.gnu.org/software/glpk/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/36"
+IUSE="doc examples gmp odbc mysql static-libs"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+RDEPEND="
+	sci-libs/amd:0=
+	sci-libs/colamd:=
+	sys-libs/zlib:0=
+	gmp? ( dev-libs/gmp:0= )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.54-debundle-system-libs.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable mysql)
+		$(use_enable odbc)
+		$(use_with gmp)
+	)
+	if use mysql || use odbc; then
+		myeconfargs+=( --enable-dl )
+	else
+		myeconfargs+=( --disable-dl )
+	fi
+	[[ -z $(type -P odbc-config) ]] && \
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
+}
diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml
index 00e9a6f8b81b..f58fdc6b640e 100644
--- a/sci-mathematics/glpk/metadata.xml
+++ b/sci-mathematics/glpk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
   The GNU Linear Programming Kit package is intended for solving
   large-scale linear programming (LP), mixed integer programming
   (MIP), and other related problems. It is a set of routines written