1 |
commit: bee6018c5a1d8eb792b69deda2acfc087c7213b9 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 17 13:29:05 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 17 13:43:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee6018c |
7 |
|
8 |
dev-db/mariadb: Adjust REQUIRED_USE for GLEP73 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
dev-db/mariadb/mariadb-10.0.29.ebuild | 2 +- |
13 |
dev-db/mariadb/mariadb-10.0.30.ebuild | 2 +- |
14 |
dev-db/mariadb/mariadb-10.0.31.ebuild | 2 +- |
15 |
dev-db/mariadb/mariadb-10.1.24.ebuild | 2 +- |
16 |
dev-db/mariadb/mariadb-10.1.25.ebuild | 2 +- |
17 |
dev-db/mariadb/mariadb-10.2.1_alpha.ebuild | 2 +- |
18 |
6 files changed, 6 insertions(+), 6 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/mariadb/mariadb-10.0.29.ebuild b/dev-db/mariadb/mariadb-10.0.29.ebuild |
21 |
index a28ac0f9bc6..091fe95c3d5 100644 |
22 |
--- a/dev-db/mariadb/mariadb-10.0.29.ebuild |
23 |
+++ b/dev-db/mariadb/mariadb-10.0.29.ebuild |
24 |
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
25 |
IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" |
26 |
RESTRICT="!bindist? ( bindist )" |
27 |
|
28 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
29 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
30 |
|
31 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
32 |
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" |
33 |
|
34 |
diff --git a/dev-db/mariadb/mariadb-10.0.30.ebuild b/dev-db/mariadb/mariadb-10.0.30.ebuild |
35 |
index 1241f92c723..a0218bb3238 100644 |
36 |
--- a/dev-db/mariadb/mariadb-10.0.30.ebuild |
37 |
+++ b/dev-db/mariadb/mariadb-10.0.30.ebuild |
38 |
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
39 |
IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" |
40 |
RESTRICT="!bindist? ( bindist )" |
41 |
|
42 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
43 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
44 |
|
45 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
46 |
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" |
47 |
|
48 |
diff --git a/dev-db/mariadb/mariadb-10.0.31.ebuild b/dev-db/mariadb/mariadb-10.0.31.ebuild |
49 |
index 32d354269d3..f6f70d9bf5e 100644 |
50 |
--- a/dev-db/mariadb/mariadb-10.0.31.ebuild |
51 |
+++ b/dev-db/mariadb/mariadb-10.0.31.ebuild |
52 |
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
53 |
IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" |
54 |
RESTRICT="!bindist? ( bindist )" |
55 |
|
56 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
57 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
58 |
|
59 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
60 |
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" |
61 |
|
62 |
diff --git a/dev-db/mariadb/mariadb-10.1.24.ebuild b/dev-db/mariadb/mariadb-10.1.24.ebuild |
63 |
index c2af25accb6..e11a76b6202 100644 |
64 |
--- a/dev-db/mariadb/mariadb-10.1.24.ebuild |
65 |
+++ b/dev-db/mariadb/mariadb-10.1.24.ebuild |
66 |
@@ -18,7 +18,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
67 |
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" |
68 |
RESTRICT="!bindist? ( bindist )" |
69 |
|
70 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
71 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
72 |
|
73 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
74 |
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" |
75 |
|
76 |
diff --git a/dev-db/mariadb/mariadb-10.1.25.ebuild b/dev-db/mariadb/mariadb-10.1.25.ebuild |
77 |
index fe7121af1dc..9bdb5a8887f 100644 |
78 |
--- a/dev-db/mariadb/mariadb-10.1.25.ebuild |
79 |
+++ b/dev-db/mariadb/mariadb-10.1.25.ebuild |
80 |
@@ -18,7 +18,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
81 |
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" |
82 |
RESTRICT="!bindist? ( bindist )" |
83 |
|
84 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
85 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
86 |
|
87 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
88 |
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" |
89 |
|
90 |
diff --git a/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild b/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild |
91 |
index b80aa96803d..8209119b1a5 100644 |
92 |
--- a/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild |
93 |
+++ b/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild |
94 |
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
95 |
IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
96 |
RESTRICT="!bindist? ( bindist )" |
97 |
|
98 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
99 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
100 |
|
101 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
102 |
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" |