Version bump, now slotted

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

5 files changed, 116 insertions, 3 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 36087abf1062..1d605658f53a 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/rpy
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.28 2008/10/27 10:33:45 bicatali Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.29 2009/01/23 18:27:38 bicatali Exp $
+
+*rpy-2.0.1 (23 Jan 2009)
+*rpy-1.0.3 (23 Jan 2009)
+
+  23 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> -files/90rpy,
+  +files/rpy-2.0.1-setup.patch, +rpy-1.0.3.ebuild, +rpy-2.0.1.ebuild:
+  Version bump, now slotted
 
   27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/rpy-1.0.2-R28.patch, rpy-1.0.2-r1.ebuild:
diff --git a/dev-python/rpy/files/90rpy b/dev-python/rpy/files/90rpy
deleted file mode 100644
index 55ca969a8175..000000000000
--- a/dev-python/rpy/files/90rpy
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH=/usr/lib/R/lib
\ No newline at end of file
diff --git a/dev-python/rpy/files/rpy-2.0.1-setup.patch b/dev-python/rpy/files/rpy-2.0.1-setup.patch
new file mode 100644
index 000000000000..8a4ce0836178
--- /dev/null
+++ b/dev-python/rpy/files/rpy-2.0.1-setup.patch
@@ -0,0 +1,13 @@
+--- setup.py.orig	2009-01-20 21:54:55.000000000 +0000
++++ setup.py	2009-01-20 23:23:59.000000000 +0000
+@@ -124,8 +124,8 @@
+             runtime_library_dirs = r_libs,
+             #extra_compile_args=['-O0', '-g'],
+             extra_link_args = get_rconfig(RHOME, '--ldflags') +\
+-                              get_rconfig(RHOME, 'LAPACK_LIBS') +\
+-                              get_rconfig(RHOME, 'BLAS_LIBS'),
++                              tuple(get_rconfig(RHOME, 'LAPACK_LIBS')[0].split()) +\
++                              tuple(get_rconfig(RHOME, 'BLAS_LIBS')[0].split()),
+             )
+ 
+     return rinterface_ext
diff --git a/dev-python/rpy/rpy-1.0.3.ebuild b/dev-python/rpy/rpy-1.0.3.ebuild
new file mode 100644
index 000000000000..6cc409bead0b
--- /dev/null
+++ b/dev-python/rpy/rpy-1.0.3.ebuild
@@ -0,0 +1,57 @@
+# 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-1.0.3.ebuild,v 1.1 2009/01/23 18:27:38 bicatali Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="1"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-lang/R
+	dev-python/numpy
+	!<=dev-python/rpy-1.0.2-r2"
+
+DEPEND="${RDEPEND}
+	doc? ( || ( virtual/texi2dvi ) )"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${PN}-1.0_rc3-version-detect.patch
+	epatch "${FILESDIR}"/${PN}-testfiles.patch
+	epatch "${FILESDIR}"/${PN}-1.0.2-R28.patch
+	# this module should exist only if R was built with USE=lapack
+	if [[ ! -e /usr/$(get_libdir)/R/lib/libRlapack.so ]]; then
+		sed -i \
+			-e 's:Rlapack:lapack:g' \
+			setup.py || die "sed in setup.py failed"
+	fi
+}
+
+src_test() {
+	cd tests
+	PYTHONPATH=$(ls -d ../build/lib.*) \
+		"${python}" testall.py || die "tests failed"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+
+	if use doc; then
+		cd doc
+		emake html pdf || die "emake docs failed"
+		dohtml rpy_html/* || die
+		insinto /usr/share/doc/${PF}
+		doins rpy.pdf || die
+	fi
+}
diff --git a/dev-python/rpy/rpy-2.0.1.ebuild b/dev-python/rpy/rpy-2.0.1.ebuild
new file mode 100644
index 000000000000..c5a9e8310172
--- /dev/null
+++ b/dev-python/rpy/rpy-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# 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.1.ebuild,v 1.1 2009/01/23 18:27:38 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.7
+	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"
+}