dev-db/mariadb: Adjust REQUIRED_USE for GLEP73

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-db/mariadb/mariadb-10.0.29.ebuild b/dev-db/mariadb/mariadb-10.0.29.ebuild
index a28ac0f9bc6cb5898b51e3782f4a508161e2cbc3..091fe95c3d59c9719683d7a2fb5895196e4b4c35 100644 (file)
--- a/dev-db/mariadb/mariadb-10.0.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.29.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
 RESTRICT="!bindist? ( bindist )"
 
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

diff --git a/dev-db/mariadb/mariadb-10.0.30.ebuild b/dev-db/mariadb/mariadb-10.0.30.ebuild
index 1241f92c7230a9b9eb212c2f7c867f3c032a2a40..a0218bb323891f10ae4e6f5e025eaa346f2bce66 100644 (file)
--- a/dev-db/mariadb/mariadb-10.0.30.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.30.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
 RESTRICT="!bindist? ( bindist )"
 
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

diff --git a/dev-db/mariadb/mariadb-10.0.31.ebuild b/dev-db/mariadb/mariadb-10.0.31.ebuild
index 32d354269d383dc417e6e6e7b36ed9f703171606..f6f70d9bf5e8400982397d21543a49da184b6656 100644 (file)
--- a/dev-db/mariadb/mariadb-10.0.31.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.31.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
 RESTRICT="!bindist? ( bindist )"
 
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

diff --git a/dev-db/mariadb/mariadb-10.1.24.ebuild b/dev-db/mariadb/mariadb-10.1.24.ebuild
index c2af25accb671ede38ee4ee78e51b6b74a3e757d..e11a76b62026d292b9fc10bdfe763c132120acda 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
 RESTRICT="!bindist? ( bindist )"
 
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

diff --git a/dev-db/mariadb/mariadb-10.1.25.ebuild b/dev-db/mariadb/mariadb-10.1.25.ebuild
index fe7121af1dc8d25644c8528874c07ad6638f52ed..9bdb5a8887f3880a738f74c7a9a507a2b1a85e5d 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.25.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
 RESTRICT="!bindist? ( bindist )"
 
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

diff --git a/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild b/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild
index b80aa96803ddadd0714bf9dae93f9f5a2c308b6c..8209119b1a59ad7dd925c5f0d3d6a442f11c68af 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
 RESTRICT="!bindist? ( bindist )"
 
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"