Version bump, cleaning older versions (1.0.3 was wrongly slotted and 1.0.2-r1 is actually the same thanks to the R-2.8 patch)

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

4 files changed, 23 insertions, 65 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 3b5db07f5c9e..03331adc8b6c 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/rpy
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.30 2009/02/15 15:00:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.31 2009/04/07 07:56:55 bicatali Exp $
+
+*rpy-2.0.3 (07 Apr 2009)
+
+  07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> -rpy-1.0.3.ebuild,
+  -rpy-2.0.1.ebuild, +rpy-2.0.3.ebuild:
+  Version bump, cleaning older versions (1.0.3 was wrongly slotted and
+  1.0.2-r1 is actually the same thanks to the R-2.8 patch)
 
 *rpy-2.0.2 (15 Feb 2009)
 
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index ce18cb8791da..a0acb161d2c0 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,15 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 DIST rpy2-2.0.2.tar.gz 71782 RMD160 cdc2ff9ca99f338b62adda03bbc3e5ad47e85fa9 SHA1 5e84d596620536d8f0fdfabd238d1f46a8dcb614 SHA256 4f93438a5db10c8946a9f430cf01dab2f6c8ce8c0eb234128b4a0cc2dffe0910
+DIST rpy2-2.0.3.tar.gz 74296 RMD160 44e2ebf669d72ba59be334583721fb614e41984a SHA1 7d263087afa0f9ccb7bb59a2792ac2e519445438 SHA256 76ab7b5f266ca3af8580a86df0d1c7d0938cf117d74045dbbea8ebbd0318dd5f
 EBUILD rpy-1.0.2-r1.ebuild 1412 RMD160 5f9bcabf93c6fd27d04d7d7727caa5786cf860b0 SHA1 796d30cd3b901c8335acffade1a1458d28979b02 SHA256 3c0bb0698900d104837b52e19f0cf733ff573d352d1929948b9fa9d1bc24bee5
-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
 EBUILD rpy-2.0.2.ebuild 851 RMD160 ce8888e7f5a881b9898b474f3164107b6176a901 SHA1 76298d6f31c02887f6b36509ae8d5405d6009022 SHA256 01a121f63283d4b531e6f074505ee6ebb8b71829a00e37cbe43d9d5a639d972f
-MISC ChangeLog 5231 RMD160 0c49c78b06981ee2ad196f7859175dcdbca86c6a SHA1 3dcad6e7f1598f56c48026144bea81fa55be22ec SHA256 4766fe0803f11c78d9b111a5871d56704a5b022f916bbffbec9880939f770d65
+EBUILD rpy-2.0.3.ebuild 852 RMD160 f2e1d37299246e6041af7654fb9d1ef0188e0161 SHA1 505caed2d31bb6885d57ee164902947e5760aa53 SHA256 e61f1c79a407c796a37adaa7b2c7439b6be311dc63aca8205116613ec75c0bb4
+MISC ChangeLog 5503 RMD160 05a3292e829c771f20bdd32060152b2ccdc38de3 SHA1 b3f67f52953d6b76ef35de9c088e5137bf7f060f SHA256 8437b271d82d1cc6b4b8806229555b69be93cdab8ec7d4f53c1419ef1ea2b999
 MISC metadata.xml 435 RMD160 b9de7bdc77c1d92f1ef787aa0891092ab37c38e8 SHA1 bb74a8f3c611f3f406b6343acb349d05e9765ad3 SHA256 cfbeb2f702e55ef46bef1a51dd78b7ceae7724a5ab5ccfd2daa65554e1a553de
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknbB1EACgkQ1ycZbhPLE2B1EgCgnc6z/C7HjzZ8jSd0eniaBULG
+b6IAn0q0w/Qe4eOjb9WmB7gADzO7Gl4T
+=41KP
+-----END PGP SIGNATURE-----
diff --git a/dev-python/rpy/rpy-1.0.3.ebuild b/dev-python/rpy/rpy-1.0.3.ebuild
deleted file mode 100644
index 6cc409bead0b..000000000000
--- a/dev-python/rpy/rpy-1.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.3.ebuild
index c5a9e8310172..4db634eb7720 100644
--- a/dev-python/rpy/rpy-2.0.1.ebuild
+++ b/dev-python/rpy/rpy-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.0.3.ebuild,v 1.1 2009/04/07 07:56:55 bicatali Exp $
 
 EAPI=2
 NEED_PYTHON=2.4
@@ -28,7 +28,7 @@ PYTHON_MODNAME="${MYPN}"
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-setup.patch
+	epatch "${FILESDIR}"/${PN}-2.0.1-setup.patch
 }
 
 src_test() {