gentoo resync : 25.11.2020

4 files changed, 131 insertions, 2 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 5884fbc847fa..cc91493bcc1d 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,6 +1,7 @@
 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
+AUX galera-26.4.6-strip-extra-cflags.patch 1065 BLAKE2B d2a6a3016f9fd423eb7ad6893532eee7602e1e8f93f51a9297f2b09ca0db608cc71d6371c72621b1376ef8cafed55519a3f1695c9f319e0bec9d243f9c8f4092 SHA512 7025cce58228fb7685006afc72ce7951abb0151d7444a47c721bf010e5796f6636423933b68a1a10803cadc10212a371f1465f052839b6a4dda10b593556edbe
 AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad
 AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
@@ -13,12 +14,14 @@ DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d3
 DIST galera-26.4.4.tar.gz 3472392 BLAKE2B 146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4 SHA512 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
 DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B 2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6 SHA512 a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f
+DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
 EBUILD galera-25.3.25.ebuild 1912 BLAKE2B ac9d716d6c0b11b7f85db6da47e549895e5808e6d12a62089786996d730ea59164a389054e6ff3f89cb2cfc2c3bd2f1c15c637045487855ab1f8167979869d8e SHA512 4fceea28b0fa3b420f0f5c79ef17eacbaf029ac75566f41ad37e21ffa9737365092f32d5cd4f70f67b22e3ab497120046142e489f1ee5531d49797b32cad68b4
 EBUILD galera-25.3.26.ebuild 1933 BLAKE2B 497e6de11a10d6500e2874a973ac47383dda943b3f46340c56896024781bbfa4e4b19aa7b0a9e245170493d3246a6a6bf0b3c117b8acb6eb6db8af8b2e44da2d SHA512 7c9f83109a9418dd0a1bd1122a131338b68dde9ea0085fd5301a1b04ac089ae35e0554076336c70bcdbc8d4bb3e867436f246119fd21ff5b477ed6e331bd54e7
 EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B 724e57232f39574fc9a74ac6005b0f0ef82f3c37a7d9dc7d06b6f967f8966d42596f97710a0048098fe4234fc6e50485b142b1f2d17c7f9ea9a7ded8a8d63c54 SHA512 13570740a581465ad5a1dc0c8475d8c301a1baad3da399d45eef620c14e731ed7619d9920620a7b218686f8596b49512573567d05c7cd376462abcbafe41ca37
 EBUILD galera-25.3.28.ebuild 1933 BLAKE2B 30d6355db4bc5eecec418c814cb6de00d4013ec31ca72a0dbaf981d19eb348639b3777917b0df81df0ccb0c166c40364c7417699aaf2434204b4c153f67cea2f SHA512 d589683edac16b58618cf4ba48c994e8a7deecf9051610ab544f57a95023e8038afab083f526c3e474eb5d8b08d5e648e676453b326005297e47e2b0e99cd806
 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 1837 BLAKE2B a948407a0e4e8fd766b73232cde385bbadb6567cda4065e19ffee6f147d55d24717294db48b22c2363fdd1e293d1e5a8a42039907d7e964ef6af5baf523a769d SHA512 90b4c2fab65528b1495744d0c4ac893898fec8b1f26c18791aead216550312a8214af9c619604ff837f58a7488290d7f89fd7a83d089525d1efbf2d98c60302a
+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 1885 BLAKE2B e3141f734bc6ba80b88c282c648f42e003c977e89be303d495fb114a88c869bd5c2745b2c9df6722402abb4a972518352d4b7f88a4818157f1da918b0693b4e5 SHA512 3be1b09df6441978ca734aa0fe62caea21bb47203ba881dd72569fda16f1bf91cd9c9bba418801f2387cb0fc3b9aff1eb317dcd9cdfc2cb7d54237d035eadef3
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch
new file mode 100644
index 000000000000..5f5be7a7a94b
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch
@@ -0,0 +1,38 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -89,7 +89,7 @@ Commandline Options:
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -134,26 +134,6 @@ if dbug:
+ 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:
+-        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.4.ebuild b/sys-cluster/galera/galera-26.4.4.ebuild
index 32400de86ef0..bb3365ea44ed 100644
--- a/sys-cluster/galera/galera-26.4.4.ebuild
+++ b/sys-cluster/galera/galera-26.4.4.ebuild
@@ -14,7 +14,7 @@ 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 )"
 
diff --git a/sys-cluster/galera/galera-26.4.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild
new file mode 100644
index 000000000000..b459d342ff13
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.6.ebuild
@@ -0,0 +1,88 @@
+# 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
+
+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
+}