gentoo resync : 07.08.2021

5 files changed, 95 insertions, 1 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3280c9574f5b..f523603d23b5 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index e0c82f3fe539..0ceff2867c9b 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -9,10 +9,12 @@ DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5
 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-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-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 1909 BLAKE2B cacfb74ca71c02f846e2d5804ad827a9d697c7531005149d89bcff83187b22429ced418a790cd575bfabd202774ab6155ef52ec477401e94169308453ecad96f SHA512 48bd6e47d3eae317578c0d28ce90c280d5c1981256762eee4584615b2146866f8795e73404d28f168f2e79e6d8ff27250c6266c0db219717a78e4dd0eceaa84e
+EBUILD galera-26.4.9.ebuild 1912 BLAKE2B 6afe7d53883703ecb4423a46d6285321b07eb9aec432b182c402d99b547c45b86a227fb2a0827397c8bdabca542ea44f67f0dc68ff0f9346b30eee5112c00a12 SHA512 8f6c62efaa8c72e762366c5be4ce69bd4675d7b39da4b58fbb8a5b5ac8dbb951ee5a8bff1073bea10d160010c3c47c5c9ffde830b3b011b340c467c74d342d59
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.9.ebuild b/sys-cluster/galera/galera-26.4.9.ebuild
new file mode 100644
index 000000000000..18d41bef84ca
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.9.ebuild
@@ -0,0 +1,89 @@
+# 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/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 4acc8e69d948..ec88502b0c85 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -9,4 +9,4 @@ DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b4
 EBUILD keepalived-2.0.20.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
 EBUILD keepalived-2.1.5.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
 EBUILD keepalived-2.2.2.ebuild 2147 BLAKE2B f8df9357c8adfe8c50bd7746e7e807d727a971a5248a3ddedbe57bf2917dc5ac1659cf5d168d84df4674b8a095e9f8599ddb144d9412ce43109fef6daf27b992 SHA512 91265586dcc506d64cfcbc167a6418d23523bbb62937e324bc29c346ed23fe7881c84fb1362b1ae01cb2e1ba44d874366607221d501a805013b0ad24250a685d
-MISC metadata.xml 529 BLAKE2B e20e135a1037fe1ce32a4321858160594512de8c13bb8bf67655fc431c7d6ebf8806db518a09c59e6724842577647a23bb7f310638025a85c5ee8e5fee4ee877 SHA512 3925927d7e0866283769f5582e77bfadf1708162e6aae6a5d1a605fda4a2b4c3de631b96718f5ea69ed5335445523ea1ec1e121a1372641dbec751285cb35dd2
+MISC metadata.xml 612 BLAKE2B 0ab97817bb6e83b80383a05e33408074e7f9919c051c0582262487405b306693a7a48dafcb9d11c4bda1ecdd99ea4b79d5277e37502a5fc22472bb07ec9a4662 SHA512 0270c60c6750450cca5f5e9a51266a5de888aab07b06d791e77fc4bdbb14d4f13e6b83f9a819ce3183943a6d27c213052225ac8989849f0ffe3aad1afba4297e
diff --git a/sys-cluster/keepalived/metadata.xml b/sys-cluster/keepalived/metadata.xml
index 10ad7b166fdc..8333f9e2d4a1 100644
--- a/sys-cluster/keepalived/metadata.xml
+++ b/sys-cluster/keepalived/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="json">compile with signal to dump configuration and stats as JSON.</flag>
 		<flag name="regex">compile with support for regex in health checks</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">acassen/keepalived</remote-id>
+	</upstream>
 </pkgmetadata>