Version bump, now slotted

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 125 insertions, 8 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/Manifest b/dev-python/rpy/Manifest
index 4c6c1e10c066..bfc7a2b7e7d7 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 90rpy 21 RMD160 67787b952b20da4e82a5cf761a63dd999283a24c SHA1 fdfba3081fee34551d46083d367e6a5d0b24e9d2 SHA256 6759a9579b9271d22e362979ea77cb2d5dac687ba8beaf007cc4214833205a49
 AUX rpy-1.0.2-R28.patch 335 RMD160 e1389f09e34fa99ce69318dd0cf6f9e33656317d SHA1 367f77a2bac17303065b50f7935aed44fa5f2552 SHA256 ca274cf2127fd19569785053da2342dbf51dfb6593817c9ab8d121e144858198
 AUX rpy-1.0.2-rpymodule-R-2.7.patch 415 RMD160 f5ec70233673a983aff8433e56ad5907a614d41f SHA1 8efea983db9544528cd396436d5475b23ab59319 SHA256 939d08f700a73d4c982aaa1725da6049f2680a94d06b988f6727c2321f49cd63
 AUX rpy-1.0_rc3-version-detect.patch 592 RMD160 536d493f0ad469c6c6508ef0860e92c98d71a948 SHA1 5d7959378426c1dbe76a5dab94f9f423ad56d60c SHA256 ab156087a1b8a631630c0dec0362fcfb1e6d8ca8e2deadc4447dbcc6047e44ad
+AUX rpy-2.0.1-setup.patch 625 RMD160 289fa40c4716a8cf27bd1773c90c7f6e921d37b3 SHA1 b1ad2157778783cdb0a40a377114a00d7ef6145d SHA256 f9be26cbdbfc67ec6a061905e1790255e95bd2bfc83d76b0b818a81211185172
 AUX rpy-testfiles.patch 2854 RMD160 e94af532950604f5efb68125239d0b938dd58231 SHA1 d7d4cca007f41df13c6aeed6a618efddf24d9cc3 SHA256 b5003de03dda9897ab4e0a26d8a5a9655e961d3129665f7e3999ac91a31c9288
 DIST rpy-1.0.2.tar.gz 85458 RMD160 2814eb406ff167826df1bd2983035ac8d0968b40 SHA1 c3307c3a895c1ddcb3b4c67a6759f164cb2f667e SHA256 bae91fff8f4ee754b70d14d4f6e1f2c64c026c97eff75c3bc84c725d6de03d30
+DIST rpy-1.0.3.tar.gz 87009 RMD160 82db02e5f3d704cdb605628d3193806e5be0dfe2 SHA1 492be646603be4a2ce1ff37d329df65a5203dabf SHA256 4ad23632ddcb6318a1af27a7f64526c110d59cbd166a0338c929de952f33c48b
+DIST rpy2-2.0.1.tar.gz 63406 RMD160 56ca7c0c981f0d738a3b54b73545fd329f4e4a57 SHA1 594f36202ed2a523ce7b008f408444765aabf4e8 SHA256 ad66d0b2d8ef18807cf732c064d8011dc93b71f08c3d7fe5b8977a3b98d9cbc1
 EBUILD rpy-1.0.2-r1.ebuild 1412 RMD160 5f9bcabf93c6fd27d04d7d7727caa5786cf860b0 SHA1 796d30cd3b901c8335acffade1a1458d28979b02 SHA256 3c0bb0698900d104837b52e19f0cf733ff573d352d1929948b9fa9d1bc24bee5
-MISC ChangeLog 4901 RMD160 a572933dcf6d66849bed324ae972dbef487d800f SHA1 e0992302727043583924767d8276ebd6e400eead SHA256 1569fd72386faeef34f63d2ea02a6641fb06491efd1fb13b18e553e869baffc2
+EBUILD rpy-1.0.3.ebuild 1399 RMD160 69d06c34e6d9b74a1b5dd152033ba2789ff3c691 SHA1 fe8bebdc8b26304273153e98dc802625be3c674e SHA256 3f729676e9784edf7edf4a9bca8f73273e7eb727b192d14e3e1f239264962fe0
+EBUILD rpy-2.0.1.ebuild 845 RMD160 5c6a844510476fe41a13fa2f4b4b24158cb2be81 SHA1 998cfdd43761f8e0928bb182990bbd8f06c60cc1 SHA256 fbdc431d05f9a0578b1db77f2199a7c9769b2a9174b6ddfc8ad69a0626c96482
+MISC ChangeLog 5120 RMD160 32797a1e83d73f1b7955368bca0f219b4285db79 SHA1 0bef6e553627ef81f743ce7f493a58cc0d76a5f1 SHA256 f7fc9e4d3f4ab26fbc0a3843e55c67a1d370c3c934f23fe3c77f445ce9d47721
 MISC metadata.xml 435 RMD160 b9de7bdc77c1d92f1ef787aa0891092ab37c38e8 SHA1 bb74a8f3c611f3f406b6343acb349d05e9765ad3 SHA256 cfbeb2f702e55ef46bef1a51dd78b7ceae7724a5ab5ccfd2daa65554e1a553de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkFmbUACgkQ1ycZbhPLE2ArHgCfUv3U1ADkqNAD5a4Jk5uLuCM4
-L3UAn1+cU11dg2X78CBZOK/Gz+XqivJa
-=tFTB
+iEYEARECAAYFAkl6DCgACgkQ1ycZbhPLE2BqhACgn8O0BYyXal2+09DUeQE5WhTW
+lfsAnjDI/LoQo13apVeofBGyehFr6y1T
+=Z8BW
 -----END PGP SIGNATURE-----
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"
+}