1 |
commit: 6805b9c4ce3b0097ff9747c3421930fbae048c4c |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Mon May 30 17:28:10 2022 +0000 |
4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
5 |
CommitDate: Mon May 30 17:46:59 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6805b9c4 |
7 |
|
8 |
sci-misc/boinc-wrapper: version bump to 7.18.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/842204 |
11 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
12 |
|
13 |
profiles/package.mask | 6 --- |
14 |
sci-misc/boinc-wrapper/Manifest | 2 +- |
15 |
.../boinc-wrapper/boinc-wrapper-7.16.17.ebuild | 55 ---------------------- |
16 |
...16.17-r1.ebuild => boinc-wrapper-7.18.1.ebuild} | 2 +- |
17 |
.../files/boinc-wrapper-7.16-makefile.patch | 25 ---------- |
18 |
.../files/boinc-wrapper-7.18-makefile.patch | 20 ++++++++ |
19 |
6 files changed, 22 insertions(+), 88 deletions(-) |
20 |
|
21 |
diff --git a/profiles/package.mask b/profiles/package.mask |
22 |
index de7eb00e2..7a7af0842 100644 |
23 |
--- a/profiles/package.mask |
24 |
+++ b/profiles/package.mask |
25 |
@@ -9,12 +9,6 @@ |
26 |
# TODO: Either fix per profile masking in overlays, or move |
27 |
# relevant entries to the relevant package.mask files in ::gentoo |
28 |
|
29 |
-# Arthur Zamarin <arthurzam@g.o> (2022-05-02) |
30 |
-# Depends on removed ~sci-misc/boinc-7.16.17 |
31 |
-# Bug #842204 |
32 |
-sci-misc/boinc-wrapper |
33 |
-sci-biology/cmdock |
34 |
- |
35 |
# Sergey Torokhov <torokhov-s-a@××××××.ru> (2022-04-29) |
36 |
# The upstream didn't update the md-environ since 2016. |
37 |
# The only rev. dependency is =app-doc/ford-1.6.8 |
38 |
|
39 |
diff --git a/sci-misc/boinc-wrapper/Manifest b/sci-misc/boinc-wrapper/Manifest |
40 |
index a8d70e790..b9de5fbda 100644 |
41 |
--- a/sci-misc/boinc-wrapper/Manifest |
42 |
+++ b/sci-misc/boinc-wrapper/Manifest |
43 |
@@ -1 +1 @@ |
44 |
-DIST boinc-7.16.17.tar.gz 49628624 BLAKE2B 87e266a29506ecaa41fd18a2521b08c291548a4e31f7748001e5214e6f1fada1ded8bb8b559635d4f9c7c256cd7829dcf9132c02448c559d5ceb13524ca42e0f SHA512 e9882f37ad5c83ed020155c8192228322932f83b88ed00d025dcda63bff2dca109ecdcbaf98b48c4522b841f545f32352e5c158ae0a41de0a1f2941ac8135221 |
45 |
+DIST boinc-7.18.1.tar.gz 50851883 BLAKE2B 64d321c8c56d7c34a08646dc16de5ddbb9b8e4be57b673fa77515845d967e28b5cf1fda677293e2fc8cf36a18ac0b7e7feebfbd8e434ebed41b8280c7395950d SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532 |
46 |
|
47 |
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild |
48 |
deleted file mode 100644 |
49 |
index e282280fd..000000000 |
50 |
--- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,55 +0,0 @@ |
53 |
-# Copyright 1999-2021 Gentoo Authors |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-EAPI=8 |
57 |
- |
58 |
-inherit toolchain-funcs |
59 |
- |
60 |
-MY_PN=${PN%%-*} |
61 |
-MY_PV=$(ver_cut 1-2) |
62 |
-DESCRIPTION="Wrapper to use non-BOINC apps with BOINC" |
63 |
-HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp" |
64 |
- |
65 |
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" |
66 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
67 |
-S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}" |
68 |
- |
69 |
-LICENSE="LGPL-3+ regexp-UofT" |
70 |
-SLOT="0" |
71 |
- |
72 |
-# sci-misc/boinc doesn't have all necessary headers, so |
73 |
-# we have to include from build root. All that said, |
74 |
-# versions must not mismatch. |
75 |
-RDEPEND=" |
76 |
- ~sci-misc/boinc-${PV} |
77 |
- >=dev-libs/boinc-zip-${PV} |
78 |
-" |
79 |
-DEPEND="${RDEPEND}" |
80 |
- |
81 |
-PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch ) |
82 |
-DOCS=( job.xml ) |
83 |
- |
84 |
-src_configure() { |
85 |
- cd ../.. || die |
86 |
- |
87 |
- bash ./generate_svn_version.sh || die |
88 |
- |
89 |
- # autotools would take an eternity to configure |
90 |
- cat <<-EOF > "config.h" |
91 |
- #ifndef BOINC_CONFIG_H |
92 |
- #define BOINC_CONFIG_H |
93 |
- |
94 |
- #define HAVE_SYS_RESOURCE_H 1 |
95 |
- #define HAVE_SYS_TIME_H 1 |
96 |
- #define HAVE_SYS_WAIT_H 1 |
97 |
- |
98 |
- #endif |
99 |
- EOF |
100 |
- |
101 |
- tc-export CC CXX |
102 |
-} |
103 |
- |
104 |
-src_install() { |
105 |
- einstalldocs |
106 |
- newbin wrapper boinc-wrapper |
107 |
-} |
108 |
|
109 |
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17-r1.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild |
110 |
similarity index 96% |
111 |
rename from sci-misc/boinc-wrapper/boinc-wrapper-7.16.17-r1.ebuild |
112 |
rename to sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild |
113 |
index 91ccc4e18..470bb372d 100644 |
114 |
--- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17-r1.ebuild |
115 |
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild |
116 |
@@ -18,7 +18,7 @@ SLOT="0" |
117 |
# versions must not mismatch. |
118 |
RDEPEND=" |
119 |
~sci-misc/boinc-${PV} |
120 |
- >=dev-libs/boinc-zip-${PV} |
121 |
+ dev-libs/boinc-zip |
122 |
" |
123 |
DEPEND="${RDEPEND}" |
124 |
|
125 |
|
126 |
diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch |
127 |
deleted file mode 100644 |
128 |
index f503ba847..000000000 |
129 |
--- a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch |
130 |
+++ /dev/null |
131 |
@@ -1,25 +0,0 @@ |
132 |
-diff --git a/samples/wrapper/Makefile b/samples/wrapper/Makefile |
133 |
-index c20af9446d..5ecd76c45d 100644 |
134 |
---- a/Makefile |
135 |
-+++ b/Makefile |
136 |
-@@ -7,8 +7,7 @@ BOINC_LIB_DIR = $(BOINC_DIR)/lib |
137 |
- BOINC_ZIP_DIR = $(BOINC_DIR)/zip |
138 |
- PTHREAD = -pthread |
139 |
- |
140 |
--CXXFLAGS += -g -O0 \ |
141 |
-- -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \ |
142 |
-+CXXFLAGS += \ |
143 |
- -I$(BOINC_DIR) \ |
144 |
- -I$(BOINC_LIB_DIR) \ |
145 |
- -I$(BOINC_API_DIR) \ |
146 |
-@@ -41,5 +40,5 @@ REGEXP_OBJS = \ |
147 |
- regexp_memory.o \ |
148 |
- regexp_report.o |
149 |
- |
150 |
--wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS) |
151 |
-- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip |
152 |
-+wrapper: wrapper.o $(REGEXP_OBJS) |
153 |
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(PTHREAD) -lboinc_api -lboinc -lboinc_zip $(LDFLAGS) |
154 |
--- |
155 |
-2.31.1 |
156 |
- |
157 |
|
158 |
diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch |
159 |
new file mode 100644 |
160 |
index 000000000..58a9e766e |
161 |
--- /dev/null |
162 |
+++ b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch |
163 |
@@ -0,0 +1,20 @@ |
164 |
+--- a/Makefile |
165 |
++++ b/Makefile |
166 |
+@@ -22,8 +22,7 @@ |
167 |
+ MAKEFILE_STDLIB = libstdc++.a |
168 |
+ endif |
169 |
+ |
170 |
+-CXXFLAGS += -g -O0 \ |
171 |
+- -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \ |
172 |
++CXXFLAGS += -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings \ |
173 |
+ -I$(BOINC_DIR) \ |
174 |
+ -I$(BOINC_LIB_DIR) \ |
175 |
+ -I$(BOINC_API_DIR) \ |
176 |
+@@ -56,5 +55,5 @@ |
177 |
+ regexp_memory.o \ |
178 |
+ regexp_report.o |
179 |
+ |
180 |
+-wrapper: wrapper.o $(MAKEFILE_STDLIB) $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS) |
181 |
+- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(MAKEFILE_LDFLAGS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC) |
182 |
++wrapper: wrapper.o $(REGEXP_OBJS) |
183 |
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC) |