[gentoo-commits] gentoo-x86 commit in dev-python/rpy: ChangeLog rpy-1.0.1.ebuild rpy-0.99.2-r1.ebuild rpy-1.0_rc3.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    08/02/26 20:06:20

  Modified:             ChangeLog rpy-1.0.1.ebuild
  Removed:              rpy-0.99.2-r1.ebuild rpy-1.0_rc3.ebuild
  Log:
  Re-fixes lapack dependencies when USE=-lapack is asked
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.20                 dev-python/rpy/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/rpy/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/rpy/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/rpy/ChangeLog?r1=1.19&r2=1.20

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	17 Jan 2008 16:50:15 -0000	1.19
+++ ChangeLog	26 Feb 2008 20:06:19 -0000	1.20
@@ -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@g.o>
+  -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)
 



1.2                  dev-python/rpy/rpy-1.0.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/rpy/rpy-1.0.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/rpy/rpy-1.0.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/rpy/rpy-1.0.1.ebuild?r1=1.1&r2=1.2

Index: rpy-1.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-1.0.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpy-1.0.1.ebuild	17 Jan 2008 16:50:15 -0000	1.1
+++ rpy-1.0.1.ebuild	26 Feb 2008 20:06:19 -0000	1.2
@@ -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 @@
 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
 }



-- 
gentoo-commits@l.g.o mailing list