Fixed lapack detection again (bug #224935) and switch texlive and tetex order for doc flag. Cleaned for old versions.

Package-Manager: portage-2.1.5.3

5 files changed, 14 insertions, 130 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 850e2ebc5e23..ec49419f4bc2 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2008/05/07 08:33:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.23 2008/06/05 10:19:21 bicatali Exp $
+
+  05 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> -rpy-1.0.1.ebuild,
+  -rpy-1.0.2.ebuild, rpy-1.0.2-r1.ebuild:
+  Fixed lapack detection again (bug #224935) and switch texlive and tetex
+  order for doc flag. Cleaned for old versions.
 
 *rpy-1.0.2-r1 (07 May 2008)
 
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index f7071d99eeb3..19252ddff624 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -6,18 +6,15 @@ AUX rpy-1.0.2-rpymodule-R-2.7.patch 415 RMD160 f5ec70233673a983aff8433e56ad5907a
 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
-DIST rpy-1.0.1.tar.gz 83692 RMD160 4eb9343ade3907124f9e706dfe9cb9a25e7b4eea SHA1 58a11668da93f3be8ca42ea2440cf0223ab1769d SHA256 7064de3662d9db69e35383de0c3c17d415406964e8f2f10cc915df71574eeba5
 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 4098 RMD160 f9ad03df05dd62fa70fd8003e731ffab30860374 SHA1 3a81af69c6d67547195af6b2eacb64ec1e865dce SHA256 f22dcd037151fdafe8b5875823b23947f4e4ebbcdb9d21cf95f991ddb51f6883
+EBUILD rpy-1.0.2-r1.ebuild 1411 RMD160 806964cde46414067dbbe697325897043621932c SHA1 38b86d140102066e4534b58f0451d92e08410582 SHA256 d1a21a9ed9989ae64af4a99f81f1b5aa52765346fced169320b0c084772d7979
+MISC ChangeLog 4337 RMD160 45e6a78d9e7ace7d696bdca0832cb09dc5962c90 SHA1 6d84e9f600b746271992faf52efb5c93cf52705f SHA256 09db6193d8f79c147d198d22f41ea8037e5ad398676eddf09e1a7131742cc368
 MISC metadata.xml 435 RMD160 b9de7bdc77c1d92f1ef787aa0891092ab37c38e8 SHA1 bb74a8f3c611f3f406b6343acb349d05e9765ad3 SHA256 cfbeb2f702e55ef46bef1a51dd78b7ceae7724a5ab5ccfd2daa65554e1a553de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEUEARECAAYFAkgkTVcACgkQ1ycZbhPLE2A0VQCY5JeXgILvnfXFBtZfQj2Lgepu
-bACaAz9S3e2mKjvbaPNZ4FRJ1xmFTq4=
-=H2z6
+iEYEARECAAYFAkhHvdAACgkQ1ycZbhPLE2BcegCfdrd+mhTXDOHWp5HwpHwaMOPP
+CLAAoKev9iOk7Chrhlu3Jfwu/SsufLbC
+=4+ks
 -----END PGP SIGNATURE-----
diff --git a/dev-python/rpy/rpy-1.0.1.ebuild b/dev-python/rpy/rpy-1.0.1.ebuild
deleted file mode 100644
index d5cb47925d3f..000000000000
--- a/dev-python/rpy/rpy-1.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.1.ebuild,v 1.2 2008/02/26 20:06:19 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 lapack"
-
-RDEPEND=">=dev-lang/R-2.6.1
-	lapack? ( virtual/lapack )
-	dev-python/numpy"
-DEPEND="${RDEPEND}
-	doc? ( || ( virtual/tetex  dev-texlive/texlive-texinfo ) )"
-
-pkg_setup() {
-	if use lapack && ! built_with_use dev-lang/R lapack; then
-		eerror "If you want ${PN} with lapack bindings,"
-		eerror "you also need dev-lang/R with lapack"
-		die "need dev-lang/R compiled with lapack"
-	fi
-}
-
-src_unpack() {
-	distutils_src_unpack
-	# Fix lapack linking issue, bug 143396
-	if use lapack; then
-		sed -i \
-			-e 's:Rlapack:lapack:g' \
-			setup.py || die "sed in setup.py failed"
-	fi
-	epatch "${FILESDIR}"/${PN}-1.0_rc3-version-detect.patch
-	epatch "${FILESDIR}"/${PN}-testfiles.patch
-}
-
-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-1.0.2-r1.ebuild b/dev-python/rpy/rpy-1.0.2-r1.ebuild
index 989d2176028c..b5473e2616a4 100644
--- a/dev-python/rpy/rpy-1.0.2-r1.ebuild
+++ b/dev-python/rpy/rpy-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-1.0.2-r1.ebuild,v 1.2 2008/06/05 10:19:21 bicatali Exp $
 
 inherit distutils eutils
 
@@ -16,7 +16,7 @@ IUSE="doc examples"
 RDEPEND=">=dev-lang/R-2.6.1
 	dev-python/numpy"
 DEPEND="${RDEPEND}
-	doc? ( || ( virtual/tetex  dev-texlive/texlive-texinfo ) )"
+	doc? ( || ( dev-texlive/texlive-texinfo virtual/tetex ) )"
 
 src_unpack() {
 	distutils_src_unpack
@@ -24,7 +24,7 @@ src_unpack() {
 	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
+	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"
diff --git a/dev-python/rpy/rpy-1.0.2.ebuild b/dev-python/rpy/rpy-1.0.2.ebuild
deleted file mode 100644
index c67fc0657b1c..000000000000
--- a/dev-python/rpy/rpy-1.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.ebuild,v 1.1 2008/04/11 16:38:39 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
-
-	# 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
-}