gentoo Easter resync : 12.04.2020

3 files changed, 1 insertions, 57 deletions

diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index c11fce0d0616..4b6a6ad2b6c9 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,5 +1,3 @@
-DIST rpy2-2.6.2.tar.gz 171655 BLAKE2B f590e63dbbb6f5aa9f18d7475136005fa993d32af41e12a8e33fda0232a73d444f83341aa2dac3ec8300cf68de83e377d5f6caabb27b5d439af795126670e286 SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542
 DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2
-EBUILD rpy-2.6.2.ebuild 1284 BLAKE2B 385b8551efd6e67fedf147fa4be4c01c12ece7b3c9abe90b54b47239c2f5aa0df9b1d99e97399ad885eb3e3d5ed4312bee1090ca8f70f051d4cc1732b044cc6c SHA512 5d74443bfefb77a4f97de78f4066f0f07887db9ef20b241b020a1f41aaa1e1e795d1f0ff273cbc7803e1e6f777d9a4398e92805f3f57757cd8d9b24dc9bcaeda
-EBUILD rpy-2.9.0.ebuild 1220 BLAKE2B 1a19b9ee5447246009566fb790a7c8be0a0980c8ab9c44f238197230388adad512a24b92c6c44ca21350fdd444e00c297c52e5c324837ec02f4813e5daaf8015 SHA512 ffe031376ecc151b8ddd007b0c9feaf5343167d0bb68aeb54fbb986d94b4472e8fcc8a513a08c0533af62f6fa36b774b2de579154025aee641dcd93c7bf0a38c
+EBUILD rpy-2.9.0.ebuild 1171 BLAKE2B 2d98dce71464a932c7b1503f7aef3e298cabe7867b85af8cf84f2a82da8906402e6bee31f43ae1985d315c321a9175e1801ab964732ad2b2fbabe1b86021ba35 SHA512 0d743f8a3488870e404e43375efc7eeb1d158a0223a1e7ae79a37d9c219e8c2acc947fd81fa8582386320f37fa7cc2fbd7525d075ecba03b8e02a14a3ff9c9ae
 MISC metadata.xml 700 BLAKE2B 42fce60e594dbff010837724886940504b6d01545afbb9330238139855b4350247180cd05875935e9ce807808e02979733b000eb15558a7dd764b7e444a7b4c1 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af
diff --git a/dev-python/rpy/rpy-2.6.2.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
deleted file mode 100644
index 39ab1094a6e3..000000000000
--- a/dev-python/rpy/rpy-2.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="https://rpy.sourceforge.net/
-	https://pypi.org/project/rpy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index 96c50803dcca..c81957215420 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/R-3.2[X,png] )