New ebuild for bug 190615; thanks to genstef and dev-zero.

Package-Manager: portage-2.1.3.12

6 files changed, 114 insertions, 5 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/Manifest b/dev-python/rpy/Manifest
index 9822425475b7..cb57e2dcdefa 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -6,8 +6,17 @@ AUX rpy-0.99.2-version-detect.patch 546 RMD160 bf5f0fbb6aed9b26230bfc7022a857a39
 MD5 0de9fd7a990025c76486feb501cd8781 files/rpy-0.99.2-version-detect.patch 546
 RMD160 bf5f0fbb6aed9b26230bfc7022a857a393092a0a files/rpy-0.99.2-version-detect.patch 546
 SHA256 599ba79b16d13e41e387e8242ab68f1d68e536d77eeadb2340b8291cde25d33c files/rpy-0.99.2-version-detect.patch 546
+AUX rpy-1.0_rc3-lib-handling.patch 667 RMD160 8fdcd2bcc6f5afffe4dd1b3addf14788ea99eeef SHA1 ba4d588961169387c1f098320f46a82977907f92 SHA256 ec5d5be953dbdcd7f0fa26691e435b4adab1cae7f2cf6e0734fcef1a9b2372e0
+MD5 9d1f3d24f3746a3bbbd324632050c771 files/rpy-1.0_rc3-lib-handling.patch 667
+RMD160 8fdcd2bcc6f5afffe4dd1b3addf14788ea99eeef files/rpy-1.0_rc3-lib-handling.patch 667
+SHA256 ec5d5be953dbdcd7f0fa26691e435b4adab1cae7f2cf6e0734fcef1a9b2372e0 files/rpy-1.0_rc3-lib-handling.patch 667
+AUX rpy-1.0_rc3-version-detect.patch 592 RMD160 536d493f0ad469c6c6508ef0860e92c98d71a948 SHA1 5d7959378426c1dbe76a5dab94f9f423ad56d60c SHA256 ab156087a1b8a631630c0dec0362fcfb1e6d8ca8e2deadc4447dbcc6047e44ad
+MD5 dd13e1e69e074d1daaf022963305241a files/rpy-1.0_rc3-version-detect.patch 592
+RMD160 536d493f0ad469c6c6508ef0860e92c98d71a948 files/rpy-1.0_rc3-version-detect.patch 592
+SHA256 ab156087a1b8a631630c0dec0362fcfb1e6d8ca8e2deadc4447dbcc6047e44ad files/rpy-1.0_rc3-version-detect.patch 592
 DIST rpy-0.4.6.tar.gz 77384 RMD160 efd46a9ecc9450c4c4ee90a153b3bb89a066f316 SHA1 01d7548958820e5437eb4edb4c8f8bdd0c4f8f28 SHA256 02f8ae9deb72cc3d05199e636b3981e72d5db22cd0c38e2bf3382d1063fa76da
 DIST rpy-0.99.2.tar.gz 77088 RMD160 e78dcd20c184e6daed0e199da288efa9f70d5e96 SHA1 76c89507606b4785352b0b8b287e85b638965af6 SHA256 8a7ae0c5b24fbba4a43bf0e5cbd4229464c35338d406b9074429f8eced204138
+DIST rpy-1.0-RC3.tar.gz 67099 RMD160 a1070e8fdc0ba52bf47b954370c5d5521dfddeaf SHA1 46de1e9b452002bc979260706dfa23bb23ea3969 SHA256 b5397b09e95282e7b1c51bb3d69bef8a18bad1bdae9039f99f950f2045ce7ca6
 EBUILD rpy-0.4.6.ebuild 670 RMD160 5f748dbcff1c7a1623916a4171d17a52fe6fa697 SHA1 f1e8c66b165389123060d8043295f19a8ed519b8 SHA256 0aea5d588979d42522d3fa7e410154303af46245598215180985495a7d2fe946
 MD5 5f98bd53d48c4644f876a7d37940c23f rpy-0.4.6.ebuild 670
 RMD160 5f748dbcff1c7a1623916a4171d17a52fe6fa697 rpy-0.4.6.ebuild 670
@@ -16,10 +25,14 @@ EBUILD rpy-0.99.2-r1.ebuild 1161 RMD160 e2c66cd53a4b14aff83e9d8f52b315ca7d1b723a
 MD5 efd34985f6c6de8d89512335044689f6 rpy-0.99.2-r1.ebuild 1161
 RMD160 e2c66cd53a4b14aff83e9d8f52b315ca7d1b723a rpy-0.99.2-r1.ebuild 1161
 SHA256 df660ded69606cc054dff8e429053343d0ca359091eb84994f41e81207e2f8a8 rpy-0.99.2-r1.ebuild 1161
-MISC ChangeLog 2707 RMD160 6c84cbe743e390a20690d8885e240461ead10608 SHA1 d40bef3b2a4965b82c18ff8c671fd320b6341ece SHA256 c3f589346ff2fbf8405a3fbf4bb7adfbe4897a0589e4346473855d6707aba7bf
-MD5 6124e44b38a49b559df151ba75ffe424 ChangeLog 2707
-RMD160 6c84cbe743e390a20690d8885e240461ead10608 ChangeLog 2707
-SHA256 c3f589346ff2fbf8405a3fbf4bb7adfbe4897a0589e4346473855d6707aba7bf ChangeLog 2707
+EBUILD rpy-1.0_rc3.ebuild 1280 RMD160 cba40f9180d0f0f3d2e71ff7d8db0003c6584715 SHA1 8abd8d7b79cd1c5f5e95e65627ee137af2a9297c SHA256 b141647efe7601995a210596aa8a4f63e8b49c2224380f4814187c518b90959d
+MD5 79c9c2e464681e4db030dc22509b5992 rpy-1.0_rc3.ebuild 1280
+RMD160 cba40f9180d0f0f3d2e71ff7d8db0003c6584715 rpy-1.0_rc3.ebuild 1280
+SHA256 b141647efe7601995a210596aa8a4f63e8b49c2224380f4814187c518b90959d rpy-1.0_rc3.ebuild 1280
+MISC ChangeLog 3045 RMD160 078c9c390383b5a6910c0d5374cc3068db8d330b SHA1 56e24e7f662e0fa8100536a54d9bc8e6cf6d00c2 SHA256 a751ddd364b7c9112980277d1a7ba79745d523e433c3e2259b6823e776c73701
+MD5 5be3b9e992f50d61e323fd5ae843b53b ChangeLog 3045
+RMD160 078c9c390383b5a6910c0d5374cc3068db8d330b ChangeLog 3045
+SHA256 a751ddd364b7c9112980277d1a7ba79745d523e433c3e2259b6823e776c73701 ChangeLog 3045
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -30,3 +43,6 @@ SHA256 8d09f21fe44352fb285478bd3da5ef109f484b40a87bcba3adeef8802fef8c0c files/di
 MD5 c19257006cd9b63a9e98ec68e355aeb5 files/digest-rpy-0.99.2-r1 229
 RMD160 0f6eb84947a451f8e1768aa11691078b0a262c28 files/digest-rpy-0.99.2-r1 229
 SHA256 092bdc04da80b55397bdd60aa5fae4120e98874942a05c317ba7453bb3cc7690 files/digest-rpy-0.99.2-r1 229
+MD5 e671b70fe8154aa80d1887ff748f9b01 files/digest-rpy-1.0_rc3 232
+RMD160 9cf30033750ffe8a104a70723088081055321281 files/digest-rpy-1.0_rc3 232
+SHA256 0dfc2c550f6a86206e7ff4b0fa2adaa9504e79a574a8ce4f15cbc16b4ac6f6df files/digest-rpy-1.0_rc3 232
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."
+}