Version bump

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 46 insertions, 38 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 46f1faa869a0..5de4d6c6e054 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/rpy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.37 2010/04/26 17:42:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.38 2010/05/03 20:57:01 bicatali Exp $
+
+*rpy-2.1.1 (03 May 2010)
+
+  03 May 2010; Sébastien Fabbro <bicatali@gentoo.org> -rpy-2.0.6.ebuild,
+  +rpy-2.1.1.ebuild:
+  Version bump
 
 *rpy-2.1.0 (26 Apr 2010)
 
diff --git a/dev-python/rpy/rpy-2.0.6.ebuild b/dev-python/rpy/rpy-2.0.6.ebuild
deleted file mode 100644
index c6346a44e14b..000000000000
--- a/dev-python/rpy/rpy-2.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.0.6.ebuild,v 1.1 2009/08/01 12:44:43 bicatali Exp $
-
-EAPI=2
-NEED_PYTHON=2.4
-inherit distutils eutils
-
-SLOT=2
-MYPN=${PN}${SLOT}
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-lang/R-2.8
-	dev-python/numpy
-	!<=dev-python/rpy-1.0.2-r2"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="${MYPN}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-setup.patch
-}
-
-src_test() {
-	cd build/lib*
-	PYTHONPATH=. "${python}" rpy2/tests.py || die "tests failed"
-}
diff --git a/dev-python/rpy/rpy-2.1.1.ebuild b/dev-python/rpy/rpy-2.1.1.ebuild
new file mode 100644
index 000000000000..d7c33e19b22f
--- /dev/null
+++ b/dev-python/rpy/rpy-2.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.1.1.ebuild,v 1.1 2010/05/03 20:57:01 bicatali Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+SLOT=2
+MYPN=${PN}${SLOT}
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ http://pypi.python.org/pypi/rpy2"
+SRC_URI="http://pypi.python.org/packages/source/r/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/R-2.8
+	dev-python/numpy
+	!<=dev-python/rpy-1.0.2-r2"
+DEPEND="${RDEPEND}"
+
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_MODNAME="${MYPN}"
+
+S="${WORKDIR}/${MYP}"
+
+src_test() {
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
+			"$(PYTHON)" rpy/tests.py
+	}
+	python_execute_function testing
+}