5 files changed, 94 insertions, 1 deletions
diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 522efdb0c620..4615775de88d 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/rpy
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.17 2007/09/27 07:34:16 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.18 2007/10/14 06:33:41 genstef Exp $
+
+  13 Oct 2007; Dirkjan Ochtman (djc) <mail@manuzhai.nl> +files/90rpy,
+  +files/rpy-0.99.2-version-detect.patch,
+  +files/rpy-1.0_rc3-lib-handling.patch,
+  +files/rpy-1.0_rc3-version-detect.patch, +metadata.xml, +rpy-0.4.6.ebuild,
+  +rpy-0.99.2-r1.ebuild, +rpy-1.0_rc3.ebuild:
+  New ebuild for bug 190615; thanks to genstef and dev-zero.
 
 *rpy-0.99.2-r1 (27 Sep 2007)
 
diff --git a/dev-python/rpy/files/digest-rpy-1.0_rc3 b/dev-python/rpy/files/digest-rpy-1.0_rc3
new file mode 100644
index 000000000000..bf309111d0e1
--- /dev/null
+++ b/dev-python/rpy/files/digest-rpy-1.0_rc3
@@ -0,0 +1,3 @@
+MD5 92bc13f5dfd31bd6ab92c834e845ed4c rpy-1.0-RC3.tar.gz 67099
+RMD160 a1070e8fdc0ba52bf47b954370c5d5521dfddeaf rpy-1.0-RC3.tar.gz 67099
+SHA256 b5397b09e95282e7b1c51bb3d69bef8a18bad1bdae9039f99f950f2045ce7ca6 rpy-1.0-RC3.tar.gz 67099
diff --git a/dev-python/rpy/files/rpy-1.0_rc3-lib-handling.patch b/dev-python/rpy/files/rpy-1.0_rc3-lib-handling.patch
new file mode 100644
index 000000000000..2e105aea0a0c
--- /dev/null
+++ b/dev-python/rpy/files/rpy-1.0_rc3-lib-handling.patch
@@ -0,0 +1,16 @@
+diff -ur rpy-1.0-RC3/setup.py rpy-1.0-RC3.patched/setup.py
+--- rpy-1.0-RC3/setup.py	2007-02-20 00:30:04.000000000 +0100
++++ rpy-1.0-RC3.patched/setup.py	2007-09-07 14:22:04.000000000 +0200
+@@ -142,10 +142,11 @@
+         import numpy
+         DEFINE.append(('WITH_NUMERIC', '3'))
+         DEFINE.append(('PY_ARRAY_TYPES_PREFIX', 'PyArray_'))
+-        include_dirs.append(numpy.get_numpy_include())
++        include_dirs.append(numpy.get_include())
+     except ImportError:
+         # fall back to Numeric
+         try:
++            import Numeric
+             DEFINE.append(('WITH_NUMERIC', '1'))
+         except ImportError:
+             UNDEF.append('WITH_NUMERIC')
diff --git a/dev-python/rpy/files/rpy-1.0_rc3-version-detect.patch b/dev-python/rpy/files/rpy-1.0_rc3-version-detect.patch
new file mode 100644
index 000000000000..39574d8d82d4
--- /dev/null
+++ b/dev-python/rpy/files/rpy-1.0_rc3-version-detect.patch
@@ -0,0 +1,11 @@
+--- rpy_tools.py	2006-07-11 17:07:05.000000000 +0200
++++ rpy_tools.py	2007-09-04 11:06:14.000000000 +0200
+@@ -98,7 +98,7 @@
+       raise RuntimeError("Couldn't execute the R interpreter" +
+                          " `%s'.\n" % rexec )
+     # edd 05 Apr 2006  version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+-    version = re.search(" +([0-9]\.[0-9]\.[0-9])", output)
++    version = re.search(" version ([0-9]\.[0-9]\.[0-9])", output)
+     if not version:
+       raise RuntimeError("Couldn't obtain version number from output\n"
+                                "of `R --version'.\n")
diff --git a/dev-python/rpy/rpy-1.0_rc3.ebuild b/dev-python/rpy/rpy-1.0_rc3.ebuild
new file mode 100644
index 000000000000..807bf78458fa
--- /dev/null
+++ b/dev-python/rpy/rpy-1.0_rc3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-1.0_rc3.ebuild,v 1.1 2007/10/14 06:33:41 genstef Exp $
+
+inherit distutils eutils
+
+MY_P="${P/_rc/-RC}"
+DESCRIPTION="RPy is a very simple, yet robust, Python interface to the R Programming Language."
+HOMEPAGE="http://rpy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rpy/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="examples lapack"
+
+DEPEND=">=dev-lang/R-2.3
+	dev-python/numpy
+	lapack? ( virtual/lapack )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	distutils_src_unpack
+
+	# Fix lapack linking issue, bug 143396
+	if use lapack; then
+		sed -i \
+			-e "s:Rlapack:lapack:" \
+			setup.py || die "sed in setup.py failed"
+	else
+		sed -i \
+			-e "s:'Rlapack'::" \
+			setup.py || die "sed in setup.py failed"
+	fi
+
+	epatch "${FILESDIR}/${P}-version-detect.patch"
+	epatch "${FILESDIR}/${P}-lib-handling.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	# add R libs to ld.so.conf
+	doenvd "${FILESDIR}/90rpy"
+}
+
+pkg_postinst() {
+	elog "You'll have to run env-update in order to find the R libraries."
+}