1 |
commit: b233842a5305ee457f09e2dd396b76e0d39dea26 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 12 10:19:37 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 12 10:19:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b233842a |
7 |
|
8 |
sci-libs/inchi: Port to EAPI 8 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/828699 |
11 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
12 |
|
13 |
sci-libs/inchi/files/inchi-1.03-shared.patch | 5 --- |
14 |
sci-libs/inchi/files/inchi-1.04-static.patch | 26 --------------- |
15 |
.../{inchi-1.04.ebuild => inchi-1.04-r1.ebuild} | 37 ++++++++-------------- |
16 |
3 files changed, 14 insertions(+), 54 deletions(-) |
17 |
|
18 |
diff --git a/sci-libs/inchi/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch |
19 |
index 6f4619d86bd9..6a47ce99c294 100644 |
20 |
--- a/sci-libs/inchi/files/inchi-1.03-shared.patch |
21 |
+++ b/sci-libs/inchi/files/inchi-1.03-shared.patch |
22 |
@@ -1,8 +1,3 @@ |
23 |
- INCHI_API/gcc_so_makefile/makefile | 4 +++- |
24 |
- 1 files changed, 3 insertions(+), 1 deletions(-) |
25 |
- |
26 |
-diff --git a/INCHI_API/gcc_so_makefile/makefile b/INCHI_API/gcc_so_makefile/makefile |
27 |
-index dd8e53c..cd617ad 100644 |
28 |
--- a/INCHI_API/gcc_so_makefile/makefile |
29 |
+++ b/INCHI_API/gcc_so_makefile/makefile |
30 |
@@ -213,9 +213,11 @@ $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS) |
31 |
|
32 |
diff --git a/sci-libs/inchi/files/inchi-1.04-static.patch b/sci-libs/inchi/files/inchi-1.04-static.patch |
33 |
deleted file mode 100644 |
34 |
index a367c153824a..000000000000 |
35 |
--- a/sci-libs/inchi/files/inchi-1.04-static.patch |
36 |
+++ /dev/null |
37 |
@@ -1,26 +0,0 @@ |
38 |
---- INCHI_API/gcc_so_makefile/makefile 2012-05-13 14:52:53.587632989 +0300 |
39 |
-+++ INCHI_API/gcc_so_makefile/makefile 2012-05-13 14:52:11.668635419 +0300 |
40 |
-@@ -209,6 +209,14 @@ |
41 |
- |
42 |
- else |
43 |
- |
44 |
-+ifdef STATIC |
45 |
-+ |
46 |
-+libinchi.a: $(INCHI_LIB_OBJS) |
47 |
-+ $(AR) rcs $(INCHI_LIB_PATHNAME).a $(INCHI_LIB_OBJS) |
48 |
-+ $(RANLIB) $(INCHI_LIB_PATHNAME).a |
49 |
-+ |
50 |
-+else |
51 |
-+ |
52 |
- $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS) |
53 |
- $(SHARED_LINK) $(SHARED_LINK_PARM) -o \ |
54 |
- $(INCHI_LIB_PATHNAME).so$(VERSION) \ |
55 |
-@@ -219,6 +226,8 @@ |
56 |
- |
57 |
- endif |
58 |
- |
59 |
-+endif |
60 |
-+ |
61 |
- # === InChI Library compile rule ========= |
62 |
- |
63 |
- %.o: $(P_LIBR)%.c |
64 |
|
65 |
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04-r1.ebuild |
66 |
similarity index 69% |
67 |
rename from sci-libs/inchi/inchi-1.04.ebuild |
68 |
rename to sci-libs/inchi/inchi-1.04-r1.ebuild |
69 |
index c41a1e5ee2dc..5a19ed1854a7 100644 |
70 |
--- a/sci-libs/inchi/inchi-1.04.ebuild |
71 |
+++ b/sci-libs/inchi/inchi-1.04-r1.ebuild |
72 |
@@ -1,30 +1,29 @@ |
73 |
-# Copyright 1999-2021 Gentoo Authors |
74 |
+# Copyright 1999-2022 Gentoo Authors |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
|
77 |
-EAPI=5 |
78 |
+EAPI=8 |
79 |
|
80 |
-inherit epatch toolchain-funcs |
81 |
+inherit toolchain-funcs |
82 |
|
83 |
DESCRIPTION="Program and library for generating standard and non-standard InChI and InChIKeys" |
84 |
HOMEPAGE="http://www.iupac.org/inchi/" |
85 |
SRC_URI=" |
86 |
http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP -> ${P}.zip |
87 |
doc? ( http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-DOC.ZIP -> ${P}-doc.zip )" |
88 |
+S="${WORKDIR}"/INCHI-1-API |
89 |
|
90 |
LICENSE="IUPAC-InChi" |
91 |
SLOT="0" |
92 |
KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" |
93 |
-IUSE="doc static-libs" |
94 |
+IUSE="doc" |
95 |
|
96 |
-DEPEND="app-arch/unzip" |
97 |
-RDEPEND="" |
98 |
+BDEPEND="app-arch/unzip" |
99 |
|
100 |
-S="${WORKDIR}"/INCHI-1-API |
101 |
+PATCHES=( |
102 |
+ "${FILESDIR}"/${PN}-1.03-shared.patch |
103 |
+) |
104 |
|
105 |
-src_prepare() { |
106 |
- epatch \ |
107 |
- "${FILESDIR}"/${PN}-1.03-shared.patch \ |
108 |
- "${FILESDIR}"/${PN}-1.04-static.patch |
109 |
+src_configure() { |
110 |
tc-export AR RANLIB |
111 |
} |
112 |
|
113 |
@@ -43,31 +42,23 @@ src_compile() { |
114 |
ISLINUX=1 |
115 |
) |
116 |
for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do |
117 |
- pushd ${dir} > /dev/null |
118 |
+ pushd ${dir} > /dev/null || die |
119 |
emake \ |
120 |
"${common_opts[@]}" |
121 |
- popd > /dev/null |
122 |
+ popd > /dev/null || die |
123 |
done |
124 |
- if use static-libs ; then |
125 |
- pushd INCHI_API/gcc_so_makefile > /dev/null |
126 |
- emake libinchi.a \ |
127 |
- "${common_opts[@]}" \ |
128 |
- STATIC=1 |
129 |
- popd > /dev/null |
130 |
- fi |
131 |
} |
132 |
|
133 |
src_install() { |
134 |
dodoc readme*.txt |
135 |
if use doc ; then |
136 |
- cd "${WORKDIR}/INCHI-1-DOC/" |
137 |
+ cd "${WORKDIR}"/INCHI-1-DOC || die |
138 |
docinto doc |
139 |
dodoc *.pdf readme.txt |
140 |
fi |
141 |
dobin "${S}"/INCHI/gcc/inchi-1/inchi-1 |
142 |
- cd "${S}/INCHI_API/gcc_so_makefile/result" || die |
143 |
+ cd "${S}"/INCHI_API/gcc_so_makefile/result || die |
144 |
rm *gz || die |
145 |
dolib.so lib*so* |
146 |
- use static-libs && dolib.a lib*a |
147 |
doheader ../../inchi_main/inchi_api.h |
148 |
} |