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

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 78 insertions, 12 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/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