1 |
commit: bcc75ebcff4cfb8a99a5a5f418f3b73174da7e11 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 17 11:19:19 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 17 11:19:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc75ebc |
7 |
|
8 |
sci-biology/stride: Port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
.../files/stride-20011129-fix-buildsystem.patch | 21 +++++++++++++++++++ |
14 |
sci-biology/stride/files/stride-LDFLAGS.patch | 11 ---------- |
15 |
sci-biology/stride/stride-20011129-r1.ebuild | 24 +++++++++------------- |
16 |
3 files changed, 31 insertions(+), 25 deletions(-) |
17 |
|
18 |
diff --git a/sci-biology/stride/files/stride-20011129-fix-buildsystem.patch b/sci-biology/stride/files/stride-20011129-fix-buildsystem.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..ec4415ec45d |
21 |
--- /dev/null |
22 |
+++ b/sci-biology/stride/files/stride-20011129-fix-buildsystem.patch |
23 |
@@ -0,0 +1,21 @@ |
24 |
+--- a/Makefile |
25 |
++++ b/Makefile |
26 |
+@@ -1,4 +1,3 @@ |
27 |
+-CC = gcc -g |
28 |
+ FLAGS = -lm -o |
29 |
+ |
30 |
+ SOURCE = stride.c splitstr.c rdpdb.c initchn.c geometry.c thr2one.c one2thr.c filename.c tolostr.c strutil.c place_h.c hbenergy.c memory.c helix.c sheet.c rdmap.c phipsi.c command.c molscr.c die.c hydrbond.c mergepat.c fillasn.c escape.c p_jrnl.c p_rem.c p_atom.c p_helix.c p_sheet.c p_turn.c p_ssbond.c p_expdta.c p_model.c p_compnd.c report.c nsc.c area.c ssbond.c chk_res.c chk_atom.c turn.c pdbasn.c dssp.c outseq.c chkchain.c elem.c measure.c asngener.c p_endmdl.c stred.c contact_order.c contact_map.c |
31 |
+@@ -7,12 +6,9 @@ |
32 |
+ |
33 |
+ BINDIR = . |
34 |
+ |
35 |
+-.c.o: |
36 |
+- $(CC) -c $< -o $@ |
37 |
+- |
38 |
+ |
39 |
+ stride : $(OBJECT) |
40 |
+- $(CC) $(OBJECT) $(FLAGS) $(BINDIR)/stride |
41 |
++ $(CC) $(LDFLAGS) $(OBJECT) $(FLAGS) $(BINDIR)/stride |
42 |
+ |
43 |
+ $(OBJECT) : stride.h protot.h |
44 |
+ |
45 |
|
46 |
diff --git a/sci-biology/stride/files/stride-LDFLAGS.patch b/sci-biology/stride/files/stride-LDFLAGS.patch |
47 |
deleted file mode 100644 |
48 |
index 1761b12129b..00000000000 |
49 |
--- a/sci-biology/stride/files/stride-LDFLAGS.patch |
50 |
+++ /dev/null |
51 |
@@ -1,11 +0,0 @@ |
52 |
---- Makefile 2009-10-27 21:18:45.000000000 +0100 |
53 |
-+++ Makefile.new 2009-10-27 21:19:00.000000000 +0100 |
54 |
-@@ -12,7 +12,7 @@ |
55 |
- |
56 |
- |
57 |
- stride : $(OBJECT) |
58 |
-- $(CC) $(OBJECT) $(FLAGS) $(BINDIR)/stride |
59 |
-+ $(CC) $(LDFLAGS) $(OBJECT) $(FLAGS) $(BINDIR)/stride |
60 |
- |
61 |
- $(OBJECT) : stride.h protot.h |
62 |
- |
63 |
|
64 |
diff --git a/sci-biology/stride/stride-20011129-r1.ebuild b/sci-biology/stride/stride-20011129-r1.ebuild |
65 |
index 77a19f3ea89..678887de925 100644 |
66 |
--- a/sci-biology/stride/stride-20011129-r1.ebuild |
67 |
+++ b/sci-biology/stride/stride-20011129-r1.ebuild |
68 |
@@ -1,9 +1,9 @@ |
69 |
# Copyright 1999-2019 Gentoo Authors |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
|
72 |
-EAPI=5 |
73 |
+EAPI=7 |
74 |
|
75 |
-inherit eutils toolchain-funcs |
76 |
+inherit toolchain-funcs |
77 |
|
78 |
DESCRIPTION="Protein secondary structure assignment from atomic coordinates" |
79 |
HOMEPAGE="http://webclu.bio.wzw.tum.de/stride/" |
80 |
@@ -11,25 +11,21 @@ SRC_URI=" |
81 |
ftp://ftp.ebi.ac.uk/pub/software/unix/${PN}/src/${PN}.tar.gz -> ${P}.tar.gz |
82 |
https://dev.gentoo.org/~jlec/distfiles/${PN}-20060723-update.patch.bz2" |
83 |
|
84 |
-SLOT="0" |
85 |
LICENSE="STRIDE" |
86 |
+SLOT="0" |
87 |
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos" |
88 |
-IUSE="" |
89 |
- |
90 |
-S="${WORKDIR}" |
91 |
- |
92 |
RESTRICT="mirror bindist" |
93 |
|
94 |
-src_prepare() { |
95 |
+S="${WORKDIR}" |
96 |
+PATCHES=( |
97 |
# this patch updates the source to the most recent |
98 |
# version which was kindly provided by the author |
99 |
- epatch \ |
100 |
- "${DISTDIR}/${PN}-20060723-update.patch.bz2" \ |
101 |
- "${FILESDIR}"/${PN}-LDFLAGS.patch |
102 |
+ "${S}"/${PN}-20060723-update.patch |
103 |
+ "${FILESDIR}"/${PN}-20011129-fix-buildsystem.patch |
104 |
+) |
105 |
|
106 |
- # fix makefile |
107 |
- sed -e "/^CC/s|gcc -g|$(tc-getCC) ${CFLAGS}|" -i Makefile || \ |
108 |
- die "Failed to fix Makefile" |
109 |
+src_configure() { |
110 |
+ tc-export CC |
111 |
} |
112 |
|
113 |
src_install() { |