commit: aa3e9f8f66e3a423278559933dabf6e94b46faa2
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 12 08:08:10 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Nov 12 08:08:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3e9f8f
dev-db/mariadb: address 11.8.3 sanity for stabilization
Recent addition of AWS Key Management support in commit 4302cd8b22b5
("dev-db/mariadb: Add AWS Key Mangement support (amd64).") broke sanity
of ongoing mariadb-11.8.3 stabilization. To fix this, the original pre
USE=aws-km is restored as -r2 and the current version is moved as -r3.
Related stabilization bug will be changed to -r2.
Bug: https://bugs.gentoo.org/963354
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
.../mariadb/{mariadb-11.8.3-r1.ebuild => mariadb-11.8.3-r2.ebuild} | 5 ++---
.../mariadb/{mariadb-11.8.3-r1.ebuild => mariadb-11.8.3-r3.ebuild} | 0
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
b/dev-db/mariadb/mariadb-11.8.3-r2.ebuild
similarity index 99%
copy from dev-db/mariadb/mariadb-11.8.3-r1.ebuild
copy to dev-db/mariadb/mariadb-11.8.3-r2.ebuild
index 55af964cf45d..06a91892f6ca 100644
--- a/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
+++ b/dev-db/mariadb/mariadb-11.8.3-r2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera
innodb-lz4
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
@@ -45,7 +45,6 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
>=virtual/zlib-1.2.3:=
virtual/libcrypt:=
- aws-km? ( dev-cpp/aws-sdk-cpp:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -392,7 +391,7 @@ src_configure() {
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_AWS_KEY_MANAGEMENT=$(usex aws-km DYNAMIC NO)
+ -DPLUGIN_AWS_KEY_MANAGEMENT=NO
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
diff --git a/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
b/dev-db/mariadb/mariadb-11.8.3-r3.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-11.8.3-r1.ebuild
rename to dev-db/mariadb/mariadb-11.8.3-r3.ebuild
