gentoo resync : 14.07.2018

5 files changed, 2 insertions, 268 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 2c76d4f2aa55..99dca0b656a2 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,12 +1,6 @@
 AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
-DIST galera-3-25.3.20.tar.gz 3319355 BLAKE2B 0f00da318e11713d0e44f9de38a941fd0c18c1c64faa780c797262d467305f16bbb91c5e1d130b9b351a3956573aa297aa520239db54fbdc01d23f1be1530952 SHA512 4531073bbd13542cf4b0ed06788ec0b857971bd2e0161b8df2d90072b134d5343216c012d2f712ff336209f6e34920e2aadf7b0f58f91d6ce365fb2b65ed7fbd
-DIST galera-3-25.3.21.tar.gz 3317865 BLAKE2B e3f1fec764c171615d0db3a0375bf660185c3271470a0f9114299cc0159bf43cce7bdf4ad85cfb8e7fcd3d50917846ed3ce0726a3a5e371439f5ca0a1b2d63d6 SHA512 04f9a879c1c161c84dc74c002467e60739186d49746255f0f60ad090cf9c3ff778610a3cfc58896c73c244355baefdd65109df8538c010d7a749e9ee1e88e033
-DIST galera-3-25.3.22.tar.gz 3320337 BLAKE2B f55ac3f5dc18bb5aa0cf5f3fd8eee4cc7697324d3c62902303b36311dac06042b5a497be4beba2a202865cdd5866d37ca74239014ec3c3960847fe9bb3bc873f SHA512 4367ed8b36013e2c68c90d91b83a1929aa602bf82447f9d2382a1ad56f287867da543cdd995ed5791a1ba60f891fbc380afe1ecec983c2184f2050a83eed0fed
 DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5 SHA512 5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1
-EBUILD galera-25.3.20.ebuild 1816 BLAKE2B 6699e5f545d51d15f7b82c17ce56fa5733a817a820a80ab6b84e16f7eef3bf88baf6ebcae54af0f06072a2e299b83d8a87478271efd378fa2d19fa70c11e148b SHA512 ac38b5e8a74494baebc889fe312eca034dc7637c3aab2ccc560f6e8ac4d81e95e36e9a08b8f2a11e8020fc4c8e01a5b2fcb2d0d453d51c6b94a644f7f853fb4b
-EBUILD galera-25.3.21.ebuild 1828 BLAKE2B 01cf04ad9d25318480f7d44242c4295ca49bdbf4de6f7d5650707e323a57fe0fe0883057d7a3aef7729c4485a65eca51ae45797c97a3c47b283150ab848a9d9b SHA512 701753adad3fe6556f18d53990f0fb8eb9acc8625dff14b6ce2666e168ae19b68f78d08935ff735fbca8ac93102549ebc0bd46aea17a1effb9d64de67a0a4a84
-EBUILD galera-25.3.22.ebuild 1824 BLAKE2B 9a0b5ca6268fa6b82920323d801a7fb5d4b3b497b950e777bbfbe7264407655b81c25ac2817bc84db7e1deb45bfc3e8ccfa611a87b97e7b91877d0dd450ffcd8 SHA512 e6e1126a523a996d99ed0286ef1ef04005eb48d9e99300e421dcdb7330fe8823c91f8eb22138af0a5b51256b1ffbb6c1420ca6487fbfbd12d805faebf4aeea57
-EBUILD galera-25.3.23.ebuild 1812 BLAKE2B 1f9944a4972c29adad2c1e74113155366e073af5c90d25bea7323aa0f1295bb74a66b0e0b1fe6bb2dbf97b8ee386fedd1f63b175862768563de9f1813783ec6f SHA512 94bb2004d6579ec099864fcd312867e87b4ee3b09ef7f849b5fa4d2065ee0d9dfcf2b9399210a28c6712c2c972df0c7cd1886c5bc627fb3344c2d83c761fa717
+EBUILD galera-25.3.23.ebuild 1834 BLAKE2B c9c0ce726168b44adebd8a862f0446865e9acfb22dee871c322a60c3a2bbd1b1e02fc363ed2840f09cad7f7ca984128319fb49fab2470e5dee97586f8d2b51de SHA512 f5389646c9d5ef832a430440e31c27e99488352a645657a2044f4739c45ef185207e0a3466a35b731b68a9d53c362b28ca4aa9ef91e403a506ee1a435e1a1aae
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.20.ebuild b/sys-cluster/galera/galera-25.3.20.ebuild
deleted file mode 100644
index 08d698fa170c..000000000000
--- a/sys-cluster/galera/galera-25.3.20.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-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=(
-		ssl=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.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.21.ebuild b/sys-cluster/galera/galera-25.3.21.ebuild
deleted file mode 100644
index b81600aef42d..000000000000
--- a/sys-cluster/galera/galera-25.3.21.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-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=(
-		ssl=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.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.22.ebuild b/sys-cluster/galera/galera-25.3.22.ebuild
deleted file mode 100644
index 2800a6fdeeb3..000000000000
--- a/sys-cluster/galera/galera-25.3.22.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-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=(
-		ssl=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.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.23.ebuild b/sys-cluster/galera/galera-25.3.23.ebuild
index 13c2d41fc3fa..bcb3d49b1677 100644
--- a/sys-cluster/galera/galera-25.3.23.ebuild
+++ b/sys-cluster/galera/galera-25.3.23.ebuild
@@ -25,6 +25,7 @@ DEPEND="${DEPEND}
 	dev-libs/check
 	>=sys-devel/gcc-4.4
 	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
 	"
 #Run time only
 RDEPEND="${CDEPEND}"