[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/

[Ulrich Müller]

commit:     a93daad6531eae0c5756356cf71925e2149373d9
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Sat Dec 18 20:20:00 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 10:48:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a93daad6

sys-cluster/galera: bump to galera-25.3.35

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sys-cluster/galera/Manifest                        |  2 +-
 ...era-25.3.32-r1.ebuild => galera-25.3.35.ebuild} | 34 ++++++++++------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index fc10b6bc9caa..b8855e99ff9a 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,4 +1,4 @@
 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
 SHA512 
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
-DIST galera-25.3.32.tar.gz 1277302 BLAKE2B 
061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2
 SHA512 
e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
+DIST galera-25.3.35.tar.gz 1278869 BLAKE2B 
c5c0cc1d4ad29caf94550a6b96ab9762a97273713b906c4f3e3d9851b90b1028246285e74becc912336edbb6e1a427d9bdd9c31177f3dd899153dbed54cdde92
 SHA512 
aaa7038cf9e8be57ae1760d259af31bafa8d3c994c46cbb6224231fe3bb63d7bc830a97a2d4833cd24b85a47da2e4c7bfc2a99d73155d6bd6330e4a9dda3083d
 DIST galera-26.4.10.tar.gz 1424663 BLAKE2B 
6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38
 SHA512 
97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226
 DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 
9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4
 SHA512 
5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661

diff --git a/sys-cluster/galera/galera-25.3.32-r1.ebuild 
b/sys-cluster/galera/galera-25.3.35.ebuild
similarity index 73%
rename from sys-cluster/galera/galera-25.3.32-r1.ebuild
rename to sys-cluster/galera/galera-25.3.35.ebuild
index 03535e674d74..03e5e8cb2a39 100644
--- a/sys-cluster/galera/galera-25.3.32-r1.ebuild
+++ b/sys-cluster/galera/galera-25.3.35.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
+MY_PN="${PN}-3"
+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/galera-3/source/galera-3-${PV}.tar.gz
 -> ${P}.tar.gz"
+SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz -> 
${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -18,43 +21,38 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+COMMON_DEPEND="
        dev-libs/openssl:0=
        >=dev-libs/boost-1.41:0=
-       "
-
-BDEPEND=">=sys-devel/gcc-4.4"
+"
 
-DEPEND="${BDEPEND}
-       ${CDEPEND}
+DEPEND="
+       ${COMMON_DEPEND}
        dev-libs/check
        >=dev-cpp/asio-1.10.1[ssl(+)]
        <dev-cpp/asio-1.12.0
-       "
+"
 
 #Run time only
-RDEPEND="${CDEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 
 # Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}"/${PN}-25.3.32-respect-cflags.patch )
+PATCHES=( "${FILESDIR}/${PN}"-25.3.32-respect-cflags.patch )
 
-S="${WORKDIR}/galera-3-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        default
-
        # Remove bundled dev-cpp/asio
-       rm -r "${S}/asio" || die
-
+       rm -r "${S}/asio" || die "Failed to remove bundled asio"
        #Remove optional garbd daemon
        if ! use garbd ; then
-               rm -r "${S}/garb" || die
+               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=(
@@ -77,6 +75,6 @@ src_install() {
                newinitd "${FILESDIR}/garb.init" garbd
                doman man/garbd.8
        fi
-       exeinto /usr/$(get_libdir)/${PN}
+       exeinto /usr/$(get_libdir)/"${PN}"
        doexe libgalera_smm.so
 }