Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
Date: Sat, 01 Jan 2022 10:48:28
Message-Id: 1641034080.390112c10222dcd5bdb5724c225ee99d11ffd7b0.ulm@gentoo
1 commit: 390112c10222dcd5bdb5724c225ee99d11ffd7b0
2 Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
3 AuthorDate: Sat Dec 18 06:40:44 2021 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 1 10:48:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390112c1
7
8 sys-cluster/galera: drop old ebuilds and patches
9
10 leave behind galera-25 because of mariadb
11
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
14 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
15
16 sys-cluster/galera/Manifest | 3 -
17 .../files/galera-26.4.5-respect-toolchain.patch | 55 -------------
18 .../files/galera-4.1-strip-extra-cflags.patch | 78 -------------------
19 sys-cluster/galera/galera-26.4.6-r1.ebuild | 88 ---------------------
20 sys-cluster/galera/galera-26.4.7-r1.ebuild | 85 ---------------------
21 sys-cluster/galera/galera-26.4.9-r1.ebuild | 89 ----------------------
22 6 files changed, 398 deletions(-)
23
24 diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
25 index 1fbb7b7efc17..fc10b6bc9caa 100644
26 --- a/sys-cluster/galera/Manifest
27 +++ b/sys-cluster/galera/Manifest
28 @@ -1,7 +1,4 @@
29 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
30 DIST galera-25.3.32.tar.gz 1277302 BLAKE2B 061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2 SHA512 e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
31 DIST galera-26.4.10.tar.gz 1424663 BLAKE2B 6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38 SHA512 97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226
32 -DIST galera-26.4.7.tar.gz 1339462 BLAKE2B 9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975 SHA512 ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
33 DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
34 -DIST galera-26.4.9.tar.gz 1422801 BLAKE2B 45840fd73083c292ca7b2f491dafdf9134066f66bee85e10d6be72a428272dbe8773bf8d7ba52793cbc63c388e59d900e2e7a7c861266d11a5d07640552cb42d SHA512 c089d76ec72c2b3ad8814119f24b0f46e562d469a029b43bffc5b25dc73334f23fd016084f69f4fe42152402db8e03528371e2fa9802c9fa39d4112300aa163d
35 -DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
36
37 diff --git a/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch b/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch
38 deleted file mode 100644
39 index c82c870b4f39..000000000000
40 --- a/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch
41 +++ /dev/null
42 @@ -1,55 +0,0 @@
43 ---- a/SConscript
44 -+++ b/SConscript
45 -@@ -33,15 +33,17 @@ if has_version_script:
46 - def check_dynamic_symbols(target, source, env):
47 - import subprocess
48 -
49 -+ objdump = env['OBJDUMP']
50 -+
51 - # Check if objdump exists
52 -- p = subprocess.Popen(['objdump', '--version'], stdout=subprocess.PIPE)
53 -+ p = subprocess.Popen([objdump, '--version'], stdout=subprocess.PIPE)
54 - p.wait()
55 - if p.returncode != 0:
56 - print('objdump utility is not found. Skipping checks...')
57 - return 0
58 -
59 - # Check that DSO doesn't contain asio-related dynamic symbols
60 -- if env.Execute(Action(['! objdump -T ' + target[0].abspath + ' | grep asio'], None)):
61 -+ if env.Execute(Action(['! ' + objdump + ' -T ' + target[0].abspath + ' | grep asio'], None)):
62 - return 1
63 - return 0
64 -
65 ---- a/SConstruct
66 -+++ b/SConstruct
67 -@@ -5,6 +5,7 @@
68 - # SCons build script to build galera libraries
69 - #
70 - # How to control the build with environment variables:
71 -+# Set AR to specify archive utility
72 - # Set CC to specify C compiler
73 - # Set CXX to specify C++ compiler
74 - # Set CPPFLAGS to add non-standard include paths and preprocessor macros
75 -@@ -13,6 +14,7 @@
76 - # Set CXXFLAGS to supply C++ compiler options
77 - # Set LDFLAGS to *override* linking flags
78 - # Set LIBPATH to add non-standard linker paths
79 -+# Set OBJDUMP to specify objdump utility
80 - # Set RPATH to add rpaths
81 - #
82 - # Some useful CPPFLAGS:
83 -@@ -205,6 +207,13 @@ if cxx != 'default':
84 - link = os.getenv('LINK', 'default')
85 - if link != 'default':
86 - env.Replace(LINK = link)
87 -+ar = os.getenv('AR', 'default')
88 -+if ar != 'default':
89 -+ env.Replace(AR = ar)
90 -+objdump = os.getenv('OBJDUMP', 'default')
91 -+if objdump != 'default':
92 -+ env.Replace(OBJDUMP = objdump)
93 -+
94 -
95 - # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
96 - cc_version = str(read_first_line(env['CC'].split() + ['--version']))
97 -
98
99 diff --git a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
100 deleted file mode 100644
101 index dfa1642c7d7e..000000000000
102 --- a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
103 +++ /dev/null
104 @@ -1,78 +0,0 @@
105 -diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
106 ---- a/galerautils/src/SConscript 2019-02-25 10:37:25.000000000 -0500
107 -+++ b/galerautils/src/SConscript 2019-03-07 09:51:27.163226469 -0500
108 -@@ -1,4 +1,4 @@
109 --Import('env', 'x86', 'sysname', 'machine')
110 -+Import('env', 'sysname', 'machine')
111 -
112 - libgalerautils_env = env.Clone()
113 -
114 -@@ -39,22 +39,6 @@
115 - crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
116 - crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
117 -
118 --if x86:
119 -- if machine != 'ppc64' and machine != 'ppc64le':
120 -- crc32c_env.Append(CFLAGS = ' -msse4.2')
121 -- if sysname == 'sunos':
122 -- # Ideally we want to simply strip SSE4.2 flag from the resulting
123 -- # crc32.pic.o
124 -- # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
125 -- # but that requires some serious scons-fu, so we just don't
126 -- # compile hardware support in if host CPU does not have it.
127 -- from subprocess import check_call
128 -- try:
129 -- check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
130 -- except:
131 -- libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
132 -- crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
133 --
134 - libgalerautils_env.StaticLibrary('galerautils',
135 - libgalerautils_objs + crc32c_objs)
136 -
137 -diff -aurN a/SConstruct b/SConstruct
138 ---- a/SConstruct 2019-03-07 09:44:38.588841625 -0500
139 -+++ b/SConstruct 2019-03-07 09:50:06.305952407 -0500
140 -@@ -67,7 +67,7 @@
141 - build_target = 'all'
142 -
143 - # Optimization level
144 --opt_flags = ' -g -O3 -DNDEBUG'
145 -+opt_flags = ' -DNDEBUG'
146 -
147 - # Architecture (defaults to build host type)
148 - compile_arch = ''
149 -@@ -120,33 +120,6 @@
150 - if gcov:
151 - opt_flags = opt_flags + ' --coverage -g'
152 -
153 --if sysname == 'sunos':
154 -- compile_arch = ' -mtune=native'
155 --elif x86:
156 -- if bits == 32:
157 -- if machine == 'x86_64':
158 -- compile_arch = ' -mx32'
159 -- else:
160 -- compile_arch = ' -m32 -march=i686'
161 -- if sysname == 'linux':
162 -- link_arch = ' -Wl,-melf_i386'
163 -- else:
164 -- if machine == 'ppc64':
165 -- compile_arch = ' -mtune=native'
166 -- link_arch = ' -Wl,-melf64ppc'
167 -- elif machine == 'ppc64le':
168 -- compile_arch = ' -mtune=native'
169 -- link_arch = ' -Wl,-melf64lppc'
170 -- else:
171 -- compile_arch = ' -m64'
172 -- if sysname == 'linux':
173 -- link_arch = ' -Wl,-melf_x86_64'
174 -- link_arch = compile_arch + link_arch
175 --elif machine == 's390x':
176 -- compile_arch = ' -mzarch'
177 -- if bits == 32:
178 -- compile_arch += ' -m32'
179 --
180 - boost = int(ARGUMENTS.get('boost', 1))
181 - boost_pool = int(ARGUMENTS.get('boost_pool', 0))
182 - system_asio= int(ARGUMENTS.get('system_asio', 1))
183
184 diff --git a/sys-cluster/galera/galera-26.4.6-r1.ebuild b/sys-cluster/galera/galera-26.4.6-r1.ebuild
185 deleted file mode 100644
186 index 23c60542ac9a..000000000000
187 --- a/sys-cluster/galera/galera-26.4.6-r1.ebuild
188 +++ /dev/null
189 @@ -1,88 +0,0 @@
190 -# Copyright 1999-2021 Gentoo Authors
191 -# Distributed under the terms of the GNU General Public License v2
192 -
193 -EAPI=7
194 -
195 -PYTHON_COMPAT=( python3_{7,8,9} )
196 -
197 -inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
198 -
199 -MY_P="${PN}-4-${PV}"
200 -
201 -DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
202 -HOMEPAGE="https://galeracluster.com"
203 -SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_P}.tar.gz"
204 -LICENSE="GPL-2 BSD"
205 -
206 -SLOT="0"
207 -
208 -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
209 -IUSE="cpu_flags_x86_sse4_2 garbd test"
210 -RESTRICT="!test? ( test )"
211 -
212 -CDEPEND="
213 - dev-libs/openssl:0=
214 - >=dev-libs/boost-1.41:0=
215 - "
216 -BDEPEND=">=sys-devel/gcc-4.4"
217 -DEPEND="${BDEPEND}
218 - ${CDEPEND}
219 - dev-libs/check
220 - >=dev-cpp/asio-1.10.1[ssl(+)]
221 - <dev-cpp/asio-1.12.0
222 - "
223 -#Run time only
224 -RDEPEND="${CDEPEND}"
225 -
226 -# Respect {C,LD}FLAGS.
227 -PATCHES=(
228 - "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
229 - "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
230 -)
231 -
232 -S="${WORKDIR}/${MY_P}"
233 -
234 -src_prepare() {
235 - default
236 -
237 - # Remove bundled dev-cpp/asio
238 - rm -r "${S}/asio" || die
239 -
240 - #Remove optional garbd daemon
241 - if ! use garbd ; then
242 - rm -r "${S}/garb" || die
243 - fi
244 -}
245 -
246 -src_configure() {
247 - tc-export AR CC CXX OBJDUMP
248 - # Uses hardware specific code that seems to depend on SSE4.2
249 - if use cpu_flags_x86_sse4_2 ; then
250 - append-cflags -msse4.2
251 - else
252 - append-cflags -DCRC32C_NO_HARDWARE
253 - fi
254 - # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
255 - # and -Wold-style-cast
256 - MYSCONS=(
257 - tests=$(usex test 1 0)
258 - strict_build_flags=0
259 - system_asio=1
260 - )
261 -}
262 -
263 -src_compile() {
264 - escons --warn=no-missing-sconscript "${MYSCONS[@]}"
265 -}
266 -
267 -src_install() {
268 - dodoc scripts/packages/README scripts/packages/README-MySQL
269 - if use garbd ; then
270 - dobin garb/garbd
271 - newconfd "${FILESDIR}/garb.cnf" garbd
272 - newinitd "${FILESDIR}/garb.init" garbd
273 - doman man/garbd.8
274 - fi
275 - exeinto /usr/$(get_libdir)/${PN}
276 - doexe libgalera_smm.so
277 -}
278
279 diff --git a/sys-cluster/galera/galera-26.4.7-r1.ebuild b/sys-cluster/galera/galera-26.4.7-r1.ebuild
280 deleted file mode 100644
281 index 4da1ee14e942..000000000000
282 --- a/sys-cluster/galera/galera-26.4.7-r1.ebuild
283 +++ /dev/null
284 @@ -1,85 +0,0 @@
285 -# Copyright 1999-2021 Gentoo Authors
286 -# Distributed under the terms of the GNU General Public License v2
287 -
288 -EAPI=7
289 -
290 -PYTHON_COMPAT=( python3_{7,8,9} )
291 -
292 -inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
293 -
294 -DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
295 -HOMEPAGE="https://galeracluster.com"
296 -SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz -> ${P}.tar.gz"
297 -LICENSE="GPL-2 BSD"
298 -
299 -SLOT="0"
300 -
301 -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
302 -IUSE="cpu_flags_x86_sse4_2 garbd test"
303 -RESTRICT="!test? ( test )"
304 -
305 -CDEPEND="
306 - dev-libs/openssl:0=
307 - >=dev-libs/boost-1.41:0=
308 - "
309 -
310 -BDEPEND=">=sys-devel/gcc-4.4"
311 -
312 -DEPEND="${BDEPEND}
313 - ${CDEPEND}
314 - dev-libs/check
315 - >=dev-cpp/asio-1.10.1[ssl(+)]
316 - <dev-cpp/asio-1.12.0
317 - "
318 -
319 -#Run time only
320 -RDEPEND="${CDEPEND}"
321 -
322 -# Respect {C,LD}FLAGS.
323 -PATCHES=(
324 - "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
325 - "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
326 -)
327 -
328 -S="${WORKDIR}/galera-4-${PV}"
329 -
330 -src_prepare() {
331 - default
332 -
333 - # Remove bundled dev-cpp/asio
334 - rm -r "${S}/asio" || die
335 -
336 - #Remove optional garbd daemon
337 - if ! use garbd ; then
338 - rm -r "${S}/garb" || die
339 - fi
340 -}
341 -
342 -src_configure() {
343 - tc-export AR CC CXX OBJDUMP
344 -
345 - # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
346 - # and -Wold-style-cast
347 - MYSCONS=(
348 - crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
349 - tests=$(usex test 1 0)
350 - strict_build_flags=0
351 - system_asio=1
352 - )
353 -}
354 -
355 -src_compile() {
356 - escons --warn=no-missing-sconscript "${MYSCONS[@]}"
357 -}
358 -
359 -src_install() {
360 - dodoc scripts/packages/README scripts/packages/README-MySQL
361 - if use garbd ; then
362 - dobin garb/garbd
363 - newconfd "${FILESDIR}/garb.cnf" garbd
364 - newinitd "${FILESDIR}/garb.init" garbd
365 - doman man/garbd.8
366 - fi
367 - exeinto /usr/$(get_libdir)/${PN}
368 - doexe libgalera_smm.so
369 -}
370
371 diff --git a/sys-cluster/galera/galera-26.4.9-r1.ebuild b/sys-cluster/galera/galera-26.4.9-r1.ebuild
372 deleted file mode 100644
373 index 8c2638ef5bb9..000000000000
374 --- a/sys-cluster/galera/galera-26.4.9-r1.ebuild
375 +++ /dev/null
376 @@ -1,89 +0,0 @@
377 -# Copyright 1999-2021 Gentoo Authors
378 -# Distributed under the terms of the GNU General Public License v2
379 -
380 -EAPI=7
381 -
382 -PYTHON_COMPAT=( python3_{7,8,9} )
383 -
384 -inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
385 -
386 -DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
387 -HOMEPAGE="https://galeracluster.com"
388 -SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz -> ${P}.tar.gz"
389 -LICENSE="GPL-2 BSD"
390 -
391 -SLOT="0"
392 -
393 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
394 -IUSE="cpu_flags_x86_sse4_2 garbd test"
395 -
396 -# Tests are currently broken, see
397 -# - https://github.com/codership/galera/issues/595
398 -# - https://github.com/codership/galera/issues/596
399 -RESTRICT="test"
400 -
401 -CDEPEND="
402 - dev-libs/openssl:0=
403 - >=dev-libs/boost-1.41:0=
404 - "
405 -
406 -BDEPEND=">=sys-devel/gcc-4.4"
407 -
408 -DEPEND="${BDEPEND}
409 - ${CDEPEND}
410 - dev-libs/check
411 - >=dev-cpp/asio-1.10.1[ssl(+)]
412 - <dev-cpp/asio-1.12.0
413 - "
414 -
415 -#Run time only
416 -RDEPEND="${CDEPEND}"
417 -
418 -# Respect {C,LD}FLAGS.
419 -PATCHES=(
420 - "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
421 - "${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
422 -)
423 -
424 -S="${WORKDIR}/galera-4-${PV}"
425 -
426 -src_prepare() {
427 - default
428 -
429 - # Remove bundled dev-cpp/asio
430 - rm -r "${S}/asio" || die
431 -
432 - #Remove optional garbd daemon
433 - if ! use garbd ; then
434 - rm -r "${S}/garb" || die
435 - fi
436 -}
437 -
438 -src_configure() {
439 - tc-export AR CC CXX OBJDUMP
440 -
441 - # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
442 - # and -Wold-style-cast
443 - MYSCONS=(
444 - crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
445 - tests=$(usex test 1 0)
446 - strict_build_flags=0
447 - system_asio=1
448 - )
449 -}
450 -
451 -src_compile() {
452 - escons --warn=no-missing-sconscript "${MYSCONS[@]}"
453 -}
454 -
455 -src_install() {
456 - dodoc scripts/packages/README scripts/packages/README-MySQL
457 - if use garbd ; then
458 - dobin garb/garbd
459 - newconfd "${FILESDIR}/garb.cnf" garbd
460 - newinitd "${FILESDIR}/garb.init" garbd
461 - doman man/garbd.8
462 - fi
463 - exeinto /usr/$(get_libdir)/${PN}
464 - doexe libgalera_smm.so
465 -}