From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1718720-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id F0B2D1582EF
for <garchives@archives.gentoo.org>; Mon, 17 Feb 2025 09:26:16 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id DBB283432B7
for <garchives@archives.gentoo.org>; Mon, 17 Feb 2025 09:26:16 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 22E1E110470;
Mon, 17 Feb 2025 09:26:13 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id 1DBE9110470
for <gentoo-commits@lists.gentoo.org>; Mon, 17 Feb 2025 09:26:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C8467343288
for <gentoo-commits@lists.gentoo.org>; Mon, 17 Feb 2025 09:26:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id F18432637
for <gentoo-commits@lists.gentoo.org>; Mon, 17 Feb 2025 09:26:10 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1739784323.c406e3a1d11e81185c65aaa2821455eab1dba394.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/mariadb/mariadb-10.11.11.ebuild dev-db/mariadb/mariadb-10.6.21.ebuild dev-db/mariadb/mariadb-11.4.5.ebuild
X-VCS-Directories: dev-db/mariadb/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: c406e3a1d11e81185c65aaa2821455eab1dba394
X-VCS-Branch: master
Date: Mon, 17 Feb 2025 09:26:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1a4a6fd8-05ab-46be-a98f-baca89e81bf9
X-Archives-Hash: f29a980b6674971b8c00af6632de436c
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