commit: c406e3a1d11e81185c65aaa2821455eab1dba394 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 14 14:11:05 2025 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Feb 17 09:25:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c406e3a1
dev-db/mariadb: Port to ver_replacing Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> dev-db/mariadb/mariadb-10.11.11.ebuild | 15 +++++---------- dev-db/mariadb/mariadb-10.6.21.ebuild | 15 +++++---------- dev-db/mariadb/mariadb-11.4.5.ebuild | 15 +++++---------- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.11.11.ebuild b/dev-db/mariadb/mariadb-10.11.11.ebuild index aa765cee2852..e7d7e97b4a0e 100644 --- a/dev-db/mariadb/mariadb-10.11.11.ebuild +++ b/dev-db/mariadb/mariadb-10.11.11.ebuild @@ -7,7 +7,7 @@ SUBSLOT="18" JAVA_PKG_OPT_USE="jdbc" inherit systemd flag-o-matic prefix toolchain-funcs \ - multiprocessing java-pkg-opt-2 cmake + multiprocessing java-pkg-opt-2 cmake eapi9-ver DESCRIPTION="An enhanced, drop-in replacement for MySQL" HOMEPAGE="https://mariadb.org/"; @@ -797,15 +797,10 @@ pkg_postinst() { elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." elog "This option should then be removed for subsequent starts." einfo - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - local rver - for rver in ${REPLACING_VERSIONS} ; do - if ver_test "${rver}" -lt "10.4.0" ; then - ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster." - ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"; - ewarn "for more information" - fi - done + if ver_replacing -lt "10.4.0" ; then + ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster." + ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"; + ewarn "for more information" fi fi fi diff --git a/dev-db/mariadb/mariadb-10.6.21.ebuild b/dev-db/mariadb/mariadb-10.6.21.ebuild index c028d6cbff3a..c3959ff898a8 100644 --- a/dev-db/mariadb/mariadb-10.6.21.ebuild +++ b/dev-db/mariadb/mariadb-10.6.21.ebuild @@ -7,7 +7,7 @@ SUBSLOT="18" JAVA_PKG_OPT_USE="jdbc" inherit systemd flag-o-matic prefix toolchain-funcs \ - multiprocessing java-pkg-opt-2 cmake + multiprocessing java-pkg-opt-2 cmake eapi9-ver DESCRIPTION="An enhanced, drop-in replacement for MySQL" HOMEPAGE="https://mariadb.org/"; @@ -798,15 +798,10 @@ pkg_postinst() { elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." elog "This option should then be removed for subsequent starts." einfo - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - local rver - for rver in ${REPLACING_VERSIONS} ; do - if ver_test "${rver}" -lt "10.4.0" ; then - ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster." - ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"; - ewarn "for more information" - fi - done + if ver_replacing -lt "10.4.0" ; then + ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster." + ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"; + ewarn "for more information" fi fi fi diff --git a/dev-db/mariadb/mariadb-11.4.5.ebuild b/dev-db/mariadb/mariadb-11.4.5.ebuild index 4dd61ea1f812..c99a1d9a8d84 100644 --- a/dev-db/mariadb/mariadb-11.4.5.ebuild +++ b/dev-db/mariadb/mariadb-11.4.5.ebuild @@ -7,7 +7,7 @@ SUBSLOT="18" JAVA_PKG_OPT_USE="jdbc" inherit systemd flag-o-matic prefix toolchain-funcs \ - multiprocessing java-pkg-opt-2 cmake + multiprocessing java-pkg-opt-2 cmake eapi9-ver DESCRIPTION="An enhanced, drop-in replacement for MySQL" HOMEPAGE="https://mariadb.org/"; @@ -792,15 +792,10 @@ pkg_postinst() { elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." elog "This option should then be removed for subsequent starts." einfo - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - local rver - for rver in ${REPLACING_VERSIONS} ; do - if ver_test "${rver}" -lt "10.4.0" ; then - ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster." - ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"; - ewarn "for more information" - fi - done + if ver_replacing -lt "10.4.0" ; then + ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster." + ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"; + ewarn "for more information" fi fi fi
