gentoo resync : 25.08.2018

3 files changed, 31 insertions, 41 deletions

diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 8811d98a0f83..0de4b88ff3cb 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,5 @@
-DIST Bottleneck-0.8.0.tar.gz 1634340 BLAKE2B 9ec38acb7d2415139b144fd4985d801183e86ef6f938d4f5d6232201e50a2d447959c2a7cde00a13d5455da9292739e4f47448ad5e9c0263e0a8b03fdd70029f SHA512 5b03ce2d0df9d177534d3f1fa02f147b12b23f5fbaa3b2685d1e8b86848c96c54832e0b0b6364479841742785c0b23bcccb51a0ac95675c72efc39693121dcaf
 DIST Bottleneck-1.0.0.tar.gz 363223 BLAKE2B 6dd8e18d14675c08010850091343856f2599de71ef57ff1b0bf1b748bc7f2e6d2d0fd0ad8ae1bc00dc38b9dd92676531b4564558b7ec0f9b79d2ebe4061a028a SHA512 b3edeec0b4c2beeebb08eed8cb7aabb92f736e47c657f1fa580ec36d839941d3d1955209b2286fd9d41c4941b46b97a27049c51bcf5a098d27a19881f570d2d6
-EBUILD bottleneck-0.8.0.ebuild 828 BLAKE2B 819e0e46eba90a647915a80e41d8186d91c2335b77f64b4351551f73d65f472de7b52cdb0564aa25844670b26097cff0e6e673757228c3e0ddd16a93e5f3820d SHA512 e09b195967b9029b370e99c83a33649a790a71ab15acdd5ba8eddb6d2d262d1329ce6c7de7ae42095d35097c52987c6682ed3fc0eb6b752b6529713ade9c6603
+DIST bottleneck-1.2.1.tar.gz 98920 BLAKE2B 02fd35eaa15761f2008e46c459d842cdb5ad16372a03ea51a82b775ae0fbfa81beb0f1f304dcf6565956dc2d6deded579d8e400eaa250f9ab639261c085a6525 SHA512 0299eb1a12d808f18b8c4259c2205b47b34af4c1245867ab0857eb34a1aad630507cd3307a16f522db461977bd3f70aca688fb6a62ae84d1f895d18165132781
 EBUILD bottleneck-1.0.0.ebuild 860 BLAKE2B 8e7b5bd0bd0b2f10d76cd3e52a574f6fb48031bae184e8daee73802fbc01ee43f7e278da33162f0feed75d35ab6a14a1573680d6079cbb0f99a3c43d43a8d7e4 SHA512 0c2a9ffc02b7f8c2b41947b316a73fc9a4e3e7d0df7f32777ea0e85b1838708ed456d2aad4bba92c70c5c1a0f004ed2143aabb1dc40c44aceae504eaddc1818a
+EBUILD bottleneck-1.2.1.ebuild 702 BLAKE2B f8640d842f7c7934dac908755bfd3bab4c7798562511b52005033faf4f04ae43247e507f4f06805b3341d70879048501b99310fd73d936f2252510133e87776d SHA512 33dc00d3cd68473418da60d41cb1994cd2a3e86f926bb89f854b09beb0395cc906a073f810a5101922e2ac576d425c66817eb54898ea0f8f83c89d35de0d41cf
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-0.8.0.ebuild b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
deleted file mode 100644
index 80a55c122fb2..000000000000
--- a/dev-python/bottleneck/bottleneck-0.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-MY_PN="Bottleneck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
-SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	emake cfiles
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	${PYTHON} -c "import bottleneck;bottleneck.test(extra_argv=['--verbosity=3'])" || die
-}
diff --git a/dev-python/bottleneck/bottleneck-1.2.1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
new file mode 100644
index 000000000000..27188970e9b5
--- /dev/null
+++ b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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"
+
+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
+}