1 |
commit: 820c0379631ff7d17476d2080c1ee4687013f5c0 |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Mon Jul 19 07:54:44 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 19 08:10:26 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=820c0379 |
7 |
|
8 |
sci-misc/boinc-wrapper: various improvements |
9 |
|
10 |
Notable changes |
11 |
* writing config.h manually instead of calling ./configure |
12 |
* changed dependency operator from '>=' to '~' |
13 |
|
14 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
15 |
|
16 |
.../boinc-wrapper/boinc-wrapper-7.16.16.ebuild | 47 ++++++++++++---------- |
17 |
.../boinc-wrapper/boinc-wrapper-7.16.17.ebuild | 45 ++++++++++++--------- |
18 |
sci-misc/boinc-wrapper/metadata.xml | 2 +- |
19 |
3 files changed, 52 insertions(+), 42 deletions(-) |
20 |
|
21 |
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild |
22 |
index becebc0ab..e282280fd 100644 |
23 |
--- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild |
24 |
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild |
25 |
@@ -1,50 +1,55 @@ |
26 |
# Copyright 1999-2021 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI=7 |
30 |
+EAPI=8 |
31 |
|
32 |
-inherit autotools toolchain-funcs |
33 |
+inherit toolchain-funcs |
34 |
|
35 |
+MY_PN=${PN%%-*} |
36 |
MY_PV=$(ver_cut 1-2) |
37 |
- |
38 |
-DESCRIPTION="use non-BOINC apps with BOINC" |
39 |
+DESCRIPTION="Wrapper to use non-BOINC apps with BOINC" |
40 |
HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp" |
41 |
|
42 |
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz" |
43 |
-KEYWORDS="~amd64 ~x86" |
44 |
-S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/samples/wrapper" |
45 |
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" |
46 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
47 |
+S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}" |
48 |
|
49 |
LICENSE="LGPL-3+ regexp-UofT" |
50 |
SLOT="0" |
51 |
|
52 |
+# sci-misc/boinc doesn't have all necessary headers, so |
53 |
+# we have to include from build root. All that said, |
54 |
+# versions must not mismatch. |
55 |
RDEPEND=" |
56 |
~sci-misc/boinc-${PV} |
57 |
- ~dev-libs/boinc-zip-${PV} |
58 |
+ >=dev-libs/boinc-zip-${PV} |
59 |
" |
60 |
DEPEND="${RDEPEND}" |
61 |
|
62 |
PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch ) |
63 |
-DOCS=( ReadMe.txt job.xml ) |
64 |
- |
65 |
-src_prepare() { |
66 |
- default |
67 |
+DOCS=( job.xml ) |
68 |
|
69 |
+src_configure() { |
70 |
cd ../.. || die |
71 |
- eautoreconf |
72 |
+ |
73 |
bash ./generate_svn_version.sh || die |
74 |
-} |
75 |
|
76 |
-src_configure() { |
77 |
- cd ../.. || die |
78 |
- econf --enable-pkg-devel --disable-static --disable-fcgi --without-x |
79 |
-} |
80 |
+ # autotools would take an eternity to configure |
81 |
+ cat <<-EOF > "config.h" |
82 |
+ #ifndef BOINC_CONFIG_H |
83 |
+ #define BOINC_CONFIG_H |
84 |
+ |
85 |
+ #define HAVE_SYS_RESOURCE_H 1 |
86 |
+ #define HAVE_SYS_TIME_H 1 |
87 |
+ #define HAVE_SYS_WAIT_H 1 |
88 |
+ |
89 |
+ #endif |
90 |
+ EOF |
91 |
|
92 |
-src_compile() { |
93 |
tc-export CC CXX |
94 |
- default |
95 |
} |
96 |
|
97 |
src_install() { |
98 |
- default |
99 |
+ einstalldocs |
100 |
newbin wrapper boinc-wrapper |
101 |
} |
102 |
|
103 |
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild |
104 |
index f25f7d399..e282280fd 100644 |
105 |
--- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild |
106 |
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild |
107 |
@@ -3,48 +3,53 @@ |
108 |
|
109 |
EAPI=8 |
110 |
|
111 |
-inherit autotools toolchain-funcs |
112 |
+inherit toolchain-funcs |
113 |
|
114 |
+MY_PN=${PN%%-*} |
115 |
MY_PV=$(ver_cut 1-2) |
116 |
- |
117 |
-DESCRIPTION="use non-BOINC apps with BOINC" |
118 |
+DESCRIPTION="Wrapper to use non-BOINC apps with BOINC" |
119 |
HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp" |
120 |
|
121 |
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz" |
122 |
-KEYWORDS="~amd64 ~x86" |
123 |
-S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/samples/wrapper" |
124 |
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" |
125 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
126 |
+S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}" |
127 |
|
128 |
LICENSE="LGPL-3+ regexp-UofT" |
129 |
SLOT="0" |
130 |
|
131 |
+# sci-misc/boinc doesn't have all necessary headers, so |
132 |
+# we have to include from build root. All that said, |
133 |
+# versions must not mismatch. |
134 |
RDEPEND=" |
135 |
- >=sci-misc/boinc-${PV} |
136 |
+ ~sci-misc/boinc-${PV} |
137 |
>=dev-libs/boinc-zip-${PV} |
138 |
" |
139 |
DEPEND="${RDEPEND}" |
140 |
|
141 |
PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch ) |
142 |
-DOCS=( ReadMe.txt job.xml ) |
143 |
- |
144 |
-src_prepare() { |
145 |
- default |
146 |
+DOCS=( job.xml ) |
147 |
|
148 |
+src_configure() { |
149 |
cd ../.. || die |
150 |
- eautoreconf |
151 |
+ |
152 |
bash ./generate_svn_version.sh || die |
153 |
-} |
154 |
|
155 |
-src_configure() { |
156 |
- cd ../.. || die |
157 |
- econf --enable-pkg-devel --disable-static --disable-fcgi --without-x |
158 |
-} |
159 |
+ # autotools would take an eternity to configure |
160 |
+ cat <<-EOF > "config.h" |
161 |
+ #ifndef BOINC_CONFIG_H |
162 |
+ #define BOINC_CONFIG_H |
163 |
+ |
164 |
+ #define HAVE_SYS_RESOURCE_H 1 |
165 |
+ #define HAVE_SYS_TIME_H 1 |
166 |
+ #define HAVE_SYS_WAIT_H 1 |
167 |
+ |
168 |
+ #endif |
169 |
+ EOF |
170 |
|
171 |
-src_compile() { |
172 |
tc-export CC CXX |
173 |
- default |
174 |
} |
175 |
|
176 |
src_install() { |
177 |
- default |
178 |
+ einstalldocs |
179 |
newbin wrapper boinc-wrapper |
180 |
} |
181 |
|
182 |
diff --git a/sci-misc/boinc-wrapper/metadata.xml b/sci-misc/boinc-wrapper/metadata.xml |
183 |
index a07d56d79..ce271dd13 100644 |
184 |
--- a/sci-misc/boinc-wrapper/metadata.xml |
185 |
+++ b/sci-misc/boinc-wrapper/metadata.xml |
186 |
@@ -1,7 +1,7 @@ |
187 |
<?xml version="1.0" encoding="UTF-8"?> |
188 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
189 |
<pkgmetadata> |
190 |
- <maintainer type="person" proxied="yes"> |
191 |
+ <maintainer type="person"> |
192 |
<email>cyber+gentoo@×××××.in</email> |
193 |
<name>Anna</name> |
194 |
</maintainer> |