dev-python/pycuda: Version Bump; bump to EAPI=5 and distutils-r1.eclass; depend on libcuda.so, #403729

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 110 insertions, 17 deletions

diff --git a/dev-python/pycuda/ChangeLog b/dev-python/pycuda/ChangeLog
index 91c45ac4acb9..359906a5d174 100644
--- a/dev-python/pycuda/ChangeLog
+++ b/dev-python/pycuda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pycuda
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/ChangeLog,v 1.17 2012/11/08 06:32:59 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/ChangeLog,v 1.18 2013/01/15 15:25:13 jlec Exp $
+
+*pycuda-2012.1 (15 Jan 2013)
+
+  15 Jan 2013; Justin Lecher <jlec@gentoo.org> +pycuda-2012.1.ebuild,
+  metadata.xml:
+  Version Bump; bump to EAPI=5 and distutils-r1.eclass; depend on libcuda.so,
+  #403729
 
   08 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> -pycuda-2011.2.2.ebuild:
   Remove old version depending on older boost.
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index e2f98084b0c8..8725300d617f 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA256
 
 DIST pycuda-2011.2.2.tar.gz 1310515 SHA256 54a354c7c8f43a098482436059a7a6258390d013bf558d04d3f4822c23eee99a SHA512 ffc10394237aebaafb16c536d098abfa94d5697341210bb4b228ab534ee5930ab4c5c38158b2f166ac399efd3f972c5688034365fa3687409c99f5981e589f9f WHIRLPOOL 3531d5f68515a534cb6925c9c88cd52aad18af7cdbcdeb7d0ff2fc0f87378f41cfa67ce07baf7efa7dfbb0973c1c3722a9ab7d58dbeaef66a50e76f35fc64a07
+DIST pycuda-2012.1.tar.gz 1473695 SHA256 d5b90467b926c73ceaf2dd2662fef2e21e106f00a0aa0d11f09a891aac3925dc SHA512 bb8889fa46de3d4ae57fb47883232953eba0e12a53431fffdefb12af3134540aec2671f0f2fbbe1d836dab354d407e078e773e84f8ee9a5345400a4a59da7937 WHIRLPOOL b35484ddc8d2c1808a0d706dcdcc9ebe49af153b0aaaf8fc2596f4068c5c2dbdb9fb4f84ac46512b314ef9383f70dfcefa4895191d7a9f6d78eee8ae8a56fe71
 EBUILD pycuda-2011.2.2-r1.ebuild 1529 SHA256 7e206ecf42f7e129efe68ed6d58b06730d1ae7c78cfdedb63d1675f2f1b2be12 SHA512 e079a29cad1b3f9619a93bc2496f9ab1c6ef80afb607667457f2540bb28f9ff1e001eddd06bd41456b69a20467aa1cebc64df462c84c25e083225fc005ce196a WHIRLPOOL 22901c3bea444c55489e84d8adfbd177a904cbcf80c8142e2e93182f77922a03eef762512ce715f04cdfc04b5d8c00b164c9bb66b4cd345cad5b17276f4a8e8b
+EBUILD pycuda-2012.1.ebuild 2353 SHA256 773e490721032c4cd7dbca89b6c90ef44e47ecf919521265e89466997781f9f5 SHA512 56d8b1c841d534393f964199c66b256f4dd154587c55b5abd58df4fdfa758c0def9760a130fdffb136277568e63ecab57053c104f7e7c07f70e38aa16e98f4bd WHIRLPOOL c2139a25e2bd59b4c741e44577fdb598d603762b5c30274f9c742d17ffe9a41cb60a9171bb5fbf062b7060507dc262f15392fff96b6d56a9db0075713df76829
 EBUILD pycuda-9999.ebuild 1594 SHA256 4b675a71cd63b30469751b4e188f90cb29a93631612a7c3f8c1ca15890884cb1 SHA512 79126a87342b1bd204d40e59b97cf8504fa219d3a0d6f4f31d5ec1c85de7d8a8e274d46ca17471664c0b7fbd083189920514ce744768cdc19966cef93db2352b WHIRLPOOL f39ac538c4c312c748005020e5e1e3656dff43ac900ca66912680c9234abb0b0b563a465eb66b1cf31965caedda8813e11085de48d5986f43f76bd03054901d2
-MISC ChangeLog 3006 SHA256 c774633a5df4d444f3a0f3c527ab3e9246dda65ebd5f5ce397e9a3041cc3629e SHA512 c4c6a98bc3aaf3025bae15e2043c9c7267548fe4371f36184a9ff28f5a1216f994ddc850f67ce2b295a79b758616ae01098fb083be7f581aa8596f2e9963c4ff WHIRLPOOL 97f332340f9113b1235b6a33a3b853121852dff1efb73c31011f1f9ac904fbc9ea3783b6584f45c9406386a354e40de1ba91be034461a27415437cdfc7d57dc9
-MISC metadata.xml 271 SHA256 165952e9a8505b1f7e2df7fdd33303f60f8d1ec3a2e90899e402f507dd0c9a47 SHA512 80cb4efe2146cca60754b6618e8b207eba66adca643a52be3ded39995c6b93b0c5922be3977332f5cb5fa82e7fa8aa45f1fd6b0c17834c87e9465b06ab7a6278 WHIRLPOOL 045f397099e081cd6c7a0bbe750b04078e28689a535dd57a86cff5237b170e4c32bfe08fd4e0f9be53d10c5d979c3b6352b61804c70722c07b89273f66e35088
+MISC ChangeLog 3206 SHA256 7370d682da91ac12924b273718858c044ff3c16244c032487a7ceb08b9d52366 SHA512 292aeadb65b270c971f33f2dd7419977c590d825397e9d4af1fa31d76ad780ec837baed3ea2dc9bf6f2ff814aa600d7dc03d17a9d35f95b66d21d28a2899dbfc WHIRLPOOL b94cac49185ea5b9929bb62b4d9c52ee7e9917b92c7708b31d62404a1bbdd7e310c1169b08e6e0940aa5cb5927194381ca0f63b5fd7aef0deaa72529e98909a7
+MISC metadata.xml 279 SHA256 c3391df158e2a8ccc19f6d69d1407093160dd43346760ec560611a6d61e2d857 SHA512 67827056d17edbce9c0f61cfbb476fc6baee000d546349a149a6b91ccd48c70361b0ff948a966479904b6a5c6e94333192de8bb613121e74bdd91fad0ca1faf8 WHIRLPOOL 2096c21375db1f97a03ac1adbf4d03ba5ca7c14588ef60778d931455aea22f9329a130067f9f16d79287eb3bd5be1af11261ebfe09b445aef8dfab1355f0f702
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQm1IhAAoJEBzRPIrUMBNCbzcH/jcGWbMTWozHvOklYWENGJJV
-Mh7rGh5mRpeOPD5KIBeXEo6Icf2PASBvt9tTt3mEX8bk3seAx+18WZvEorkVaxCB
-vRz8q/KRAhBhPfQaClp6u8j7DfbU2RPCsM/ZdtNzXpTYCFDFawsG0K3zzE0lZdl/
-9MVP1sJm9momKEyePXWCEvtQnVjMzJK6asS9uOqNtcMHDMPuzsp1ZMfjgm6+JY/6
-TRtAORJt2AuZrwGZ+JkaHL8y6TH9fCTO1+7HpiJpxSaBpHLTKlx5sGCFFjkPQ4nO
-wCD5OGzHri7KK1zBv4pLZTni0mbZ12+A4vKOYTT1y/wy4MoL2nT2dZwh15jfNLQ=
-=gn0b
+iEYEAREIAAYFAlD1dNoACgkQgAnW8HDreRYgOwCfd4PDMudmB2s8TnqPD8a4YjOD
+rSAAn0mnZrlbNo5S0dYi1USNTfoTuXSf
+=pCwv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycuda/metadata.xml b/dev-python/pycuda/metadata.xml
index e4705c8632e0..5d6640e9c329 100644
--- a/dev-python/pycuda/metadata.xml
+++ b/dev-python/pycuda/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>spock@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pycuda</remote-id>
-	</upstream>
+  <maintainer>
+    <email>spock@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pycuda</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
new file mode 100644
index 000000000000..4c1feda1eb4c
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2012.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-2012.1.ebuild,v 1.1 2013/01/15 15:25:13 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit cuda distutils-r1 multilib
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ http://pypi.python.org/pypi/pycuda"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost[python]
+	dev-python/decorator
+	dev-python/mako
+	dev-python/numpy
+	>=dev-python/pytools-2011.2
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+src_prepare() {
+	cuda_sanitize
+	sed \
+		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	local myopts=()
+	use opengl && myopts+=( --cuda-enable-gl )
+
+	compilation() {
+		[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+		"${EPYTHON}" configure.py \
+			--boost-inc-dir="${EPREFIX}/usr/include" \
+			--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+			--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+			--boost-thread-libname=boost_thread-mt \
+			--cuda-root="${EPREFIX}/opt/cuda" \
+			--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+			--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+			--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+			--no-use-shipped-boost \
+			"${myopts[@]}"
+			distutils-r1_python_compile
+	}
+	python_foreach_impl compilation
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	python_test() {
+			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}