Version Bump, Dropped old, fixes python.eclass related issues, do not link against bundled boost, fix finding of system cuda related libs, use git submodules, #345517, #383041 and #384211; thanks JTRiley for the many fixes

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 70 insertions, 99 deletions

diff --git a/dev-python/pycuda/ChangeLog b/dev-python/pycuda/ChangeLog
index deea8d5c822d..fc506045e03a 100644
--- a/dev-python/pycuda/ChangeLog
+++ b/dev-python/pycuda/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pycuda
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/ChangeLog,v 1.12 2011/09/21 08:48:19 mgorny Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/ChangeLog,v 1.13 2012/01/10 16:16:58 jlec Exp $
+
+*pycuda-2011.2.2 (10 Jan 2012)
+
+  10 Jan 2012; Justin Lecher <jlec@gentoo.org> -pycuda-0.94.2.ebuild,
+  -pycuda-2011.1.2.ebuild, +pycuda-2011.2.2.ebuild, pycuda-9999.ebuild,
+  metadata.xml:
+  Version Bump, Dropped old, fixes python.eclass related issues, do not link
+  against bundled boost, fix finding of system cuda related libs, use git
+  submodules, #345517, #383041 and #384211; thanks JTRiley for the many fixes
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> pycuda-9999.ebuild:
   Migrate to git-2.
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index 3e41c274b03c..fc8a1a8eecec 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST pycuda-0.94.2.tar.gz 1193158 RMD160 6f3978286d195a37f32bc043eac0d124f41ee799 SHA1 aff473d0cea2842657c38eef6c5bb6eaa3e0d8e1 SHA256 1b9ab93a5bd55184c30090dd5153a0e8201dbac4f0dc30eef951bb2059143b3d
-DIST pycuda-2011.1.2.tar.gz 1302715 RMD160 9d4e57ccf17752ebd7d7b4dea2a1521a15bb8e58 SHA1 8ab8625cb4efe3d63ad53613993c547e14dbab9f SHA256 181f5b7868995aebbfc23d156c684fdf6bad35bf6ec57ea040bb6a1f06a08f56
-EBUILD pycuda-0.94.2.ebuild 1226 RMD160 d9f7aadd5f353b7783f156eeb3a858c775a0474b SHA1 45d504337fe0e828ea0f5db755a3cb5227cb600b SHA256 95470c7f797e94591be794992aa73cb6ac43b92f5fb6c240033e65e8715ed6f3
-EBUILD pycuda-2011.1.2.ebuild 1081 RMD160 8a004363c091d63cfbb28c63530784330b8cc9f7 SHA1 26aba8f6c7506c44ed02280e9dded76210f3b640 SHA256 275421ac335bd0d9e6562562fa64cc01d31e641e43283b9f96adf08ca1dfee04
-EBUILD pycuda-9999.ebuild 1263 RMD160 73ea8a7c77d005279df94684af2f554da453833d SHA1 ee777a0258a97920c532b304e459f50bb02f2058 SHA256 d44486e6fe15bd46e605360eae25e6e1cbf07d42c4796863eebe0f05dbc24534
-MISC ChangeLog 1877 RMD160 ca501307fb8ab96fb012bc21bbb98ba534195f57 SHA1 595a7e364ca14dfd6193b275f34702c771e61b98 SHA256 3f725c04a87a86a64455076884ba0237dd2a2ff0e777533781b0ac02a8797be4
-MISC metadata.xml 199 RMD160 a39af8bd1b88bdcb9e78d56e54a036a18d166d3e SHA1 2a95edf70916fce6b621a790d8e32cc2a5c2cd1b SHA256 ce4606d1cdd054847cdd2b6db8fcdb54e2971548b642a519becf702fa92ece34
+DIST pycuda-2011.2.2.tar.gz 1310515 RMD160 d5d1d2ae532edc8856de3cd6607d6e60898f0488 SHA1 026ca33f66d35c82a087a5ef3f8e0f213575059b SHA256 54a354c7c8f43a098482436059a7a6258390d013bf558d04d3f4822c23eee99a
+EBUILD pycuda-2011.2.2.ebuild 1358 RMD160 e0fa1e22ccaf2dc4e58574a4e656ed3134ae470f SHA1 dac9459a5cd000d1d49730ff5b7c425eae4bb1ef SHA256 8eceaa0c55554b77f73fe930c79383660667d0a7826bc968eef0a1d662886642
+EBUILD pycuda-9999.ebuild 1583 RMD160 9f25231bb57b12f382bcbba7af9d86389cb87aee SHA1 246a725d2e4b23526df4f9c4b18ba9b40c5c91ea SHA256 6cab8266052739a68ea0b091ea39a7c1d615efab4e89e52f44b31a8ba63fcefc
+MISC ChangeLog 2295 RMD160 85e1274a56120bc241db9424d0a9c42d86278005 SHA1 d2f3b6a2a140d482c48d7da185d6330c946bd773 SHA256 ee7cc1b166926f1f7e732c659810eb163d51a33e483d4f8ab389279471b59b42
+MISC metadata.xml 202 RMD160 46bab90fa43788d51f6d02022e89a0107a886f89 SHA1 da8c4c65794c5d988956c761d847d97f36eecbfd SHA256 58c9ad9b8ef4bf41c91d13b74236ee6ddda95ac302f1270be2423bdea50d1c9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59lYgACgkQfXuS5UK5QB0P5wP/RaM3u5OGTnHYnvvvE9gqFFx2
-CQm+mzi239/wlrA1/B1MNuS3q4dVOlRaelEVk8+X/LgdIIXm6+PnlRe4mDlowxnh
-FyHZ0lr0Zd0/9yjE66dMkJKIv62IY4EO53WlgHvQrX6o1GH6SpwM3SKipDUEat2G
-OCf0LuNlh53pZS/HuWU=
-=nS3C
+iEYEAREKAAYFAk8MZIAACgkQgAnW8HDreRbr+ACfZRED/tQg0dXKuFoUrGibOrrV
+/zwAoLzdW6nwcMf0dvkRN5hmk/WAUBaI
+=m3lr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycuda/metadata.xml b/dev-python/pycuda/metadata.xml
index fd23cf9d5ecb..b5e4c5762655 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>
-<maintainer>
-	<email>spock@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>spock@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pycuda/pycuda-0.94.2.ebuild b/dev-python/pycuda/pycuda-0.94.2.ebuild
deleted file mode 100644
index ca624419160f..000000000000
--- a/dev-python/pycuda/pycuda-0.94.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-0.94.2.ebuild,v 1.3 2011/01/01 21:15:03 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-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"
-
-RDEPEND="dev-python/decorator
-	dev-python/pytools
-	dev-libs/boost[python]
-	>=dev-util/nvidia-cuda-toolkit-2.0
-	>=dev-python/numpy-1.0.4
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-
-src_configure()
-{
-	local myopts=""
-	use opengl && myopts="${myopts} --cuda-enable-gl"
-
-	./configure.py --cuda-root="${ROOT}opt/cuda" \
-		--boost-python-libname=boost_python-mt \
-		--boost-thread-libname=boost_thread-mt \
-		${myopts}
-}
-
-src_install()
-{
-	distutils_src_install
-	insinto /usr/share/doc/${PF}
-	if use examples; then
-		doins -r examples || die
-	fi
-}
-
-pkg_postinst()
-{
-	distutils_pkg_postinst
-	if use examples; then
-		elog "Some of the examples provided by this package require dev-python/matplotlib."
-	fi
-}
diff --git a/dev-python/pycuda/pycuda-2011.1.2.ebuild b/dev-python/pycuda/pycuda-2011.2.2.ebuild
index 4675a97747e1..1ced86c13715 100644
--- a/dev-python/pycuda/pycuda-2011.1.2.ebuild
+++ b/dev-python/pycuda/pycuda-2011.2.2.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-2011.1.2.ebuild,v 1.1 2011/09/05 22:36:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-2011.2.2.ebuild,v 1.1 2012/01/10 16:16:58 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils eutils
+inherit distutils multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda http://pypi.python.org/pypi/pycuda"
+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"
@@ -17,27 +19,32 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples opengl"
 
-RDEPEND="dev-python/decorator
-	dev-python/pytools
+RDEPEND="
 	dev-libs/boost[python]
-	>=dev-util/nvidia-cuda-toolkit-2.0
-	>=dev-python/numpy-1.0.4
+	dev-python/decorator
+	dev-python/numpy
+	dev-python/pytools
+	dev-util/nvidia-cuda-toolkit
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}"
 
-src_configure()
-{
+src_configure() {
 	local myopts=""
 	use opengl && myopts="${myopts} --cuda-enable-gl"
 
-	./configure.py --cuda-root="${ROOT}opt/cuda" \
+	./configure.py \
+		--cuda-root="${ROOT}opt/cuda" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
 		--boost-python-libname=boost_python-mt \
 		--boost-thread-libname=boost_thread-mt \
+		--no-use-shipped-boost \
 		${myopts}
 }
 
-src_install()
-{
+src_install() {
 	distutils_src_install
 	insinto /usr/share/doc/${PF}
 	if use examples; then
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
index c14c83f1f5ff..3d209386b678 100644
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.8 2011/09/21 08:48:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-9999.ebuild,v 1.9 2012/01/10 16:16:58 jlec Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
+EAPI=4
 
-inherit git-2 distutils
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
-EGIT_REPO_URI="http://git.tiker.net/trees/pycuda.git"
+inherit git-2 distutils multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda http://pypi.python.org/pypi/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ http://pypi.python.org/pypi/pycuda/"
 SRC_URI=""
+EGIT_REPO_URI="http://git.tiker.net/trees/pycuda.git"
+EGIT_HAS_SUBMODULES="True"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="examples opengl"
 
-RDEPEND="=dev-python/pytools-9999
+RDEPEND="
 	dev-libs/boost[python]
-	>=dev-util/nvidia-cuda-toolkit-2.0
-	>=dev-python/numpy-1.0.4
-	virtual/opengl"
-
+	dev-python/decorator
+	dev-python/numpy
+	dev-python/pytools
+	dev-util/nvidia-cuda-toolkit
+	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -33,9 +37,17 @@ src_unpack() {
 src_configure() {
 	local myopts=""
 	use opengl && myopts="${myopts} --cuda-enable-gl"
-	./configure.py --cuda-root="${ROOT}opt/cuda" \
+
+	./configure.py \
+		--cuda-root="${ROOT}opt/cuda" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
 			--boost-python-libname=boost_python-mt \
-			--boost-thread-libname=boost_thread-mt --boost-compiler=gcc ${myopts}
+		--boost-thread-libname=boost_thread-mt \
+		--no-use-shipped-boost \
+		${myopts}
 }
 
 src_install() {