commit:     c42f92e03de962101dd48a34442a4b4278967536
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 00:42:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 00:42:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42f92e0

dev-db/mariadb: fix REQUIRED_USE for tests

Per the official test instructions above src_test, too...

Closes: https://bugs.gentoo.org/874756
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/mariadb/mariadb-10.3.36.ebuild    | 7 +++++--
 dev-db/mariadb/mariadb-10.3.37.ebuild    | 7 +++++--
 dev-db/mariadb/mariadb-10.4.26.ebuild    | 7 +++++--
 dev-db/mariadb/mariadb-10.4.27.ebuild    | 7 +++++--
 dev-db/mariadb/mariadb-10.5.17.ebuild    | 7 +++++--
 dev-db/mariadb/mariadb-10.5.18.ebuild    | 7 +++++--
 dev-db/mariadb/mariadb-10.6.10.ebuild    | 7 +++++--
 dev-db/mariadb/mariadb-10.6.11-r1.ebuild | 7 +++++--
 dev-db/mariadb/mariadb-10.6.11.ebuild    | 7 +++++--
 9 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/dev-db/mariadb/mariadb-10.3.36.ebuild 
b/dev-db/mariadb/mariadb-10.3.36.ebuild
index a4cfcfe57f25..f939b7ec970d 100644
--- a/dev-db/mariadb/mariadb-10.3.36.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.36.ebuild
@@ -27,10 +27,13 @@ IUSE="+backup bindist client-libs cracklib debug 
extraengine galera innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        server? ( tokudb? ( jemalloc !tcmalloc ) )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !extraengine !pam )"
+       static? ( yassl !extraengine !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.3.37.ebuild 
b/dev-db/mariadb/mariadb-10.3.37.ebuild
index ec4245a011ba..517f12786a11 100644
--- a/dev-db/mariadb/mariadb-10.3.37.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.37.ebuild
@@ -27,10 +27,13 @@ IUSE="+backup bindist client-libs cracklib debug 
extraengine galera innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        server? ( tokudb? ( jemalloc !tcmalloc ) )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !extraengine !pam )"
+       static? ( yassl !extraengine !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.4.26.ebuild 
b/dev-db/mariadb/mariadb-10.4.26.ebuild
index 26f337d76e62..958912f828a0 100644
--- a/dev-db/mariadb/mariadb-10.4.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.26.ebuild
@@ -27,10 +27,13 @@ IUSE="+backup bindist cracklib debug extraengine galera 
innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        server? ( tokudb? ( jemalloc !tcmalloc ) )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
+       static? ( yassl !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.4.27.ebuild 
b/dev-db/mariadb/mariadb-10.4.27.ebuild
index f03d9d91b921..c162f08df0cc 100644
--- a/dev-db/mariadb/mariadb-10.4.27.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.27.ebuild
@@ -27,10 +27,13 @@ IUSE="+backup bindist cracklib debug extraengine galera 
innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        server? ( tokudb? ( jemalloc !tcmalloc ) )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
+       static? ( yassl !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.5.17.ebuild 
b/dev-db/mariadb/mariadb-10.5.17.ebuild
index 384feb3be774..46cdd74fcf86 100644
--- a/dev-db/mariadb/mariadb-10.5.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.17.ebuild
@@ -27,9 +27,12 @@ IUSE="+backup bindist columnstore cracklib debug extraengine 
galera innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
+       static? ( yassl !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris 
~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.5.18.ebuild 
b/dev-db/mariadb/mariadb-10.5.18.ebuild
index 2b131d7c2a1d..138ad05991b8 100644
--- a/dev-db/mariadb/mariadb-10.5.18.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.18.ebuild
@@ -27,9 +27,12 @@ IUSE="+backup bindist columnstore cracklib debug extraengine 
galera innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
+       static? ( yassl !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris 
~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.6.10.ebuild 
b/dev-db/mariadb/mariadb-10.6.10.ebuild
index a67cb52a4a5e..2eb20a78c614 100644
--- a/dev-db/mariadb/mariadb-10.6.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.10.ebuild
@@ -27,9 +27,12 @@ IUSE="+backup bindist columnstore cracklib debug extraengine 
galera innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
+       static? ( yassl !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris 
~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.6.11-r1.ebuild 
b/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
index 18c894925298..48ec56b4ccc2 100644
--- a/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
@@ -24,9 +24,12 @@ IUSE="+backup bindist columnstore cracklib debug extraengine 
galera innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
+       static? ( yassl !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris ~x86-solaris"
 

diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild 
b/dev-db/mariadb/mariadb-10.6.11.ebuild
index 930b7e0df6ee..61fe37166184 100644
--- a/dev-db/mariadb/mariadb-10.6.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11.ebuild
@@ -27,9 +27,12 @@ IUSE="+backup bindist columnstore cracklib debug extraengine 
galera innodb-lz4
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
-REQUIRED_USE="jdbc? ( extraengine server !static )
+REQUIRED_USE="
+       jdbc? ( extraengine server !static )
        ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
+       static? ( yassl !pam )
+       test? ( extraengine perl server xml )
+"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris 
~x86-solaris"
 

Reply via email to