1 |
commit: 29c11366ddc185f4d0e2c834cbed46f4c826b385 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 17 19:21:42 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 17 19:23:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=29c11366 |
7 |
|
8 |
dev-db/mariadb: Bring live ebuild into line and update all for GLEP73 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
12 |
|
13 |
dev-db/mariadb/mariadb-10.2.6.ebuild | 2 +- |
14 |
dev-db/mariadb/mariadb-9999.ebuild | 46 ++++++++++++++++++++++++++++-------- |
15 |
2 files changed, 37 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild |
18 |
index 65e0f2c..300717f 100644 |
19 |
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild |
20 |
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild |
21 |
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1+" |
22 |
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" |
23 |
RESTRICT="!bindist? ( bindist )" |
24 |
|
25 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
26 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
27 |
|
28 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
29 |
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" |
30 |
|
31 |
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild |
32 |
index 71781c1..23309ad 100644 |
33 |
--- a/dev-db/mariadb/mariadb-9999.ebuild |
34 |
+++ b/dev-db/mariadb/mariadb-9999.ebuild |
35 |
@@ -9,15 +9,16 @@ EGIT_REPO_URI="https://github.com/MariaDB/server.git" |
36 |
WSREP_REVISION="25" |
37 |
SUBSLOT="18" |
38 |
MYSQL_PV_MAJOR="5.6" |
39 |
+JAVA_PKG_OPT_USE="jdbc" |
40 |
|
41 |
-inherit toolchain-funcs mysql-multilib-r1 git-r3 |
42 |
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 git-r3 |
43 |
HOMEPAGE="http://mariadb.org/" |
44 |
DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
45 |
|
46 |
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
47 |
+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" |
48 |
RESTRICT="!bindist? ( bindist )" |
49 |
|
50 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
51 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
52 |
|
53 |
KEYWORDS="" |
54 |
|
55 |
@@ -30,6 +31,7 @@ COMMON_DEPEND=" |
56 |
>=sys-libs/readline-4.1:0= |
57 |
) |
58 |
server? ( |
59 |
+ backup? ( app-arch/libarchive:0= ) |
60 |
cracklib? ( sys-libs/cracklib:0= ) |
61 |
extraengine? ( |
62 |
odbc? ( dev-db/unixODBC:0= ) |
63 |
@@ -45,24 +47,40 @@ COMMON_DEPEND=" |
64 |
>=dev-libs/libpcre-8.35:3= |
65 |
" |
66 |
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
67 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
68 |
${COMMON_DEPEND}" |
69 |
RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
70 |
- galera? ( |
71 |
+ server? ( galera? ( |
72 |
sys-apps/iproute2 |
73 |
=sys-cluster/galera-${WSREP_REVISION}* |
74 |
sst-rsync? ( sys-process/lsof ) |
75 |
sst-xtrabackup? ( net-misc/socat[ssl] ) |
76 |
- ) |
77 |
+ ) ) |
78 |
perl? ( !dev-db/mytop |
79 |
virtual/perl-Getopt-Long |
80 |
dev-perl/TermReadKey |
81 |
virtual/perl-Term-ANSIColor |
82 |
virtual/perl-Time-HiRes ) |
83 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
84 |
" |
85 |
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
86 |
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
87 |
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
88 |
+ |
89 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
90 |
+ /usr/include/mariadb/mariadb_version.h |
91 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
92 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
93 |
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config ) |
94 |
|
95 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
96 |
+pkg_setup() { |
97 |
+ java-pkg-opt-2_pkg_setup |
98 |
+ mysql-multilib-r1_pkg_setup |
99 |
+} |
100 |
+ |
101 |
+pkg_preinst() { |
102 |
+ java-pkg-opt-2_pkg_preinst |
103 |
+ mysql-multilib-r1_pkg_preinst |
104 |
+} |
105 |
|
106 |
# This is a special unpack for the VCS version |
107 |
src_unpack() { |
108 |
@@ -71,6 +89,11 @@ src_unpack() { |
109 |
mv -f "${WORKDIR}/${P}" "${S}" |
110 |
} |
111 |
|
112 |
+src_prepare() { |
113 |
+ java-pkg-opt-2_src_prepare |
114 |
+ mysql-multilib-r1_src_prepare |
115 |
+} |
116 |
+ |
117 |
src_configure(){ |
118 |
# bug 508724 mariadb cannot use ld.gold |
119 |
tc-ld-disable-gold |
120 |
@@ -103,12 +126,15 @@ src_configure(){ |
121 |
-DCONNECT_WITH_MYSQL=1 |
122 |
-DCONNECT_WITH_LIBXML2=$(usex xml) |
123 |
-DCONNECT_WITH_ODBC=$(usex odbc) |
124 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
125 |
-DWITH_WSREP=$(usex galera) |
126 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
127 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo) |
128 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
129 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
130 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
131 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
132 |
-DPLUGIN_MROONGA=$(usex mroonga YES NO) |
133 |
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
134 |
+ -DWITH_MARIABACKUP=$(usex backup ON OFF) |
135 |
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
136 |
) |
137 |
fi |
138 |
mysql-multilib-r1_src_configure |