| 1 |
commit: 8e225a62110259ce51e71bb7dc3eac113b81bf06 |
| 2 |
Author: Marco Scardovi <marco <AT> scardovi <DOT> com> |
| 3 |
AuthorDate: Sat Dec 18 20:24:33 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 1 10:48:01 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e225a62 |
| 7 |
|
| 8 |
sys-cluster/galera: revbump galera-26.4.10 to r1 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com> |
| 12 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 13 |
|
| 14 |
...era-26.4.10.ebuild => galera-26.4.10-r1.ebuild} | 34 ++++++++++------------ |
| 15 |
1 file changed, 16 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/galera/galera-26.4.10.ebuild b/sys-cluster/galera/galera-26.4.10-r1.ebuild |
| 18 |
similarity index 75% |
| 19 |
rename from sys-cluster/galera/galera-26.4.10.ebuild |
| 20 |
rename to sys-cluster/galera/galera-26.4.10-r1.ebuild |
| 21 |
index 8c2638ef5bb9..9e68c73486b2 100644 |
| 22 |
--- a/sys-cluster/galera/galera-26.4.10.ebuild |
| 23 |
+++ b/sys-cluster/galera/galera-26.4.10-r1.ebuild |
| 24 |
@@ -7,9 +7,12 @@ PYTHON_COMPAT=( python3_{7,8,9} ) |
| 25 |
|
| 26 |
inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic |
| 27 |
|
| 28 |
+MY_PN="${PN}-4" |
| 29 |
+MY_P="${MY_PN}-${PV}" |
| 30 |
+ |
| 31 |
DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" |
| 32 |
HOMEPAGE="https://galeracluster.com" |
| 33 |
-SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz -> ${P}.tar.gz" |
| 34 |
+SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz -> ${P}.tar.gz" |
| 35 |
LICENSE="GPL-2 BSD" |
| 36 |
|
| 37 |
SLOT="0" |
| 38 |
@@ -22,46 +25,41 @@ IUSE="cpu_flags_x86_sse4_2 garbd test" |
| 39 |
# - https://github.com/codership/galera/issues/596 |
| 40 |
RESTRICT="test" |
| 41 |
|
| 42 |
-CDEPEND=" |
| 43 |
+COMMON_DEPEND=" |
| 44 |
dev-libs/openssl:0= |
| 45 |
>=dev-libs/boost-1.41:0= |
| 46 |
- " |
| 47 |
- |
| 48 |
-BDEPEND=">=sys-devel/gcc-4.4" |
| 49 |
+" |
| 50 |
|
| 51 |
-DEPEND="${BDEPEND} |
| 52 |
- ${CDEPEND} |
| 53 |
+DEPEND=" |
| 54 |
+ ${COMMON_DEPEND} |
| 55 |
dev-libs/check |
| 56 |
>=dev-cpp/asio-1.10.1[ssl(+)] |
| 57 |
<dev-cpp/asio-1.12.0 |
| 58 |
- " |
| 59 |
+" |
| 60 |
|
| 61 |
#Run time only |
| 62 |
-RDEPEND="${CDEPEND}" |
| 63 |
+RDEPEND="${COMMON_DEPEND}" |
| 64 |
|
| 65 |
# Respect {C,LD}FLAGS. |
| 66 |
PATCHES=( |
| 67 |
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch |
| 68 |
- "${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch |
| 69 |
+ "${FILESDIR}/${PN}"-26.4.6-strip-extra-cflags.patch |
| 70 |
+ "${FILESDIR}/${PN}"-26.4.8-respect-toolchain.patch |
| 71 |
) |
| 72 |
|
| 73 |
-S="${WORKDIR}/galera-4-${PV}" |
| 74 |
+S="${WORKDIR}/${MY_P}" |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
default |
| 78 |
- |
| 79 |
# Remove bundled dev-cpp/asio |
| 80 |
- rm -r "${S}/asio" || die |
| 81 |
- |
| 82 |
+ rm -r "${S}/asio" || die "Failed to remove bundled asio" |
| 83 |
#Remove optional garbd daemon |
| 84 |
if ! use garbd ; then |
| 85 |
- rm -r "${S}/garb" || die |
| 86 |
+ rm -r "${S}/garb" || die "Failed to remove garbd daemon" |
| 87 |
fi |
| 88 |
} |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
tc-export AR CC CXX OBJDUMP |
| 92 |
- |
| 93 |
# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, |
| 94 |
# and -Wold-style-cast |
| 95 |
MYSCONS=( |
| 96 |
@@ -84,6 +82,6 @@ src_install() { |
| 97 |
newinitd "${FILESDIR}/garb.init" garbd |
| 98 |
doman man/garbd.8 |
| 99 |
fi |
| 100 |
- exeinto /usr/$(get_libdir)/${PN} |
| 101 |
+ exeinto /usr/$(get_libdir)/"${PN}" |
| 102 |
doexe libgalera_smm.so |
| 103 |
} |
Archives