commit: 390112c10222dcd5bdb5724c225ee99d11ffd7b0
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Sat Dec 18 06:40:44 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 10:48:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390112c1
sys-cluster/galera: drop old ebuilds and patches
leave behind galera-25 because of mariadb
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sys-cluster/galera/Manifest | 3 -
.../files/galera-26.4.5-respect-toolchain.patch | 55 -------------
.../files/galera-4.1-strip-extra-cflags.patch | 78 -------------------
sys-cluster/galera/galera-26.4.6-r1.ebuild | 88 ---------------------
sys-cluster/galera/galera-26.4.7-r1.ebuild | 85 ---------------------
sys-cluster/galera/galera-26.4.9-r1.ebuild | 89 ----------------------
6 files changed, 398 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 1fbb7b7efc17..fc10b6bc9caa 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,7 +1,4 @@
DIST galera-25.3.28.tar.gz 3390722 BLAKE2B
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
SHA512
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
DIST galera-25.3.32.tar.gz 1277302 BLAKE2B
061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2
SHA512
e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
DIST galera-26.4.10.tar.gz 1424663 BLAKE2B
6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38
SHA512
97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226
-DIST galera-26.4.7.tar.gz 1339462 BLAKE2B
9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975
SHA512
ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
DIST galera-26.4.8.tar.gz 1423256 BLAKE2B
9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4
SHA512
5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
-DIST galera-26.4.9.tar.gz 1422801 BLAKE2B
45840fd73083c292ca7b2f491dafdf9134066f66bee85e10d6be72a428272dbe8773bf8d7ba52793cbc63c388e59d900e2e7a7c861266d11a5d07640552cb42d
SHA512
c089d76ec72c2b3ad8814119f24b0f46e562d469a029b43bffc5b25dc73334f23fd016084f69f4fe42152402db8e03528371e2fa9802c9fa39d4112300aa163d
-DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B
fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6
SHA512
25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
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
deleted file mode 100644
index c82c870b4f39..000000000000
--- a/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/SConscript
-+++ b/SConscript
-@@ -33,15 +33,17 @@ if has_version_script:
- def check_dynamic_symbols(target, source, env):
- import subprocess
-
-+ objdump = env['OBJDUMP']
-+
- # Check if objdump exists
-- p = subprocess.Popen(['objdump', '--version'], stdout=subprocess.PIPE)
-+ p = subprocess.Popen([objdump, '--version'], stdout=subprocess.PIPE)
- p.wait()
- if p.returncode != 0:
- print('objdump utility is not found. Skipping checks...')
- return 0
-
- # Check that DSO doesn't contain asio-related dynamic symbols
-- if env.Execute(Action(['! objdump -T ' + target[0].abspath + ' | grep
asio'], None)):
-+ if env.Execute(Action(['! ' + objdump + ' -T ' + target[0].abspath + ' |
grep asio'], None)):
- return 1
- return 0
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -5,6 +5,7 @@
- # SCons build script to build galera libraries
- #
- # How to control the build with environment variables:
-+# Set AR to specify archive utility
- # Set CC to specify C compiler
- # Set CXX to specify C++ compiler
- # Set CPPFLAGS to add non-standard include paths and preprocessor macros
-@@ -13,6 +14,7 @@
- # Set CXXFLAGS to supply C++ compiler options
- # Set LDFLAGS to *override* linking flags
- # Set LIBPATH to add non-standard linker paths
-+# Set OBJDUMP to specify objdump utility
- # Set RPATH to add rpaths
- #
- # Some useful CPPFLAGS:
-@@ -205,6 +207,13 @@ if cxx != 'default':
- link = os.getenv('LINK', 'default')
- if link != 'default':
- env.Replace(LINK = link)
-+ar = os.getenv('AR', 'default')
-+if ar != 'default':
-+ env.Replace(AR = ar)
-+objdump = os.getenv('OBJDUMP', 'default')
-+if objdump != 'default':
-+ env.Replace(OBJDUMP = objdump)
-+
-
- # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
- cc_version = str(read_first_line(env['CC'].split() + ['--version']))
-
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
deleted file mode 100644
index dfa1642c7d7e..000000000000
--- a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
---- a/galerautils/src/SConscript 2019-02-25 10:37:25.000000000 -0500
-+++ b/galerautils/src/SConscript 2019-03-07 09:51:27.163226469 -0500
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname', 'machine')
-+Import('env', 'sysname', 'machine')
-
- libgalerautils_env = env.Clone()
-
-@@ -39,22 +39,6 @@
- crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
- crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
-
--if x86:
-- if machine != 'ppc64' and machine != 'ppc64le':
-- crc32c_env.Append(CFLAGS = ' -msse4.2')
-- if sysname == 'sunos':
-- # Ideally we want to simply strip SSE4.2 flag from the resulting
-- # crc32.pic.o
-- # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
-- # but that requires some serious scons-fu, so we just don't
-- # compile hardware support in if host CPU does not have it.
-- from subprocess import check_call
-- try:
-- check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1",
shell=True);
-- except:
-- libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
-- crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
--
- libgalerautils_env.StaticLibrary('galerautils',
- libgalerautils_objs + crc32c_objs)
-
-diff -aurN a/SConstruct b/SConstruct
---- a/SConstruct 2019-03-07 09:44:38.588841625 -0500
-+++ b/SConstruct 2019-03-07 09:50:06.305952407 -0500
-@@ -67,7 +67,7 @@
- build_target = 'all'
-
- # Optimization level
--opt_flags = ' -g -O3 -DNDEBUG'
-+opt_flags = ' -DNDEBUG'
-
- # Architecture (defaults to build host type)
- compile_arch = ''
-@@ -120,33 +120,6 @@
- if gcov:
- opt_flags = opt_flags + ' --coverage -g'
-
--if sysname == 'sunos':
-- compile_arch = ' -mtune=native'
--elif x86:
-- if bits == 32:
-- if machine == 'x86_64':
-- compile_arch = ' -mx32'
-- else:
-- compile_arch = ' -m32 -march=i686'
-- if sysname == 'linux':
-- link_arch = ' -Wl,-melf_i386'
-- else:
-- if machine == 'ppc64':
-- compile_arch = ' -mtune=native'
-- link_arch = ' -Wl,-melf64ppc'
-- elif machine == 'ppc64le':
-- compile_arch = ' -mtune=native'
-- link_arch = ' -Wl,-melf64lppc'
-- else:
-- compile_arch = ' -m64'
-- if sysname == 'linux':
-- link_arch = ' -Wl,-melf_x86_64'
-- link_arch = compile_arch + link_arch
--elif machine == 's390x':
-- compile_arch = ' -mzarch'
-- if bits == 32:
-- compile_arch += ' -m32'
--
- boost = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
- system_asio= int(ARGUMENTS.get('system_asio', 1))
diff --git a/sys-cluster/galera/galera-26.4.6-r1.ebuild
b/sys-cluster/galera/galera-26.4.6-r1.ebuild
deleted file mode 100644
index 23c60542ac9a..000000000000
--- a/sys-cluster/galera/galera-26.4.6-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
-
-MY_P="${PN}-4-${PV}"
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the
wsrep API"
-HOMEPAGE="https://galeracluster.com";
-SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_P}.tar.gz";
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
- "
-BDEPEND=">=sys-devel/gcc-4.4"
-DEPEND="${BDEPEND}
- ${CDEPEND}
- dev-libs/check
- >=dev-cpp/asio-1.10.1[ssl(+)]
- <dev-cpp/asio-1.12.0
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
- # Uses hardware specific code that seems to depend on SSE4.2
- if use cpu_flags_x86_sse4_2 ; then
- append-cflags -msse4.2
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-26.4.7-r1.ebuild
b/sys-cluster/galera/galera-26.4.7-r1.ebuild
deleted file mode 100644
index 4da1ee14e942..000000000000
--- a/sys-cluster/galera/galera-26.4.7-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the
wsrep API"
-HOMEPAGE="https://galeracluster.com";
-SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz
-> ${P}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
- "
-
-BDEPEND=">=sys-devel/gcc-4.4"
-
-DEPEND="${BDEPEND}
- ${CDEPEND}
- dev-libs/check
- >=dev-cpp/asio-1.10.1[ssl(+)]
- <dev-cpp/asio-1.12.0
- "
-
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
-)
-
-S="${WORKDIR}/galera-4-${PV}"
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
-
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-26.4.9-r1.ebuild
b/sys-cluster/galera/galera-26.4.9-r1.ebuild
deleted file mode 100644
index 8c2638ef5bb9..000000000000
--- a/sys-cluster/galera/galera-26.4.9-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the
wsrep API"
-HOMEPAGE="https://galeracluster.com";
-SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz
-> ${P}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-# Tests are currently broken, see
-# - https://github.com/codership/galera/issues/595
-# - https://github.com/codership/galera/issues/596
-RESTRICT="test"
-
-CDEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
- "
-
-BDEPEND=">=sys-devel/gcc-4.4"
-
-DEPEND="${BDEPEND}
- ${CDEPEND}
- dev-libs/check
- >=dev-cpp/asio-1.10.1[ssl(+)]
- <dev-cpp/asio-1.12.0
- "
-
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
-)
-
-S="${WORKDIR}/galera-4-${PV}"
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
-
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
