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

[Michał Górny]

commit:     2a558c6b8aeee939e9ac3f804a9528a375f4dad9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:53:24 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 21:30:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a558c6b

dev-python/bottleneck: Combine ebuilds (remove py2)

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

 dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild |  2 +-
 dev-python/bottleneck/bottleneck-1.2.1.ebuild    | 29 ------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
index 833b7c25e77..ffe790c6fe3 100644
--- a/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/dev-python/bottleneck/bottleneck-1.2.1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
deleted file mode 100644
index 6221eaf8242..00000000000
--- a/dev-python/bottleneck/bottleneck-1.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
-SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose )"
-
-python_test() {
-	${EPYTHON} ./tools/test-installed-bottleneck.py
-}