bump; remove old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 43 insertions, 41 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 1a7ee49930ed..0fe2e0941ca7 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/rpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.78 2014/04/30 11:48:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.79 2014/06/03 05:42:56 idella4 Exp $
+
+*rpy-2.4.0 (03 Jun 2014)
+
+  03 Jun 2014; Ian Delaney <idella4@gentoo.org> +rpy-2.4.0.ebuild,
+  -rpy-2.2.6.ebuild:
+  bump; remove old
 
   30 Apr 2014; Justin Lecher <jlec@gentoo.org> rpy-2.3.10.ebuild, metadata.xml:
   Add pypi HOMEPAGE
diff --git a/dev-python/rpy/rpy-2.2.6.ebuild b/dev-python/rpy/rpy-2.2.6.ebuild
deleted file mode 100644
index c2f670f9cc56..000000000000
--- a/dev-python/rpy/rpy-2.2.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.2.6.ebuild,v 1.4 2012/11/20 20:33:58 ago Exp $
-
-EAPI=4
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
-
-inherit distutils
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ http://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/R-2.8
-	dev-python/numpy
-	!<=dev-python/rpy-1.0.2-r2"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME=${MY_PN}
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-S=${WORKDIR}/${MY_P}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
-			"$(PYTHON)" -m 'rpy2.tests'
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/rpy/rpy-2.4.0.ebuild b/dev-python/rpy/rpy-2.4.0.ebuild
new file mode 100644
index 000000000000..85db4e1f15f5
--- /dev/null
+++ b/dev-python/rpy/rpy-2.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.4.0.ebuild,v 1.1 2014/06/03 05:42:56 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/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"
+
+RDEPEND="
+	>=dev-lang/R-3
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/pandas-0.13[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	${PYTHON} -m 'rpy2.tests' -v || die
+}