dev-python/cvxopt: move to new python eclass

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 109 insertions, 19 deletions

diff --git a/dev-python/cvxopt/ChangeLog b/dev-python/cvxopt/ChangeLog
index 1e66bf67e964..6498e2df7ef5 100644
--- a/dev-python/cvxopt/ChangeLog
+++ b/dev-python/cvxopt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cvxopt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/ChangeLog,v 1.12 2013/02/25 07:21:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/ChangeLog,v 1.13 2013/02/26 20:33:17 jlec Exp $
+
+*cvxopt-1.1.5-r2 (26 Feb 2013)
+
+  26 Feb 2013; Justin Lecher <jlec@gentoo.org> cvxopt-1.1.5.ebuild,
+  +cvxopt-1.1.5-r2.ebuild, metadata.xml:
+  move to new python eclass
 
   25 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> cvxopt-1.1.5-r1.ebuild:
   Previous was wrong commmit
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 76c152e4b82c..c6157f1049ff 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cvxopt-1.1.5-setup.patch 5810 SHA256 ef461a563c7ff9122b24410f446bedc1188b5755c935a90e457ebac089e0f440 SHA512 ac2c12d2208b5d24e780c44068922e0f84f6a0b7f3f92e725f58cec54c0ec2667de78202049d2a4970b54ff0d27ebad732f82aa881f1716da8761a1e14e30d44 WHIRLPOOL a42b7467dbc29eca970d48f78c47042fc03acaea199af16b8198344388388ce8c810c2f4fa839edbd4b70f8a2702b25fb6de602819f7bb64c25deeb184c15073
 DIST cvxopt-1.1.5.tar.gz 3436288 SHA256 f1c0bd46321db941a46bb3544f4a23c6b15a90cbe5a485d735659abf110993d8 SHA512 8318e51589c7001f253e190082d550becbabcffa761cdb867c74593a7be9b764770fefc879057a389edccd64dcc34434b665f7df8bca460a036275dbcaa259a8 WHIRLPOOL 6dd81538813e033f028fae528d6d97d4477f57087479686017b249a054d46cc34d32e7dc61414bcf2628791cb43821545c576872b9332da953f9417e58ffa40c
 EBUILD cvxopt-1.1.5-r1.ebuild 1954 SHA256 a88ceac2d4d1655485e7200470ee050f849cb52563e56b00ac5b024673b8165c SHA512 7afceca221997c16f71e12ef1eac7cd02cde1db520e2fb1410bd50ba2ba92fb831404d8715b0966f4c1ba299e0a2abfebe0d62e01e3eb1f012978d365e7784ae WHIRLPOOL b55d89ed29117a62f23f0d5af23bdafe4aba90d8768b841e4fe427f2d894238bc872b3ccc9675996e5455627cbd96661fd84c7436a219046ad36f043e8633f97
-EBUILD cvxopt-1.1.5.ebuild 1900 SHA256 2b72ab0afed92e9da3bafae20d82ea12e06ba151bb2ad068a9490f2413fcb077 SHA512 77a31d2fbb9ec97be9235930fccf1f95d37eca9ada352c4761907993e92ba762e28ad64e3cb8a2503b946b1bd55f9bcd59b02bb390d4dea238c32c2c5e5a911f WHIRLPOOL 237d8761d75e2372c3567aceb37fbed947aa6108d0c359226320479c0a7f26dbe8c5078bcf0ad3e51979b2c35117c7d8864b9da625bab19dcf91168105f6a28b
-MISC ChangeLog 4053 SHA256 79685a71ba2011e067f9228dbb1cb0a69ce63804e4b48ba6d6ed3d96c89af45a SHA512 ce7517a20a4f7667ea5d63995e79205217cf995d6f7c1fd4a2cf4da3812bdf6b15db5ccbbafc87a39f8d99fd11783b060fef0c45720d947c7e287b89ee87f99e WHIRLPOOL 87153e0acb0059ef154f8677d996ffd4ed6ac96fe97e54b46405b1b50670047b92727c47b773496f5367aa21ae1b14039d3e4646eca5f4b96c7b511a81378894
-MISC metadata.xml 606 SHA256 7793793a25bb276c5ebb3df3355beb7cfdb5835edb806805f5d580e78d41518c SHA512 406094342507fcc44dedc9ac1d8774b5d5929b39e5d87efc2fcacee121d0d9e5b1ebd22e3df4dd20d6674e0d05a793773c091ed8f6a73634180e23f11c3827b6 WHIRLPOOL d36701526a5180861b77572f6f2a63397c2effe5cba20f4a410a5de399df6b434e8a919f4638766fd0b18269e195691887d550697aeafbdb7074aa5351a030d1
+EBUILD cvxopt-1.1.5-r2.ebuild 1842 SHA256 7172370462be765dcf4c75d330edd191f67c9e3e3a4cdce32de3505565d6d4ad SHA512 c2bc2811584a9935322669386fd179c36ad0a2eb480e69a79afbb066d3a9a5ae5c0c6650eb50b1b21bfa1ab9746ffd84c945afa641ee81307700473816924351 WHIRLPOOL d445936f4f78b55e38ef561f705952908506bed43edbc1a73b4f97dcf215cd5115824b0e194c2feb21664ea211ea758ec328b923f1fd6339d8535627dfaa0dd6
+EBUILD cvxopt-1.1.5.ebuild 1924 SHA256 a1f697761c0304e9d13ccc8d71db951ee7812a0d65c9ed62668d901da29a475d SHA512 62c36901501a9de60ce7f0f38e1b7e110d3eacf869321d9bd289a180c91b5427b21275cc11bacdfb1476746c81dd67704b3519c0873e4f33b416831fec956e50 WHIRLPOOL 224309fc8b0879be7eacdc0acac74fc5d6658fb1fde2ceecc78b96c29d9762e6bb3749d4530964bd32b1a763eb342184475fe4186b095a71f4400237d45b415b
+MISC ChangeLog 4219 SHA256 5033bd60ad1721449f0c747aca6b70988b07a25d5d840a6654fcaf8cf4ade0f1 SHA512 68f08c488da3932597d94ca66a66ddb801eedf5879cd009509c4f0c25544bcd937975a356f210957356764725e0e46cee65adf75174a106e05a0fd7dcc1ce2e1 WHIRLPOOL ad2a2acd7ba07ba747e2386431844d6cc3fa440bdd779ab9ac5e687337ebcc71e1af9d475986dbc31ac7bc74a702f234791e58800f0bcee2101a7509cdd9507b
+MISC metadata.xml 618 SHA256 9355ed07efa3008d28e4a463166636c2fb82d1ac03fbc930a69c10a28f7f259f SHA512 1d33e7e871bcb6250ed2c40626cdf491975f04f62fc913591a3f273d55f3dba2ba2f3ec1f00b714b4d4f56e74f53f8f4338522619adf1c266b9f90c8dc2c7440 WHIRLPOOL a6408401eeceb2cfdb37d7ea0682f57a468bc7e2845f5858e08939c4e205020c695ff1d355a1a0fc2ce3547908532b6fbf9e013a0adbc7016478c8b80b0116fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlErEPUACgkQ1ycZbhPLE2D98gCgrxOZHkPx8QM/mEfeePZ0Rryl
-OKgAmQGjGoBB9kZYD6XJD8+yuP7+VxKG
-=uXgd
+iEYEAREKAAYFAlEtHA4ACgkQgAnW8HDreRb/zgCgxYtJYKvDUeoPcZXHmmxuVcey
+blgAoKM/dZ0ZKF0hUCV7TflPAz3M+UEc
+=hN3c
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cvxopt/cvxopt-1.1.5-r2.ebuild b/dev-python/cvxopt/cvxopt-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..560365a6717a
--- /dev/null
+++ b/dev-python/cvxopt/cvxopt-1.1.5-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5-r2.ebuild,v 1.1 2013/02/26 20:33:17 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python package for convex optimization"
+HOMEPAGE="http://abel.ee.ucla.edu/cvxopt"
+SRC_URI="http://abel.ee.ucla.edu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +dsdp examples fftw +glpk gsl"
+
+RDEPEND="
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	sci-libs/cholmod
+	sci-libs/umfpack
+	dsdp? ( sci-libs/dsdp )
+	fftw? ( sci-libs/fftw:3.0 )
+	glpk? ( sci-mathematics/glpk )
+	gsl? ( sci-libs/gsl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${P}/src"
+
+python_prepare_all(){
+	local PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+	rm -rf src/C/SuiteSparse*/
+	rm -rf ../doc/build # 413905
+
+	distutils-r1_python_prepare_all
+
+	pkg_lib() {
+		local pylib=\'$($(tc-getPKG_CONFIG) --libs-only-l ${1} | sed \
+			-e 's/^-l//' \
+			-e "s/ -l/\',\'/g" \
+			-e 's/.,.pthread//g' \
+			-e "s:[[:space:]]::g")\'
+		sed -i -e "/_LIB = /s:\(.*\)'${1}'\(.*\):\1${pylib}\2:" setup.py || die
+	}
+
+	use_cvx() {
+		if use ${1}; then
+			sed -i \
+				-e "s/\(BUILD_${1^^} =\) 0/\1 1/" \
+				setup.py || die
+		fi
+	}
+
+	pkg_lib blas
+	pkg_lib lapack
+	use_cvx gsl
+	use_cvx fftw
+	use_cvx glpk
+	use_cvx dsdp
+}
+
+python_compile_all() {
+	use doc && emake -C "${WORKDIR}"/${P}/doc -B html
+}
+
+python_test() {
+	cd "${WORKDIR}"/${P}/examples/doc/chap8
+	"${PYTHON}" lp.py || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${WORKDIR}"/${P}/doc/build/html/. )
+	insinto /usr/share/doc/${PF}
+	use examples && doins -r "${WORKDIR}"/${P}/examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cvxopt/cvxopt-1.1.5.ebuild b/dev-python/cvxopt/cvxopt-1.1.5.ebuild
index 5ba86d40f7e5..2353abc77a02 100644
--- a/dev-python/cvxopt/cvxopt-1.1.5.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5.ebuild,v 1.3 2012/05/04 15:12:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5.ebuild,v 1.4 2013/02/26 20:33:17 jlec Exp $
 
 EAPI=4
 
 SUPPORT_PYTHON_ABIS=1
 RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython 2.7-pypy-*"
 
-inherit distutils eutils
+inherit distutils eutils toolchain-funcs
 
 DESCRIPTION="Python package for convex optimization"
 HOMEPAGE="http://abel.ee.ucla.edu/cvxopt"
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc +dsdp examples fftw +glpk gsl"
 
-RDEPEND="virtual/blas
+RDEPEND="
+	virtual/blas
 	virtual/cblas
 	virtual/lapack
 	sci-libs/cholmod
@@ -39,7 +40,7 @@ src_prepare(){
 	rm -rf ../doc/build # 413905
 
 	pkg_lib() {
-		local pylib=\'$(pkg-config --libs-only-l ${1} | sed \
+		local pylib=\'$($(tc-getPKG_CONFIG) --libs-only-l ${1} | sed \
 			-e 's/^-l//' \
 			-e "s/ -l/\',\'/g" \
 			-e 's/.,.pthread//g' \
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index a58f8748b8f8..2e5db1fcde1d 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang='en'>
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   CVXOPT is a software for convex optimization based on
   the Python programming language. Its main purpose is to make the
   development of software for convex optimization applications
   straightforward.
 </longdescription>
-<use>
-  <flag name='glpk'>Use GNU Linear Programming Kit
+  <use>
+    <flag name="glpk">Use GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg></flag>
-  <flag name='dsdp'>Use interior point library
+    <flag name="dsdp">Use interior point library
   <pkg>sci-libs/dsdp</pkg></flag>
-</use>
+  </use>
 </pkgmetadata>