dev-python/pycuda: Version Bump; fix usage of python r1 eclasses

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

6 files changed, 189 insertions, 73 deletions

diff --git a/dev-python/pycuda/ChangeLog b/dev-python/pycuda/ChangeLog
index beae917bdbce..2d946d04e7c3 100644
--- a/dev-python/pycuda/ChangeLog
+++ b/dev-python/pycuda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pycuda
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/ChangeLog,v 1.20 2013/02/02 19:33:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/ChangeLog,v 1.21 2013/07/07 19:15:38 jlec Exp $
+
+*pycuda-2013.1.1 (07 Jul 2013)
+
+  07 Jul 2013; Justin Lecher <jlec@gentoo.org> pycuda-2012.1.ebuild,
+  +pycuda-2013.1.1.ebuild, pycuda-9999.ebuild, metadata.xml:
+  Version Bump; fix usage of python r1 eclasses
 
   02 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Assign to new maintainers per http://gentoo.2317880.n4.nabble.com/Packages-up-
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index 4ac0959d4f20..757c9d54964b 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST pycuda-2012.1.tar.gz 1473695 SHA256 d5b90467b926c73ceaf2dd2662fef2e21e106f00a0aa0d11f09a891aac3925dc SHA512 bb8889fa46de3d4ae57fb47883232953eba0e12a53431fffdefb12af3134540aec2671f0f2fbbe1d836dab354d407e078e773e84f8ee9a5345400a4a59da7937 WHIRLPOOL b35484ddc8d2c1808a0d706dcdcc9ebe49af153b0aaaf8fc2596f4068c5c2dbdb9fb4f84ac46512b314ef9383f70dfcefa4895191d7a9f6d78eee8ae8a56fe71
-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 3524 SHA256 0c1206d23c150825770f483a1152e5db39b0d8a563060e04040f9f16607ea714 SHA512 091890b48a5709a1baf6bcaed6ca113d62352ea320d36f96db831bd92e5d882d4e2dcd06ef5e0a8a744e5a6a9ba6798cad38e0d472808e45f7f7b397bf6f06f8 WHIRLPOOL 87aa464b2b67696fe1726e32b2d3847c2ea86682ba8c254b897101d54fedcb80ee32ab57aeda686fa35d110d1a3d4e086a85a9e670f71df80571c9ae2ceeb836
-MISC metadata.xml 229 SHA256 0f5e5d5a6dafebdd3d08964047619b9f6609a5fa239f437f00c3a8eff587f45e SHA512 6f5007470f9ba9b8169c2d6f14837ec40aceb2c5edc43fc355ebcb6e228516c7f8b00cb4b2e223df88fdbae8ee4b19d3839660e69c473566c1d878c0385fdd70 WHIRLPOOL a41f1d71c30e71d7a92c427ec2a91a932e0b9746d2ce9419f6898feec2a02cc7f68648f1f0474d90a16014f1105c6695b2bc60a3bac731f6e1a73c8499be733a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlENagMACgkQCaWpQKGI+9TS4gCfYEaLTqmhbtJ4pszpZwi1t9ee
-Gd0An1HamOz2TqDwHZV9pYdN1DoGCw+U
-=HHw8
------END PGP SIGNATURE-----
+DIST pycuda-2013.1.1.tar.gz 1586425 SHA256 4b541ff7ab4a867e9389b3b9b9456c6957000f39a20a46e872dd25dd3bece2da SHA512 7a7e95fcd4f76d10234558021064cc299e6d93ab9a428c9560e5a8a73b13304ba9ccc3c103674a25effdc01a14aac21981a62de881a9c990ad16d7689b75e502 WHIRLPOOL c1e958defbe4998c0af5a256df51daa3901f0bf2a45e5c5faed9abf5ba60ebd0dddab6fbb4caff41eac588fe7fc3cca1517c032d95d316492f99c307b6a260f3
+EBUILD pycuda-2012.1.ebuild 2487 SHA256 7cc773f3fb8727a9908d165f37a66ae2f86202ccef15be03b7b22ff7b9dfe97f SHA512 e31e9beb4b9f396f80bb6f2e37a56242414ff43920236ac7e71ddcb336e5296ab7e5b5f58d7c3e4dc9cfd9448a4b3fc02649498634db80e1940c387a81d553d3 WHIRLPOOL 6c340d6fbb231ef63e2ec17fdb378eb682a02f7bcf51c62ce87d29c7cd3b4dc2fe72f2529c9d86d0f183e5c5ee1b4afef3d058a36712688e5ef1ba5f14cfdb32
+EBUILD pycuda-2013.1.1.ebuild 2489 SHA256 c9d22c33ff80320421fb833edf82784cc1a06f43810f462a65f7b35d14180c0b SHA512 dcb59b834578165114c53858bf6df4b2d05f76722d11f137af0740b003798c5b625958a6c4c16a0018a2f09ace0d00b21a466f657386f90fbcfa0621cb5f08aa WHIRLPOOL 83a0aa4f596424ca5732dc5275e62652d8d95cec09ae69656d6b06c3dace82a020eeffb56ca9feb5c3c66478289b585130bd5ee0900f31fa12347d26087b61dc
+EBUILD pycuda-9999.ebuild 2553 SHA256 a500a385c8c9aba61e98ec6434571943dbed68274ef01bb04cac3f351ab453c4 SHA512 aac2c8a03e722512608b9de01ad4467c2ce405f48862c9f3a092ddc668a64585da3da3719c54ad39563e4750c63e5752f5de0bc64fe4c46b620e031607308106 WHIRLPOOL 715a96dbdab9e7b2257be11741d44d659ecb13bd55ee30a171cb053c2ec52642ccacf963a16a137b0f2d318d372a9507ff0a7617fe265126a016b13f9204a0e2
+MISC ChangeLog 3734 SHA256 11c85dddecd187277a45a2058559db0530339238b160afb3bbcf648c05148862 SHA512 5194b2184e5b9d6c8804bec3b27ea7356776b2bed91578b3ab8a84f580a090429770ab64f7d1f4bc604986ec5d23f391df30f7cc398cbc7a70a1e5eccd707634 WHIRLPOOL 7c803e38ee4988809b645a2f0ff71c20769701f6c77bcf3c9275d8826b6bb01ee832cc094ebe3d02cc60f01cabc428bbaee3529986b83c6a3a9498b090e8f922
+MISC metadata.xml 231 SHA256 798a9739189ba106db0e2e1abe6cade2f3619931003ea974a72e4e53ac6dd665 SHA512 9742b243dda45a2a330e563df2f5a4be63f58c6bfcb66edb52c5e5a92f1d588b5c4a02d6109448aaa273289a0c9129fa9ac7a3c52fb7cda20e2ae07f81771395 WHIRLPOOL d093c70e883c3f746f8bd7c600c40a8924dd6bd08804979861b41adc9cc61e842655271b7c8100fc214dc04eb5879cedff82c73ef11a38bda56c9483807cdc25
diff --git a/dev-python/pycuda/metadata.xml b/dev-python/pycuda/metadata.xml
index ebc7b1038d7d..858a4b6936dd 100644
--- a/dev-python/pycuda/metadata.xml
+++ b/dev-python/pycuda/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+  <herd>sci</herd>
   <upstream>
     <remote-id type="pypi">pycuda</remote-id>
   </upstream>
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
index 4c1feda1eb4c..725c61bef8bc 100644
--- a/dev-python/pycuda/pycuda-2012.1.ebuild
+++ b/dev-python/pycuda/pycuda-2012.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-2012.1.ebuild,v 1.2 2013/07/07 19:15:38 jlec Exp $
 
 EAPI=5
 
@@ -18,24 +18,24 @@ 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-libs/boost[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2011.2[${PYTHON_USEDEP}]
 	dev-util/nvidia-cuda-toolkit
 	x11-drivers/nvidia-drivers
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/mako
+		dev-python/mako[${PYTHON_USEDEP}]
 		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() {
+python_prepare_all() {
 	cuda_sanitize
 	sed \
 		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
@@ -43,29 +43,29 @@ src_prepare() {
 		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
 		-i pycuda/compiler.py || die
 
-	distutils-r1_src_prepare
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
+python_configure() {
 	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
+	mkdir "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+	"${EPYTHON}" "${S}"/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[@]}"
 }
 
 src_test() {
@@ -78,8 +78,8 @@ src_test() {
 	distutils-r1_src_test
 }
 
-src_install() {
-	distutils-r1_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
diff --git a/dev-python/pycuda/pycuda-2013.1.1.ebuild b/dev-python/pycuda/pycuda-2013.1.1.ebuild
new file mode 100644
index 000000000000..49f0573391cd
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2013.1.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-2013.1.1.ebuild,v 1.1 2013/07/07 19:15:38 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,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2011.2[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		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"
+
+python_prepare_all() {
+	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
+
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local myopts=()
+	use opengl && myopts+=( --cuda-enable-gl )
+
+	mkdir "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+	"${EPYTHON}" "${S}"/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[@]}"
+}
+
+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
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
index d085bfe434fb..73059b872ece 100644
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -1,13 +1,12 @@
-# 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/pycuda/pycuda-9999.ebuild,v 1.12 2012/02/25 01:54:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-9999.ebuild,v 1.13 2013/07/07 19:15:38 jlec Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+EAPI=5
 
-inherit distutils git-2 multilib
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit cuda distutils-r1 git-2 multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
 HOMEPAGE="http://mathema.tician.de/software/pycuda/ http://pypi.python.org/pypi/pycuda"
@@ -18,43 +17,74 @@ EGIT_HAS_SUBMODULES="True"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples opengl"
+IUSE="examples opengl test"
 
-RDEPEND=">=dev-libs/boost-1.48[python]
-	dev-python/decorator
-	dev-python/numpy
-	dev-python/pytools
+RDEPEND="
+	dev-libs/boost[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
 	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
 	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
 
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
 
 src_unpack() {
 	git-2_src_unpack
 }
 
-src_configure() {
+python_prepare_all() {
+	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
+
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
 	local myopts=()
 	use opengl && myopts+=(--cuda-enable-gl)
 
-	configuration() {
-		"$(PYTHON)" configure.py \
-			--boost-inc-dir="${EPREFIX}/usr/include" \
-			--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-			--boost-python-libname=boost_python-${PYTHON_ABI}-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)" \
-			--no-use-shipped-boost \
-			"${myopts[@]}"
+	mkdir "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+	"${EPYTHON}" "${S}"/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[@]}"
+	}
+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}"
 	}
-	python_execute_function -s configuration
+	distutils-r1_src_test
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}