Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
Date: Fri, 01 Jan 2021 02:03:07
Message-Id: 1609466319.e4ff5ba360d02ceacebfefc9b509aaf7fce715f0.mgorny@gentoo
1 commit: e4ff5ba360d02ceacebfefc9b509aaf7fce715f0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 01:58:39 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 01:58:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ff5ba3
7
8 sys-cluster/galera: Remove old (py3.6)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-cluster/galera/Manifest | 2 -
13 .../files/galera-3.15-strip-extra-cflags.patch | 70 -----------------
14 sys-cluster/galera/galera-25.3.25.ebuild | 90 ----------------------
15 sys-cluster/galera/galera-25.3.26.ebuild | 90 ----------------------
16 sys-cluster/galera/galera-25.3.28.ebuild | 90 ----------------------
17 5 files changed, 342 deletions(-)
18
19 diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
20 index 8bc9a834075..3de72656162 100644
21 --- a/sys-cluster/galera/Manifest
22 +++ b/sys-cluster/galera/Manifest
23 @@ -1,8 +1,6 @@
24 -DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
25 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
26 DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
27 DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976 SHA512 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
28 DIST galera-26.4.4.tar.gz 3472392 BLAKE2B 146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4 SHA512 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f
29 -DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
30 DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B 2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6 SHA512 a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f
31 DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
32
33 diff --git a/sys-cluster/galera/files/galera-3.15-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-3.15-strip-extra-cflags.patch
34 deleted file mode 100644
35 index b47ec39bf5a..00000000000
36 --- a/sys-cluster/galera/files/galera-3.15-strip-extra-cflags.patch
37 +++ /dev/null
38 @@ -1,70 +0,0 @@
39 -diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
40 ---- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -0400
41 -+++ b/galerautils/src/SConscript 2015-04-07 15:03:21.661301200 -0400
42 -@@ -1,4 +1,4 @@
43 --Import('env', 'x86', 'sysname')
44 -+Import('env', 'sysname')
45 -
46 - libgalerautils_env = env.Clone()
47 -
48 -@@ -39,21 +39,6 @@
49 - crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
50 - crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
51 -
52 --if x86:
53 -- crc32c_env.Append(CFLAGS = ' -msse4.2')
54 -- if sysname == 'sunos':
55 -- # Ideally we want to simply strip SSE4.2 flag from the resulting
56 -- # crc32.pic.o
57 -- # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
58 -- # but that requires some serious scons-fu, so we just don't
59 -- # compile hardware support in if host CPU does not have it.
60 -- from subprocess import check_call
61 -- try:
62 -- check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
63 -- except:
64 -- libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
65 -- crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
66 --
67 - libgalerautils_env.StaticLibrary('galerautils',
68 - libgalerautils_objs + crc32c_objs)
69 -
70 -diff -aurN a/SConstruct b/SConstruct
71 ---- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
72 -+++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
73 -@@ -67,7 +67,7 @@
74 - build_target = 'all'
75 -
76 - # Optimization level
77 --opt_flags = ' -g -O3 -DNDEBUG'
78 -+opt_flags = ' -DNDEBUG'
79 -
80 - # Architecture (defaults to build host type)
81 - compile_arch = ''
82 -@@ -97,26 +97,6 @@
83 - if dbug:
84 - opt_flags = opt_flags + ' -DGU_DBUG_ON'
85 -
86 --if sysname == 'sunos':
87 -- compile_arch = ' -mtune=native'
88 --elif x86:
89 -- if bits == 32:
90 -- if machine == 'x86_64':
91 -- compile_arch = ' -mx32'
92 -- else:
93 -- compile_arch = ' -m32 -march=i686'
94 -- if sysname == 'linux':
95 -- link_arch = ' -Wl,-melf_i386'
96 -- else:
97 -- compile_arch = ' -m64'
98 -- if sysname == 'linux':
99 -- link_arch = ' -Wl,-melf_x86_64'
100 -- link_arch = compile_arch + link_arch
101 --elif machine == 's390x':
102 -- compile_arch = ' -mzarch'
103 -- if bits == 32:
104 -- compile_arch += ' -m32'
105 --
106 - boost = int(ARGUMENTS.get('boost', 1))
107 - boost_pool = int(ARGUMENTS.get('boost_pool', 0))
108 - ssl = int(ARGUMENTS.get('ssl', 1))
109
110 diff --git a/sys-cluster/galera/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild
111 deleted file mode 100644
112 index 1e78ab35544..00000000000
113 --- a/sys-cluster/galera/galera-25.3.25.ebuild
114 +++ /dev/null
115 @@ -1,90 +0,0 @@
116 -# Copyright 1999-2020 Gentoo Authors
117 -# Distributed under the terms of the GNU General Public License v2
118 -
119 -EAPI=7
120 -
121 -PYTHON_COMPAT=( python3_6 )
122 -
123 -MY_P="${PN}-3-${PV}"
124 -
125 -inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
126 -DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
127 -HOMEPAGE="https://galeracluster.com"
128 -SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
129 -LICENSE="GPL-2 BSD"
130 -
131 -SLOT="0"
132 -
133 -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
134 -IUSE="cpu_flags_x86_sse4_2 garbd test"
135 -RESTRICT="!test? ( test )"
136 -
137 -CDEPEND="
138 - dev-libs/openssl:0=
139 - >=dev-libs/boost-1.41:0=
140 - "
141 -BDEPEND=">=sys-devel/gcc-4.4"
142 -DEPEND="${BDEPEND}
143 - ${CDEPEND}
144 - dev-libs/check
145 - >=dev-cpp/asio-1.10.1[ssl]
146 - <dev-cpp/asio-1.12.0
147 - "
148 -#Run time only
149 -RDEPEND="${CDEPEND}"
150 -
151 -S="${WORKDIR}/${MY_P}"
152 -# Respect {C,LD}FLAGS.
153 -PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
154 -
155 -pkg_preinst() {
156 - if use garbd ; then
157 - enewgroup garbd
158 - enewuser garbd -1 -1 -1 garbd
159 - fi
160 -}
161 -
162 -src_prepare() {
163 - default
164 -
165 - # Remove bundled dev-cpp/asio
166 - rm -r "${S}/asio" || die
167 -
168 - #Remove optional garbd daemon
169 - if ! use garbd ; then
170 - rm -r "${S}/garb" || die
171 - fi
172 -}
173 -
174 -src_configure() {
175 - tc-export CC CXX
176 - # Uses hardware specific code that seems to depend on SSE4.2
177 - if use cpu_flags_x86_sse4_2 ; then
178 - append-cflags -msse4.2
179 - else
180 - append-cflags -DCRC32C_NO_HARDWARE
181 - fi
182 - # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
183 - # and -Wold-style-cast
184 - MYSCONS=(
185 - tests=$(usex test 1 0)
186 - strict_build_flags=0
187 - system_asio=1
188 - )
189 -}
190 -
191 -src_compile() {
192 - escons --warn=no-missing-sconscript "${MYSCONS[@]}"
193 -}
194 -
195 -src_install() {
196 - dodoc scripts/packages/README scripts/packages/README-MySQL
197 - if use garbd ; then
198 - dobin garb/garbd
199 - newconfd "${FILESDIR}/garb.cnf" garbd
200 - newinitd "${FILESDIR}/garb.sh" garbd
201 - doman man/garbd.8
202 - fi
203 - exeinto /usr/$(get_libdir)/${PN}
204 - doexe libgalera_smm.so
205 -}
206
207 diff --git a/sys-cluster/galera/galera-25.3.26.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild
208 deleted file mode 100644
209 index 46e3368fde1..00000000000
210 --- a/sys-cluster/galera/galera-25.3.26.ebuild
211 +++ /dev/null
212 @@ -1,90 +0,0 @@
213 -# Copyright 1999-2020 Gentoo Authors
214 -# Distributed under the terms of the GNU General Public License v2
215 -
216 -EAPI=7
217 -
218 -PYTHON_COMPAT=( python{3_6,3_7} )
219 -
220 -MY_P="${PN}-3-${PV}"
221 -
222 -inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
223 -DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
224 -HOMEPAGE="https://galeracluster.com"
225 -SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/${P}/src/${P}.tar.gz"
226 -LICENSE="GPL-2 BSD"
227 -
228 -SLOT="0"
229 -
230 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
231 -IUSE="cpu_flags_x86_sse4_2 garbd test"
232 -RESTRICT="!test? ( test )"
233 -
234 -CDEPEND="
235 - dev-libs/openssl:0=
236 - >=dev-libs/boost-1.41:0=
237 - "
238 -BDEPEND=">=sys-devel/gcc-4.4"
239 -DEPEND="${BDEPEND}
240 - ${CDEPEND}
241 - dev-libs/check
242 - >=dev-cpp/asio-1.10.1[ssl]
243 - <dev-cpp/asio-1.12.0
244 - "
245 -#Run time only
246 -RDEPEND="${CDEPEND}"
247 -
248 -#S="${WORKDIR}/${MY_P}"
249 -# Respect {C,LD}FLAGS.
250 -PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
251 -
252 -pkg_preinst() {
253 - if use garbd ; then
254 - enewgroup garbd
255 - enewuser garbd -1 -1 -1 garbd
256 - fi
257 -}
258 -
259 -src_prepare() {
260 - default
261 -
262 - # Remove bundled dev-cpp/asio
263 - rm -r "${S}/asio" || die
264 -
265 - #Remove optional garbd daemon
266 - if ! use garbd ; then
267 - rm -r "${S}/garb" || die
268 - fi
269 -}
270 -
271 -src_configure() {
272 - tc-export CC CXX
273 - # Uses hardware specific code that seems to depend on SSE4.2
274 - if use cpu_flags_x86_sse4_2 ; then
275 - append-cflags -msse4.2
276 - else
277 - append-cflags -DCRC32C_NO_HARDWARE
278 - fi
279 - # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
280 - # and -Wold-style-cast
281 - MYSCONS=(
282 - tests=$(usex test 1 0)
283 - strict_build_flags=0
284 - system_asio=1
285 - )
286 -}
287 -
288 -src_compile() {
289 - escons --warn=no-missing-sconscript "${MYSCONS[@]}"
290 -}
291 -
292 -src_install() {
293 - dodoc scripts/packages/README scripts/packages/README-MySQL
294 - if use garbd ; then
295 - dobin garb/garbd
296 - newconfd "${FILESDIR}/garb.cnf" garbd
297 - newinitd "${FILESDIR}/garb.sh" garbd
298 - doman man/garbd.8
299 - fi
300 - exeinto /usr/$(get_libdir)/${PN}
301 - doexe libgalera_smm.so
302 -}
303
304 diff --git a/sys-cluster/galera/galera-25.3.28.ebuild b/sys-cluster/galera/galera-25.3.28.ebuild
305 deleted file mode 100644
306 index 958e59104d2..00000000000
307 --- a/sys-cluster/galera/galera-25.3.28.ebuild
308 +++ /dev/null
309 @@ -1,90 +0,0 @@
310 -# Copyright 1999-2020 Gentoo Authors
311 -# Distributed under the terms of the GNU General Public License v2
312 -
313 -EAPI=7
314 -
315 -PYTHON_COMPAT=( python{3_6,3_7} )
316 -
317 -MY_P="${PN}-3-${PV}"
318 -
319 -inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
320 -DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
321 -HOMEPAGE="https://galeracluster.com"
322 -SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/${P}/src/${P}.tar.gz"
323 -LICENSE="GPL-2 BSD"
324 -
325 -SLOT="0"
326 -
327 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
328 -IUSE="cpu_flags_x86_sse4_2 garbd test"
329 -RESTRICT="!test? ( test )"
330 -
331 -CDEPEND="
332 - dev-libs/openssl:0=
333 - >=dev-libs/boost-1.41:0=
334 - "
335 -BDEPEND=">=sys-devel/gcc-4.4"
336 -DEPEND="${BDEPEND}
337 - ${CDEPEND}
338 - dev-libs/check
339 - >=dev-cpp/asio-1.10.1[ssl]
340 - <dev-cpp/asio-1.12.0
341 - "
342 -#Run time only
343 -RDEPEND="${CDEPEND}"
344 -
345 -#S="${WORKDIR}/${MY_P}"
346 -# Respect {C,LD}FLAGS.
347 -PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
348 -
349 -pkg_preinst() {
350 - if use garbd ; then
351 - enewgroup garbd
352 - enewuser garbd -1 -1 -1 garbd
353 - fi
354 -}
355 -
356 -src_prepare() {
357 - default
358 -
359 - # Remove bundled dev-cpp/asio
360 - rm -r "${S}/asio" || die
361 -
362 - #Remove optional garbd daemon
363 - if ! use garbd ; then
364 - rm -r "${S}/garb" || die
365 - fi
366 -}
367 -
368 -src_configure() {
369 - tc-export CC CXX
370 - # Uses hardware specific code that seems to depend on SSE4.2
371 - if use cpu_flags_x86_sse4_2 ; then
372 - append-cflags -msse4.2
373 - else
374 - append-cflags -DCRC32C_NO_HARDWARE
375 - fi
376 - # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
377 - # and -Wold-style-cast
378 - MYSCONS=(
379 - tests=$(usex test 1 0)
380 - strict_build_flags=0
381 - system_asio=1
382 - )
383 -}
384 -
385 -src_compile() {
386 - escons --warn=no-missing-sconscript "${MYSCONS[@]}"
387 -}
388 -
389 -src_install() {
390 - dodoc scripts/packages/README scripts/packages/README-MySQL
391 - if use garbd ; then
392 - dobin garb/garbd
393 - newconfd "${FILESDIR}/garb.cnf" garbd
394 - newinitd "${FILESDIR}/garb.sh" garbd
395 - doman man/garbd.8
396 - fi
397 - exeinto /usr/$(get_libdir)/${PN}
398 - doexe libgalera_smm.so
399 -}