gentoo auto-resync : 09:03:2023 - 18:02:55

3 files changed, 24 insertions, 116 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 092be613d6b3..c1133bf091ce 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -4,8 +4,6 @@ AUX galera-26.4.6-strip-extra-cflags.patch 1065 BLAKE2B d2a6a3016f9fd423eb7ad689
 AUX galera-26.4.8-respect-toolchain.patch 1786 BLAKE2B fb03674be3415a10b6cf9ea1534ff99a81a48e71de82e1f1d1f6a442f974e56876364cb48b62f730bfbf6ddc228155b20ac0ed913834d5548bcfade4c343adb0 SHA512 43a85f1b221c6128b5e6c8a5881711336840d57f7c2f17a716cb53bde0adb7ab2d8f72b87506cb8b5ac63ceead9ac1a7d5c5349496c6ec914129f18c7ddecb77
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.init 905 BLAKE2B a6f64183587ae9815aedb491dc9dd06f9a625ca4d935099bfbe80bd9a97f7a4020a8ca8d6d9056c0b6a7556aa750e08e232a656da38451d5ae0a47246be7e39a SHA512 716443592e1bb2c8071e3ab5267c6d46ab4c7a1aea25d7cb4f732ef5fd192aff1e439138cab01166539d9509ef75d71ead52a702567744af39df23c021c808a7
-DIST galera-26.4.10.tar.gz 1424663 BLAKE2B 6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38 SHA512 97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226
 DIST galera-26.4.13.tar.gz 1529682 BLAKE2B d7030fd5e3a48ede16f608cca9986de117a54f99cf3d972a5b14623acd84f05f31f5cdbbc3032bf5caa8e0486f418ac07c8f87287bb14a8164507c558876ae61 SHA512 e548048eac5fceb0bea1ae736abc6c488d175bc71a3cfb963675232688392ecb5dcc64ddd8e78ceda40e26b94b806d3c34bd9fc9765ebc047b5a5ce28ff7efea
-EBUILD galera-26.4.10-r1.ebuild 1966 BLAKE2B b94b909a9573e47fedc412aa7367c91fd9ad4ad6b3603032b6d2fd231f213cb788eb07986b7248638ab88454793f5725621fbeb0073b8105bab76edee395b47b SHA512 1ddb436a59cb45fe79da0da3ea0718cf5e32d80d3fa3d29834a1933156302a162bf4deca1d5c16b4b4330ce2d801b553156f9f8fce2ae44ba4a347c8a261bb7e
-EBUILD galera-26.4.13.ebuild 1881 BLAKE2B 4fd118ed2aa003063f109870b9d9c4417fae5e360847a3a07c5bffc7ccd61dd6fa9dafa5863fec193f31d04461fe742dad9d8dbd4dc30d0c09b50341987920ef SHA512 bcb4457be3d6926a2ed14295b1989826fa63b63c0f56e8f1f6e095103cbd6218bba45d762232c2b3788678c304206623339c03ffcac68b397141af0b6089b28e
+EBUILD galera-26.4.13-r1.ebuild 1781 BLAKE2B a2c799d0a0e24553252f656439e89cbf6b0ad9b063336ef1f4d5a8bc982b876884b0b6b387203f69e3dee0a62c797fff9ea56778303284a7d3155dc98a8cd5e9 SHA512 22e874658778976e069e225c9769960ba07bf030bbd32f848e3bd11e245306bf8937b66816813c70cf8d8f244600fb2e1cb105c6e024b44f329e20362badc727
 MISC metadata.xml 559 BLAKE2B 05daf7c57b0abe81f64a57092be24067d41785a0d2fa48c5d2d369bc6d1a35e83af2704b2b82737de16bb9be18543411ce913263913d5dfa9a5f9964c3a66c4c SHA512 b51dbbcaf9f966516a649cd819c130358716052782ae2470ab264444c7f8a86f4cd16dd48ccd95569f9d9ef068d6b2eab75017d1dab5ddb92e79403338131ef7
diff --git a/sys-cluster/galera/galera-26.4.10-r1.ebuild b/sys-cluster/galera/galera-26.4.10-r1.ebuild
deleted file mode 100644
index 82ec608d2d93..000000000000
--- a/sys-cluster/galera/galera-26.4.10-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
-
-MY_PN="${PN}-4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="https://galeracluster.com"
-SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.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"
-
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	dev-libs/boost:=
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/check
-	>=dev-cpp/asio-1.10.1[ssl(+)]
-	<dev-cpp/asio-1.12.0
-"
-
-#Run time only
-RDEPEND="${COMMON_DEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
-	"${FILESDIR}/${PN}"-26.4.6-strip-extra-cflags.patch
-	"${FILESDIR}/${PN}"-26.4.8-respect-toolchain.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die "Failed to remove bundled asio"
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die "Failed to remove garbd daemon"
-	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/galera/galera-26.4.13.ebuild b/sys-cluster/galera/galera-26.4.13-r1.ebuild
index 8225925b67b1..2df9c574f02d 100644
--- a/sys-cluster/galera/galera-26.4.13.ebuild
+++ b/sys-cluster/galera/galera-26.4.13-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
@@ -13,51 +13,46 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
 HOMEPAGE="https://galeracluster.com"
 SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2 BSD"
+S="${WORKDIR}/${MY_P}"
 
+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 )"
 
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
+RDEPEND="
+	dev-libs/openssl:=
+	dev-libs/boost:=
 "
-
 DEPEND="
-	${COMMON_DEPEND}
+	${RDEPEND}
 	dev-libs/check
 	>=dev-cpp/asio-1.22
 "
 
-#Run time only
-RDEPEND="${COMMON_DEPEND}"
-
-# Respect {C,LD}FLAGS.
 PATCHES=(
-	"${FILESDIR}/${PN}"-26.4.6-strip-extra-cflags.patch
-	"${FILESDIR}/${PN}"-26.4.8-respect-toolchain.patch
-	"${FILESDIR}/${PN}"-26.4.13-asio.patch
-	"${FILESDIR}/${PN}"-26.4.13-tests.patch
+	"${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
+	"${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
+	"${FILESDIR}"/${PN}-26.4.13-asio.patch
+	"${FILESDIR}"/${PN}-26.4.13-tests.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
+
 	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die "Failed to remove bundled asio"
-	#Remove optional garbd daemon
+	rm -r asio || die "Failed to remove bundled asio"
+
+	# Remove optional garbd daemon
 	if ! use garbd ; then
-		rm -r "${S}/garb" || die "Failed to remove garbd daemon"
+		rm -r garb || die "Failed to remove garbd daemon"
 	fi
 }
 
 src_configure() {
 	tc-export AR CC CXX OBJDUMP
+
 	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
 	# and -Wold-style-cast
 	MYSCONS=(
@@ -74,12 +69,14 @@ src_compile() {
 
 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
+		newconfd "${FILESDIR}"/garb.cnf garbd
+		newinitd "${FILESDIR}"/garb.init garbd
 		doman man/garbd.8
 	fi
-	exeinto /usr/$(get_libdir)/"${PN}"
+
+	exeinto /usr/$(get_libdir)/galera
 	doexe libgalera_smm.so
 }