gentoo resync : 22.01.2021

8 files changed, 71 insertions, 210 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 73049050fe80..2a3115e25ab8 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,3 +1,4 @@
+AUX galera-25.3.32-respect-cflags.patch 1076 BLAKE2B 4deac59bbb865f8b58d87a963d0f7357a62d349b7b2e321f8da3e63c921a72e0bf376ec16791ac73a7d6f4625a52c6b3b5f3d3613fabfcd31bfd23de6cdda944 SHA512 428b3aff5d76d6f94a582daf5e156bad377f729de940431be6869e20d44224b10b85487da97f97a98ec963447ff9473d93b84918b4b983a2659f8995031db61a
 AUX galera-26.4.4-respect-AR.patch 396 BLAKE2B 17c0b47ce5d1a8326b9f11311647e77d12ae55570d30847d5f9bc3eaee0cc80b482375da0b4d4d398539e9763ba981b0135292c67a356df32a2f6453be71d7e3 SHA512 fa1014c1574e489e4903dbe583a4e981853d612ca2fffbe88010826a40f889a2bb20995699a520efe9bdb52595bb6afff115321505438387d564dd25f93dd140
 AUX galera-26.4.5-respect-toolchain.patch 1867 BLAKE2B ba2bf780717bfc9b778645366d933c234aad279985f8ddfe68c4d6d01b71baf7961bae0dc67c980d8b0271c63b567509a2dafb241aaf67e2cb06b018bda54d40 SHA512 34d23d1e9c0906e0b7bff357e76e547d1bd4e1d555a68ef64b8389ddc64af817832bcd4e04958b25d60ef9700dbe2df69a2e2acc5060d701496629b848bc7f7b
 AUX galera-26.4.5-strip-extra-cflags.patch 2235 BLAKE2B 95c0a28a34382e4ba9690fd2c1556574ebc7a4da93fa43f21cd1dddf99ceac357922ba325dbf8f5d110ea6fdea63fe3e7fecb10c2fdc83857b70410409437aa2 SHA512 ca979602feb222ab052971ab08bfee10efc7980f2c509d4bcf1476d052ad3793aab91c4daecb1c029408becac62607b04c91cfe81f0a9f8cf42b3ef0d0cc8d89
@@ -7,15 +8,11 @@ AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c
 AUX garb.init 905 BLAKE2B a6f64183587ae9815aedb491dc9dd06f9a625ca4d935099bfbe80bd9a97f7a4020a8ca8d6d9056c0b6a7556aa750e08e232a656da38451d5ae0a47246be7e39a SHA512 716443592e1bb2c8071e3ab5267c6d46ab4c7a1aea25d7cb4f732ef5fd192aff1e439138cab01166539d9509ef75d71ead52a702567744af39df23c021c808a7
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
-DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
-DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976 SHA512 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
-DIST galera-26.4.4.tar.gz 3472392 BLAKE2B 146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4 SHA512 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f
-DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B 2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6 SHA512 a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f
+DIST galera-25.3.32.tar.gz 1277302 BLAKE2B 061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2 SHA512 e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
+DIST galera-26.4.7.tar.gz 1339462 BLAKE2B 9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975 SHA512 ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
 DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
-EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B 724e57232f39574fc9a74ac6005b0f0ef82f3c37a7d9dc7d06b6f967f8966d42596f97710a0048098fe4234fc6e50485b142b1f2d17c7f9ea9a7ded8a8d63c54 SHA512 13570740a581465ad5a1dc0c8475d8c301a1baad3da399d45eef620c14e731ed7619d9920620a7b218686f8596b49512573567d05c7cd376462abcbafe41ca37
-EBUILD galera-26.4.2.ebuild 1887 BLAKE2B 3cfcc688d2211a780d74e8c1001abb560c4990328f281bf4754c4d0a47b0c1f54a3cd83817e66086e330050f8cee45ca5a55b4034cbd6f9c7c2b2e74b98f9a2a SHA512 4ebd12af503f8c62b354a1fc2f19190f61a1708d1c7f391320fc7df013a1409790af14c4722b7ae739094c7552f7c9c3825153fdc06f0190627616b17b18d23d
-EBUILD galera-26.4.3.ebuild 1789 BLAKE2B 457e551c47e4711a1c4420aa667a4d949b386bac6942b9c20dfbc577d6158db07b103e542daaff2e71c3233d61a99921ab20d5bf901e7b10a543aeb880af1495 SHA512 78e370cee168728221740f984907f987c5c5f84a889e5ea62406bee503b8bd5638c2d3d1057dbd220f2a195f971fe91696e6f6e72d0f709df1fca3c5567e9660
-EBUILD galera-26.4.4.ebuild 1836 BLAKE2B e2fc171232d64252c1e4647c34d1bde5c37e326042d883515dd43ecd4b6722c23e669a8fd8a720941e75065239db8a6faa838f4727aa95288bdb1b70c09d0c6e SHA512 a8fef312f762fa23558da417d3463c1a9e1e4ce71dedbce4c6d0eb02d9f2fd1ebcda71e4fbd3dfeb0c0778d3a4adb60c954771a537278b7667945ec9fdcf9c94
-EBUILD galera-26.4.5.ebuild 1886 BLAKE2B 4a98c96e37676c0348581a6090338ec97b90915f4599aa3d001d2f866a26450dec5543ce82b818d144d3697ca4ba88f773fa7f9df8d7054310760a2bd5f5a674 SHA512 2b55cb4aa102aa713eb23ee2348b0fc92d82028d30920b6765155e6ff613ef8664e0f72d8c1e830bfd1cb5609c614ad6eaa9a50ec0a5748f101d5a0865408d0e
-EBUILD galera-26.4.6.ebuild 1883 BLAKE2B 7c621db128acc11c70b62587002437a5108b0dfd643df1e6fdde26eeb24c93501863c7039166af7c80bcc47b7ccd817957766d372b6aaeefedffc19f4d876d2e SHA512 2e2775aa0aee812f5f0a0faee860287756e5aba4f142815fc2441ac98204b9271defe2568d9106751ac18eeef8996abf9095220a8e91357ee45bd58e07aa76df
+EBUILD galera-25.3.28-r1.ebuild 1789 BLAKE2B a1ef80dfc62d841af009ea1da7af2180661da2070f9775520cfc8c95197784b63002d7435ef085ca3c74fd98b8edb68384aa7ae6e6648751f2e3a4467dbbcced SHA512 d297ee0350763cd74fb357ae827761cfb8c1a1d1271194cf853bfe46a900aebf51489d0b06ba4dbc686f19e66d07ba5a88092cff71bcbaacde5c5fe482b7bce1
+EBUILD galera-25.3.32.ebuild 1728 BLAKE2B 23a572ac756dbc224b97fe4d529bac89a691b8adacac75f8d98818ea50b797a9f1cbc1958a8da843b565a52b5ce1d2ca7ab7d9968ce3bcdf56ecc347e8f6b06b SHA512 91c55457e24928c44ffc453ddfde0b38eb7e93c4fba80e4b110ee25e8a695514a37ec80a7cda0169cc6057f20fe5733a07635f369ebd6c8d305e86f4995328be
+EBUILD galera-26.4.6.ebuild 1885 BLAKE2B 4cef7e924fa19bbea5048b8cf4f5d0eec7e05c66b9d59d34018923950f42b41c45f0e42f957123aa19cf8d7ae14b51a43ec5ecebd2f24e01bdb460377a4f4ee1 SHA512 91debc8c5e433887e65e1c1d514e024fc5cbab7f9c709fc33ccc8740205f00235b7796f962e453fcfb2a64d1c762ad9a45249eeff17689a078547d7a998062f2
+EBUILD galera-26.4.7.ebuild 1784 BLAKE2B 805a7ccafd77b282e529c6915243f8efa9f609d77851d2f74368069d00018941119652164f84651a4fa028a482d5e8d6451f3a1929f68da0670864c9da1c0834 SHA512 dd5042fab7db0e1ed45f441c4986a65391712ea7317580d5045ad1847b9ba9d0162448bc5ff068072499c6e538bdf27efeb14bb06e2e9c6f7d316b69262339dd
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
new file mode 100644
index 000000000000..94c1f829450a
--- /dev/null
+++ b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
@@ -0,0 +1,38 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -88,7 +88,7 @@ Commandline Options:
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -121,26 +121,6 @@ elif debug_lvl == 3:
+ if dbug:
+     opt_flags = opt_flags + ' -DGU_DBUG_ON'
+ 
+-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:
+-        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.28-r1.ebuild b/sys-cluster/galera/galera-25.3.28-r1.ebuild
index a9043c5dcdd0..27c5cf405123 100644
--- a/sys-cluster/galera/galera-25.3.28-r1.ebuild
+++ b/sys-cluster/galera/galera-25.3.28-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-25.3.32.ebuild
index f90a6be153bb..ef8bd5a746ca 100644
--- a/sys-cluster/galera/galera-26.4.3.ebuild
+++ b/sys-cluster/galera/galera-25.3.32.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,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="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.10/${P}/src/${P}.tar.gz"
+SRC_URI="https://releases.galeracluster.com/galera-3/source/galera-3-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
@@ -22,18 +22,23 @@ 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}/galera-4.1-strip-extra-cflags.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-25.3.32-respect-cflags.patch )
+
+S="${WORKDIR}/galera-3-${PV}"
 
 src_prepare() {
 	default
@@ -48,16 +53,12 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC CXX
-	# 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
+	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
diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild
deleted file mode 100644
index 73b0f881a815..000000000000
--- a/sys-cluster/galera/galera-26.4.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="https://galeracluster.com"
-SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/${P}/src/${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}/galera-4.1-strip-extra-cflags.patch" )
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd -1 -1 -1 garbd
-	fi
-}
-
-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 CC CXX
-	# 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.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-26.4.4.ebuild b/sys-cluster/galera/galera-26.4.4.ebuild
deleted file mode 100644
index bb3365ea44ed..000000000000
--- a/sys-cluster/galera/galera-26.4.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.13/${P}/src/${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}-4.1-strip-extra-cflags.patch
-	"${FILESDIR}"/${PN}-26.4.4-respect-AR.patch
-)
-
-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
-	# 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.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild
index 6a336ad43690..ba0bb5f7dc4d 100644
--- a/sys-cluster/galera/galera-26.4.6.ebuild
+++ b/sys-cluster/galera/galera-26.4.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
diff --git a/sys-cluster/galera/galera-26.4.5.ebuild b/sys-cluster/galera/galera-26.4.7.ebuild
index 9cdd6baf8cd7..1e9d889fb1b1 100644
--- a/sys-cluster/galera/galera-26.4.5.ebuild
+++ b/sys-cluster/galera/galera-26.4.7.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,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"
+SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -24,23 +22,26 @@ 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.5-strip-extra-cflags.patch
+	"${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
 	"${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
 )
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/galera-4-${PV}"
 
 src_prepare() {
 	default
@@ -56,15 +57,11 @@ src_prepare() {
 
 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=(
+		crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
 		tests=$(usex test 1 0)
 		strict_build_flags=0
 		system_asio=1