gentoo resync : 04.01.2022

8 files changed, 35 insertions, 442 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 161ac46f96c4..e8ddd7558b6c 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,22 +1,14 @@
 AUX galera-25.3.32-respect-cflags.patch 1076 BLAKE2B 4deac59bbb865f8b58d87a963d0f7357a62d349b7b2e321f8da3e63c921a72e0bf376ec16791ac73a7d6f4625a52c6b3b5f3d3613fabfcd31bfd23de6cdda944 SHA512 428b3aff5d76d6f94a582daf5e156bad377f729de940431be6869e20d44224b10b85487da97f97a98ec963447ff9473d93b84918b4b983a2659f8995031db61a
-AUX galera-26.4.5-respect-toolchain.patch 1867 BLAKE2B ba2bf780717bfc9b778645366d933c234aad279985f8ddfe68c4d6d01b71baf7961bae0dc67c980d8b0271c63b567509a2dafb241aaf67e2cb06b018bda54d40 SHA512 34d23d1e9c0906e0b7bff357e76e547d1bd4e1d555a68ef64b8389ddc64af817832bcd4e04958b25d60ef9700dbe2df69a2e2acc5060d701496629b848bc7f7b
 AUX galera-26.4.6-strip-extra-cflags.patch 1065 BLAKE2B d2a6a3016f9fd423eb7ad6893532eee7602e1e8f93f51a9297f2b09ca0db608cc71d6371c72621b1376ef8cafed55519a3f1695c9f319e0bec9d243f9c8f4092 SHA512 7025cce58228fb7685006afc72ce7951abb0151d7444a47c721bf010e5796f6636423933b68a1a10803cadc10212a371f1465f052839b6a4dda10b593556edbe
 AUX galera-26.4.8-respect-toolchain.patch 1786 BLAKE2B fb03674be3415a10b6cf9ea1534ff99a81a48e71de82e1f1d1f6a442f974e56876364cb48b62f730bfbf6ddc228155b20ac0ed913834d5548bcfade4c343adb0 SHA512 43a85f1b221c6128b5e6c8a5881711336840d57f7c2f17a716cb53bde0adb7ab2d8f72b87506cb8b5ac63ceead9ac1a7d5c5349496c6ec914129f18c7ddecb77
-AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.init 905 BLAKE2B a6f64183587ae9815aedb491dc9dd06f9a625ca4d935099bfbe80bd9a97f7a4020a8ca8d6d9056c0b6a7556aa750e08e232a656da38451d5ae0a47246be7e39a SHA512 716443592e1bb2c8071e3ab5267c6d46ab4c7a1aea25d7cb4f732ef5fd192aff1e439138cab01166539d9509ef75d71ead52a702567744af39df23c021c808a7
 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-25.3.35.tar.gz 1278869 BLAKE2B c5c0cc1d4ad29caf94550a6b96ab9762a97273713b906c4f3e3d9851b90b1028246285e74becc912336edbb6e1a427d9bdd9c31177f3dd899153dbed54cdde92 SHA512 aaa7038cf9e8be57ae1760d259af31bafa8d3c994c46cbb6224231fe3bb63d7bc830a97a2d4833cd24b85a47da2e4c7bfc2a99d73155d6bd6330e4a9dda3083d
 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
 EBUILD galera-25.3.28-r2.ebuild 1790 BLAKE2B cf5f207f092141d2e752e3dfe98caea8ad5439b0aebb36f45d60a091465231aff35edf04cfabfe12928bafc88488a18b34b7d0de977c68758cdcc879b956f2d1 SHA512 0ce6461300ed994c180eaf99d398a38936aa9df816e5e6345d304379a03fe074ab3bc4811f2d4704a34a97d013648db04766c5ebd7741d1ac57f0b1fdf426c95
-EBUILD galera-25.3.32-r1.ebuild 1729 BLAKE2B 5450eb476eac4427b8c06e4b72e2cb6b312dfd505b45a9d2f1daaa10b87e1181443ee57589f52b92d8bdefe1ed3ee375acd0d2cb228b5e9ff125ed98bd9ad9e2 SHA512 ea84aa3176c6e22bafa95ebed3a115799f72a999e13170780901e55546bbfdcece523bc6182a671a3cf2ae703481dfa202b03fcaa3b5778aeb44a7c43a147af6
-EBUILD galera-26.4.10.ebuild 1915 BLAKE2B 3bca5d75c5eb56ae18f8b9c738a4e7ae9d05dde54daca2b67c5ffb1c422bae5a558bc6e756e50a7b16217e094ca19ec69101aa491862d110e09bf99711d22bab SHA512 4b138ce8e4f5a6ebc0ce8bf055d5606da9b818700673ea33b6a4fd410cd7cf43010d99882ee978e709c08e2e486f64f2ccdc6c04a4032690af522f2a60050e9b
-EBUILD galera-26.4.6-r1.ebuild 1886 BLAKE2B 78f23ae0b05f643c67777b1be3b6755f04708aa9d587f7c06ebe90be6c4f2d22b8f9fb9a46810e92bce6b2f7622c1a1d35126b0e7643c11845f083b10cb4f7d0 SHA512 f10b8b73a26c2e84d0fd98cfc7da68d03e44daa46cc7479d9a0f927489c5c5509475656ec5a32b32e53f8f52a11b9eaa6dd1c73aadbd1986a556009ca182b10b
-EBUILD galera-26.4.7-r1.ebuild 1783 BLAKE2B 50acb2d6f377a577a34b2a457a315bbffb5be6aed1f733d02096ebc929c890a4e88a02cc7bc124b00a484dcff6beb30c0285ecd67c7802e09ed68bce60ead575 SHA512 51cf3072911894d41c2e24ee09f0f61047dad11ef880e3a8b879be08589e711a8d4be7c0714d15fcb9c82d9e8fc9268cf49963f5b86c504f1d9382a58dcc56f8
+EBUILD galera-25.3.35.ebuild 1792 BLAKE2B 649476c55cdcbc39934a9721f4f80109ece1051abcdf28a2dc1db76cbbf8bc25c73e3d1460d27d46cf250755d852a96fe5e1322287f56a110efd59d7f521f68c SHA512 00273c615261c96a724cb53ab98caac0850ea81a29095549a417f7f46548282442e1d6435327b9d571ff7df9ea49e3edd344121af33b8a3a3a95284d4c7d2461
+EBUILD galera-26.4.10-r1.ebuild 1978 BLAKE2B b76bd90e5c34c180b1de833fd0d2cd393d3b56e9dc828aa66bec3b046303279cf36c09370845547b9a1760726ab9ccbe69cda02e1236d6b7fa61e6a0fcb6543a SHA512 3dc495cd98a5bad119967ae1397175659c0d8c176e76b0e2c881746f199a844f66b21cc83f12d9164450805233c1dec6feb36ea7d395f154d339c3c48ca0e582
 EBUILD galera-26.4.8-r1.ebuild 1912 BLAKE2B a0c4f82160ffa3b1486fe333f245b0f202bb0e1370f094aa382a773c9b99dd368f8780f34486a8118180dc8436cc140ebfa9a7702a2649922e716b8502a0e8f1 SHA512 e19291122bbe795f8718b90694e68bf346fab85c14b5ae15181f73e0acbf3fd5c5fff93bef7d707623351577b7cc060fae646ede2753c60e78fd8f3461d365be
-EBUILD galera-26.4.9-r1.ebuild 1915 BLAKE2B 3bca5d75c5eb56ae18f8b9c738a4e7ae9d05dde54daca2b67c5ffb1c422bae5a558bc6e756e50a7b16217e094ca19ec69101aa491862d110e09bf99711d22bab SHA512 4b138ce8e4f5a6ebc0ce8bf055d5606da9b818700673ea33b6a4fd410cd7cf43010d99882ee978e709c08e2e486f64f2ccdc6c04a4032690af522f2a60050e9b
 MISC metadata.xml 463 BLAKE2B c8abf190860590cf4d9f8e2d2629358f888526ad3ad5c17593b318f1be3b0db306d77faa0b08a7b3b5f496930460849df27e7ac83886565caff1baf6e8b0f6ed SHA512 5ba9d6bb06c6b86bcb56bde9c4d1c975458bba4a54067fe509b0e1182dac7e4a930299aa984a68f2009d0e52daad4cfafbd833d68b88650044bb6a6250b39022
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-25.3.32-r1.ebuild b/sys-cluster/galera/galera-25.3.35.ebuild
index 03535e674d74..03e5e8cb2a39 100644
--- a/sys-cluster/galera/galera-25.3.32-r1.ebuild
+++ b/sys-cluster/galera/galera-25.3.35.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
+MY_PN="${PN}-3"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
 HOMEPAGE="https://galeracluster.com"
-SRC_URI="https://releases.galeracluster.com/galera-3/source/galera-3-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -18,43 +21,38 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+COMMON_DEPEND="
 	dev-libs/openssl:0=
 	>=dev-libs/boost-1.41:0=
-	"
-
-BDEPEND=">=sys-devel/gcc-4.4"
+"
 
-DEPEND="${BDEPEND}
-	${CDEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	dev-libs/check
 	>=dev-cpp/asio-1.10.1[ssl(+)]
 	<dev-cpp/asio-1.12.0
-	"
+"
 
 #Run time only
-RDEPEND="${CDEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 
 # Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}"/${PN}-25.3.32-respect-cflags.patch )
+PATCHES=( "${FILESDIR}/${PN}"-25.3.32-respect-cflags.patch )
 
-S="${WORKDIR}/galera-3-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-
 	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
+	rm -r "${S}/asio" || die "Failed to remove bundled asio"
 	#Remove optional garbd daemon
 	if ! use garbd ; then
-		rm -r "${S}/garb" || die
+		rm -r "${S}/garb" || die "Failed to remove garbd daemon"
 	fi
 }
 
 src_configure() {
 	tc-export AR CC CXX OBJDUMP
-
 	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
 	# and -Wold-style-cast
 	MYSCONS=(
@@ -77,6 +75,6 @@ src_install() {
 		newinitd "${FILESDIR}/garb.init" garbd
 		doman man/garbd.8
 	fi
-	exeinto /usr/$(get_libdir)/${PN}
+	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.10-r1.ebuild
index 8c2638ef5bb9..9e68c73486b2 100644
--- a/sys-cluster/galera/galera-26.4.9-r1.ebuild
+++ b/sys-cluster/galera/galera-26.4.10-r1.ebuild
@@ -7,9 +7,12 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
+MY_PN="${PN}-4"
+MY_P="${MY_PN}-${PV}"
+
 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"
+SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -22,46 +25,41 @@ IUSE="cpu_flags_x86_sse4_2 garbd test"
 #   - https://github.com/codership/galera/issues/596
 RESTRICT="test"
 
-CDEPEND="
+COMMON_DEPEND="
 	dev-libs/openssl:0=
 	>=dev-libs/boost-1.41:0=
-	"
-
-BDEPEND=">=sys-devel/gcc-4.4"
+"
 
-DEPEND="${BDEPEND}
-	${CDEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	dev-libs/check
 	>=dev-cpp/asio-1.10.1[ssl(+)]
 	<dev-cpp/asio-1.12.0
-	"
+"
 
 #Run time only
-RDEPEND="${CDEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 
 # Respect {C,LD}FLAGS.
 PATCHES=(
-	"${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
-	"${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
+	"${FILESDIR}/${PN}"-26.4.6-strip-extra-cflags.patch
+	"${FILESDIR}/${PN}"-26.4.8-respect-toolchain.patch
 )
 
-S="${WORKDIR}/galera-4-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-
 	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
+	rm -r "${S}/asio" || die "Failed to remove bundled asio"
 	#Remove optional garbd daemon
 	if ! use garbd ; then
-		rm -r "${S}/garb" || die
+		rm -r "${S}/garb" || die "Failed to remove garbd daemon"
 	fi
 }
 
 src_configure() {
 	tc-export AR CC CXX OBJDUMP
-
 	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
 	# and -Wold-style-cast
 	MYSCONS=(
@@ -84,6 +82,6 @@ src_install() {
 		newinitd "${FILESDIR}/garb.init" garbd
 		doman man/garbd.8
 	fi
-	exeinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/"${PN}"
 	doexe libgalera_smm.so
 }
diff --git a/sys-cluster/galera/galera-26.4.10.ebuild b/sys-cluster/galera/galera-26.4.10.ebuild
deleted file mode 100644
index 8c2638ef5bb9..000000000000
--- a/sys-cluster/galera/galera-26.4.10.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
-}
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
-}