From ddc371b5e15b3a5507b895e91c18bd476b9bdb9e Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+gentoo@asokolov.org>
Date: Tue, 10 Aug 2021 23:55:10 +0100
Subject: sys-cluster/galera: add (+) to asio[ssl] use-dep

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
---
 sys-cluster/galera/galera-25.3.28-r1.ebuild | 81 --------------------------
 sys-cluster/galera/galera-25.3.28-r2.ebuild | 81 ++++++++++++++++++++++++++
 sys-cluster/galera/galera-25.3.32-r1.ebuild | 82 ++++++++++++++++++++++++++
 sys-cluster/galera/galera-25.3.32.ebuild    | 82 --------------------------
 sys-cluster/galera/galera-26.4.6-r1.ebuild  | 88 ++++++++++++++++++++++++++++
 sys-cluster/galera/galera-26.4.6.ebuild     | 88 ----------------------------
 sys-cluster/galera/galera-26.4.7-r1.ebuild  | 85 +++++++++++++++++++++++++++
 sys-cluster/galera/galera-26.4.7.ebuild     | 85 ---------------------------
 sys-cluster/galera/galera-26.4.8-r1.ebuild  | 89 +++++++++++++++++++++++++++++
 sys-cluster/galera/galera-26.4.8.ebuild     | 89 -----------------------------
 sys-cluster/galera/galera-26.4.9-r1.ebuild  | 89 +++++++++++++++++++++++++++++
 sys-cluster/galera/galera-26.4.9.ebuild     | 89 -----------------------------
 12 files changed, 514 insertions(+), 514 deletions(-)
 delete mode 100644 sys-cluster/galera/galera-25.3.28-r1.ebuild
 create mode 100644 sys-cluster/galera/galera-25.3.28-r2.ebuild
 create mode 100644 sys-cluster/galera/galera-25.3.32-r1.ebuild
 delete mode 100644 sys-cluster/galera/galera-25.3.32.ebuild
 create mode 100644 sys-cluster/galera/galera-26.4.6-r1.ebuild
 delete mode 100644 sys-cluster/galera/galera-26.4.6.ebuild
 create mode 100644 sys-cluster/galera/galera-26.4.7-r1.ebuild
 delete mode 100644 sys-cluster/galera/galera-26.4.7.ebuild
 create mode 100644 sys-cluster/galera/galera-26.4.8-r1.ebuild
 delete mode 100644 sys-cluster/galera/galera-26.4.8.ebuild
 create mode 100644 sys-cluster/galera/galera-26.4.9-r1.ebuild
 delete mode 100644 sys-cluster/galera/galera-26.4.9.ebuild

diff --git a/sys-cluster/galera/galera-25.3.28-r1.ebuild b/sys-cluster/galera/galera-25.3.28-r1.ebuild
deleted file mode 100644
index bb7884c89681..000000000000
--- a/sys-cluster/galera/galera-25.3.28-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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="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
-}
diff --git a/sys-cluster/galera/galera-25.3.28-r2.ebuild b/sys-cluster/galera/galera-25.3.28-r2.ebuild
new file mode 100644
index 000000000000..9c47b3b485d7
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.28-r2.ebuild
@@ -0,0 +1,81 @@
+# 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="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
+}
diff --git a/sys-cluster/galera/galera-25.3.32-r1.ebuild b/sys-cluster/galera/galera-25.3.32-r1.ebuild
new file mode 100644
index 000000000000..03535e674d74
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.32-r1.ebuild
@@ -0,0 +1,82 @@
+# 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-3/source/galera-3-${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}-25.3.32-respect-cflags.patch )
+
+S="${WORKDIR}/galera-3-${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/galera/galera-25.3.32.ebuild b/sys-cluster/galera/galera-25.3.32.ebuild
deleted file mode 100644
index d32911d987b4..000000000000
--- a/sys-cluster/galera/galera-25.3.32.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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-3/source/galera-3-${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}-25.3.32-respect-cflags.patch )
-
-S="${WORKDIR}/galera-3-${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/galera/galera-26.4.6-r1.ebuild b/sys-cluster/galera/galera-26.4.6-r1.ebuild
new file mode 100644
index 000000000000..23c60542ac9a
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.6-r1.ebuild
@@ -0,0 +1,88 @@
+# 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
+
+MY_P="${PN}-4-${PV}"
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="https://galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_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.5-respect-toolchain.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+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
+	# 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
+}
diff --git a/sys-cluster/galera/galera-26.4.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild
deleted file mode 100644
index 5d6caaca13bb..000000000000
--- a/sys-cluster/galera/galera-26.4.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-
-MY_P="${PN}-4-${PV}"
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="https://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_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.5-respect-toolchain.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-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
-	# 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
-}
diff --git a/sys-cluster/galera/galera-26.4.7-r1.ebuild b/sys-cluster/galera/galera-26.4.7-r1.ebuild
new file mode 100644
index 000000000000..4da1ee14e942
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.7-r1.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.5-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/galera/galera-26.4.7.ebuild b/sys-cluster/galera/galera-26.4.7.ebuild
deleted file mode 100644
index 4f013d349ddc..000000000000
--- a/sys-cluster/galera/galera-26.4.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.5-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/galera/galera-26.4.8-r1.ebuild b/sys-cluster/galera/galera-26.4.8-r1.ebuild
new file mode 100644
index 000000000000..18c45857880e
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.8-r1.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/galera/galera-26.4.8.ebuild b/sys-cluster/galera/galera-26.4.8.ebuild
deleted file mode 100644
index 8c74829e351e..000000000000
--- a/sys-cluster/galera/galera-26.4.8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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/galera/galera-26.4.9-r1.ebuild b/sys-cluster/galera/galera-26.4.9-r1.ebuild
new file mode 100644
index 000000000000..8c2638ef5bb9
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.9-r1.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/galera/galera-26.4.9.ebuild b/sys-cluster/galera/galera-26.4.9.ebuild
deleted file mode 100644
index 18d41bef84ca..000000000000
--- a/sys-cluster/galera/galera-26.4.9.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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
-}
-- 
cgit v1.2.3-65-gdbad