sci-mathematics/pulp: Move to EAPI=5, distutils-r1.eclass and virtual/pyparsing, #449564; unbundle sci-libs/coinor-cbc

Package-Manager: portage-2.2.0_alpha151

5 files changed, 53 insertions, 45 deletions

diff --git a/sci-mathematics/pulp/ChangeLog b/sci-mathematics/pulp/ChangeLog
index 306cf7d49..7f207db0f 100644
--- a/sci-mathematics/pulp/ChangeLog
+++ b/sci-mathematics/pulp/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for sci-mathematics/pulp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pulp-1.5.3 (14 Jan 2013)
+
+  14 Jan 2013; Justin Lecher <jlec@gentoo.org> -pulp-1.4.9.ebuild,
+  +pulp-1.5.3.ebuild, metadata.xml:
+  Move to EAPI=5, distutils-r1.eclass and virtual/pyparsing, #449564; unbundle
+  sci-libs/coinor-cbc
+
 *pulp-1.4.9 (02 Dec 2011)
 
   02 Dec 2011; Tim Cera <tim@cerazone.net> +pulp-1.4.9.ebuild, +metadata.xml:
diff --git a/sci-mathematics/pulp/Manifest b/sci-mathematics/pulp/Manifest
index b30da8ecf..f52a27a16 100644
--- a/sci-mathematics/pulp/Manifest
+++ b/sci-mathematics/pulp/Manifest
@@ -1 +1 @@
-DIST PuLP-1.4.9.tar.gz 7075569 RMD160 85de60cb2a5cb0d393fb570165e39cdb09d63709 SHA1 aeb52b2cffefc0aca75003912147e76ceb312490 SHA256 14e385b7c4c4e7b0ea89c111bf4201263a740eaa563c3371525c7b4beacaec77
+DIST PuLP-1.5.3.tar.gz 7078216 SHA256 25501ddde6d00cca4957ed52f73c24e83d46f1c9779ac27baa29ed817d15e755 SHA512 1cf8092aadd7d55e6a6326358b4679a5b213f4f7c01380416064b0475535cfdea2a03fb82b507dd71361086defb8c01d6fcf1fecbf307d9d787e7616efe97f3f WHIRLPOOL 9085849de9217729744626cd6da34bfbca52265d0e0f6b0f32b8f8a8706942b1d9f0deeda92c5a22c4745a8d29e61c3494e5ee8bae2673c869e8b1941e777116
diff --git a/sci-mathematics/pulp/metadata.xml b/sci-mathematics/pulp/metadata.xml
index 09239037c..897aa2e6b 100644
--- a/sci-mathematics/pulp/metadata.xml
+++ b/sci-mathematics/pulp/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<longdescription></longdescription>
+  <herd>sci</herd>
 </pkgmetadata>
diff --git a/sci-mathematics/pulp/pulp-1.4.9.ebuild b/sci-mathematics/pulp/pulp-1.4.9.ebuild
deleted file mode 100644
index 1d210973e..000000000
--- a/sci-mathematics/pulp/pulp-1.4.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# Ebuild generated by g-pypi 0.1
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-MY_PN="PuLP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python linear programming wrapper that creates MPS/LP files,
-calls solvers, and presents results."
-
-HOMEPAGE="http://pulp-or.googlecode.com/"
-SRC_URI="mirror://pypi/packages/source/P/PuLP/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=">=dev-python/pyparsing-1.5.2
-	>=sci-mathematics/glpk-4.35
-	dev-python/setuptools"
-
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/
-		doins -r examples
-	fi
-}
diff --git a/sci-mathematics/pulp/pulp-1.5.3.ebuild b/sci-mathematics/pulp/pulp-1.5.3.ebuild
new file mode 100644
index 000000000..6788d05a1
--- /dev/null
+++ b/sci-mathematics/pulp/pulp-1.5.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+MY_PN="PuLP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Create MPS/LP files, call solvers, and present results"
+HOMEPAGE="http://pulp-or.googlecode.com/"
+SRC_URI="mirror://pypi/P/PuLP/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools"
+RDEPEND="
+	dev-python/setuptools
+	sci-libs/coinor-cbc
+	>=sci-mathematics/glpk-4.35
+	virtual/pyparsing"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm -rf ./src/pulp/solverdir/cbc* || die
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/
+		doins -r examples
+	fi
+}