[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/

2020-01-15 Thread Michał Górny
commit: a5dac8d5ca0c8cb08d474dd4b3d2a0037cd897f0
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 07:58:29 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:58:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5dac8d5

sci-physics/root: Revert "Remove Python 2"

sci-physics/yoda needs it.

Signed-off-by: Michał Górny  gentoo.org>

 sci-physics/root/root-6.12.06-r11.ebuild | 2 +-
 sci-physics/root/root-6.14.08-r4.ebuild  | 2 +-
 sci-physics/root/root-6.16.00-r4.ebuild  | 2 +-
 sci-physics/root/root-6.18.04.ebuild | 2 +-
 sci-physics/root/root-.ebuild| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-physics/root/root-6.12.06-r11.ebuild 
b/sci-physics/root/root-6.12.06-r11.ebuild
index 139fd7277d1..2cf1a95ecc9 100644
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r11.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-6.14.08-r4.ebuild 
b/sci-physics/root/root-6.14.08-r4.ebuild
index eeb19eb0b20..5bbe2ef1976 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-6.16.00-r4.ebuild 
b/sci-physics/root/root-6.16.00-r4.ebuild
index c4a7323b08a..a5cb23b4a64 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-6.18.04.ebuild 
b/sci-physics/root/root-6.18.04.ebuild
index 369dc19e6db..ff963889945 100644
--- a/sci-physics/root/root-6.18.04.ebuild
+++ b/sci-physics/root/root-6.18.04.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 5af6fb5eac0..2ced39aaf19 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs



[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/

2020-01-15 Thread Michał Górny
commit: 518e107a9a654dbcc5fc91d6e1dc17c8fc4d1eef
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 07:04:58 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:04:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518e107a

sci-visualization/paraview: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-visualization/paraview/paraview-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/paraview/paraview-5.6.1.ebuild 
b/sci-visualization/paraview/paraview-5.6.1.ebuild
index abbfa00a4e9..52e09353c23 100644
--- a/sci-visualization/paraview/paraview-5.6.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils 
toolchain-funcs
 
 MAIN_PV=$(ver_cut 0-1)



[gentoo-commits] repo/gentoo:master commit in: sci-libs/numkit/

2020-01-15 Thread Michał Górny
commit: 6878452b092c6ddba0e00d2f5c61314e8024e5aa
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:50:34 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6878452b

sci-libs/numkit: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/numkit/numkit-1.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild 
b/sci-libs/numkit/numkit-1.1.2.ebuild
index 19fc0f3c816..8fb64e296e6 100644
--- a/sci-libs/numkit/numkit-1.1.2.ebuild
+++ b/sci-libs/numkit/numkit-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ $PV = ** ]]; then
scm_eclass=git-r3



[gentoo-commits] repo/gentoo:master commit in: sci-libs/Shapely/

2020-01-15 Thread Michał Górny
commit: 03a91905d8394bab5b04900240300ec5358e7cd9
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:57:45 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03a91905

sci-libs/Shapely: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/Shapely/Shapely-1.5.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild 
b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
index 9c0df2cbe22..692e04da131 100644
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_optimization/

2020-01-15 Thread Michał Górny
commit: af33d339024f7a1d87c309ba2ebdf223c3c1e7d0
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:56:25 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af33d339

sci-libs/scikits_optimization: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 .../scikits_optimization-0.3.ebuild| 31 --
 1 file changed, 31 deletions(-)

diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild 
b/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
deleted file mode 100644
index aefab9cd031..000
--- a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/scikits_/scikits.}"
-
-DESCRIPTION="Python module for numerical optimization"
-HOMEPAGE="http://projects.scipy.org/scipy/scikits;
-SRC_URI="mirror://pypi/${PN:0:1}/scikits.optimization/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/scikits[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-   esetup.py test
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/

2020-01-15 Thread Michał Górny
commit: 7c319b1f21e6ab39c26cddaf0ba0c3bb251d6f5a
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:56:05 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c319b1f

sci-libs/scikits_learn: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild | 2 +-
 sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild| 2 +-
 sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild 
b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
index 991b1ca7d29..467c2124494 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild 
b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index a7cda1c289c..2f8f116d33b 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild 
b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index a7cda1c289c..2f8f116d33b 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_timeseries/

2020-01-15 Thread Michał Górny
commit: f536ad2d9da26850b619d24ccc052ec5c641e18e
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:56:44 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f536ad2d

sci-libs/scikits_timeseries: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 .../scikits_timeseries-0.91.3-r1.ebuild| 47 --
 1 file changed, 47 deletions(-)

diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r1.ebuild 
b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r1.ebuild
deleted file mode 100644
index 12d23e7fb04..000
--- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/scikits_/scikits.}"
-
-DESCRIPTION="SciPy module for manipulating, reporting, and plotting time 
series"
-HOMEPAGE="http://pytseries.sourceforge.net/index.html;
-SRC_URI="
-   mirror://sourceforge/pytseries/${MY_P}.tar.gz
-   doc? ( mirror://sourceforge/pytseries/${MY_P}-html_docs.zip )"
-
-LICENSE="BSD eGenixPublic-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   sci-libs/scikits[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/pytables[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-   esetup.py test
-}
-
-python_install() {
-   distutils-r1_python_install
-   rm "${D}"$(python_get_sitedir)/scikits/__init__.py || die
-}
-
-python_install_all() {
-   use doc && HTMLDOCS=( "${WORKDIR}/html" )
-   distutils-r1_python_install_all
-}



[gentoo-commits] repo/gentoo:master commit in: sci-physics/qutip/

2020-01-15 Thread Michał Górny
commit: 1f1976d355e7771587becfad8587dadc5cb3153d
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:58:47 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1976d3

sci-physics/qutip: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-physics/qutip/qutip-4.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/qutip/qutip-4.2.0.ebuild 
b/sci-physics/qutip/qutip-4.2.0.ebuild
index 52d699a8653..9bbf6fe19d2 100644
--- a/sci-physics/qutip/qutip-4.2.0.ebuild
+++ b/sci-physics/qutip/qutip-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/shogun/

2020-01-15 Thread Michał Górny
commit: 865fb907bfb6785f1845198f26c6137b8b88c4b4
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:58:03 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865fb907

sci-libs/shogun: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/shogun/shogun-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/shogun/shogun-5.0.0.ebuild 
b/sci-libs/shogun/shogun-5.0.0.ebuild
index 82a612f3707..81fa1c18b72 100644
--- a/sci-libs/shogun/shogun-5.0.0.ebuild
+++ b/sci-libs/shogun/shogun-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils flag-o-matic python-single-r1 toolchain-funcs versionator
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-01-15 Thread Michał Górny
commit: e153a0cbbcaa93370fed8807b03f60e84f6ed6e6
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:50:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e153a0cb

sci-libs/nlopt: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/nlopt/nlopt-2.4.2-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
index ff049980545..5a937cd80ed 100644
--- a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,10 @@ DEPEND="
octave? ( sci-mathematics/octave )
python? (
${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)"
 RDEPEND="${DEPEND}"
 



[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2020-01-15 Thread Michał Górny
commit: c366d2e26eebaecef660b88afb6f76b4a3ef721c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:58:28 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c366d2e2

sci-physics/espresso: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-physics/espresso/espresso-4.0.0-r1.ebuild| 2 +-
 sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 2 +-
 sci-physics/espresso/espresso-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild 
b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
index b969b400a5e..00b53caa2ef 100644
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild 
b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 4d969a356a2..5755eba6cdf 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 51c609793c3..b9d14d3937e 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig



[gentoo-commits] repo/gentoo:master commit in: sci-libs/pymmlib/

2020-01-15 Thread Michał Górny
commit: 6ba1c93b1ad090b04dbe0248848fc5318ed89fc0
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:55:37 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba1c93b

sci-libs/pymmlib: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/pymmlib/pymmlib-1.2.1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild 
b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
index a372a683218..e05c2a381dd 100644
--- a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
+++ b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,10 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/pygtkglext[${PYTHON_USEDEP}]
media-libs/freeglut
virtual/glu



[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/

2020-01-15 Thread Michał Górny
commit: 904aea5c1f8e00e7c8f92795657b34d68ae95c06
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:59:44 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904aea5c

sci-physics/root: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-physics/root/root-6.12.06-r11.ebuild | 2 +-
 sci-physics/root/root-6.14.08-r4.ebuild  | 2 +-
 sci-physics/root/root-6.16.00-r4.ebuild  | 2 +-
 sci-physics/root/root-6.18.04.ebuild | 2 +-
 sci-physics/root/root-.ebuild| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-physics/root/root-6.12.06-r11.ebuild 
b/sci-physics/root/root-6.12.06-r11.ebuild
index 2cf1a95ecc9..139fd7277d1 100644
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r11.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-6.14.08-r4.ebuild 
b/sci-physics/root/root-6.14.08-r4.ebuild
index 5bbe2ef1976..eeb19eb0b20 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-6.16.00-r4.ebuild 
b/sci-physics/root/root-6.16.00-r4.ebuild
index a5cb23b4a64..c4a7323b08a 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-6.18.04.ebuild 
b/sci-physics/root/root-6.18.04.ebuild
index ff963889945..369dc19e6db 100644
--- a/sci-physics/root/root-6.18.04.ebuild
+++ b/sci-physics/root/root-6.18.04.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 2ced39aaf19..5af6fb5eac0 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
prefix python-single-r1 toolchain-funcs



[gentoo-commits] repo/gentoo:master commit in: dev-python/geoalchemy2/

2020-01-15 Thread Michał Górny
commit: 0f652239c0736c750e1cac52e8fbc3b037c82686
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:57:33 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f652239

dev-python/geoalchemy2: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/geoalchemy2/geoalchemy2-0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild 
b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
index 9108b4f9d32..227d7b80336 100644
--- a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
+++ b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/

2020-01-15 Thread Michał Górny
commit: 35fbb469eeb84c740d4d40efa2789b0d7b2f40de
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 07:00:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35fbb469

sci-libs/scikits_learn: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild | 2 +-
 sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild 
b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index 2f8f116d33b..901e9afe5ff 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org;
+HOMEPAGE="https://scikit-learn.org;
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild 
b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index 2f8f116d33b..901e9afe5ff 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org;
+HOMEPAGE="https://scikit-learn.org;
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2020-01-15 Thread Michał Górny
commit: 9ab2591dbc80ed201ca0095ee58342d6eb160672
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:49:39 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab2591d

sci-libs/mathgl: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/mathgl/mathgl-2.4.1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.1.ebuild 
b/sci-libs/mathgl/mathgl-2.4.1.ebuild
index 461956958f1..81c1241a2fa 100644
--- a/sci-libs/mathgl/mathgl-2.4.1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,7 +38,13 @@ RDEPEND="
openmp? ( sys-cluster/openmpi )
pdf? ( media-libs/libharu )
png? ( media-libs/libpng:0 )
-   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+   python? (
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   ${PYTHON_DEPS}
+   )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_timeseries/

2020-01-15 Thread Michał Górny
commit: db2018c49872b5117c95b927f723dec6b5b85a4c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:56:52 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2018c4

sci-libs/scikits_timeseries: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild 
b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
index f67ebf2a2ef..b1dd82b3629 100644
--- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
+++ b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/

2020-01-15 Thread Michał Górny
commit: 54487bb4b714227bb48925c2316cd2305566f23e
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:55:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54487bb4

sci-libs/plplot: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/plplot/Manifest   |   1 -
 sci-libs/plplot/files/plplot-5.11.0-octave.patch   |  16 -
 .../files/plplot-5.12.0-java-install-path.patch|  13 -
 .../plplot/files/plplot-5.12.0-multiarch.patch |  49 ---
 .../files/plplot-5.12.0-ocaml-remove-rpath.patch   |  34 --
 sci-libs/plplot/files/replace-gdc-extensions.patch | 434 -
 sci-libs/plplot/metadata.xml   |   1 -
 sci-libs/plplot/plplot-5.12.0-r1.ebuild| 282 -
 8 files changed, 830 deletions(-)

diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index f8b1522a06a..782cbdef89d 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,2 +1 @@
-DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 
5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b
 SHA512 
5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 
41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe
 SHA512 
54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8

diff --git a/sci-libs/plplot/files/plplot-5.11.0-octave.patch 
b/sci-libs/plplot/files/plplot-5.11.0-octave.patch
deleted file mode 100644
index a2a41c96da7..000
--- a/sci-libs/plplot/files/plplot-5.11.0-octave.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- plplot_test/test_octave.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plplot_test/test_octave.sh.in b/plplot_test/test_octave.sh.in
-index 8a50d8b..8eb35fc 100755
 a/plplot_test/test_octave.sh.in
-+++ b/plplot_test/test_octave.sh.in
-@@ -35,7 +35,7 @@ echo "$TOPDIR"
- export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
- 
- # Launch an Octave script that exercises all the demos
--$octave -f -q  < test.error
-+$octave -f -q $octaveopts -p "$octavedir" < test.error
- 
- # Disable warnings about shadowed functions - PLplot is _supposed_ to shadow 
the core functions
- warning("off","Octave:shadowed-function");

diff --git a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch 
b/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch
deleted file mode 100644
index 2c053a2b166..000
--- a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Java libs are installed into an already prefixed path.
-
 a/bindings/java/CMakeLists.txt
-+++ b/bindings/java/CMakeLists.txt
-@@ -189,7 +189,7 @@
-   )
-   endif(APPLE)
- 
--  install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_HARDDIR})
-+  install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_DIR})
- 
-   set(JAVA_CLASSES)
-   foreach( srcfile ${JAVA_FILES_FULL} )

diff --git a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch 
b/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch
deleted file mode 100644
index 63e92f5aa5a..000
--- a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch
+++ /dev/null
@@ -1,49 +0,0 @@
 a/examples/c/Makefile.examples.in
-+++ b/examples/c/Makefile.examples.in
-@@ -25,9 +25,6 @@
- CC = @CC@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
--
- @extXdrawable_true@extXdrawable_EXECUTABLES_list = \
- @extXdrawable_true@   extXdrawable_demo$(EXEEXT)
- 
 a/examples/c++/Makefile.examples.in
-+++ b/examples/c++/Makefile.examples.in
-@@ -25,10 +25,7 @@
- CXX = @CXX@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
- @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
--@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@
- 
- @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
- @wxwidgets_true@  @wxdemo_name@$(EXEEXT)
 a/examples/f95/Makefile.examples.in
-+++ b/examples/f95/Makefile.examples.in
-@@ -25,9 +25,6 @@
- F95 = @FC@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--FORTRAN_RPATHCMD = @FORTRAN_RPATHCMD@
--
- EXECUTABLES_list = \
-x00f$(EXEEXT) \
-x01f$(EXEEXT) \
 a/examples/tk/Makefile.examples.in
-+++ b/examples/tk/Makefile.examples.in
-@@ -24,9 +24,6 @@
- CC = @CC@
- EXEEXT = @EXEEXT@
- 
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@
--
- EXECUTABLES_list = xtk01$(EXEEXT)
- # Second and fourth examples depend on itk.
- @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT)


[gentoo-commits] repo/gentoo:master commit in: sci-libs/shogun/

2020-01-15 Thread Michał Górny
commit: 9d64333449d73cfc7544671ad53d8dce924abb8c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 07:00:50 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d643334

sci-libs/shogun: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/shogun/shogun-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/shogun/shogun-5.0.0.ebuild 
b/sci-libs/shogun/shogun-5.0.0.ebuild
index 81fa1c18b72..3bca4c41c56 100644
--- a/sci-libs/shogun/shogun-5.0.0.ebuild
+++ b/sci-libs/shogun/shogun-5.0.0.ebuild
@@ -11,7 +11,7 @@ MYPV=$(get_version_component_range 1-2)
 MYPD=${PN}-data-0.9
 
 DESCRIPTION="Large Scale Machine Learning Toolbox"
-HOMEPAGE="http://shogun-toolbox.org/;
+HOMEPAGE="https://shogun-toolbox.org/;
 SRC_URI="
ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2
test? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_optimization/

2020-01-15 Thread Michał Górny
commit: 2d4d0f37038f90755ab4b27cdd58eba4da48015c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:56:32 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4d0f37

sci-libs/scikits_optimization: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild 
b/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
index 3dfd78dd638..a86a8204ee9 100644
--- a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
+++ b/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/deep_merge/

2020-01-15 Thread Hans de Graaff
commit: ffa92ebeee293998e617e54faede21eac7cc2960
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jan 16 06:21:03 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jan 16 06:52:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa92ebe

dev-ruby/deep_merge: add ruby27

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/deep_merge/deep_merge-1.2.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild 
b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
index edbfb391a7c..2a7e95330b4 100644
--- a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
+++ b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby-augeas/

2020-01-15 Thread Hans de Graaff
commit: 44bdc23143a1d8d11aa350fa84e96f7a6d0b2df8
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jan 16 06:40:16 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jan 16 06:52:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bdc231

dev-ruby/ruby-augeas: add ruby27

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild 
b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild
index 262229ffbf2..a3292c31020 100644
--- a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild
+++ b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_DOCDIR="doc/site/api"
 RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby-ldap/

2020-01-15 Thread Hans de Graaff
commit: bde6084f55d81dd00eba71d4a6b5795213d89ba2
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jan 16 06:43:14 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jan 16 06:52:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde6084f

dev-ruby/ruby-ldap: add ruby27

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild 
b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
index f619ce7d024..ffe7a0ab521 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit multilib ruby-fakegem
 



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby-shadow/

2020-01-15 Thread Hans de Graaff
commit: e5478fd9224ba6289b8ce94537470bc0735ba63c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jan 16 06:44:47 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jan 16 06:52:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5478fd9

dev-ruby/ruby-shadow: add ruby27

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild 
b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
index e6d5a34e31f..edc5690fc4c 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/introspection/

2020-01-15 Thread Hans de Graaff
commit: e52e6e01354bdb40f973cd9b1bfe9f9c6c5b1219
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jan 16 06:37:06 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jan 16 06:52:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52e6e01

dev-ruby/introspection: add ruby27

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/introspection/introspection-0.0.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild 
b/dev-ruby/introspection/introspection-0.0.4.ebuild
index 1747257040d..59673f4fcea 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/hocon/

2020-01-15 Thread Hans de Graaff
commit: f4c28f078e71a9cd8ca53c69055b30880b4c77f6
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jan 16 06:51:31 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jan 16 06:52:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c28f07

dev-ruby/hocon: add ruby27

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/hocon/hocon-1.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/hocon/hocon-1.3.0.ebuild 
b/dev-ruby/hocon/hocon-1.3.0.ebuild
index c9a3580f249..ce808c13ff2 100644
--- a/dev-ruby/hocon/hocon-1.3.0.ebuild
+++ b/dev-ruby/hocon/hocon-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"



[gentoo-commits] repo/gentoo:master commit in: virtual/ruby-ssl/

2020-01-15 Thread Hans de Graaff
commit: 65ca176c08fea86a7873671b980803d0b7539c19
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jan 16 06:47:14 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jan 16 06:52:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ca176c

virtual/ruby-ssl: add ruby27

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 virtual/ruby-ssl/ruby-ssl-11.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/virtual/ruby-ssl/ruby-ssl-11.ebuild 
b/virtual/ruby-ssl/ruby-ssl-11.ebuild
index 106dc78ec38..ac581eac45b 100644
--- a/virtual/ruby-ssl/ruby-ssl-11.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit ruby-ng
 
@@ -14,6 +14,7 @@ RDEPEND="
ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] )
ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] )
ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] )
+   ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] )
 "
 
 pkg_setup() { :; }



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/vmd/

2020-01-15 Thread Michał Górny
commit: 2ea12cd580ee77a8b6571ecb80b6ac2481904a2d
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:28:38 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea12cd5

sci-chemistry/vmd: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/vmd/vmd-1.9.2.ebuild| 7 +--
 sci-chemistry/vmd/vmd-1.9.3-r1.ebuild | 7 +--
 sci-chemistry/vmd/vmd-1.9.3-r2.ebuild | 7 +--
 sci-chemistry/vmd/vmd-1.9.3.ebuild| 7 +--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sci-chemistry/vmd/vmd-1.9.2.ebuild 
b/sci-chemistry/vmd/vmd-1.9.2.ebuild
index 4bc9360f009..2cee984cdd4 100644
--- a/sci-chemistry/vmd/vmd-1.9.2.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1
dev-lang/perl
dev-libs/expat
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1

diff --git a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild 
b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
index 3f24f85d627..abf5d03202f 100644
--- a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1:0=
dev-lang/perl
dev-libs/expat
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1

diff --git a/sci-chemistry/vmd/vmd-1.9.3-r2.ebuild 
b/sci-chemistry/vmd/vmd-1.9.3-r2.ebuild
index 02ad806afbe..8d8897a57f8 100644
--- a/sci-chemistry/vmd/vmd-1.9.3-r2.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1:0=
dev-lang/perl
dev-libs/expat
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1

diff --git a/sci-chemistry/vmd/vmd-1.9.3.ebuild 
b/sci-chemistry/vmd/vmd-1.9.3.ebuild
index c1480738aa4..01098a723de 100644
--- a/sci-chemistry/vmd/vmd-1.9.3.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1
dev-lang/perl
dev-libs/expat
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/nmrglue/

2020-01-15 Thread Michał Górny
commit: bff287c58026660efee351eea84f988ea559ddab
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:34:47 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff287c5

sci-chemistry/nmrglue: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild 
b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
index 5b878a0faa8..78539bfaf77 100644
--- a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
+++ b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A module for working with NMR data in Python"
-HOMEPAGE="http://nmrglue.com/;
+HOMEPAGE="https://nmrglue.com/;
 
SRC_URI="https://github.com/jjhelmus/nmrglue/releases/download/v${PV}/${P}.tar.gz;
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c0b83f

sci-chemistry/relax: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index 5a99d4554ba..da182eead0a 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,10 @@ RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
sci-chemistry/molmol
sci-chemistry/pymol[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2020-01-15 Thread Michał Górny
commit: d9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:29:12 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ef686a

sci-geosciences/grass: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-geosciences/grass/grass-7.4.4-r1.ebuild | 7 +--
 sci-geosciences/grass/grass-7.4.4.ebuild| 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/grass/grass-7.4.4-r1.ebuild 
b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
index 5c87d32bf2a..4fc91618386 100644
--- a/sci-geosciences/grass/grass-7.4.4-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc 
opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
>=app-admin/eselect-1.2
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
media-libs/libprojectm
sci-libs/gdal
sys-libs/gdbm

diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild 
b/sci-geosciences/grass/grass-7.4.4.ebuild
index e067fbf0aaa..e875e74c758 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc 
opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
>=app-admin/eselect-1.2
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
media-libs/libprojectm
sci-libs/gdal
sys-libs/gdbm



[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/

2020-01-15 Thread Michał Górny
commit: 8cbd3b8d70bc07daa677dbee7205238478327cc3
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:23:56 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbd3b8d

net-wireless/gnuradio: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild |  5 -
 net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild   | 10 --
 net-wireless/gnuradio/gnuradio-3.7..ebuild   | 10 --
 net-wireless/gnuradio/gnuradio-.ebuild   |  5 -
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild 
b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index 03fd5605be2..5c9dcc31678 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${PYTHON_DEPS}
)
grc? (
dev-python/lxml[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/pygtk:2[${PYTHON_USEDEP}]
)
jack? (

diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild 
b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
index 3c132c32fca..afa455f3565 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
@@ -64,7 +64,10 @@ RDEPEND="${PYTHON_DEPS}
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)
jack? (
media-sound/jack-audio-connection-kit
@@ -90,7 +93,10 @@ RDEPEND="${PYTHON_DEPS}
)
wxwidgets? (
dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)
zeromq? ( >=net-libs/zeromq-2.1.11 )
"

diff --git a/net-wireless/gnuradio/gnuradio-3.7..ebuild 
b/net-wireless/gnuradio/gnuradio-3.7..ebuild
index 15027d0285d..ff1b29da54e 100644
--- a/net-wireless/gnuradio/gnuradio-3.7..ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7..ebuild
@@ -61,7 +61,10 @@ RDEPEND="${PYTHON_DEPS}
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)
jack? (
media-sound/jack-audio-connection-kit
@@ -80,7 +83,10 @@ RDEPEND="${PYTHON_DEPS}
)
wxwidgets? (
dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)
zeromq? ( >=net-libs/zeromq-2.1.11 )
"

diff --git a/net-wireless/gnuradio/gnuradio-.ebuild 
b/net-wireless/gnuradio/gnuradio-.ebuild
index e99366eabc8..3861b55c857 100644
--- a/net-wireless/gnuradio/gnuradio-.ebuild
+++ b/net-wireless/gnuradio/gnuradio-.ebuild
@@ -50,7 +50,10 @@ RDEPEND="${PYTHON_DEPS}
>=dev-lang/orc-0.4.12
dev-libs/boost:0=[${PYTHON_USEDEP}]
!<=dev-libs/boost-1.52.0-r6:0/1.52
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/six[${PYTHON_USEDEP}]
sci-libs/fftw:3.0=
alsa? (



[gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/

2020-01-15 Thread Michał Górny
commit: f7b62181e1a4a8d2f24f15e07ee4cdc201f43d31
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:12:19 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b62181

media-libs/aubio: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/aubio/aubio-0.4.7.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-libs/aubio/aubio-0.4.7.ebuild 
b/media-libs/aubio/aubio-0.4.7.ebuild
index 25b51776ece..544e1262ead 100644
--- a/media-libs/aubio/aubio-0.4.7.ebuild
+++ b/media-libs/aubio/aubio-0.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,10 @@ RDEPEND="
libsamplerate? ( media-libs/libsamplerate )
python? (
${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)
sndfile? ( media-libs/libsndfile )
 "



[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-01-15 Thread Michał Górny
commit: 9b431e299a46705b99fa0bc8e1c190e637abcd51
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:33:32 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b431e29

sci-libs/libsigrok: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index a360d439247..4b21e16866f 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-single-r1 java-pkg-opt-2
 

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index a55893a0199..af1e257b901 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils
 

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index b34f77155e0..ef3ba1331db 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 USE_RUBY="ruby26 ruby25 ruby24"
 RUBY_OPTIONAL="yes"
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 5c3c959d1d2..5f5f5dc0de7 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 USE_RUBY="ruby26 ruby25 ruby24"
 RUBY_OPTIONAL="yes"
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/

2020-01-15 Thread Michał Górny
commit: 1c85811c6cc882505a17939055632210293f8aed
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:10:21 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:10:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c85811c

media-gfx/openvdb: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/openvdb/openvdb-4.0.2-r2.ebuild | 2 +-
 media-gfx/openvdb/openvdb-5.2.0.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild 
b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 718926ffc40..e54468f1c2a 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils flag-o-matic python-single-r1
 

diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild 
b/media-gfx/openvdb/openvdb-5.2.0.ebuild
index 879fe534b06..3bbdbdb4fb2 100644
--- a/media-gfx/openvdb/openvdb-5.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils flag-o-matic python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/seawater/

2020-01-15 Thread Michał Górny
commit: 62ffdd6b3ea586813915d76ba3706d69a971fea6
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:30:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ffdd6b

sci-geosciences/seawater: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 sci-geosciences/seawater/Manifest  |  1 -
 sci-geosciences/seawater/seawater-2.0.1.ebuild | 21 -
 2 files changed, 22 deletions(-)

diff --git a/sci-geosciences/seawater/Manifest 
b/sci-geosciences/seawater/Manifest
index f75fc8b1fb1..640b6becb65 100644
--- a/sci-geosciences/seawater/Manifest
+++ b/sci-geosciences/seawater/Manifest
@@ -1,2 +1 @@
-DIST seawater-2.0.1.tar.gz 2680741 BLAKE2B 
5c1e8f5bd3cdc7a093732657d8d774f13d9a00785ea736617b8837076e740eab384caa61ae11b6f429db7bcf57f0ee1af8fd0c6dc917f3c3b50b25ee93a88920
 SHA512 
9d59d5c41f46311240934e18b8727514babc4e714553ba595017a17b95edf040c10ac7161f607c7e262c751e238a909d55a639a94fab4d4ce004a4c297af1e79
 DIST seawater-3.3.4.tar.gz 22899 BLAKE2B 
1f3af9e1d592b2c7075711f0431dc9198c41047e46cefcbc2466eaad92bad1e9894e63e6d3846d08df00ad21df8dc773cd1822915896658fe06e298ed36b83ef
 SHA512 
1e448c0473809ae5022eda6b695d67db85a22767d068d7a025bdb1ad49a09f0f336e5f43b6a2fd869d39082895e45e7fa4ae2af98c1f2d613d28393f88ef27af

diff --git a/sci-geosciences/seawater/seawater-2.0.1.ebuild 
b/sci-geosciences/seawater/seawater-2.0.1.ebuild
deleted file mode 100644
index 324d8ac5d09..000
--- a/sci-geosciences/seawater/seawater-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for 
MATLAB"
-HOMEPAGE="https://pypi.org/project/seawater/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-
-DOCS=( "${S}"/docs/. )



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/;
+HOMEPAGE="https://www.nmr-relax.com/;
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2;
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/nmrdepaker/

2020-01-15 Thread Michał Górny
commit: da3b4d2d53e57f5d8c7494a6a0d6097a5994d48c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:25:58 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3b4d2d

sci-chemistry/nmrdepaker: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild 
b/sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild
index 5ccd2c4508b..29a13632c88 100644
--- a/sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild
+++ b/sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,10 @@ IUSE=""
 
 RDEPEND="
>=dev-python/matplotlib-0.98.5[gtk2,${PYTHON_USEDEP}]
-   >=dev-python/numpy-1.2[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.2[${PYTHON_USEDEP}]
+   )
>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/GromacsWrapper/

2020-01-15 Thread Michał Górny
commit: bebba32d00cd8635166a3b2856696000f20d4df9
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:25:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebba32d

sci-chemistry/GromacsWrapper: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild 
b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild
index e9bde2396c6..b80d49a156d 100644
--- a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild
+++ b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ $PV = ** ]]; then
scm_eclass=git-r3



[gentoo-commits] repo/gentoo:master commit in: sci-libs/keras-applications/

2020-01-15 Thread Michał Górny
commit: 40dd5a66d6be1122f1c22d5e731eb43dbd0d0f34
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:32:06 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40dd5a66

sci-libs/keras-applications: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/keras-applications/keras-applications-1.0.7.ebuild | 2 +-
 sci-libs/keras-applications/keras-applications-1.0.8.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild 
b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
index d83037357a9..97ad5b05486 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Keras deep learning library reference implementations of deep 
learning models"

diff --git a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild 
b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
index 8468b5755fa..1d5f4c3b2f3 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Keras deep learning library reference implementations of deep 
learning models"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol/

2020-01-15 Thread Michał Górny
commit: d1a502c6076dba392a82e7a3a476f65f4ac8cf55
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a502c6

sci-chemistry/pymol: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild | 5 -
 sci-chemistry/pymol/pymol-2.3.0-r1.ebuild   | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild 
b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
index 0bcafb2e322..d6864f00a97 100644
--- a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
@@ -22,7 +22,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
 IUSE="web"
 
 DEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/pmw:py2[${PYTHON_USEDEP}]
dev-python/pyopengl[${PYTHON_USEDEP}]
media-libs/freeglut

diff --git a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild 
b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
index b84c2769806..7591fe38393 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
@@ -22,7 +22,10 @@ IUSE="web"
 DEPEND="
dev-libs/msgpack[cxx]
dev-libs/mmtf-cpp
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/pmw:py2[${PYTHON_USEDEP}]
dev-python/pyopengl[${PYTHON_USEDEP}]
dev-python/PyQt5[opengl,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/printrun/

2020-01-15 Thread Michał Górny
commit: 280f0df81189bff7aa9b50d1cd6ee219506e5723
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:10:51 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280f0df8

media-gfx/printrun: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/printrun/printrun-20150310-r3.ebuild | 7 +--
 media-gfx/printrun/printrun-.ebuild| 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-gfx/printrun/printrun-20150310-r3.ebuild 
b/media-gfx/printrun/printrun-20150310-r3.ebuild
index 9159486852d..0cf2154043a 100644
--- a/media-gfx/printrun/printrun-20150310-r3.ebuild
+++ b/media-gfx/printrun/printrun-20150310-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,10 @@ IUSE=""
 DEPEND="
app-text/psutils
dev-python/dbus-python[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pyglet[${PYTHON_USEDEP}]
dev-python/pyserial[${PYTHON_USEDEP}]

diff --git a/media-gfx/printrun/printrun-.ebuild 
b/media-gfx/printrun/printrun-.ebuild
index 6143c13b917..8b8f31fa4ec 100644
--- a/media-gfx/printrun/printrun-.ebuild
+++ b/media-gfx/printrun/printrun-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,10 @@ IUSE=""
 DEPEND="
app-text/psutils
dev-python/dbus-python[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pyglet[${PYTHON_USEDEP}]
dev-python/pyserial[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/nmrglue/

2020-01-15 Thread Michał Górny
commit: b630c765490f9b7d554cc566ec42a83d18cdc8f9
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:26:18 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b630c765

sci-chemistry/nmrglue: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild 
b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
index 49d670980a0..5b878a0faa8 100644
--- a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
+++ b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol/

2020-01-15 Thread Michał Górny
commit: 903ca8dc261b929d0b6d57f62e2ec18129cb14ec
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:36:25 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903ca8dc

sci-chemistry/pymol: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild | 4 ++--
 sci-chemistry/pymol/pymol-2.3.0-r1.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild 
b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
index d6864f00a97..f60de8dcb18 100644
--- a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="tk"
 inherit distutils-r1 eutils fdo-mime flag-o-matic versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/;
+HOMEPAGE="https://www.pymol.org/;
 SRC_URI="
https://dev.gentoo.org/~jlec/distfiles/${P}.png.xz
mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 
1-2)/${PN}-v${PV}.tar.bz2

diff --git a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild 
b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
index 7591fe38393..6e8433b403e 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 desktop eutils flag-o-matic xdg-utils
 
 DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/;
+HOMEPAGE="https://www.pymol.org/;
 SRC_URI="
https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz 
-> ${P}.tar.gz



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/ParmEd/

2020-01-15 Thread Michał Górny
commit: 811d91ea61e39b7544ed6997fa3a89059d24bfdb
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:26:38 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811d91ea

sci-chemistry/ParmEd: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild | 2 +-
 sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild 
b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
index ab581daea0c..b7a964b8165 100644
--- a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
+++ b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ $PV = ** ]]; then
scm_eclass=git-2

diff --git a/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild 
b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
index a2a476a1d5e..37f959acdc6 100644
--- a/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
+++ b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ $PV = ** ]]; then
scm_eclass=git-r3



[gentoo-commits] repo/gentoo:master commit in: sci-libs/getdata/

2020-01-15 Thread Michał Górny
commit: 7a3fa6dba6728adfff29106b05c36b06f5733d48
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:31:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3fa6db

sci-libs/getdata: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/getdata/getdata-0.9.0-r1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-libs/getdata/getdata-0.9.0-r1.ebuild 
b/sci-libs/getdata/getdata-0.9.0-r1.ebuild
index 1e6aa25c7ab..65085d535e5 100644
--- a/sci-libs/getdata/getdata-0.9.0-r1.ebuild
+++ b/sci-libs/getdata/getdata-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,13 @@ DEPEND="
bzip2? ( app-arch/bzip2 )
lzma? ( app-arch/xz-utils )
perl? ( dev-lang/perl )
-   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )"
+   python? (
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   ${PYTHON_DEPS}
+   )"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-remove-python-test.patch" )



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pdb2pqr/

2020-01-15 Thread Michał Górny
commit: 1c501ce62778e8e8dda63bb285de2ae421551826
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:06 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c501ce6

sci-chemistry/pdb2pqr: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild 
b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
index 46766b7715e..8f367caec92 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
sci-chemistry/openbabel-python[${PYTHON_USEDEP}]
opal? ( dev-python/zsi[${PYTHON_USEDEP}] )
pdb2pka? ( sci-chemistry/apbs[${PYTHON_USEDEP},-mpi] )"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemex/

2020-01-15 Thread Michał Górny
commit: 7691b0f7a661771a181a181cad28abe0e2dad526
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:24:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7691b0f7

sci-chemistry/chemex: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/chemex/chemex-0.6.1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/chemex/chemex-0.6.1.ebuild 
b/sci-chemistry/chemex/chemex-0.6.1.ebuild
index 28af7461892..9e4f47aafc9 100644
--- a/sci-chemistry/chemex/chemex-0.6.1.ebuild
+++ b/sci-chemistry/chemex/chemex-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,10 @@ IUSE=""
 
 RDEPEND="
>=dev-python/matplotlib-1.1[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
>=sci-libs/scipy-0.11[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/

2020-01-15 Thread Michał Górny
commit: 59ff8a1c12fd7e19ccb8436688ef222b774a164a
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:13:02 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ff8a1c

media-libs/aubio: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/aubio/aubio-0.4.8.ebuild | 2 +-
 media-libs/aubio/aubio-0.4.9.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/aubio/aubio-0.4.8.ebuild 
b/media-libs/aubio/aubio-0.4.8.ebuild
index dbdea5d92c6..c0e64da911d 100644
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ b/media-libs/aubio/aubio-0.4.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 

diff --git a/media-libs/aubio/aubio-0.4.9.ebuild 
b/media-libs/aubio/aubio-0.4.9.ebuild
index 4406674b7a9..b03de834c4f 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pdb2pqr/

2020-01-15 Thread Michał Górny
commit: 86dd55fe750ec8bfed6c980e0ae4abc8c4f08b3c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:35:49 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86dd55fe

sci-chemistry/pdb2pqr: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild 
b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
index 8f367caec92..ad95f8f410f 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit scons-utils fortran-2 flag-o-matic python-r1 toolchain-funcs
 
 DESCRIPTION="Automated pipeline for performing Poisson-Boltzmann 
electrostatics calculations"
-HOMEPAGE="http://www.poissonboltzmann.org/;
+HOMEPAGE="https://www.poissonboltzmann.org/;
 
SRC_URI="https://github.com/Electrostatics/apbs-${PN}/releases/download/${P}/${PN}-src-${PV}.tar.gz;
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-biology/HTSeq/

2020-01-15 Thread Michał Górny
commit: 506d03fd7b11f6257955611053672bce3874da1d
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:24:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:37:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506d03fd

sci-biology/HTSeq: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-biology/HTSeq/HTSeq-0.9.1.ebuild | 2 +-
 sci-biology/HTSeq/HTSeq-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/HTSeq/HTSeq-0.9.1.ebuild 
b/sci-biology/HTSeq/HTSeq-0.9.1.ebuild
index 8e051640e6d..18a07a7b9f9 100644
--- a/sci-biology/HTSeq/HTSeq-0.9.1.ebuild
+++ b/sci-biology/HTSeq/HTSeq-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

diff --git a/sci-biology/HTSeq/HTSeq-.ebuild 
b/sci-biology/HTSeq/HTSeq-.ebuild
index 8e051640e6d..18a07a7b9f9 100644
--- a/sci-biology/HTSeq/HTSeq-.ebuild
+++ b/sci-biology/HTSeq/HTSeq-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-01-15 Thread Michał Górny
commit: 6239799ea9a410047ee324758ed6f5423626cbfc
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:09:42 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:09:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6239799e

media-gfx/mypaint: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/mypaint/mypaint-1.2.1-r3.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
index a557d74eb68..d30ef32ed43 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,10 @@ LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl 
pt_BR ro ru sl sv uk z
 
 RDEPEND="${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
>=dev-libs/json-c-0.11:=



[gentoo-commits] repo/gentoo:master commit in: sci-libs/keras-preprocessing/

2020-01-15 Thread Michał Górny
commit: fee6ec1ac792ae5e3ad615c6e22d48482faebb5a
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:32:21 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee6ec1a

sci-libs/keras-preprocessing: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild | 2 +-
 sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild 
b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
index f75f64631d3..58c165ae501 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Easy data preprocessing and data augmentation for deep learning 
models"

diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild 
b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
index 90f33c01b7d..e40aaa9f033 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Easy data preprocessing and data augmentation for deep learning 
models"



[gentoo-commits] repo/gentoo:master commit in: dev-python/root_numpy/

2020-01-15 Thread Michał Górny
commit: e9d910eae925063bec27d630388da635cc58696f
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:36:50 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d910ea

dev-python/root_numpy: Remove old (py2)

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/root_numpy/Manifest|  1 -
 dev-python/root_numpy/root_numpy-4.4.0.ebuild | 36 ---
 2 files changed, 37 deletions(-)

diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index 8f35909f970..c4c95d223d4 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -1,2 +1 @@
-DIST root_numpy-4.4.0.tar.gz 441522 BLAKE2B 
af3b0b08e80e7cba57730cdb32719ad56be914b5329d953693b898f2bb30c19b3bfa7bb4594e7fed819b08a3ba6894580e38d03f9520ecffab7a67daa17898be
 SHA512 
24afa043e4bdaa74412c36ff90ee8c1fc411801d9dc394ab5036035924910a7f4f304c5c90f4c5f389aaee9dda07b0b7e25566e68c4da424f1b4d59e6184f5b2
 DIST root_numpy-4.7.3.tar.gz 522432 BLAKE2B 
9aab3090c894d8917218a68d83269c0f426ee4e7f81628081e9e710c4239bba5e8f88dcb1d91156cf02c7c36b1ee5d03cdd0c3931ca6e2f3eee6c78201386705
 SHA512 
7c2684ac0e4e68676304e2a72c7169e0299cfea5b4b63f2525a422974ca83f9c9b4f9f11d992acef7d8565cda7f7a85bd13621513cd7c47f1887aaa0cc46d6e7

diff --git a/dev-python/root_numpy/root_numpy-4.4.0.ebuild 
b/dev-python/root_numpy/root_numpy-4.4.0.ebuild
deleted file mode 100644
index 9df21e01009..000
--- a/dev-python/root_numpy/root_numpy-4.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface between ROOT and numpy"
-HOMEPAGE="https://github.com/rootpy/root_numpy;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-physics/root[python,${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-   cd "${BUILD_DIR}" || die
-   nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-   use examples && local EXAMPLES=( tutorial/. )
-   distutils-r1_python_install_all
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/ngxtop/

2020-01-15 Thread Michał Górny
commit: 538149c9dfe47fff4b1976b27e8e3ff78caf123e
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:44:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538149c9

app-admin/ngxtop: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild 
b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
index 6b3bb539312..3b1214dbc2b 100644
--- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1



[gentoo-commits] repo/gentoo:master commit in: app-admin/ngxtop/

2020-01-15 Thread Michał Górny
commit: 58dbddd6612090134fc44a9a3f313f72cc44cf7f
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:44:03 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58dbddd6

app-admin/ngxtop: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 app-admin/ngxtop/Manifest   |  1 -
 app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild | 27 ---
 2 files changed, 28 deletions(-)

diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index 2f2c5a18947..e67fa82d45e 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -1,2 +1 @@
-DIST ngxtop-0.0.2.tar.gz 9668 BLAKE2B 
becd0ba58490ad26dce2166ddf39d2064e797bc26da64b70e38e137078130f5c21a95fffccf656fcaa35ca595fe769bd4b59036e9e0993afa75d062b49714f10
 SHA512 
49cd0f43bb7dae79253a13c4011a5bb92a33c137d0ce7a8de7d57ba18624ec1e10bf462a32fe96d1045ed85ba9c273260a846fb1983e189884e65c1621a39d43
 DIST ngxtop-0.0.3_pre141201.tar.xz 9012 BLAKE2B 
9e8a7d2c3aadb302e0923fc7cb5b0219a56489993fdcf83fb7b38ba67036f2b5cae7e5bba2c9efc81d858c58b0f1e25f17fa8cc600e77f76b45aafd9d5a3354e
 SHA512 
ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde

diff --git a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild 
b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
deleted file mode 100644
index e8ccdd2483a..000
--- a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="real-time metrics for nginx server (and others)"
-HOMEPAGE="https://github.com/lebinh/ngxtop;
-SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-   dev-python/docopt[${PYTHON_USEDEP}]
-   dev-python/pyparsing[${PYTHON_USEDEP}]
-   dev-python/tabulate[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}"/${P}-py3.patch )



[gentoo-commits] repo/gentoo:master commit in: dev-python/root_numpy/

2020-01-15 Thread Michał Górny
commit: 530587ff5f300d772256a062ee83a8be70251f58
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:37:06 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530587ff

dev-python/root_numpy: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/root_numpy/root_numpy-4.7.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/root_numpy/root_numpy-4.7.3.ebuild 
b/dev-python/root_numpy/root_numpy-4.7.3.ebuild
index 0e4f2ac5824..d76b3145562 100644
--- a/dev-python/root_numpy/root_numpy-4.7.3.ebuild
+++ b/dev-python/root_numpy/root_numpy-4.7.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/

2020-01-15 Thread Michał Górny
commit: 36dd04e06c80430e3cd210b2050f029d5b05af12
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:40:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36dd04e0

dev-db/mycli: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-db/mycli/mycli-1.19.0.ebuild | 2 +-
 dev-db/mycli/mycli-1.20.1.ebuild | 2 +-
 dev-db/mycli/mycli-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mycli/mycli-1.19.0.ebuild b/dev-db/mycli/mycli-1.19.0.ebuild
index 382fd13f0c6..2927d8196bb 100644
--- a/dev-db/mycli/mycli-1.19.0.ebuild
+++ b/dev-db/mycli/mycli-1.19.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"

diff --git a/dev-db/mycli/mycli-1.20.1.ebuild b/dev-db/mycli/mycli-1.20.1.ebuild
index 4191db66b76..b702b50548b 100644
--- a/dev-db/mycli/mycli-1.20.1.ebuild
+++ b/dev-db/mycli/mycli-1.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"

diff --git a/dev-db/mycli/mycli-.ebuild b/dev-db/mycli/mycli-.ebuild
index 1e46e80c56e..282b53f82e8 100644
--- a/dev-db/mycli/mycli-.ebuild
+++ b/dev-db/mycli/mycli-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git;
 inherit distutils-r1 git-r3
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/cli_helpers/

2020-01-15 Thread Michał Górny
commit: eb916604e6e2e6dfbfcc6b4754e32fd7fe9800ac
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:42:15 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb916604

dev-python/cli_helpers: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/cli_helpers/Manifest |  3 ---
 dev-python/cli_helpers/cli_helpers-0.2.0.ebuild | 21 -
 dev-python/cli_helpers/cli_helpers-1.0.0.ebuild | 22 --
 dev-python/cli_helpers/cli_helpers-1.0.1.ebuild | 23 ---
 4 files changed, 69 deletions(-)

diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 741d17dba7f..ab47dcb5b66 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1 @@
-DIST cli_helpers-0.2.0.tar.gz 33855 BLAKE2B 
8509fd6ea4ce1af77a522d36f98261a019d6b4b7250549af8014c4aba01bc4f4a63106c55b3d5ce40f058f0927db4044af51c7f948879d44a452b35369df8f2b
 SHA512 
7dfa9791f472ccba3d49d0e87daf859257e74349cfbd8920a624f3e8d6905d8c8b7fa7be70eda97091963e548fa16dfbb1171e198cbbaa9d7810bff2321ebe54
-DIST cli_helpers-1.0.0.tar.gz 23269 BLAKE2B 
2de1729b32a690d5832cc956c30bdf3ec35b3bfa94d1eed391dc18a1aadfd7229a1cbb4368a08406a3c6bf2bf59c835ac975bee797a58dbb3121c34586632d1f
 SHA512 
8137b081cfe3d226c63cc7c17165f884a42147ea184d11a1e0ee5805f2d22bce37ded580a0c15566bcb057df4c39f2685595d74b2e21d46932e2e635f77eec68
-DIST cli_helpers-1.0.1.tar.gz 23382 BLAKE2B 
544bf4165315a6459ba203efc7f55e3a48d4af8a12a4a3dcd4742c9e8f9d72c9163784e4adc42f5910d5ffd42d957aca47f4765e01cc9fc8c17649494b0396c4
 SHA512 
f4999f20d7f785a143d672ea9e62375dc6cb1abf093796dedcc01003970931a397096cded3515d060b47aa8e38b2a03fbe12f919f84451365d078126a5b35021
 DIST cli_helpers-1.2.1.tar.gz 31104 BLAKE2B 
ded2b9b7825ddaeb33acf64b65362251f773a4a0a74aec1c79bdd8ef77f8f6953dd8761fd926f7a2b210c69534bee220f88e816dd63277b27db15b400510c9f3
 SHA512 
299fa4984b7c76e6be0527f040582242a746938f8725b6193895f9bbb835c82078658bbb8d1eac26f3c8d2dad93139fd600e7c8d7c2d89777de27a5b26cf

diff --git a/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild 
b/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
deleted file mode 100644
index dc30a060f6a..000
--- a/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-
-HOMEPAGE="http://cli-helpers.rtfd.io/;
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-   dev-python/terminaltables[${PYTHON_USEDEP}]
-   >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-"

diff --git a/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild 
b/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
deleted file mode 100644
index b0424fb4e6d..000
--- a/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-
-HOMEPAGE="http://cli-helpers.rtfd.io/;
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-   >=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
-   >=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
-   >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-"

diff --git a/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild 
b/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
deleted file mode 100644
index b9152ddd69f..000
--- a/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-
-HOMEPAGE="http://cli-helpers.rtfd.io/;
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-   >=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]
-   >=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
-   >=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
-   >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-"



[gentoo-commits] repo/gentoo:master commit in: dev-db/pgcli/

2020-01-15 Thread Michał Górny
commit: 85c641360da2d529770a1b7fcb73dee75a42abf2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:40:54 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c64136

dev-db/pgcli: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-db/pgcli/pgcli-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/pgcli/pgcli-2.0.2.ebuild b/dev-db/pgcli/pgcli-2.0.2.ebuild
index 3e2a37d160b..efae77fb995 100644
--- a/dev-db/pgcli/pgcli-2.0.2.ebuild
+++ b/dev-db/pgcli/pgcli-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"



[gentoo-commits] repo/gentoo:master commit in: sci-visualization/yt/

2020-01-15 Thread Michał Górny
commit: da26c69209bc11e13646c2f6028c0d7a9cc9ced5
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:54:33 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da26c692

sci-visualization/yt: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-visualization/yt/yt-3.3.5.ebuild | 2 +-
 sci-visualization/yt/yt-3.4.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/yt/yt-3.3.5.ebuild 
b/sci-visualization/yt/yt-3.3.5.ebuild
index 800ff8719bd..c8ae43e8021 100644
--- a/sci-visualization/yt/yt-3.3.5.ebuild
+++ b/sci-visualization/yt/yt-3.3.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package"
-HOMEPAGE="http://yt-project.org/;
+HOMEPAGE="https://yt-project.org/;
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-visualization/yt/yt-3.4.0.ebuild 
b/sci-visualization/yt/yt-3.4.0.ebuild
index 31f0553677f..fd01aa40a1c 100644
--- a/sci-visualization/yt/yt-3.4.0.ebuild
+++ b/sci-visualization/yt/yt-3.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package"
-HOMEPAGE="http://yt-project.org/;
+HOMEPAGE="https://yt-project.org/;
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-python/cli_helpers/

2020-01-15 Thread Michał Górny
commit: f8ffc6fa482a6be8222657adbff24301de653e55
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:42:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ffc6fa

dev-python/cli_helpers: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/cli_helpers/cli_helpers-1.2.1.ebuild | 2 +-
 dev-python/cli_helpers/cli_helpers-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild 
b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
index 797b09c21cd..e4a062604f5 100644
--- a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"

diff --git a/dev-python/cli_helpers/cli_helpers-.ebuild 
b/dev-python/cli_helpers/cli_helpers-.ebuild
index f90a664aa82..43af7034b1b 100644
--- a/dev-python/cli_helpers/cli_helpers-.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 EGIT_REPO_URI="https://github.com/dbcli/${PN}.git;
 inherit distutils-r1 git-r3
 



[gentoo-commits] repo/gentoo:master commit in: sci-visualization/yt/

2020-01-15 Thread Michał Górny
commit: 4dc2f6ca0be40e7c4e6a9165e6087fc6399beadb
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:37:59 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc2f6ca

sci-visualization/yt: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-visualization/yt/yt-3.3.5.ebuild | 2 +-
 sci-visualization/yt/yt-3.4.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/yt/yt-3.3.5.ebuild 
b/sci-visualization/yt/yt-3.3.5.ebuild
index ff62b3f130f..800ff8719bd 100644
--- a/sci-visualization/yt/yt-3.3.5.ebuild
+++ b/sci-visualization/yt/yt-3.3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 

diff --git a/sci-visualization/yt/yt-3.4.0.ebuild 
b/sci-visualization/yt/yt-3.4.0.ebuild
index 6ea640cee87..31f0553677f 100644
--- a/sci-visualization/yt/yt-3.4.0.ebuild
+++ b/sci-visualization/yt/yt-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/websockify/

2020-01-15 Thread Michał Górny
commit: 425ac8e6441c2a2120f9bff538af3b0041f65a71
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:47:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425ac8e6

dev-python/websockify: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/websockify/websockify-0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/websockify/websockify-0.8.0.ebuild 
b/dev-python/websockify/websockify-0.8.0.ebuild
index 7723b535a7b..8a046bcae7b 100644
--- a/dev-python/websockify/websockify-0.8.0.ebuild
+++ b/dev-python/websockify/websockify-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/novnc/

2020-01-15 Thread Michał Górny
commit: 72e67773befe4e526de938f9f9b2542c776c98f3
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:47:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e67773

www-apps/novnc: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 www-apps/novnc/novnc-0.6.2-r1.ebuild | 2 +-
 www-apps/novnc/novnc-0.6.2.ebuild| 2 +-
 www-apps/novnc/novnc-1.0.0.ebuild| 2 +-
 www-apps/novnc/novnc-.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-apps/novnc/novnc-0.6.2-r1.ebuild 
b/www-apps/novnc/novnc-0.6.2-r1.ebuild
index 490c9a54492..f06cf37a8b6 100644
--- a/www-apps/novnc/novnc-0.6.2-r1.ebuild
+++ b/www-apps/novnc/novnc-0.6.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

diff --git a/www-apps/novnc/novnc-0.6.2.ebuild 
b/www-apps/novnc/novnc-0.6.2.ebuild
index 4492a06893d..cf46ba67c5d 100644
--- a/www-apps/novnc/novnc-0.6.2.ebuild
+++ b/www-apps/novnc/novnc-0.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

diff --git a/www-apps/novnc/novnc-1.0.0.ebuild 
b/www-apps/novnc/novnc-1.0.0.ebuild
index 79da613d152..ea2c927ce4c 100644
--- a/www-apps/novnc/novnc-1.0.0.ebuild
+++ b/www-apps/novnc/novnc-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

diff --git a/www-apps/novnc/novnc-.ebuild b/www-apps/novnc/novnc-.ebuild
index 05e26ffb948..cf6e775ac58 100644
--- a/www-apps/novnc/novnc-.ebuild
+++ b/www-apps/novnc/novnc-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/

2020-01-15 Thread Michał Górny
commit: d19d653a781a6cb9b6f831a601931b3089e2bcdf
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:51:29 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19d653a

media-gfx/inkscape: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild 
b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 912f6b6098b..8550767b269 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -72,7 +72,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
media-gfx/uniconvertor
dia? ( app-office/dia )
latex? (



[gentoo-commits] repo/gentoo:master commit in: dev-python/theano/

2020-01-15 Thread Michał Górny
commit: e66d95524fd3257733a713d9a2ed2a1197831b1f
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:45:38 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66d9552

dev-python/theano: Remove Python 2 from 1.0.4

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/theano/theano-1.0.4.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-python/theano/theano-1.0.4.ebuild 
b/dev-python/theano/theano-1.0.4.ebuild
index 68db6a25ddc..6b6457147cc 100644
--- a/dev-python/theano/theano-1.0.4.ebuild
+++ b/dev-python/theano/theano-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils
 
@@ -25,10 +25,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
-  dev-python/flake8[${PYTHON_USEDEP}]
-  dev-python/nose[${PYTHON_USEDEP}]
-  dev-python/parameterized[${PYTHON_USEDEP}]
-  dev-python/pyflakes[${PYTHON_USEDEP}]
+   dev-python/flake8[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/parameterized[${PYTHON_USEDEP}]
+   dev-python/pyflakes[${PYTHON_USEDEP}]
)"
 
 S="${WORKDIR}/${PN^}-${PV}"
@@ -36,7 +36,7 @@ S="${WORKDIR}/${PN^}-${PV}"
 python_prepare_all() {
# remove bundled six
find -type f -name "*.py" -exec \
-sed -e 's:theano.compat.six:six:g' -i '{}' + || die
+   sed -e 's:theano.compat.six:six:g' -i '{}' + || die
distutils-r1_python_prepare_all
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/sympy/

2020-01-15 Thread Michał Górny
commit: 8fcf58f520250b861e186df46caf471925d5225c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:39:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcf58f5

dev-python/sympy: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/sympy/sympy-1.0-r1.ebuild | 29 ++---
 dev-python/sympy/sympy-1.3.ebuild| 26 ++
 dev-python/sympy/sympy-1.5.1.ebuild  | 26 ++
 dev-python/sympy/sympy-1.5.ebuild| 26 ++
 4 files changed, 8 insertions(+), 99 deletions(-)

diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild 
b/dev-python/sympy/sympy-1.0-r1.ebuild
index ee681475875..a1b4f8b591e 100644
--- a/dev-python/sympy/sympy-1.0-r1.ebuild
+++ b/dev-python/sympy/sympy-1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 eutils virtualx
 
@@ -14,15 +14,13 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test 
texmacs theano"
+IUSE="examples gtk imaging ipython latex mathml opengl pdf png test texmacs"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   doc? ( || ( $(python_gen_useflags 'python2*') ) )
ipython? ( || ( $(python_gen_useflags -3) ) )"
 
 RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' 
python2_7)
imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' 
-3) )
latex? (
@@ -33,23 +31,15 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
)
mathml? (
dev-libs/libxml2:2[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' 
python2_7)
gtk? ( x11-libs/gtkmathview[gtk] )
)
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   pyglet? ( $(python_gen_cond_dep 'dev-python/pyglet[${PYTHON_USEDEP}]' 
python2_7) )
texmacs? ( app-office/texmacs )
-   theano? ( $(python_gen_cond_dep 'dev-python/theano[${PYTHON_USEDEP}]' 
python2_7) )
 "
 
 DEPEND="${RDEPEND}
-   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
 
-pkg_setup() {
-   use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
 python_prepare_all() {
epatch "${FILESDIR}"/${P}-doc-makefile.patch
epatch "${FILESDIR}"/${P}-zeta.patch
@@ -60,15 +50,6 @@ python_compile() {
PYTHONPATH="." distutils-r1_python_compile
 }
 
-python_compile_all() {
-   if use doc; then
-   export XDG_CONFIG_HOME="${T}/config-dir"
-   mkdir "${XDG_CONFIG_HOME}" || die
-   chmod 0700 "${XDG_CONFIG_HOME}" || die
-   emake -j1 -C doc html info man cheatsheet
-   fi
-}
-
 python_test() {
virtx "${PYTHON}" setup.py test
 }
@@ -79,12 +60,6 @@ python_install() {
 
 python_install_all() {
local DOCS=( AUTHORS README.rst )
-   if use doc; then
-   DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
-   
doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
-   local HTML_DOCS=( doc/_build/html/. )
-   doinfo doc/_build/texinfo/${PN}.info
-   fi
use examples && local EXAMPLES=( examples/. )
distutils-r1_python_install_all
 

diff --git a/dev-python/sympy/sympy-1.3.ebuild 
b/dev-python/sympy/sympy-1.3.ebuild
index 966444c3424..078dc48e8f8 100644
--- a/dev-python/sympy/sympy-1.3.ebuild
+++ b/dev-python/sympy/sympy-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 eutils virtualx
 
@@ -14,10 +14,9 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet 
symengine test texmacs theano"
+IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet 
symengine test texmacs theano"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   doc? ( || ( $(python_gen_useflags 'python2*') ) )
ipython? ( || ( $(python_gen_useflags -3) ) )"
 
 RESTRICT="test"
@@ -36,7 +35,6 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
)
mathml? (
dev-libs/libxml2:2[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' 
python2_7)
gtk? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-python/theano/

2020-01-15 Thread Michał Górny
commit: 32ea19c5eeb32c48778203493aaa10cbec69a383
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:46:23 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ea19c5

dev-python/theano: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/theano/Manifest|  1 -
 dev-python/theano/theano-0.7.0.ebuild | 47 ---
 2 files changed, 48 deletions(-)

diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 66c0e87d90b..56b8e6682d5 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,2 +1 @@
-DIST Theano-0.7.0.tar.gz 1985387 BLAKE2B 
00d547d5d1f6bb4049a1db71442381ae3803be683975ccca7536b8971e066ac1d09a4fc93a7f70693ae052bbf681e0c59a8b30a326f862f870e10422b438f979
 SHA512 
6e6bf9afdebf3c281d71f5ceda73792e0a52b403b18776a639665767ac73ac4920b5042e29d656d517b8f023e5f9cd5a27086e0456dc40c42abf6f3569da3f06
 DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 
7f89caee3dd50d75ff09693fde7926f2b7da0f94758ef932f207feea29d74d38ed56591e6ebe0b46cfa043d5fb46d5b97028171acdfd324a01eb7b904169b4ac
 SHA512 
3cc7f9dbb606c3c997c8651c34dd861721d5a8b99d06ed0887306d5a5ad0d7e402fbe29dcb5ad2f513b3bf75966e41a2854ebdf9a4fb212607345f84f367de8c

diff --git a/dev-python/theano/theano-0.7.0.ebuild 
b/dev-python/theano/theano-0.7.0.ebuild
deleted file mode 100644
index 9765e72f92a..000
--- a/dev-python/theano/theano-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MYPN=Theano
-MYP=${MYPN}-$(replace_version_separator 3 '')
-
-DESCRIPTION="Define and optimize multi-dimensional arrays mathematical 
expressions"
-HOMEPAGE="https://github.com/Theano/Theano;
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-   >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   >=sci-libs/scipy-0.11[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-   find -type f -name "*.py" -exec \
-   sed \
-   -e 's:theano.compat.six:six:g' \
-   -i '{}' + || die
-
-   rm ${PN}/compat/six.py || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   nosetests --verbosity=3 || die
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/tabulate/

2020-01-15 Thread Michał Górny
commit: 9159b099b4a084504c56ee3d046de507d684fd80
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:44:41 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9159b099

dev-python/tabulate: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/tabulate/tabulate-0.8.1.ebuild | 2 +-
 dev-python/tabulate/tabulate-0.8.3.ebuild | 2 +-
 dev-python/tabulate/tabulate-0.8.6.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/tabulate/tabulate-0.8.1.ebuild 
b/dev-python/tabulate/tabulate-0.8.1.ebuild
index 668fc09feb5..7511178e7f2 100644
--- a/dev-python/tabulate/tabulate-0.8.1.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

diff --git a/dev-python/tabulate/tabulate-0.8.3.ebuild 
b/dev-python/tabulate/tabulate-0.8.3.ebuild
index c84ba20f0fe..ca367d3640d 100644
--- a/dev-python/tabulate/tabulate-0.8.3.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 

diff --git a/dev-python/tabulate/tabulate-0.8.6.ebuild 
b/dev-python/tabulate/tabulate-0.8.6.ebuild
index ee715933d24..de51686e88f 100644
--- a/dev-python/tabulate/tabulate-0.8.6.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/displaycal/

2020-01-15 Thread Michał Górny
commit: 44c4d6e0444aadee62eb633f7727f75bb60f4686
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:51:03 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c4d6e0

media-gfx/displaycal: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/displaycal/displaycal-3.8.8.1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-gfx/displaycal/displaycal-3.8.8.1.ebuild 
b/media-gfx/displaycal/displaycal-3.8.8.1.ebuild
index 6d9baac97b2..09d6133dd94 100644
--- a/media-gfx/displaycal/displaycal-3.8.8.1.ebuild
+++ b/media-gfx/displaycal/displaycal-3.8.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
dev-python/faulthandler[${PYTHON_USEDEP}]
-   >=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+   )
 "
 
 # Just in case someone renames the ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/

2020-01-15 Thread Michał Górny
commit: 631d0c8e9000b0229f52fd90863ce30fb457ef01
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:48:52 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631d0c8e

dev-vcs/git-cola: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-vcs/git-cola/git-cola-2.11.ebuild | 3 +--
 dev-vcs/git-cola/git-cola-3.2.ebuild  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild 
b/dev-vcs/git-cola/git-cola-2.11.ebuild
index 65a5d6cbed6..d97f4818b85 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
sys-devel/gettext
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
-   python_targets_python2_7? ( 
dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
)
test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} )
 "

diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild 
b/dev-vcs/git-cola/git-cola-3.2.ebuild
index 1bb68c4eb5e..de021727cff 100644
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
sys-devel/gettext
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
-   python_targets_python2_7? ( 
dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
)
test? (
${VIRTUALX_DEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyzbar/

2020-01-15 Thread Michał Górny
commit: 9befda99be57f6987c29e2dc08832104c88a689c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:36:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9befda99

dev-python/pyzbar: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyzbar/pyzbar-0.1.5.ebuild | 2 +-
 dev-python/pyzbar/pyzbar-0.1.7.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/pyzbar/pyzbar-0.1.5.ebuild 
b/dev-python/pyzbar/pyzbar-0.1.5.ebuild
index b654f76e3a8..addc5815c2f 100644
--- a/dev-python/pyzbar/pyzbar-0.1.5.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"

diff --git a/dev-python/pyzbar/pyzbar-0.1.7.ebuild 
b/dev-python/pyzbar/pyzbar-0.1.7.ebuild
index b654f76e3a8..addc5815c2f 100644
--- a/dev-python/pyzbar/pyzbar-0.1.7.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"



[gentoo-commits] repo/gentoo:master commit in: dev-python/pytools/

2020-01-15 Thread Michał Górny
commit: bc38f8a2508402530c80b6f5aa6d17f55595fe0e
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:35:23 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc38f8a2

dev-python/pytools: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pytools/pytools-2017.4-r1.ebuild | 2 +-
 dev-python/pytools/pytools-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild 
b/dev-python/pytools/pytools-2017.4-r1.ebuild
index 95a01c98b25..d410d12751d 100644
--- a/dev-python/pytools/pytools-2017.4-r1.ebuild
+++ b/dev-python/pytools/pytools-2017.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1

diff --git a/dev-python/pytools/pytools-.ebuild 
b/dev-python/pytools/pytools-.ebuild
index b797a82b219..5b1dd65f9e1 100644
--- a/dev-python/pytools/pytools-.ebuild
+++ b/dev-python/pytools/pytools-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1 git-r3



[gentoo-commits] repo/gentoo:master commit in: dev-embedded/platformio/

2020-01-15 Thread Michał Górny
commit: 426c3fe505c33f58bd0b570311c4e077b6cd05d7
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:43:27 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426c3fe5

dev-embedded/platformio: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-embedded/platformio/platformio-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-embedded/platformio/platformio-4.1.0.ebuild 
b/dev-embedded/platformio/platformio-4.1.0.ebuild
index 97f26d12796..29d4e2ad7b4 100644
--- a/dev-embedded/platformio/platformio-4.1.0.ebuild
+++ b/dev-embedded/platformio/platformio-4.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1



[gentoo-commits] repo/gentoo:master commit in: dev-python/cli_helpers/

2020-01-15 Thread Michał Górny
commit: b81941dc22c85d42eaf7f3bff2f4bf9f303937fe
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:54:21 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:05:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81941dc

dev-python/cli_helpers: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/cli_helpers/cli_helpers-1.2.1.ebuild | 2 +-
 dev-python/cli_helpers/cli_helpers-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild 
b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
index e4a062604f5..f6b73337bb9 100644
--- a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"
-HOMEPAGE="http://cli-helpers.rtfd.io/;
+HOMEPAGE="https://cli-helpers.rtfd.io/;
 SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/dev-python/cli_helpers/cli_helpers-.ebuild 
b/dev-python/cli_helpers/cli_helpers-.ebuild
index 43af7034b1b..7d5022a9d7d 100644
--- a/dev-python/cli_helpers/cli_helpers-.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://github.com/dbcli/${PN}.git;
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python helpers for common CLI tasks"
-HOMEPAGE="http://cli-helpers.rtfd.io/;
+HOMEPAGE="https://cli-helpers.rtfd.io/;
 SRC_URI=""
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-python/symengine/

2020-01-15 Thread Michał Górny
commit: 751c06d4f6f9d4159f2764c94358edecd5e968ca
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:39:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751c06d4

dev-python/symengine: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/symengine/symengine-0.3.0.ebuild | 2 +-
 dev-python/symengine/symengine-0.5.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/symengine/symengine-0.3.0.ebuild 
b/dev-python/symengine/symengine-0.3.0.ebuild
index 91da4535de4..02332c4b703 100644
--- a/dev-python/symengine/symengine-0.3.0.ebuild
+++ b/dev-python/symengine/symengine-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 

diff --git a/dev-python/symengine/symengine-0.5.1.ebuild 
b/dev-python/symengine/symengine-0.5.1.ebuild
index 531654017bc..010852d4745 100644
--- a/dev-python/symengine/symengine-0.5.1.ebuild
+++ b/dev-python/symengine/symengine-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/jackit/

2020-01-15 Thread Michał Górny
commit: 4ece86f98d6873c57d0f492bca2e1eb0b682563a
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:43:13 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:04:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ece86f9

net-wireless/jackit: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 net-wireless/jackit/jackit-0.0_p20170918.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/jackit/jackit-0.0_p20170918.ebuild 
b/net-wireless/jackit/jackit-0.0_p20170918.ebuild
index 09d8500674b..1e408e119d8 100644
--- a/net-wireless/jackit/jackit-0.0_p20170918.ebuild
+++ b/net-wireless/jackit/jackit-0.0_p20170918.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Exploit Code for Mousejack"



[gentoo-commits] data/api:master commit in: files/overlays/

2020-01-15 Thread Michał Górny
commit: 9862934a1356ffe3b170fa0ef91507bce1632f0a
Author: Rafael Lorandi  gmail  com>
AuthorDate: Thu Jan 16 05:26:50 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:53:45 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=9862934a

repositories: Add ethereum overlay

Closes: https://github.com/gentoo/api-gentoo-org/pull/243
Signed-off-by: Michał Górny  gentoo.org>

 files/overlays/repositories.xml | 12 
 1 file changed, 12 insertions(+)

diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml
index 3f658e9..c8bcfbf 100644
--- a/files/overlays/repositories.xml
+++ b/files/overlays/repositories.xml
@@ -1420,6 +1420,18 @@
 https://cgit.gentoo.org/user/eroen.git/atom/
 
   
+  
+ethereum
+The Ethereum blockchain-based distributed computing 
platform
+https://github.com/coolparadox/ethereum-gentoo-overlay
+
+  coolpara...@gmail.com
+  Rafael Lorandi
+
+https://github.com/coolparadox/ethereum-gentoo-overlay.git
+g...@github.com:coolparadox/ethereum-gentoo-overlay.git
+
https://github.com/coolparadox/ethereum-gentoo-overlay/commits/master.atom
+  
   
 eugene-bright
 The personal overlay of Eugene Bright



[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

2020-01-15 Thread Joonas Niilola
commit: 967fab266a2942f3c6d068b8c43b92bbb5a9ee2f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jan 16 05:46:32 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 16 05:48:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967fab26

net-vpn/i2p: adhere to java-utils-2.eclass with 0.9.44

Closes: https://bugs.gentoo.org/705520
Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/i2p/{i2p-0.9.44.ebuild => i2p-0.9.44-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-vpn/i2p/i2p-0.9.44.ebuild b/net-vpn/i2p/i2p-0.9.44-r1.ebuild
similarity index 98%
rename from net-vpn/i2p/i2p-0.9.44.ebuild
rename to net-vpn/i2p/i2p-0.9.44-r1.ebuild
index ae09784ef1b..dd7373b40f1 100644
--- a/net-vpn/i2p/i2p-0.9.44.ebuild
+++ b/net-vpn/i2p/i2p-0.9.44-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="nls test"
 RESTRICT="!test? ( test )"
 
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
-COMMON_DEPEND="
+CP_DEPEND="
dev-java/bcprov:1.50
dev-java/jrobin:0
dev-java/slf4j-api:0
@@ -30,7 +30,7 @@ COMMON_DEPEND="
java-virtuals/servlet-api:3.1
 "
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CP_DEPEND}
dev-java/eclipse-ecj:*
nls? ( >=sys-devel/gettext-0.19 )
virtual/jdk:1.8
@@ -42,7 +42,7 @@ DEPEND="${COMMON_DEPEND}
)
 "
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CP_DEPEND}
acct-user/i2p
acct-group/i2p
virtual/jre:1.8



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2020-01-15 Thread Joonas Niilola
commit: 9e3cc1bf46b6d4ed8bfd10ba97f09cba410b7dce
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jan 16 05:28:38 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 16 05:29:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3cc1bf

profiles: revert: profiles: USE-mask net-im/pidgin[silc]

Signed-off-by: Joonas Niilola  gentoo.org>

 profiles/base/package.use.mask | 5 -
 1 file changed, 5 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 35713c2d954..b0f8da7a101 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,11 +6,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Joonas Niilola  (2020-01-15)
-# Unmaintained dependency, stagnant upstream since 2014, removal 
-# from Gentoo scheduled. #705462
-net-im/pidgin silc
-
 # Michał Górny  (2020-01-12)
 # libcxxrt is unmaintained and it's going to be removed.
 sys-libs/libcxx libcxxrt



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-01-15 Thread Joonas Niilola
commit: 3b020d34c48903339fd7c8129846e3b84dba3c47
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jan 16 05:29:50 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 16 05:29:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b020d34

: revert: profiles: mask net-im/silc-toolkit

Signed-off-by: Joonas Niilola  gentoo.org>

 profiles/package.mask | 6 --
 1 file changed, 6 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 32d0c114b69..780d3ceb4f3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -49,12 +49,6 @@ dev-python/milksets
 # python2_7 out of default PYTHON_TARGETS first.
 >=dev-python/setuptools-45.0.0
 
-# Joonas Niilola  (2020-01-15)
-# Leftover from silc* removal (#522916), unmaintained, no upstream 
-# releases since 2014, EAPI-4. #705462
-# Removal in ~14 days.
-net-im/silc-toolkit
-
 # Mikle Kolyada  (2020-01-13)
 # Current versioning breaks portage logic and prevents
 # us from adding official releases made by google.



[gentoo-commits] repo/gentoo:master commit in: dev-python/paho-mqtt/

2020-01-15 Thread Matt Turner
commit: 340b45e1b2641d6cea011b0b84f3f5a37e510a39
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jan 16 05:24:54 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Jan 16 05:25:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340b45e1

dev-python/paho-mqtt: Add RESTRICT="!test? ( test )"

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild 
b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
index dbeecd0ba64..b60266361e6 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -26,8 +27,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 S="${WORKDIR}/paho.mqtt.python-${PV}"
 
-#RESTRICT="test" #659106
-
 src_prepare() {
eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
default



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyamg/

2020-01-15 Thread Michał Górny
commit: 97b0e01a49e41d743dcc132eda732aff2a8b4644
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:20:14 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:20:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b0e01a

dev-python/pyamg: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyamg/pyamg-3.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild 
b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
index 349233e869f..f16d431c5e3 100644
--- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
+++ b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-01-15 Thread Michał Górny
commit: f73ef32246a89b824dbfe0e44646d7ef3a34127a
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:25:50 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:26:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73ef322

package.mask: Fix bugno for pyemf

Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index fa7f853ca98..32d0c114b69 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,7 +34,7 @@
 
 # Michał Górny  (2020-01-16)
 # Python 2 only.  Last release in 2006.  No reverse dependencies.
-# Removal in 30 days.  Bug #705552.
+# Removal in 30 days.  Bug #705522.
 dev-python/pyemf
 
 # Michał Górny  (2020-01-16)



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyemf/

2020-01-15 Thread Michał Górny
commit: 49a2eb82a712edd0b64251df3480857adabec483
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:20:48 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:24:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a2eb82

dev-python/pyemf: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyemf/pyemf-2.0.0.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-python/pyemf/pyemf-2.0.0.ebuild 
b/dev-python/pyemf/pyemf-2.0.0.ebuild
index 0268e656499..3d45f79a144 100644
--- a/dev-python/pyemf/pyemf-2.0.0.ebuild
+++ b/dev-python/pyemf/pyemf-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,9 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]"
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )"
 DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-01-15 Thread Michał Górny
commit: 2be042930079a1e4924e55d72ef05ad54e4d8341
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:22:47 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:24:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be04293

package.mask: Last rite dev-python/pyemf

Bug: https://bugs.gentoo.org/705552
Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 5833bba7cd9..fa7f853ca98 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny  (2020-01-16)
+# Python 2 only.  Last release in 2006.  No reverse dependencies.
+# Removal in 30 days.  Bug #705552.
+dev-python/pyemf
+
 # Michał Górny  (2020-01-16)
 # Abandoned upstream.  Python 2 only.  No reverse dependencies.
 # Removal in 30 days.  Bug #705518.



[gentoo-commits] repo/gentoo:master commit in: dev-python/opt-einsum/

2020-01-15 Thread Michał Górny
commit: 99e1498c87d33d545f7fcc1292aff64b4cdb7303
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:18:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:18:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e1498c

dev-python/opt-einsum: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/opt-einsum/opt-einsum-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild 
b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
index 777132fc401..45bd617ea82 100644
--- a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"



[gentoo-commits] repo/gentoo:master commit in: dev-python/pupynere/

2020-01-15 Thread Michał Górny
commit: c80d5ff53d78f68dec934695ec69410ac2976377
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:19:48 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:19:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80d5ff5

dev-python/pupynere: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pupynere/pupynere-1.0.15-r1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild 
b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
index 044e5cb4589..7f70dfe14fc 100644
--- a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
+++ b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )"
 DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/netcdf4-python/

2020-01-15 Thread Michał Górny
commit: 1ed3b0ab068048ffb77b90c00465fcaa9df75de7
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:17:48 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:17:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed3b0ab

dev-python/netcdf4-python: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild 
b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
index 6496b835269..04caabe5fdf 100644
--- a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
+++ b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-   dev-python/numpy
+   dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/hdf5
sci-libs/netcdf:=[hdf,hdf5]"
 BDEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-01-15 Thread Michał Górny
commit: c5e0d31f85fb2e0fff7c9969826952aa1840673c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:11:34 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e0d31f

package.mask: Last rite dev-python/milk, dev-python/milksets

Bug: https://bugs.gentoo.org/705518
Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 49238208682..5833bba7cd9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny  (2020-01-16)
+# Abandoned upstream.  Python 2 only.  No reverse dependencies.
+# Removal in 30 days.  Bug #705518.
+dev-python/milk
+dev-python/milksets
+
 # Michał Górny  (2020-01-16)
 # The new version loses Python 2 support but does not introduce any real
 # changes.  Let's mask it to reduce the noise, and hopefully try to get



[gentoo-commits] repo/gentoo:master commit in: dev-python/fitsio/

2020-01-15 Thread Michał Górny
commit: ce19470119f81cf72c318f7a1303681d9bd8ef38
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:05:20 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce194701

dev-python/fitsio: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/fitsio/fitsio-0.9.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild 
b/dev-python/fitsio/fitsio-0.9.11.ebuild
index b413034e1d0..821d33b176f 100644
--- a/dev-python/fitsio/fitsio-0.9.11.ebuild
+++ b/dev-python/fitsio/fitsio-0.9.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/gsd/

2020-01-15 Thread Michał Górny
commit: b3e9aa0c71578411f10fcdfb5402c2e6021188a6
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:06:53 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e9aa0c

dev-python/gsd: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/gsd/gsd-1.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/gsd/gsd-1.5.3-r1.ebuild 
b/dev-python/gsd/gsd-1.5.3-r1.ebuild
index eb2e214fb73..f276140a48c 100644
--- a/dev-python/gsd/gsd-1.5.3-r1.ebuild
+++ b/dev-python/gsd/gsd-1.5.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="GSD - file format specification and a library to read and write 
it"



[gentoo-commits] repo/gentoo:master commit in: dev-python/gnuplot-py/

2020-01-15 Thread Michał Górny
commit: df7c4f53b8601c532533bdab33d53727e4757ee3
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:06:28 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df7c4f53

dev-python/gnuplot-py: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild 
b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
index 037b512df59..921b7992021 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,10 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-ma
 IUSE="doc"
 
 DEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]"
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )"
 RDEPEND="${DEPEND}
sci-visualization/gnuplot"
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/emcee/

2020-01-15 Thread Michał Górny
commit: 79f43fb253178dbe5f4c6faea8fb0e4ce6e47e10
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:05:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f43fb2

dev-python/emcee: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/emcee/emcee-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/emcee/emcee-2.2.1.ebuild 
b/dev-python/emcee/emcee-2.2.1.ebuild
index 651f3cc2f4a..335f0980a7b 100644
--- a/dev-python/emcee/emcee-2.2.1.ebuild
+++ b/dev-python/emcee/emcee-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/bcolz/

2020-01-15 Thread Michał Górny
commit: 47518f58ef18a2e84cfc0cd4cd6d4fde028e62ab
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:01:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47518f58

dev-python/bcolz: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/bcolz/bcolz-1.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/bcolz/bcolz-1.1.2.ebuild 
b/dev-python/bcolz/bcolz-1.1.2.ebuild
index 747e3936031..bebcea6b5c5 100644
--- a/dev-python/bcolz/bcolz-1.1.2.ebuild
+++ b/dev-python/bcolz/bcolz-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/glymur/

2020-01-15 Thread Michał Górny
commit: 208424a2910bacbd8cf702f882885727457a9c81
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:05:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208424a2

dev-python/glymur: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/glymur/glymur-0.8.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/glymur/glymur-0.8.10.ebuild 
b/dev-python/glymur/glymur-0.8.10.ebuild
index bc7d23c8301..214e0efc91e 100644
--- a/dev-python/glymur/glymur-0.8.10.ebuild
+++ b/dev-python/glymur/glymur-0.8.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 MYPN=Glymur



[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/

2020-01-15 Thread Michał Górny
commit: 8465c5506792439c60e64280d4ad8c04f78410ff
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:02:02 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8465c550

dev-lang/gdl: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 dev-lang/gdl/gdl-0.9.6-r2.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-lang/gdl/gdl-0.9.6-r2.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
index 7e72f15aef0..3a51f5b1f4b 100644
--- a/dev-lang/gdl/gdl-0.9.6-r2.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,7 +39,10 @@ RDEPEND="
postscript? ( dev-libs/pslib )
python? (
${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)
udunits? ( sci-libs/udunits )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"



[gentoo-commits] repo/gentoo:master commit in: dev-python/milk/

2020-01-15 Thread Michał Górny
commit: d52b93a6da8fe776c80cfecb7902a4dbb193a309
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:08:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52b93a6

dev-python/milk: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/milk/milk-0.6.1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/milk/milk-0.6.1.ebuild 
b/dev-python/milk/milk-0.6.1.ebuild
index 2ce95e5089c..f0cea5d438f 100644
--- a/dev-python/milk/milk-0.6.1.ebuild
+++ b/dev-python/milk/milk-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
dev-cpp/eigen:3
test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"



[gentoo-commits] repo/gentoo:master commit in: sci-biology/biopandas/

2020-01-15 Thread Michał Górny
commit: 1533db95f6208ad4716df1300c2bfb1ad068162f
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:03:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1533db95

sci-biology/biopandas: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-biology/biopandas/biopandas-0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/biopandas/biopandas-0.2.1.ebuild 
b/sci-biology/biopandas/biopandas-0.2.1.ebuild
index c7a632cec27..8c892419b29 100644
--- a/sci-biology/biopandas/biopandas-0.2.1.ebuild
+++ b/sci-biology/biopandas/biopandas-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 



  1   2   3   >