projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cab840b)
dev-python/pycuda: Version BUmp; add py3.4 support, #531138
authorJustin Lecher <jlec@gentoo.org>
Tue, 2 Dec 2014 11:33:54 +0000 (11:33 +0000)
committerJustin Lecher <jlec@gentoo.org>
Tue, 2 Dec 2014 11:33:54 +0000 (11:33 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

dev-python/pycuda/ChangeLog patch | blob | history
dev-python/pycuda/Manifest patch | blob | history
dev-python/pycuda/pycuda-2014.1.ebuild [new file with mode: 0644] patch | blob
dev-python/pycuda/pycuda-9999.ebuild patch | blob | history

diff --git a/dev-python/pycuda/ChangeLog b/dev-python/pycuda/ChangeLog
index 3889f75e2f839f1f65d75d213166272597ef3f95..c4cf400d98997a55ad22277f4b4fdcc0518fde3e 100644 (file)
--- 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.22 2013/11/23 09:32:46 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/ChangeLog,v 1.23 2014/12/02 11:33:53 jlec Exp $
+
+*pycuda-2014.1 (02 Dec 2014)
+
+  02 Dec 2014; Justin Lecher <jlec@gentoo.org> +pycuda-2014.1.ebuild,
+  pycuda-9999.ebuild:
+  Version BUmp; add py3.4 support, #531138
 
   23 Nov 2013; Justin Lecher <jlec@gentoo.org> pycuda-2013.1.1.ebuild,
   pycuda-9999.ebuild:
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index 3cd63f72e9efca2e6a8ea01c65471a87f0f57f92..1ac73f78265b65423bb8d2a4bfbd6ab16fbf50c2 100644 (file)
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -3,25 +3,29 @@ Hash: SHA512
 
 DIST pycuda-2012.1.tar.gz 1473695 SHA256 d5b90467b926c73ceaf2dd2662fef2e21e106f00a0aa0d11f09a891aac3925dc SHA512 bb8889fa46de3d4ae57fb47883232953eba0e12a53431fffdefb12af3134540aec2671f0f2fbbe1d836dab354d407e078e773e84f8ee9a5345400a4a59da7937 WHIRLPOOL b35484ddc8d2c1808a0d706dcdcc9ebe49af153b0aaaf8fc2596f4068c5c2dbdb9fb4f84ac46512b314ef9383f70dfcefa4895191d7a9f6d78eee8ae8a56fe71
 DIST pycuda-2013.1.1.tar.gz 1586425 SHA256 4b541ff7ab4a867e9389b3b9b9456c6957000f39a20a46e872dd25dd3bece2da SHA512 7a7e95fcd4f76d10234558021064cc299e6d93ab9a428c9560e5a8a73b13304ba9ccc3c103674a25effdc01a14aac21981a62de881a9c990ad16d7689b75e502 WHIRLPOOL c1e958defbe4998c0af5a256df51daa3901f0bf2a45e5c5faed9abf5ba60ebd0dddab6fbb4caff41eac588fe7fc3cca1517c032d95d316492f99c307b6a260f3
+DIST pycuda-2014.1.tar.gz 1588986 SHA256 28e8f7425d0bac03a6c80346a4e150024ef0e4740ce11cb54e6aef351127d7af SHA512 57e333941c472feea6974e583f9d27f7f5083011bd8a7cc0bc31d27032885a130f1f57a16b0730696c607b9dca32ad84b96c984cd82351800ec854acdfa8fe9f WHIRLPOOL c71876c6f203a0a8a996a90976ad3f012ce1497ee84534c7fb8876e19293766d4641fbac00a538b1ddb074b29f8d8347f39caae613839b38cf5ee9eb15a86c09
 EBUILD pycuda-2012.1.ebuild 2487 SHA256 7cc773f3fb8727a9908d165f37a66ae2f86202ccef15be03b7b22ff7b9dfe97f SHA512 e31e9beb4b9f396f80bb6f2e37a56242414ff43920236ac7e71ddcb336e5296ab7e5b5f58d7c3e4dc9cfd9448a4b3fc02649498634db80e1940c387a81d553d3 WHIRLPOOL 6c340d6fbb231ef63e2ec17fdb378eb682a02f7bcf51c62ce87d29c7cd3b4dc2fe72f2529c9d86d0f183e5c5ee1b4afef3d058a36712688e5ef1ba5f14cfdb32
 EBUILD pycuda-2013.1.1.ebuild 2495 SHA256 55398751956e38ad9d34835e2530504b9831003008e81d30120f11be4f1f96bd SHA512 79c03fbd430116bb13aec3cb6740fa1ab3f212a3619fb095474c2a78e3075549ecff8352b0bc2b9bc1c668ed501706674303c2768c3efce70bd395fb3b29e037 WHIRLPOOL 8ec1f1b3f5be96417a22b34e134b096fa5702602e99b8751e82d60c090c0b5e33f6ad311b0fc8246de080b44495a4d1a5f4e0c41b6d90a45b717ee0dacd6b304
-EBUILD pycuda-9999.ebuild 2562 SHA256 bce746dcefcbc8eb6b3582faaadb7423792cd0a39f3828d2faca9aff8adb2a8b SHA512 5899859168e6f91138ec4aaac2fe9084f107aae42d88a7ffdefd0a7d68a0e939f9af5619c9535a832ce237ded38919f32cb32bd45e93b4b0ff46b44c952dc937 WHIRLPOOL 6af63eaa88996001ae35d4ea494003eb472218eeee480454c089c3a66a9777e2a505efa26995728616f969408fb83e1bf5081652d0b365f64682362b362e5a43
-MISC ChangeLog 3855 SHA256 943c8400518e07783cb8c49b3cd0f6936101ff783e6a8ae4d087327fb3049fc8 SHA512 04fb9ba88929a018af4b0e42a1605ae6f10207ec5f0c1e713a4cb3aff64dc1bd89efaefd402172516583c31c3703dabfc19b815f01b0c9a1be62d1288eb5094f WHIRLPOOL 9a3e72dc588e0930706937ea1b7907d1766ba2d5084196f8259b08acc6524776d12d23f6f9e3c15f9a270adec4f67351065e4bde4164de163ffd3947ebd27193
+EBUILD pycuda-2014.1.ebuild 2493 SHA256 8eb97d218503d13e29b8a88daede1c955c9806e373a8b43c5bbd5f7c44b24c2b SHA512 cafcc2512cc7b11965ae573cd0f5f7cfd5f4342626ff5e30d1e961b8ccd9279e398a50ab711545a1b7b9e13725a0e2c08d3cc471136ce4d9bc6ae2af335a4b54 WHIRLPOOL 9ebec8e3f0f2ffaeb34abd84106f7bca4f11449e8d184fab7e8ff83dc90642018de8463557484576eeba8d9df17a7d9906223fb859e7d7e1b939f9490eff5f62
+EBUILD pycuda-9999.ebuild 2501 SHA256 8c48dfa95cf9c9f9378206f44dc207bdecb45a244f45dd6018f3c5c91ea27699 SHA512 3c039e98306a17b811aad8490c1b34856cdcfadfc052515e7b32e3e8a6efa430dec35bef62fdd025fe8b77c805c13e02a38863098d8fcb46e67ccd9a9b67598b WHIRLPOOL c191e02950842d03586c54f8182dc7ef03d5e80c3bd1140b9c24d78a645dc9188aed32ecdcd7fc6242975375402c0224cc896bbb4a21ccf5dcdb497a83ffd31a
+MISC ChangeLog 4021 SHA256 2309236bdd31c4a9952e3e3f0706ecf4b9b7257df7077788a844809ac9208a7f SHA512 f43d7670b5eeeef64bc99d906c85f9c1d1a99b4360fe8a7ef8824c55b9e2f9a0fc1f1cc69f4897234d4d6d80d4dd1ae3cd294c55218bfdc9b6031057cdbbf106 WHIRLPOOL fbb80b45131ef08c83f09972c991488b939e413b0021570eba9666d3dc1090382a20bf1af4e359d69accc60f7445bbf2ff83ae3a894c3f522e0694838f17d2a0
 MISC metadata.xml 231 SHA256 798a9739189ba106db0e2e1abe6cade2f3619931003ea974a72e4e53ac6dd665 SHA512 9742b243dda45a2a330e563df2f5a4be63f58c6bfcb66edb52c5e5a92f1d588b5c4a02d6109448aaa273289a0c9129fa9ac7a3c52fb7cda20e2ae07f81771395 WHIRLPOOL d093c70e883c3f746f8bd7c600c40a8924dd6bd08804979861b41adc9cc61e842655271b7c8100fc214dc04eb5879cedff82c73ef11a38bda56c9483807cdc25
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSkHY/AAoJELnU8jG9FVirHbkP/AiPGZbsZYDhKZm9TOT9seYA
-1f4z6zM3rhIdr1mV93fNZice6s2+Zuya8JOup4nzLthJp1ps8ZzYXQAXj1CQUqij
-BKLoqWwGWdhmhjAEo/tLo2WRH+TUYK39TBvV2zQss7YzEBhTM0bnyNF6QM1EJF/f
-iV9+b8YI+a5/0u4IP5p5op4pZjRxHuB8uiRB9dEDzMhcYVrAav7ilGZ8MtWt10lc
-qkS6xB1mFMrBS6tN/iMAS0FKMEw6iE/PQWBvNgeK0X0+92hbwGmfChYIUkJ/7te4
-VWd6rH5VfJBh9BBdOqJx8/Pd4u9WUCdAqySPtEXMEbYsVLb6Xk+z2Qd8KNEFwLEI
-CLDBEQtqZ8/6WICVfcLYRYSThUf97EQ4g1+6SZ+RBE26cZvaoRHyx+fsPbb7/6n3
-V63wQ4xV7qzVecbk35DARQBlX5tyzeNehzCJGs0VJ0hTb0jyr9AUVDh4pGyqrUW+
-d1z0BHr7yYCzam6SosIRib7Lrjb2SMk8jWvVCM6LrM30NmbbxSfef0NjyWqWZO9T
-Haz7do2P8Xr+E18N98XrpmyEROXBJF91LTL3IYreNB9D9IGRTWgMX6FeajY9vJ+E
-YafrwbPmfZcGvbd6P3TWYxbkcTXml4ciSSDf5iG16xAUgnaRKRwiDO6VM/Ygczk5
-cgVuNV3pqRRPD2+RvSMV
-=g4Tv
+iQJ8BAEBCgBmBQJUfaOiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir408QAItYFpHkCZP+wLpIU/B9yYgM
+O60DhomtSmf3WpUjG4mcTcUIjPxmM3z3moPofe2d+P9k7u43zWFUMKci03m650Iq
+Yw1N5ah8Xo6vkWaMXsz8O5mZXzqA7V6BuVsrKRaDtCXxaOxSMhCD3Z6ZBvT4Fa4U
+7HHx6f+gXIzmKmjH3xQIGJ6ntmOpHY3tOGT0m6geh/Rc3MJsjgwbBxzIhFABPO4t
+tCnmRsGqN+1CriechhLdimREDQQ+1FryzrR6QUfnOnTU5IPAY5zeaj6lUhQFTTjI
+c/uZbGzJOXmNTJmpkhFvazTY+80ArXDIKeX8e2JDqG6lsSs1FLYdqCHy3d7ikaB2
+yEd3ZDVpWks8N1w2rDRK5MDqh8IwFMoZQ3TaY+OK8rS1GM/ZROQYD650NbnHJM+4
+jgY/2vO1vhtXSBocqJhPG7jL4xZ1JxEnI+Wnf8VPhPgWm1z+uUFoKaMGxcnATEVI
+e2s3hPTA2sDTuw8Zbhe8JTn040xFZy1lvt04szBG+vCbon5I9SeJHEEybtf2rZoc
+OWLcheXZkg/Y3N96X8Y8A3TEzyOC6IaIsEGiMl6684WLLuHYAVMILEgDW1MiKsdG
+bfTN8YjiNByQUkWviAcJn507NDJMggyiL+VaHGK6DQbKzsZiq/zvS2aC0aVyGKWH
+nu4GC/N4jHl26IrFEj07
+=R0Rj
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycuda/pycuda-2014.1.ebuild b/dev-python/pycuda/pycuda-2014.1.ebuild
new file mode 100644 (file)
index 0000000..031d925
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2014.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-2014.1.ebuild,v 1.1 2014/12/02 11:33:53 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+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-2013[${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 dfd35b417e491bb9650771dbbe5e1446af2703f0..37c2f36bc3924f7b8e5673584af9d361b4e0294a 100644 (file)
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.14 2013/11/23 09:32:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycuda/pycuda-9999.ebuild,v 1.15 2014/12/02 11:33:53 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
-inherit cuda distutils-r1 git-2 multilib
+inherit cuda distutils-r1 git-r3 multilib
 
 DESCRIPTION="Python wrapper for NVIDIA CUDA"
 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"
@@ -37,10 +36,6 @@ DEPEND="${RDEPEND}
 # user is (usually) not in the video group
 RESTRICT="userpriv"
 
-src_unpack() {
-       git-2_src_unpack
-}
-
 python_prepare_all() {
        cuda_sanitize
        sed \
@@ -73,6 +68,7 @@ python_configure() {
                --no-use-shipped-boost \
                "${myopts[@]}"
 }
+
 src_test() {
        # we need write access to this to run the tests
        addwrite /dev/nvidia0
Unnamed repository; edit this file 'description' to name the repository.