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

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 61 insertions, 86 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/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() {