diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2008-02-26 20:06:20 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-02-26 20:06:20 +0000 |
| commit | ff5020c7167a54c87376fe2c38f3c685b2d439cd (patch) | |
| tree | f8a051ebfb3e4e2d2bda3cf22f1b5c0c02c41dbe /dev-python/rpy/files | |
| parent | Re-add old R-2.2.1-r1.ebuild for old rpy dependency until rpy-1.0.1 is stable (diff) | |
| download | gentoo-2-ff5020c7167a54c87376fe2c38f3c685b2d439cd.tar.gz gentoo-2-ff5020c7167a54c87376fe2c38f3c685b2d439cd.tar.bz2 gentoo-2-ff5020c7167a54c87376fe2c38f3c685b2d439cd.zip | |
Re-fixes lapack dependencies when USE=-lapack is asked
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-python/rpy/files')
| -rw-r--r-- | dev-python/rpy/files/rpy-0.99.2-version-detect.patch | 11 | ||||
| -rw-r--r-- | dev-python/rpy/files/rpy-1.0_rc3-lib-handling.patch | 16 | ||||
| -rw-r--r-- | dev-python/rpy/files/rpy-lapack.patch | 20 |
3 files changed, 0 insertions, 47 deletions
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"] |