Version bump, add -fno-strict-aliasing, remove some quotes, bump EAPI, drop useless inherit of eutils. Drop old

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 14 insertions, 45 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index e9c86ccab5f5..057ac15b1901 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.61 2012/04/02 06:03:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.62 2012/04/30 19:44:53 xarthisius Exp $
+
+*rpy-2.2.6 (30 Apr 2012)
+
+  30 Apr 2012; Kacper Kowalik <xarthisius@gentoo.org> +rpy-2.2.6.ebuild,
+  -rpy-2.2.2.ebuild, -rpy-2.2.4.ebuild:
+  Version bump, add -fno-strict-aliasing, remove some quotes, bump EAPI, drop
+  useless inherit of eutils. Drop old
 
   02 Apr 2012; Justin Lecher <jlec@gentoo.org> rpy-2.1.9.ebuild,
   rpy-2.2.2.ebuild, rpy-2.2.4.ebuild, rpy-2.2.5.ebuild:
diff --git a/dev-python/rpy/rpy-2.2.4.ebuild b/dev-python/rpy/rpy-2.2.4.ebuild
deleted file mode 100644
index e4a04c923f9d..000000000000
--- a/dev-python/rpy/rpy-2.2.4.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.2.4.ebuild,v 1.3 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)" -m 'rpy2.tests'
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/rpy/rpy-2.2.2.ebuild b/dev-python/rpy/rpy-2.2.6.ebuild
index 49d7d09b7b52..ed876d762ecb 100644
--- a/dev-python/rpy/rpy-2.2.2.ebuild
+++ b/dev-python/rpy/rpy-2.2.6.ebuild
@@ -1,12 +1,12 @@
 # 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.2.ebuild,v 1.3 2012/04/02 06:03:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.2.6.ebuild,v 1.1 2012/04/30 19:44:53 xarthisius Exp $
 
-EAPI="2"
+EAPI=4
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
 
-inherit distutils eutils
+inherit distutils
 
 MYSLOT=2
 MY_PN=${PN}${MYSLOT}
@@ -26,9 +26,10 @@ RDEPEND=">=dev-lang/R-2.8
 	!<=dev-python/rpy-1.0.2-r2"
 DEPEND="${RDEPEND}"
 
-PYTHON_MODNAME="${MY_PN}"
+PYTHON_MODNAME=${MY_PN}
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_test() {
 	testing() {