Re-fixes lapack dependencies when USE=-lapack is asked

Package-Manager: portage-2.1.4.4

8 files changed, 36 insertions, 169 deletions

diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index e6ea0135c65e..22cc6342dfb1 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.19 2008/01/17 16:50:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.20 2008/02/26 20:06:19 bicatali Exp $
+
+  26 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/rpy-0.99.2-version-detect.patch,
+  -files/rpy-1.0_rc3-lib-handling.patch, -files/rpy-lapack.patch,
+  -rpy-0.99.2-r1.ebuild, -rpy-1.0_rc3.ebuild, rpy-1.0.1.ebuild:
+  Re-fixes lapack dependencies when USE=-lapack is asked
 
 *rpy-1.0.1 (17 Jan 2008)
 
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index b3e50f910b0b..2ffcc34e26d3 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 90rpy 21 RMD160 67787b952b20da4e82a5cf761a63dd999283a24c SHA1 fdfba3081fee34551d46083d367e6a5d0b24e9d2 SHA256 6759a9579b9271d22e362979ea77cb2d5dac687ba8beaf007cc4214833205a49
-AUX rpy-0.99.2-version-detect.patch 546 RMD160 bf5f0fbb6aed9b26230bfc7022a857a393092a0a SHA1 57de5d718d431795680b36c93886d1307fa5fb18 SHA256 599ba79b16d13e41e387e8242ab68f1d68e536d77eeadb2340b8291cde25d33c
-AUX rpy-1.0_rc3-lib-handling.patch 667 RMD160 8fdcd2bcc6f5afffe4dd1b3addf14788ea99eeef SHA1 ba4d588961169387c1f098320f46a82977907f92 SHA256 ec5d5be953dbdcd7f0fa26691e435b4adab1cae7f2cf6e0734fcef1a9b2372e0
 AUX rpy-1.0_rc3-version-detect.patch 592 RMD160 536d493f0ad469c6c6508ef0860e92c98d71a948 SHA1 5d7959378426c1dbe76a5dab94f9f423ad56d60c SHA256 ab156087a1b8a631630c0dec0362fcfb1e6d8ca8e2deadc4447dbcc6047e44ad
-AUX rpy-lapack.patch 821 RMD160 a764131e81b4a73c9ebc6633063583d74bf8c41c SHA1 f09398f6871f148c4535d455e54caf7e4eca8676 SHA256 82df642b69ccdab4f48314f2f445c903aaa66824e48e5379a1ea390fe097cdb1
 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-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
 DIST rpy-1.0.1.tar.gz 83692 RMD160 4eb9343ade3907124f9e706dfe9cb9a25e7b4eea SHA1 58a11668da93f3be8ca42ea2440cf0223ab1769d SHA256 7064de3662d9db69e35383de0c3c17d415406964e8f2f10cc915df71574eeba5
 EBUILD rpy-0.4.6.ebuild 670 RMD160 5f748dbcff1c7a1623916a4171d17a52fe6fa697 SHA1 f1e8c66b165389123060d8043295f19a8ed519b8 SHA256 0aea5d588979d42522d3fa7e410154303af46245598215180985495a7d2fe946
-EBUILD rpy-0.99.2-r1.ebuild 1161 RMD160 e2c66cd53a4b14aff83e9d8f52b315ca7d1b723a SHA1 c1ee60f5a68d556b88b1a9aa426414d0e3ebceb1 SHA256 df660ded69606cc054dff8e429053343d0ca359091eb84994f41e81207e2f8a8
-EBUILD rpy-1.0.1.ebuild 1189 RMD160 3af1ccd567150e0028dc301370666c75ce098fd4 SHA1 425d7404fd81a63f376821215f463d48c00cc6eb SHA256 e29f7f934242c595c93fefdcfe95f2d26a1d12a94c301a057a87b7cf92fe38dc
-EBUILD rpy-1.0_rc3.ebuild 1280 RMD160 cba40f9180d0f0f3d2e71ff7d8db0003c6584715 SHA1 8abd8d7b79cd1c5f5e95e65627ee137af2a9297c SHA256 b141647efe7601995a210596aa8a4f63e8b49c2224380f4814187c518b90959d
-MISC ChangeLog 3451 RMD160 59cf03dae1177ec90c8bcd0f1de998200211aeb7 SHA1 0067b508b0ce40fef089de3ad03e4f82daf6e1fe SHA256 665950299dc21ec51f895301db0372c16095417e12dcff42eb48ef6ccad0a3f4
+EBUILD rpy-1.0.1.ebuild 1556 RMD160 40e52e13ad5e48bf2668e070db35e3b74f050b8a SHA1 57bdcfc481e98d40456fbac2eac2a654cd41dea1 SHA256 99cec0b6676e0bfa5c9e041479eb41842e7c30bae42144ff07669b8d617d8b44
+MISC ChangeLog 3736 RMD160 3b4929fda4e899e14c21d1b4460bec4b87ba866c SHA1 f3fe4b842b3d5bc10f8ff1d37370f3a30b366f8f SHA256 a6b1f594e4aa48cf1c2b82b05d2ccad19545527425a9a05c3e1cba50a390d53b
 MISC metadata.xml 435 RMD160 b9de7bdc77c1d92f1ef787aa0891092ab37c38e8 SHA1 bb74a8f3c611f3f406b6343acb349d05e9765ad3 SHA256 cfbeb2f702e55ef46bef1a51dd78b7ceae7724a5ab5ccfd2daa65554e1a553de
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxHFE1ycZbhPLE2ARAl6eAJ9xu3kJVqBmxx0dTQt8ZQWyC3bnjQCgq9kV
+Blh6ZHaf/EKspDZDNHmJyj4=
+=n0AS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/rpy/files/rpy-0.99.2-version-detect.patch b/dev-python/rpy/files/rpy-0.99.2-version-detect.patch
deleted file mode 100644
index af192267361d..000000000000
--- a/dev-python/rpy/files/rpy-0.99.2-version-detect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpy_tools.py	2006-07-28 13:12:02.000000000 +0100
-+++ rpy_tools.py	2006-07-28 13:11:35.000000000 +0100
-@@ -97,7 +97,7 @@
-     if stat or len(output)<=0:
-       raise RuntimeError("Couldn't execute the R interpreter" +
-                          " `%s'.\n" % rexec )
--    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
-+    version = re.search("R 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/files/rpy-1.0_rc3-lib-handling.patch b/dev-python/rpy/files/rpy-1.0_rc3-lib-handling.patch
deleted file mode 100644
index 2e105aea0a0c..000000000000
--- a/dev-python/rpy/files/rpy-1.0_rc3-lib-handling.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-lapack.patch b/dev-python/rpy/files/rpy-lapack.patch
deleted file mode 100644
index 15d5dd09876f..000000000000
--- a/dev-python/rpy/files/rpy-lapack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py.orig	2008-01-17 16:34:18.090303918 +0000
-+++ setup.py	2008-01-17 16:34:34.247143104 +0000
-@@ -133,7 +133,7 @@
-     elif sys.platform=='osf1V5':
-         include_dirs = [ os.path.join(RHOME.strip(), 'include'), 
-                          'src' ]
--        libraries=['R','Rlapack']
-+        libraries=['R','lapack']
-         library_dirs = r_libs
-         runtime_libs = r_libs
-         extra_compile_args=["-shared"]
-@@ -141,7 +141,7 @@
-     else: # unix-like systems, this is known to work for Linux and Solaris
-         include_dirs = [ os.path.join(RHOME.strip(), 'include'), 
-                          'src', '/usr/share/R/include' ]
--        libraries=['R','Rlapack']
-+        libraries=['R','lapack']
-         library_dirs = r_libs
-         runtime_libs = r_libs
-         extra_compile_args=["-shared"]
diff --git a/dev-python/rpy/rpy-0.99.2-r1.ebuild b/dev-python/rpy/rpy-0.99.2-r1.ebuild
deleted file mode 100644
index 33a57f9cfa1b..000000000000
--- a/dev-python/rpy/rpy-0.99.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-0.99.2-r1.ebuild,v 1.1 2007/09/27 07:34:16 hawking Exp $
-
-inherit distutils eutils
-
-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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="examples lapack"
-
-DEPEND="virtual/python
-	>=dev-lang/R-2.3
-	dev-python/numeric
-	lapack? ( virtual/lapack )"
-RDEPEND="${DEPEND}"
-
-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"
-}
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-
-	# add R libs to ld.so.conf
-	doenvd "${FILESDIR}/90rpy"
-}
-
-pkg_postinst() {
-	env-update
-}
diff --git a/dev-python/rpy/rpy-1.0.1.ebuild b/dev-python/rpy/rpy-1.0.1.ebuild
index 3de808490879..d5cb47925d3f 100644
--- a/dev-python/rpy/rpy-1.0.1.ebuild
+++ b/dev-python/rpy/rpy-1.0.1.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.1.ebuild,v 1.1 2008/01/17 16:50:15 bicatali Exp $
+# $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
 
@@ -11,16 +11,30 @@ 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"
+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
-	epatch "${FILESDIR}"/${PN}-lapack.patch
+	# 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
 }
diff --git a/dev-python/rpy/rpy-1.0_rc3.ebuild b/dev-python/rpy/rpy-1.0_rc3.ebuild
deleted file mode 100644
index 807bf78458fa..000000000000
--- a/dev-python/rpy/rpy-1.0_rc3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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."
-}