| 1 |
commit: 1e58b1ab68dc2345b4eb70e4324a151f5ae4d2d7 |
| 2 |
Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 2 20:27:51 2014 +0000 |
| 4 |
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 2 20:27:51 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1e58b1ab |
| 7 |
|
| 8 |
sci-libs/ghmm: fix issue #223, patch applying failure |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/ghmm/ChangeLog | 6 +++++- |
| 12 |
sci-libs/ghmm/files/ghmm-9999-clapack.patch | 11 +++++++++++ |
| 13 |
sci-libs/ghmm/files/ghmm-9999-respect.patch | 8 +++----- |
| 14 |
sci-libs/ghmm/ghmm-9999.ebuild | 1 + |
| 15 |
4 files changed, 20 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/ghmm/ChangeLog b/sci-libs/ghmm/ChangeLog |
| 18 |
index 886fd6a..1220db1 100644 |
| 19 |
--- a/sci-libs/ghmm/ChangeLog |
| 20 |
+++ b/sci-libs/ghmm/ChangeLog |
| 21 |
@@ -1,7 +1,11 @@ |
| 22 |
# ChangeLog for sci-libs/ghmm |
| 23 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 02 Jun 2014; Jauhien Piatlicki <jauhien@g.o> ghmm-9999.ebuild, |
| 28 |
+ +files/ghmm-9999-clapack.patch, files/ghmm-9999-respect.patch: |
| 29 |
+ fix issue #223 |
| 30 |
+ |
| 31 |
20 Dec 2013; Justin Lecher <jlec@g.o> ghmm-9999.ebuild, |
| 32 |
+files/ghmm-9999-link.patch, +files/ghmm-9999-obsolete.patch, |
| 33 |
+files/ghmm-9999-out-of-source.patch, +files/ghmm-9999-respect.patch: |
| 34 |
|
| 35 |
diff --git a/sci-libs/ghmm/files/ghmm-9999-clapack.patch b/sci-libs/ghmm/files/ghmm-9999-clapack.patch |
| 36 |
new file mode 100644 |
| 37 |
index 0000000..d36cb2a |
| 38 |
--- /dev/null |
| 39 |
+++ b/sci-libs/ghmm/files/ghmm-9999-clapack.patch |
| 40 |
@@ -0,0 +1,11 @@ |
| 41 |
+--- ghmm/matrixop.c |
| 42 |
++++ ghmm/matrixop.c |
| 43 |
+@@ -45,7 +45,7 @@ |
| 44 |
+ #endif |
| 45 |
+ |
| 46 |
+ #ifdef DO_WITH_ATLAS |
| 47 |
+-#include <clapack.h> |
| 48 |
++#include <clapack/clapack.h> |
| 49 |
+ #endif |
| 50 |
+ |
| 51 |
+ /*============================================================================*/ |
| 52 |
|
| 53 |
diff --git a/sci-libs/ghmm/files/ghmm-9999-respect.patch b/sci-libs/ghmm/files/ghmm-9999-respect.patch |
| 54 |
index 09c8721..cc70a07 100644 |
| 55 |
--- a/sci-libs/ghmm/files/ghmm-9999-respect.patch |
| 56 |
+++ b/sci-libs/ghmm/files/ghmm-9999-respect.patch |
| 57 |
@@ -1,12 +1,10 @@ |
| 58 |
-Index: ghmmwrapper/setup.py |
| 59 |
-=================================================================== |
| 60 |
---- ghmmwrapper/setup.py (revision 2332) |
| 61 |
-+++ ghmmwrapper/setup.py (working copy) |
| 62 |
+--- ghmmwrapper/setup.py |
| 63 |
++++ ghmmwrapper/setup.py |
| 64 |
@@ -48,7 +48,6 @@ |
| 65 |
include_dirs = ['..'], |
| 66 |
library_dirs = ['../ghmm/.libs'], |
| 67 |
libraries = ['ghmm', 'm', 'pthread', 'xml2', 'z'], |
| 68 |
- extra_compile_args = ["-O2", "-pipe", "-Wall"], # -g might help debugging |
| 69 |
- depends = ['wrapper_alphabet.i', 'wrapper_cmodel.i', 'wrapper_cseq.i', |
| 70 |
+ depends = ['wrapper_alphabet.i', 'wrapper_bayes.i', 'wrapper_cmodel.i', 'wrapper_cseq.i', |
| 71 |
'wrapper_dmodel.i', 'wrapper_dpmodel.i', 'wrapper_dpseq.i', |
| 72 |
'wrapper_dseq.i', 'wrapper_xmlfile.i'] |
| 73 |
|
| 74 |
diff --git a/sci-libs/ghmm/ghmm-9999.ebuild b/sci-libs/ghmm/ghmm-9999.ebuild |
| 75 |
index a8bcf5d..54b46f2 100644 |
| 76 |
--- a/sci-libs/ghmm/ghmm-9999.ebuild |
| 77 |
+++ b/sci-libs/ghmm/ghmm-9999.ebuild |
| 78 |
@@ -34,6 +34,7 @@ S="${WORKDIR}/${PN}" |
| 79 |
ESVN_BOOTSTRAP="autotools-utils_src_prepare" |
| 80 |
|
| 81 |
PATCHES=( |
| 82 |
+ "${FILESDIR}"/${P}-clapack.patch |
| 83 |
"${FILESDIR}"/${P}-out-of-source.patch |
| 84 |
"${FILESDIR}"/${P}-link.patch |
| 85 |
"${FILESDIR}"/${P}-respect.patch |
Archives