Patched for R >= 2.7, thanks dawe for his patch (bug #219522)

Package-Manager: portage-2.1.5_rc6

4 files changed, 83 insertions, 6 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 52d811c1ea3d..850e2ebc5e23 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2008/04/11 16:38:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.22 2008/05/07 08:33:02 bicatali Exp $
+
+*rpy-1.0.2-r1 (07 May 2008)
+
+  07 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/rpy-1.0.2-rpymodule-R-2.7.patch, +rpy-1.0.2-r1.ebuild:
+  Patched for R >= 2.7, thanks dawe for his patch (bug #219522)
 
 *rpy-1.0.2 (11 Apr 2008)
 
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 314a8500942f..ea2528fee469 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX 90rpy 21 RMD160 67787b952b20da4e82a5cf761a63dd999283a24c SHA1 fdfba3081fee34551d46083d367e6a5d0b24e9d2 SHA256 6759a9579b9271d22e362979ea77cb2d5dac687ba8beaf007cc4214833205a49
+AUX rpy-1.0.2-rpymodule-R-2.7.patch 415 RMD160 932497b8504608cd1f4f4f49affe1fdee5cba38d SHA1 6543c1d72863b5236021aa9727a28341ac355f9d SHA256 112b8b0d638509828b686202c7fb266c9c21ffbea617ab472c1f039e2d609123
 AUX rpy-1.0_rc3-version-detect.patch 592 RMD160 536d493f0ad469c6c6508ef0860e92c98d71a948 SHA1 5d7959378426c1dbe76a5dab94f9f423ad56d60c SHA256 ab156087a1b8a631630c0dec0362fcfb1e6d8ca8e2deadc4447dbcc6047e44ad
 AUX rpy-testfiles.patch 2854 RMD160 e94af532950604f5efb68125239d0b938dd58231 SHA1 d7d4cca007f41df13c6aeed6a618efddf24d9cc3 SHA256 b5003de03dda9897ab4e0a26d8a5a9655e961d3129665f7e3999ac91a31c9288
 DIST rpy-0.4.6.tar.gz 77384 RMD160 efd46a9ecc9450c4c4ee90a153b3bb89a066f316 SHA1 01d7548958820e5437eb4edb4c8f8bdd0c4f8f28 SHA256 02f8ae9deb72cc3d05199e636b3981e72d5db22cd0c38e2bf3382d1063fa76da
@@ -9,13 +10,14 @@ DIST rpy-1.0.1.tar.gz 83692 RMD160 4eb9343ade3907124f9e706dfe9cb9a25e7b4eea SHA1
 DIST rpy-1.0.2.tar.gz 85458 RMD160 2814eb406ff167826df1bd2983035ac8d0968b40 SHA1 c3307c3a895c1ddcb3b4c67a6759f164cb2f667e SHA256 bae91fff8f4ee754b70d14d4f6e1f2c64c026c97eff75c3bc84c725d6de03d30
 EBUILD rpy-0.4.6.ebuild 670 RMD160 5f748dbcff1c7a1623916a4171d17a52fe6fa697 SHA1 f1e8c66b165389123060d8043295f19a8ed519b8 SHA256 0aea5d588979d42522d3fa7e410154303af46245598215180985495a7d2fe946
 EBUILD rpy-1.0.1.ebuild 1556 RMD160 40e52e13ad5e48bf2668e070db35e3b74f050b8a SHA1 57bdcfc481e98d40456fbac2eac2a654cd41dea1 SHA256 99cec0b6676e0bfa5c9e041479eb41842e7c30bae42144ff07669b8d617d8b44
+EBUILD rpy-1.0.2-r1.ebuild 1410 RMD160 b507fad5460f86c109b9f8ba01b07e4ad34f8b13 SHA1 f3df09e9a843da1470fd33c9629cedbc60eca169 SHA256 33e043124a1df92874ec76f8f8833a016d83aa1350ce137cfe80b747a8b7a0e8
 EBUILD rpy-1.0.2.ebuild 1359 RMD160 0240c01f54d0854b5ccc6e95c041c870fc870ef7 SHA1 6c1b648649ac385a0df77dd642d551746e6e32cd SHA256 b97176ef159f945243246ed08e607bbd95693d13af6814d671da6dbe239be4cf
-MISC ChangeLog 3885 RMD160 4e24f4d30d1caf1df0aaca5c6b2de5a822cd3d45 SHA1 f2ae3c6e86ac718574390607f0bae744377083ea SHA256 46905ac9537ccedbd3fe7bd78e2bd97b89309e7433486e4e26ae1679bf329a85
+MISC ChangeLog 4098 RMD160 f9ad03df05dd62fa70fd8003e731ffab30860374 SHA1 3a81af69c6d67547195af6b2eacb64ec1e865dce SHA256 f22dcd037151fdafe8b5875823b23947f4e4ebbcdb9d21cf95f991ddb51f6883
 MISC metadata.xml 435 RMD160 b9de7bdc77c1d92f1ef787aa0891092ab37c38e8 SHA1 bb74a8f3c611f3f406b6343acb349d05e9765ad3 SHA256 cfbeb2f702e55ef46bef1a51dd78b7ceae7724a5ab5ccfd2daa65554e1a553de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH/5QZ1ycZbhPLE2ARAhw8AKCydn1TVTA8oMQtD6p9np7SZt6oVwCfVB46
-YBVMOgbku15r/OI6k4lJORc=
-=GG08
+iEYEARECAAYFAkghaUcACgkQ1ycZbhPLE2BvEACfZpAV7cR7YWcZl1kfgGc2Ub4X
+gSgAoIXxRy532enWqRntJ5pmmFGlP/vA
+=8Uky
 -----END PGP SIGNATURE-----
diff --git a/dev-python/rpy/files/rpy-1.0.2-rpymodule-R-2.7.patch b/dev-python/rpy/files/rpy-1.0.2-rpymodule-R-2.7.patch
new file mode 100644
index 000000000000..e7ca42e6b1c0
--- /dev/null
+++ b/dev-python/rpy/files/rpy-1.0.2-rpymodule-R-2.7.patch
@@ -0,0 +1,14 @@
+--- rpy-1.0.2.orig/src/rpymodule.c	2008-04-10 18:49:04.000000000 +0200
++++ rpy-1.0.2/src/rpymodule.c	2008-05-02 14:28:42.000000000 +0200
+@@ -1778,7 +1778,11 @@
+     R_dot_Last();           
+     R_RunExitFinalizers();  
+     CleanEd();              
++#if (R_VERSION >= R_Version(2,7,0)) 
++    Rf_KillAllDevices();
++#else
+     KillAllDevices();
++#endif
+ 
+ #if (R_VERSION >= R_Version(2,7,0)) 
+     R_CleanTempDir();
diff --git a/dev-python/rpy/rpy-1.0.2-r1.ebuild b/dev-python/rpy/rpy-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..989d2176028c
--- /dev/null
+++ b/dev-python/rpy/rpy-1.0.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-1.0.2-r1.ebuild,v 1.1 2008/05/07 08:33:02 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="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-lang/R-2.6.1
+	dev-python/numpy"
+DEPEND="${RDEPEND}
+	doc? ( || ( virtual/tetex  dev-texlive/texlive-texinfo ) )"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${PN}-1.0_rc3-version-detect.patch
+	epatch "${FILESDIR}"/${PN}-testfiles.patch
+	epatch "${FILESDIR}"/${P}-rpymodule-R-2.7.patch
+	# this module should exist only if R was built with USE=lapack
+	if [[ -e /usr/$(get_libdir)/R/modules/lapack.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
+}