gentoo resync : 28.04.2021

3 files changed, 141 insertions, 0 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index f6b91f16409d..93ee11a6e1a9 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,15 +1,18 @@
 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-26.4.7.tar.gz 1339462 BLAKE2B 9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975 SHA512 ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
+DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
 DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
 EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B dfe11ca3f23116f4d703a9e72ff09985919e87bbe86779d312d0358b3170c6c7341eca6e3a4889a759bee1aa12b6f4060f0982d3f5ed50395bf985666c7d05a0 SHA512 42e6b73db57e82986323a5856ff21ec8d422531f157b6ba986de60616644b1808fb26bc13ef677ba7f11cfd20f4c53412ab9659ad8e3193942088208f047d9d7
 EBUILD galera-25.3.32.ebuild 1726 BLAKE2B 69be6fa5fb2fcc79d844497c5e2c374caeefb7307620a66b93333330705a44587c0eedfa0eac8194606513bf453f42739f440e9f2704869d87ae20d02b58482a SHA512 cd89402a39cdc67e2d441106148de15928faa89d63cb93af57242ab95917467569b2342488b96dac860693dc4798627afb977ce30621edfe92f08eab46817858
 EBUILD galera-26.4.6.ebuild 1883 BLAKE2B 1c25c650cc1aaa24e15b5fe91075174ffe45292d184c78a4ad2a03c6f57576a1d27c428ad9d827308678920027061836e26679e0daf6132b51dbc1278e9c7d7e SHA512 50d2c6b0efb9e3d912ada92de0f1034bad21307b355b9bd3eb1b6edb9fa9c69e086a2dd10a257804377f03b76c60bfd134f70d7d460a95677efce8990aaaee5e
 EBUILD galera-26.4.7.ebuild 1780 BLAKE2B 3d1481060258879c4b2efd30f3923f7f3fd7b37d177941ff1b2ec15606cd77f28e242baa94b8214460cf6301a4ab7f48984b0feab4850022dff56be693415761 SHA512 f28a2fb4215ae66a14d5fc640df8e1a9b124881da616ef74e7ce2d3050630c74753cb1edeaff3c843a04505c5a99d2ae02fbd2b2f829493bcaf89f60cec94fda
+EBUILD galera-26.4.8.ebuild 1782 BLAKE2B e1452d8ca78cc933f1e5070643c34cbe7b0ff30ea7fa6f84baa32146d5de32ef87faed9d83df243fd3400830386c35f25bf2e0ae5735ac2a4909fa4b8f81ba7b SHA512 3dd1b5a1284dd9358a856bb6e1905bb4e7a4b49edb0fefaeae064544dbc1ba3f11880b9c5fde16c36938a76b2ef79e67f2e8dac8d2e0a4b4bde0c204367227d7
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch b/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
new file mode 100644
index 000000000000..202f5aaefc03
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
@@ -0,0 +1,53 @@
+--- a/SConscript
++++ b/SConscript
+@@ -47,13 +47,15 @@ def check_executable_exists(command):
+     return retval
+ 
+ def check_dynamic_symbols(target, source, env):
++    objdump = env['OBJDUMP']
++
+     # Check if objdump exists
+-    if check_executable_exists(['objdump', '--version']):
++    if check_executable_exists([objdump, '--version']):
+         print('Skipping dynamic symbols check.')
+         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:
+@@ -183,6 +185,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/galera-26.4.8.ebuild b/sys-cluster/galera/galera-26.4.8.ebuild
new file mode 100644
index 000000000000..0c3dafe0453c
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.8.ebuild
@@ -0,0 +1,85 @@
+# 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.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
+}