Add missing PYTHON_USEDEP. Port the changes to -9999.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/dev-python/pyopencl/ChangeLog b/dev-python/pyopencl/ChangeLog
index b417fd83fe11f2ea3e9edbbe2dd4d0b2eabf5a01..1b57f94efbcc0cf4e3d81ec6dc292d28a6a7427d 100644 (file)
--- a/dev-python/pyopencl/ChangeLog
+++ b/dev-python/pyopencl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyopencl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/ChangeLog,v 1.27 2014/11/25 10:38:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/ChangeLog,v 1.28 2014/12/25 19:22:00 mgorny Exp $
+
+  25 Dec 2014; Michał Górny <mgorny@gentoo.org> pyopencl-2014.1.ebuild,
+  pyopencl-9999.ebuild:
+  Add missing PYTHON_USEDEP. Port the changes to -9999.
 
   25 Nov 2014; Pacho Ramos <pacho@gentoo.org> pyopencl-2014.1.ebuild:
   Support python 3.4

diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index b8ba2e860d3e9531d0becad43efecbaacf9b7aa9..d1c37fa43c9fa07944ad96af5233ceb38cf0b554 100644 (file)
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -5,14 +5,26 @@ DIST pyopencl-2013.2.tar.gz 1637274 SHA256 f8e4218e4e47d397886f5dabde16a4d8dcc12
 DIST pyopencl-2014.1.tar.gz 1642825 SHA256 7c8df4f22ef49516a1444760dc622a037c83079ff60ff81779e60cb9fc5410e7 SHA512 da3e4e8d95605381d87db482f61fe7030fe244611a3c35d84c88210bcfb3472dc197be721f92e46e6828cc5d0245981ae004331a7c19e7fd8011a0aab593072f WHIRLPOOL e9d3c742c6ef217cf1f223990f852ae5b5ef50b7eae3513955da00f41134d9805e2078c16cd31429e327ea64a7ea16c15c014a749a3a532c3a11e4babdb91202
 EBUILD pyopencl-2013.2-r1.ebuild 1235 SHA256 6badda8856305e0d03b1690eeb0b0a00d20a4453e689e4649f2e939b1647bfe8 SHA512 4e28466f6e4ed0fb6dd960c962f62895b047b6c32abf631d8a27ec17a42d4ebf6fe018fee09af9d5f8dd541b1f1f46a695f24e1eb02eb7d4c38a0b9d8ba78be8 WHIRLPOOL ee99e396aa847dd2115a95a60ce8ae23f687d724613cfa54a2f440853784855a8f94dac9b5c931da52c12ae7dc96f155281bedc5472c89dc4b417e7809b1625c
 EBUILD pyopencl-2013.2.ebuild 1404 SHA256 00536dd4bdf0a1bbbd7187a8e5aa7e4b87b0f80e0dfe8dcc1dca7ff4866a40a7 SHA512 3061534096d390635680d2e6eebdfc3c22e0b372fc349bab281c0597f02d11ba596e99ef603e3edb0e03e5ee77320c28c31b42d6f29efd29db1ff0c004b601cf WHIRLPOOL d76e3921fb4b6ee32879fa8cf5c753be5c41a3ea5c6a4fded71197c4e8546e5e216a1f2f243ec633b340965bb14c9977dfba367a75ba726e09d5e40765351356
-EBUILD pyopencl-2014.1.ebuild 1234 SHA256 ae1f47b936abd6b7da5177e6537db1bab0320f05d19eec98c94ffee324bb3d62 SHA512 09b1458ff44b4d77adcfb619b521facfe9fd7a6e59493d4db1440cbfbfa14325d5e5dae61f4b9ef8987cb2ddea76f6b301b8a819832a8e5b8fa3c5b2ed24f7f4 WHIRLPOOL 2423449613e3856220270ced247f01046521facec5c487aacca6734ffb14abc81ef0e8120cf46247eb26c2bc3703b9f7b3292999fc0b84f99935fb55d7fc39f0
-EBUILD pyopencl-9999.ebuild 1423 SHA256 9ec8cd35c4ff1d6717ea294dbfcf81defc7c370bba282c5062581e54ef595e43 SHA512 f61aa90b106983e879cb783bbb191dd07274b075786543d98a9a2afe29494c59f45deced114296c80a766331efffa621642916be236e708a6864e1862ad73e14 WHIRLPOOL 126a79a99459298ae5887ad6b1a8acf201bd3ad75a9e4775f8608cc5d2f9b26ccd54a04b3f5b5efac54f912de0506eb4bd09aacbee3c2b2edb7bbc22c3a76b27
-MISC ChangeLog 4310 SHA256 7476968ef54df30ce0840285de09d314e67fe57871b30d736f04b6340e456cde SHA512 5ee89b7e7311f1bd09486acff9075e386ae3226d6d5ffcb8ec5bc16a72a852d473fb7e1542869e30d578ce40563ba3294126b2bf304c8355c87392cdf051ef3e WHIRLPOOL 22573fdcf624fdd2059b82aa35f207311aa7feaaaead35eec3753320c114534ddfd2aec286325d4f14339673155f54aa3aaf53ab56e163be8b93ae3132b3ccdf
+EBUILD pyopencl-2014.1.ebuild 1252 SHA256 5b1f51abafbb1984a69701d7507972ea86bc659249264431687ce07611dbbf26 SHA512 37be1cfa9db3a627f36b7f870a97fa056059f8652215c3f4c63fcbd413294efc8a9ff7691ead7811ab0010914c3dff17493d21bc883e00790de3fdad0d9a1bd8 WHIRLPOOL d3363d45962a8985278360c0a20a3ae7c7d49ca24e83a1df542539ce00be73cdad026bf1607c7c6db09d225090e44028f2509d55e1805332942e72150b831d2d
+EBUILD pyopencl-9999.ebuild 1269 SHA256 4a892e9954f47c4d24668e8efd6f55ab5e22e29a9ed8f6df8589ed19de72f22e SHA512 009f2cabd9dabb16f97835677cf6b9a9cf5c0e22482bae6ee97226d92a24f9693fd170094fe5176cd2bd667ee188540f7f870ec4732fd1df952e8c4c4e90f846 WHIRLPOOL 0a18feba29a9fe09879e5c48b1ccd3a6ef57c9db3568c488a7d581f267ff77d1f4f3f1fcd554afc000105e34a2e191043944c7e363f8bcc1ce8c0872d0c26038
+MISC ChangeLog 4466 SHA256 c585d2b46dfd65e55d7c8c6291505c02b21e2711bcc84f8507eecd78ade7683b SHA512 0048a6b0deffcd5dad116f28a45897e18e8a73c9acccab742c1ba7001423fafa0db04f5ba8adc240520bd51af999a7c4ea03292e148d7291a742ff6367b91805 WHIRLPOOL 6167c27352dfc1a6a91b2beffba6dc5bf202816040f1e980190375c9f1f96c03ab59317e4b38aa3e7cb9516d00929048dd848ba06b7661e146c6e859911399f1
 MISC metadata.xml 231 SHA256 9e625a5886001fa0ce2de7d2f358cc2767fb50bc6f1583d98e81b60b96208e4d SHA512 a54b3c3c2d5927ee6fd342f88cad53adc5411fa9d36b2e8b5ee2a6f28cef12444fcce47cc8d0aee39ce9c928be33d2bc0742d0e6399589ac1e607139ca81e81e WHIRLPOOL f2136316d8399997b3299e9743c432eb853c436059dfe5b6321f8ff9522a877fda840aded940725c5dc5c7fb4112c0ae476caa2f5a8ee57da891386b4c0136f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR0XB0ACgkQCaWpQKGI+9SVZwCfYstOHMc47y+gOpvadRYETrax
-OnYAn1MPHgggT3Vagbr2yEJomA0ymCvw
-=RjjM
+iQJ8BAEBCABmBQJUnGPZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTVsP/jfbcg2aiS8Vej3I+PTAZtIg
+L0h1goXJECvSayfTgC/qabH6QpfYJbM/Vk/BHJmxNgoy6Iovsd84UGoHq+O2iEBl
+CGgVsz/K/67VT7o175J1gWbNJKt3SY7cxrgev86zuclC7BeMSLpNshBlZHgn3jb4
+HPiAnJcK8tPFTlozoD3iANPQZu8IUxyIIdpYpK9d2JO27iAWsQuwSjVs1a3XSfaa
+25okKoaFqPtJJQ0BpzDxU/e+cAUnaORiU/XqYflux55AEo2W/AUysEIh5t8aBm/f
+8H9ONSmlTg+cVE1vMEaknLihOn+rOT7S8eRClHTPnIO1TE2W45zt8zelQ3MfuVqV
+hay8s7UMN4gqyJBAnFuv0s799iXyjmAHADdUVTeOWYoVnlEaDz4IblOz+pkPb9nq
+QOuAELwGUTxmYz+GyIYStnUjc+Ublft09MQ5VY2zlf6V/71o63lkljMhYeSbXxqS
+8pbH8SCJCOBWXsGQz0OjTOJQkWdljVue1obAY33m7+2IHEhdL+eOG9+7y6pklVkT
+SVP9Aj9wRpGASTn495B9xFTmTELXCXY+kRZNvDfCH+8GJvoRodJywcGUsTzeT3qr
+SsKqCMus4WFlN0YRxCMIr1eS2WB4E8+EpLWmwtG6KFFJd8yv5cYQJZEn/6L/3cXM
+l5UjO0qqRGPnorITFsJA
+=XZl7
 -----END PGP SIGNATURE-----

diff --git a/dev-python/pyopencl/pyopencl-2014.1.ebuild b/dev-python/pyopencl/pyopencl-2014.1.ebuild
index dd595bb7d6efda8513f7c659e6ca4c2506fbb5a0..4a78a4014d34d0a23db320bfd79339d200210bf5 100644 (file)
--- a/dev-python/pyopencl/pyopencl-2014.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2014.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2014.1.ebuild,v 1.2 2014/11/25 10:38:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2014.1.ebuild,v 1.3 2014/12/25 19:22:00 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples opengl"
 
-RDEPEND=">=dev-libs/boost-1.48[python]
+RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
        dev-python/decorator[${PYTHON_USEDEP}]
        dev-python/numpy[${PYTHON_USEDEP}]
        dev-python/mako[${PYTHON_USEDEP}]

diff --git a/dev-python/pyopencl/pyopencl-9999.ebuild b/dev-python/pyopencl/pyopencl-9999.ebuild
index 652fcb39ad6bea9995d1340b5a31ebaea05b3646..1f4ca2d0189b8c2560e0429975490a4af1415abc 100644 (file)
--- a/dev-python/pyopencl/pyopencl-9999.ebuild
+++ b/dev-python/pyopencl/pyopencl-9999.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2012 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/pyopencl/pyopencl-9999.ebuild,v 1.14 2012/04/19 07:32:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-9999.ebuild,v 1.15 2014/12/25 19:22:00 mgorny Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
-inherit distutils git-2
+inherit distutils-r1 git-2
 
 EGIT_REPO_URI="http://git.tiker.net/trees/pyopencl.git"
 
@@ -20,48 +18,32 @@ SLOT="0"
 KEYWORDS=""
 IUSE="examples opengl"
 
-RDEPEND=">=dev-libs/boost-1.48[python]
-       dev-python/decorator
-       dev-python/numpy
-       dev-python/mako
-       =dev-python/pytools-9999
+RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+       dev-python/decorator[${PYTHON_USEDEP}]
+       dev-python/numpy[${PYTHON_USEDEP}]
+       dev-python/mako[${PYTHON_USEDEP}]
+       >=dev-python/pytools-9999[${PYTHON_USEDEP}]
        >=virtual/opencl-0-r1"
 DEPEND="${RDEPEND}"
 
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
 src_configure()
 {
-       configuration() {
-               local myconf=()
-
-               if use opengl; then
-                       myconf+=(--cl-enable-gl)
-               fi
-
-               "$(PYTHON)" configure.py \
-                       --boost-compiler=gcc \
-                       --boost-python-libname=boost_python-${PYTHON_ABI}-mt \
-                       --no-use-shipped-boost \
-                       "${myconf[@]}"
-       }
-       python_execute_function -s configuration
-}
-
-src_install()
-{
-       distutils_src_install
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}
-               doins -r examples
+       local myconf=()
+       if use opengl; then
+               myconf+=(--cl-enable-gl)
        fi
+
+       "${PYTHON}" configure.py \
+               --boost-compiler=gcc \
+               --boost-python-libname=boost_python-${PYTHON_ABI}-mt \
+               --no-use-shipped-boost \
+               "${myconf[@]}"
 }
 
-pkg_postinst()
-{
-       distutils_pkg_postinst
+python_install_all() {
        if use examples; then
-               elog "Some of the examples provided by this package require dev-python/matplotlib."
+               local EXAMPLES=( examples/. )
+               einfo "Some of the examples provided by this package require dev-python/matplotlib."
        fi
+       distutils-r1_python_install_all
 }