1 |
commit: 8aca469b7b450488c3312fa2183433d9fcf42712 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 1 20:14:25 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 1 20:34:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aca469b |
7 |
|
8 |
sci-libs/libmuscle: Modernise to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
sci-libs/libmuscle/files/3.7-bufferoverflow.patch | 8 ++--- |
13 |
.../files/libmuscle-3.7-fix-build-system.patch | 21 ++++++++++++ |
14 |
sci-libs/libmuscle/libmuscle-3.7-r3.ebuild | 40 ++++++++++++++++++++++ |
15 |
3 files changed, 65 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/libmuscle/files/3.7-bufferoverflow.patch b/sci-libs/libmuscle/files/3.7-bufferoverflow.patch |
18 |
index c34b8ccacbd..384f17acfbf 100644 |
19 |
--- a/sci-libs/libmuscle/files/3.7-bufferoverflow.patch |
20 |
+++ b/sci-libs/libmuscle/files/3.7-bufferoverflow.patch |
21 |
@@ -1,5 +1,5 @@ |
22 |
---- libMUSCLE/globalslinux.cpp.old 2010-03-14 19:03:14.000000000 +1300 |
23 |
-+++ libMUSCLE/globalslinux.cpp 2010-03-14 19:11:09.000000000 +1300 |
24 |
+--- a/libMUSCLE/globalslinux.cpp |
25 |
++++ b/libMUSCLE/globalslinux.cpp |
26 |
@@ -159,7 +159,7 @@ |
27 |
} |
28 |
return DEFAULT_RAM; |
29 |
@@ -9,8 +9,8 @@ |
30 |
return ((double) Bytes)/1e6; |
31 |
} |
32 |
|
33 |
---- libMUSCLE/progress.cpp.old 2010-03-14 19:50:27.000000000 +1300 |
34 |
-+++ libMUSCLE/progress.cpp 2010-03-14 19:51:07.000000000 +1300 |
35 |
+--- a/libMUSCLE/progress.cpp |
36 |
++++ b/libMUSCLE/progress.cpp |
37 |
@@ -48,7 +48,7 @@ |
38 |
if (MB < 0) |
39 |
return ""; |
40 |
|
41 |
diff --git a/sci-libs/libmuscle/files/libmuscle-3.7-fix-build-system.patch b/sci-libs/libmuscle/files/libmuscle-3.7-fix-build-system.patch |
42 |
new file mode 100644 |
43 |
index 00000000000..2b2c28c8132 |
44 |
--- /dev/null |
45 |
+++ b/sci-libs/libmuscle/files/libmuscle-3.7-fix-build-system.patch |
46 |
@@ -0,0 +1,21 @@ |
47 |
+* Make build system parallel buildable |
48 |
+* Remove -funroll-loops and friends |
49 |
+ |
50 |
+--- a/libMUSCLE/Makefile.am |
51 |
++++ b/libMUSCLE/Makefile.am |
52 |
+@@ -1,6 +1,4 @@ |
53 |
+-OPTIMIZATION = -O2 -Wall -funroll-loops -fomit-frame-pointer -ftree-vectorize -funsafe-math-optimizations |
54 |
+-AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@ |
55 |
+-AM_LDFLAGS = $(OPTIMIZATION) |
56 |
++AM_CXXFLAGS = -DNDEBUG=1 @OPENMP_CXXFLAGS@ |
57 |
+ |
58 |
+ LIBMUSCLE_H = \ |
59 |
+ alpha.h cluster.h clust.h clustsetdf.h clustset.h clustsetmsa.h diaglist.h distcalc.h distfunc.h dpregionlist.h dpreglist.h edgelist.h enumopts.h enums.h estring.h gapscoredimer.h gonnet.h intmath.h msadist.h msa.h muscle.h objscore.h params.h profile.h pwpath.h refine.h scorehistory.h seq.h seqvect.h textfile.h timing.h tree.h types.h unixio.h threadstorage.h |
60 |
+@@ -36,6 +34,6 @@ |
61 |
+ |
62 |
+ |
63 |
+ muscle_SOURCES = main.cpp |
64 |
+-muscle_LDADD = $(top_builddir)/libMUSCLE/libMUSCLE-3.7.la |
65 |
++muscle_LDADD = libMUSCLE-3.7.la |
66 |
+ |
67 |
+ |
68 |
|
69 |
diff --git a/sci-libs/libmuscle/libmuscle-3.7-r3.ebuild b/sci-libs/libmuscle/libmuscle-3.7-r3.ebuild |
70 |
new file mode 100644 |
71 |
index 00000000000..d3a8107c105 |
72 |
--- /dev/null |
73 |
+++ b/sci-libs/libmuscle/libmuscle-3.7-r3.ebuild |
74 |
@@ -0,0 +1,40 @@ |
75 |
+# Copyright 1999-2017 Gentoo Foundation |
76 |
+# Distributed under the terms of the GNU General Public License v2 |
77 |
+ |
78 |
+EAPI=6 |
79 |
+ |
80 |
+inherit autotools |
81 |
+ |
82 |
+DESCRIPTION="Library for sci-biology/mauve" |
83 |
+HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/" |
84 |
+SRC_URI="mirror://gentoo/${P}-r1.tar.bz2" |
85 |
+ |
86 |
+LICENSE="public-domain" |
87 |
+SLOT="0" |
88 |
+KEYWORDS="~amd64 ~x86" |
89 |
+IUSE="doc static-libs" |
90 |
+ |
91 |
+RDEPEND="!sci-biology/muscle" |
92 |
+DEPEND="${RDEPEND} |
93 |
+ doc? ( app-doc/doxygen )" |
94 |
+ |
95 |
+PATCHES=( |
96 |
+ "${FILESDIR}"/${PV}-bufferoverflow.patch |
97 |
+ "${FILESDIR}"/${PN}-3.7-fix-build-system.patch |
98 |
+) |
99 |
+ |
100 |
+src_prepare() { |
101 |
+ default |
102 |
+ eautoreconf |
103 |
+} |
104 |
+ |
105 |
+src_configure() { |
106 |
+ econf $(use_enable static-libs static) |
107 |
+} |
108 |
+ |
109 |
+src_install() { |
110 |
+ default |
111 |
+ |
112 |
+ # package provides .pc file |
113 |
+ find "${D}" -name '*.la' -delete || die |
114 |
+} |