Version bump

(Portage version: 2.2.01.21476-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 28 insertions, 59 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 031f41d1a7a1..042c87236c5a 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/rpy
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.66 2012/11/20 20:33:58 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.67 2013/01/03 16:32:06 bicatali Exp $
+
+*rpy-2.3.1 (03 Jan 2013)
+
+  03 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +rpy-2.3.1.ebuild,
+  -rpy-2.1.9.ebuild, -rpy-2.2.5.ebuild, metadata.xml:
+  Version bump
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> rpy-2.2.6.ebuild:
   Stable for x86, wrt bug #418919
@@ -306,4 +312,3 @@
   21 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> metadata.xml,
   rpy-0.3.5.ebuild:
   Initial import.
-
diff --git a/dev-python/rpy/metadata.xml b/dev-python/rpy/metadata.xml
index 39c62db66a8b..fdac811a9e1d 100644
--- a/dev-python/rpy/metadata.xml
+++ b/dev-python/rpy/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>sci</herd>
-	<longdescription lang="en">RPy provides a robust Python interface to the R programming
+<herd>python</herd>
+<herd>sci</herd>
+<longdescription lang="en">
+  RPy provides a robust Python interface to the R programming
   language. It can manage R objects and can execute arbitrary R
   functions. All the errors from the R language are converted to
-  Python exceptions.</longdescription>
-	<upstream>
-		<remote-id type="pypi">rpy2</remote-id>
-	</upstream>
+  Python exceptions.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">rpy2</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/rpy/rpy-2.1.9.ebuild b/dev-python/rpy/rpy-2.1.9.ebuild
deleted file mode 100644
index cd3a78dc5b21..000000000000
--- a/dev-python/rpy/rpy-2.1.9.ebuild
+++ /dev/null
@@ -1,39 +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.1.9.ebuild,v 1.6 2012/04/02 06:03:29 jlec Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
-
-inherit distutils eutils
-
-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 ~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}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
-			"$(PYTHON)" rpy/tests.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/rpy/rpy-2.2.5.ebuild b/dev-python/rpy/rpy-2.3.1.ebuild
index 458e47f1e632..78e2427662a6 100644
--- a/dev-python/rpy/rpy-2.2.5.ebuild
+++ b/dev-python/rpy/rpy-2.3.1.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.2.5.ebuild,v 1.3 2012/04/02 06:03:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.3.1.ebuild,v 1.1 2013/01/03 16:32:06 bicatali Exp $
+
+EAPI=4
 
-EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="2.5 3.3 *-jython 2.7-pypy-*"
 
-inherit distutils eutils
+inherit distutils
 
 MYSLOT=2
 MY_PN=${PN}${MYSLOT}
 MY_P=${MY_PN}-${PV}
+PYTHON_MODNAME=${MY_PN}
 
 DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ http://pypi.python.org/pypi/rpy2"
+HOMEPAGE="http://rpy.sourceforge.net/"
 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-lang/R-2.8
+RDEPEND="
+	>=dev-lang/R-2.8
 	dev-python/numpy
 	!<=dev-python/rpy-1.0.2-r2"
 DEPEND="${RDEPEND}"
 
-PYTHON_MODNAME="${MY_PN}"
-
 S="${WORKDIR}/${MY_P}"
 
 src_test() {