gentoo resync : 15.12.2019

3 files changed, 85 insertions, 2 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index b1bab2f149c0..e9ebfa5dd60e 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,7 +1,7 @@
 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
-AUX garb.init 840 BLAKE2B f492ad2db62515ca13ac88fb6e1dba01db950fe7104b7f4bc039ada9d0205bdbf8d11e489eb4cf2a9c5f30096654a9ae2aa5d1582f2149753cf3a1cc1b17e7b2 SHA512 d677be3e2ad2d718497bff25a23d44615731f6422907811ca59d89873f891208888b7eab6bc349a1e77ea00e51aa3d903c86227cb6cf4fa39d478c3619caaa4d
+AUX garb.init 905 BLAKE2B a6f64183587ae9815aedb491dc9dd06f9a625ca4d935099bfbe80bd9a97f7a4020a8ca8d6d9056c0b6a7556aa750e08e232a656da38451d5ae0a47246be7e39a SHA512 716443592e1bb2c8071e3ab5267c6d46ab4c7a1aea25d7cb4f732ef5fd192aff1e439138cab01166539d9509ef75d71ead52a702567744af39df23c021c808a7
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
 DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
@@ -10,6 +10,7 @@ DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d3
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
 EBUILD galera-25.3.25.ebuild 1921 BLAKE2B ba3f24609c661cb8372faa296c7a5b1ac6f0e321cd044e5227e2112060d7f72b38c89cda9b97081815789b47774324a145b652426dffcef9f14037a429af5a21 SHA512 c5ee0331c7ea348a6d59c78d09d214413711e2711de6d68ad29f704b6be8c7b8517f7cb317e51d226995cd9e2304ad5afdc544ddca805ff9eccde1a8569fbeb3
 EBUILD galera-25.3.26.ebuild 1940 BLAKE2B 30f4214e8457bbe5657063ba12fa37f16888ee4928d094689070c0272fbd2471147d7c8b604db61174054c1baf0a19179ff001113445fc31c4df30be29019d57 SHA512 9d13b8300d0d907d8289c4b7e72dfeba11218aac66b60fb1b235a5d16f22592be90fdf9984ecd2dafa58e66c95c6f01877ff690539e7f73bbc9da974a2319da0
+EBUILD galera-25.3.28-r1.ebuild 1798 BLAKE2B 0923506a89b289399c746746d090d493f76350044d831e060495f1b7600d5a4a8fb319b51974d1072411a1bc1673abc5315bb9cef737bdab07d229c6f2c95b72 SHA512 db2480f6d95b95e1b25a06dca9cce806f8ae824af62a0cfde26171491744121439a2eeb44ccd87978adedd86289399ec03354cbf7b8109f0ea43f5574839287f
 EBUILD galera-25.3.28.ebuild 1940 BLAKE2B 1fef8ac231b929fb4e3dceb990ca65249ffe4b7f40c69f34e01c9e73fae6749a0c8ad2ef51122a8c825f0f95098f69ef05471fba6559e1a56b2b4843d2aa4122 SHA512 05eb56bbd931349018a8e4dae326ddc62b27b56ff5b81a9c10b7ad354298c8b2411520edc2fc12e2a35267d14b6b80918ebf2032001c7286267bf3a0c9bde2ab
 EBUILD galera-26.4.2.ebuild 1894 BLAKE2B e2e663253b96ae48fab2e5209a42a9a3b966a4c29304857922af862707548e0db8a88480857faf86a9507f71ebb287784a2d1f8e2b7e7016af5b8171b0a696e0 SHA512 76c27d5ea4fae06c388c6f22a8fd5e80c6dac7f319b8dff70804e890064e44f63737d1b82d1b83e479a6eefd8bd652e99b2c8ede2d77f6a20ae69513a4a5dc11
 EBUILD galera-26.4.3.ebuild 1798 BLAKE2B df2a27c02c1516f27cf58b10b176bac225317c7b005dabe9ab3f52cb0822b90812bf9e420f66ab8b6f39d0182062942382a965af64a27372a9f76af1413dfdd2 SHA512 f31d82807ffeeae6a641e92386ccf7f174bf2bb55c44785308acca02a5b761028e90bac9f7c437856a4470371412c315b1fb54e52de6b0ba1a3e8779c72eb22c
diff --git a/sys-cluster/galera/files/garb.init b/sys-cluster/galera/files/garb.init
index 5bf57a7a683e..6da7a7582286 100644
--- a/sys-cluster/galera/files/garb.init
+++ b/sys-cluster/galera/files/garb.init
@@ -26,7 +26,8 @@ start_pre() {
 
 	GALERA_PORT=${GALERA_PORT:-4567}
 
-	local OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
+	local nodes=$(echo "${GALERA_NODES}" | awk '{ gsub(" ", ",") ; print $0 }')
+	local OPTIONS="-a gcomm://${nodes} -g ${GALERA_GROUP}"
 	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
 	[ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
 	[ -n "${NODE_NAME}" ]      && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
diff --git a/sys-cluster/galera/galera-25.3.28-r1.ebuild b/sys-cluster/galera/galera-25.3.28-r1.ebuild
new file mode 100644
index 000000000000..adcb8849262b
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.28-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://galeracluster.com"
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/${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" )
+
+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.init" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}