1 |
commit: ee974c165f176c003618a981369764419fb7d234 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 11 15:00:04 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 11 15:00:59 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee974c16 |
7 |
|
8 |
dev-db/mariadb: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
dev-db/mariadb/Manifest | 3 - |
13 |
dev-db/mariadb/mariadb-10.0.31.ebuild | 209 ------------------------------- |
14 |
dev-db/mariadb/mariadb-10.1.23.ebuild | 227 ---------------------------------- |
15 |
dev-db/mariadb/mariadb-10.1.25.ebuild | 227 ---------------------------------- |
16 |
4 files changed, 666 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
19 |
index d14d4f91c3c..ddd4aedcce1 100644 |
20 |
--- a/dev-db/mariadb/Manifest |
21 |
+++ b/dev-db/mariadb/Manifest |
22 |
@@ -1,10 +1,7 @@ |
23 |
DIST mariadb-10.0.29.tar.gz 63385696 SHA256 f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c WHIRLPOOL ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b |
24 |
DIST mariadb-10.0.30.tar.gz 63433598 SHA256 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 WHIRLPOOL d109efc6599f457b0a270c62f32115bc0753a5357e88f40023944668c2cfece70f01050fe4773f2bb97ae58c76da15b22031a281aeebaf0512a64bc9ff3f4c37 |
25 |
-DIST mariadb-10.0.31.tar.gz 63461177 SHA256 371f2dae0b9e1a92939fba1efca77ac83ba15b6b6dcfd389ca5cbf79eb8b842a SHA512 8f4b6d59999fec77b965b98028ca3f253e950549ad785149d205fe36c3c8f05afd38fc81fd7fa7f44d50dcee83130dc28db18f0e3d198daffa28f24321477f5b WHIRLPOOL 8ea1504b8bce8bffaff466394d31cabe8f1eeddfa59f5fd8d680460902f96573aeaf277168c4c909a064ce8f482c9c7ec589b7f2207e3cc6bed5da66db34fd00 |
26 |
DIST mariadb-10.0.32.tar.gz 63567828 SHA256 f7a8d9ba88b01d426f5d69e5044e505e444a5ce73e22c9c50913dade43725936 SHA512 e1ecfc2b819b5ffa72fc0d4131fc9d7b6811919e10f15608830611028746580731c653a6b3eb43c92640cd29716b6278f48d27af5322dd2084f2d5f356e6f628 WHIRLPOOL e39e115d1382dbce432c2e27f85b03c8079dec03fd84fc3a0e1f906cb8ef2f82e2eab719fe2544de2ba8a83c66858d276ca2224e66317ecd7ade2d7a78d00368 |
27 |
-DIST mariadb-10.1.23.tar.gz 61772244 SHA256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf SHA512 338d016251038ef03d78744d93a2e21db6517e44f911512aaa3f34b52ddf6b2fc255783f8cacd63a7f89bc56eb728321c658b11f06718c83baf22109907149c6 WHIRLPOOL 2f1ae9e3dab858998cff8578b7ec8d1c0949a908a9872dc48c997ae2b233eba629d65594bf67ae145d911bb6bd8dcf3dab2778d3a0fbe74d8855805326ccee12 |
28 |
DIST mariadb-10.1.24.tar.gz 61780687 SHA256 b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 WHIRLPOOL 91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122 |
29 |
-DIST mariadb-10.1.25.tar.gz 61790542 SHA256 7205ecaa6f1bc16335ad88faa5c46be52b3ac628a5e795cb942a3f4335b2a0d6 SHA512 ae88e02a74f4f8c3b41686a0d46d4232210571072168f6645481d83ed5255ce1fec189827507106898e677d2d9749639d22b139f183ef24dab367b5d81002310 WHIRLPOOL 3a28463d4048723110a64c60cb72d07ffd1946a0a68c3e7dcdb085bb7ad0cb3c3b32579fa0587b5895f9c8224aa9414fd0bd55e0a8af6f8401e52ac5a37782fd |
30 |
DIST mariadb-10.1.26.tar.gz 61887132 SHA256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b WHIRLPOOL 8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21 |
31 |
DIST mariadb-10.2.7.tar.gz 67669554 SHA256 225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc SHA512 fa595acc0f5c9c62077db000f1721af79628994c08e82b2eb95d265e3c556e80942c487fc1b91299c382becd71f21a0a117ca93d7428752f436ed83683a4f4cd WHIRLPOOL d76d584924dac41fd787c1a02f79de90ae5334b217b66deb59756490a8c42b801fddac425542e371d68b04fa462a3f438626896749a1c12be70e9d22d857771e |
32 |
DIST mariadb-5.5.57.tar.gz 45783940 SHA256 5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641 SHA512 5d6350abd6f0ba98326633a36bb7ec67525e34e08cbe43f79c9b30bf0b872b0a8f9f0bfd5f3a4c2800a52d25b9c6f3a3a4a62e0f41574153bbf4b881f5347c71 WHIRLPOOL c2af12fb71b3fcc9989cd2208a44dc81401fe1387ae2d03981fd5d00277d480a35f23bdb8f1564f91b4c345bdb18a610b46ee91f47772ba5de1baf8f808eaec3 |
33 |
|
34 |
diff --git a/dev-db/mariadb/mariadb-10.0.31.ebuild b/dev-db/mariadb/mariadb-10.0.31.ebuild |
35 |
deleted file mode 100644 |
36 |
index f6f70d9bf5e..00000000000 |
37 |
--- a/dev-db/mariadb/mariadb-10.0.31.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,209 +0,0 @@ |
40 |
-# Copyright 1999-2017 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI="6" |
44 |
-MY_EXTRAS_VER="20170310-1426Z" |
45 |
-SUBSLOT="18" |
46 |
-MYSQL_PV_MAJOR="5.6" |
47 |
- |
48 |
-JAVA_PKG_OPT_USE="jdbc" |
49 |
- |
50 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
51 |
- |
52 |
-HOMEPAGE="http://mariadb.org/" |
53 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
54 |
- |
55 |
-IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" |
56 |
-RESTRICT="!bindist? ( bindist )" |
57 |
- |
58 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
59 |
- |
60 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
61 |
-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" |
62 |
- |
63 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
64 |
-PATCHES=( |
65 |
- "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
66 |
- "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch" |
67 |
- "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
68 |
- "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
69 |
-) |
70 |
-COMMON_DEPEND=" |
71 |
- !bindist? ( >=sys-libs/readline-4.1:0= ) |
72 |
- server? ( |
73 |
- extraengine? ( |
74 |
- odbc? ( dev-db/unixODBC:0= ) |
75 |
- xml? ( dev-libs/libxml2:2= ) |
76 |
- sys-libs/zlib[minizip] |
77 |
- ) |
78 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
79 |
- pam? ( virtual/pam:0= ) |
80 |
- tokudb? ( app-arch/snappy ) |
81 |
- ) |
82 |
- >=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}] |
83 |
-" |
84 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
85 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
86 |
- ${COMMON_DEPEND}" |
87 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
88 |
- perl? ( !dev-db/mytop |
89 |
- virtual/perl-Getopt-Long |
90 |
- dev-perl/TermReadKey |
91 |
- virtual/perl-Term-ANSIColor |
92 |
- virtual/perl-Time-HiRes ) |
93 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
94 |
-" |
95 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
96 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
97 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
98 |
- |
99 |
-pkg_setup() { |
100 |
- java-pkg-opt-2_pkg_setup |
101 |
- mysql-multilib-r1_pkg_setup |
102 |
-} |
103 |
- |
104 |
-pkg_preinst() { |
105 |
- java-pkg-opt-2_pkg_preinst |
106 |
- mysql-multilib-r1_pkg_preinst |
107 |
-} |
108 |
- |
109 |
-src_prepare() { |
110 |
- java-pkg-opt-2_src_prepare |
111 |
- mysql-multilib-r1_src_prepare |
112 |
-} |
113 |
- |
114 |
-src_configure(){ |
115 |
- # bug 508724 mariadb cannot use ld.gold |
116 |
- tc-ld-disable-gold |
117 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
118 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
119 |
- -DWITH_PCRE=system |
120 |
- ) |
121 |
- if use server ; then |
122 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
123 |
- if ! use extraengine ; then |
124 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
125 |
- -DWITHOUT_FEDERATED=1 |
126 |
- -DWITHOUT_FEDERATEDX=1 ) |
127 |
- fi |
128 |
- |
129 |
- # Connect with Zip is currently broken and does not compile |
130 |
- # Reported upstream https://jira.mariadb.org/browse/MDEV-11809 |
131 |
- |
132 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
133 |
- $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
134 |
- $(mysql-cmake_use_plugin sphinx SPHINX) |
135 |
- $(mysql-cmake_use_plugin tokudb TOKUDB) |
136 |
- $(mysql-cmake_use_plugin pam AUTH_PAM) |
137 |
- $(mysql-cmake_use_plugin extraengine SEQUENCE) |
138 |
- $(mysql-cmake_use_plugin extraengine SPIDER) |
139 |
- $(mysql-cmake_use_plugin extraengine CONNECT) |
140 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
141 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
142 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
143 |
- -DWITHOUT_MROONGA=1 |
144 |
- ) |
145 |
- fi |
146 |
- mysql-multilib-r1_src_configure |
147 |
-} |
148 |
- |
149 |
-# Official test instructions: |
150 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
151 |
-# FEATURES='test userpriv -usersandbox' \ |
152 |
-# ebuild mariadb-X.X.XX.ebuild \ |
153 |
-# digest clean package |
154 |
-multilib_src_test() { |
155 |
- |
156 |
- if ! multilib_is_native_abi ; then |
157 |
- einfo "Server tests not available on non-native abi". |
158 |
- return 0; |
159 |
- fi |
160 |
- |
161 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
162 |
- local retstatus_unit |
163 |
- local retstatus_tests |
164 |
- |
165 |
- if use server ; then |
166 |
- |
167 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
168 |
- # localhost. Also causes weird failures. |
169 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
170 |
- |
171 |
- if [[ $UID -eq 0 ]]; then |
172 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
173 |
- fi |
174 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
175 |
- |
176 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
177 |
- addpredict /this-dir-does-not-exist/t9.MYI |
178 |
- |
179 |
- # Run CTest (test-units) |
180 |
- cmake-utils_src_test |
181 |
- retstatus_unit=$? |
182 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
183 |
- |
184 |
- # Ensure that parallel runs don't die |
185 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
186 |
- # Enable parallel testing, auto will try to detect number of cores |
187 |
- # You may set this by hand. |
188 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
189 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
190 |
- |
191 |
- # create directories because mysqladmin might run out of order |
192 |
- mkdir -p "${T}"/var-tests{,/log} |
193 |
- |
194 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
195 |
- # false positives: |
196 |
- # |
197 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
198 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
199 |
- # funcs_1.is_columns_mysql main.bootstrap |
200 |
- # fails due to USE=-latin1 / utf8 default |
201 |
- # |
202 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
203 |
- # main.mysql_client_test_comp: |
204 |
- # segfaults at random under Portage only, suspect resource limits. |
205 |
- # |
206 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
207 |
- # fails due to bad cleanup of previous tests when run in parallel |
208 |
- # The tool is deprecated anyway |
209 |
- # Bug 532288 |
210 |
- |
211 |
-#main.bootstrap \ |
212 |
-# for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
213 |
-# main.mysql_client_test_comp \ |
214 |
-# binlog.binlog_statement_insert_delayed main.information_schema \ |
215 |
-# main.mysqld--help \ |
216 |
-# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
217 |
-# funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
218 |
-# mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
219 |
-# done |
220 |
- |
221 |
- # Run mysql tests |
222 |
- pushd "${TESTDIR}" || die |
223 |
- |
224 |
- # run mysql-test tests |
225 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
226 |
- |
227 |
- retstatus_tests=$? |
228 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
229 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
230 |
- |
231 |
- popd || die |
232 |
- |
233 |
- # Cleanup is important for these testcases. |
234 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
235 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
236 |
- |
237 |
- failures="" |
238 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
239 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
240 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
241 |
- |
242 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
243 |
- einfo "Tests successfully completed" |
244 |
- |
245 |
- else |
246 |
- einfo "Skipping server tests due to minimal build." |
247 |
- fi |
248 |
-} |
249 |
|
250 |
diff --git a/dev-db/mariadb/mariadb-10.1.23.ebuild b/dev-db/mariadb/mariadb-10.1.23.ebuild |
251 |
deleted file mode 100644 |
252 |
index 62d35d11d98..00000000000 |
253 |
--- a/dev-db/mariadb/mariadb-10.1.23.ebuild |
254 |
+++ /dev/null |
255 |
@@ -1,227 +0,0 @@ |
256 |
-# Copyright 1999-2017 Gentoo Foundation |
257 |
-# Distributed under the terms of the GNU General Public License v2 |
258 |
- |
259 |
-EAPI="6" |
260 |
-MY_EXTRAS_VER="20170316-1355Z" |
261 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
262 |
-WSREP_REVISION="25" |
263 |
-SUBSLOT="18" |
264 |
-MYSQL_PV_MAJOR="5.6" |
265 |
- |
266 |
-JAVA_PKG_OPT_USE="jdbc" |
267 |
- |
268 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
269 |
- |
270 |
-HOMEPAGE="http://mariadb.org/" |
271 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
272 |
- |
273 |
-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" |
274 |
-RESTRICT="!bindist? ( bindist )" |
275 |
- |
276 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
277 |
- |
278 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
279 |
-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" |
280 |
- |
281 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
282 |
- |
283 |
-PATCHES=( |
284 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch |
285 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
286 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
287 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
288 |
-) |
289 |
- |
290 |
-COMMON_DEPEND=" |
291 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
292 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
293 |
- systemd? ( sys-apps/systemd:= ) |
294 |
- !bindist? ( |
295 |
- sys-libs/binutils-libs:0= |
296 |
- >=sys-libs/readline-4.1:0= |
297 |
- ) |
298 |
- server? ( |
299 |
- backup? ( app-arch/libarchive:0= ) |
300 |
- cracklib? ( sys-libs/cracklib:0= ) |
301 |
- extraengine? ( |
302 |
- odbc? ( dev-db/unixODBC:0= ) |
303 |
- xml? ( dev-libs/libxml2:2= ) |
304 |
- sys-libs/zlib[minizip] |
305 |
- ) |
306 |
- innodb-lz4? ( app-arch/lz4 ) |
307 |
- innodb-lzo? ( dev-libs/lzo ) |
308 |
- innodb-snappy? ( app-arch/snappy ) |
309 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
310 |
- pam? ( virtual/pam:0= ) |
311 |
- tokudb? ( app-arch/snappy ) |
312 |
- ) |
313 |
- >=dev-libs/libpcre-8.35:3= |
314 |
-" |
315 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
316 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
317 |
- ${COMMON_DEPEND}" |
318 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
319 |
- galera? ( |
320 |
- sys-apps/iproute2 |
321 |
- =sys-cluster/galera-${WSREP_REVISION}* |
322 |
- sst-rsync? ( sys-process/lsof ) |
323 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
324 |
- ) |
325 |
- perl? ( !dev-db/mytop |
326 |
- virtual/perl-Getopt-Long |
327 |
- dev-perl/TermReadKey |
328 |
- virtual/perl-Term-ANSIColor |
329 |
- virtual/perl-Time-HiRes ) |
330 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
331 |
-" |
332 |
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
333 |
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
334 |
- |
335 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
336 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
337 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
338 |
- |
339 |
-pkg_setup() { |
340 |
- java-pkg-opt-2_pkg_setup |
341 |
- mysql-multilib-r1_pkg_setup |
342 |
-} |
343 |
- |
344 |
-pkg_preinst() { |
345 |
- java-pkg-opt-2_pkg_preinst |
346 |
- mysql-multilib-r1_pkg_preinst |
347 |
-} |
348 |
- |
349 |
-src_prepare() { |
350 |
- java-pkg-opt-2_src_prepare |
351 |
- mysql-multilib-r1_src_prepare |
352 |
-} |
353 |
- |
354 |
-src_configure(){ |
355 |
- # bug 508724 mariadb cannot use ld.gold |
356 |
- tc-ld-disable-gold |
357 |
- |
358 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
359 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
360 |
- -DWITH_PCRE=system |
361 |
- ) |
362 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
363 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
364 |
- ) |
365 |
- if use server ; then |
366 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
367 |
- if ! use extraengine ; then |
368 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
369 |
- -DPLUGIN_FEDERATED=NO |
370 |
- -DPLUGIN_FEDERATEDX=NO ) |
371 |
- fi |
372 |
- |
373 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
374 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
375 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
376 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
377 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
378 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
379 |
- -DPLUGIN_CASSANDRA=NO |
380 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
381 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
382 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
383 |
- -DCONNECT_WITH_MYSQL=1 |
384 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
385 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
386 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
387 |
- -DWITH_WSREP=$(usex galera) |
388 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
389 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
390 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
391 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
392 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
393 |
- -DWITH_MARIABACKUP=$(usex backup ON OFF) |
394 |
- -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
395 |
- ) |
396 |
- fi |
397 |
- mysql-multilib-r1_src_configure |
398 |
-} |
399 |
- |
400 |
-# Official test instructions: |
401 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
402 |
-# FEATURES='test userpriv -usersandbox' \ |
403 |
-# ebuild mariadb-X.X.XX.ebuild \ |
404 |
-# digest clean package |
405 |
-multilib_src_test() { |
406 |
- |
407 |
- if ! multilib_is_native_abi ; then |
408 |
- einfo "Server tests not available on non-native abi". |
409 |
- return 0; |
410 |
- fi |
411 |
- |
412 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
413 |
- local retstatus_unit |
414 |
- local retstatus_tests |
415 |
- |
416 |
- if ! use server ; then |
417 |
- einfo "Skipping server tests due to minimal build." |
418 |
- return 0 |
419 |
- fi |
420 |
- |
421 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
422 |
- # localhost. Also causes weird failures. |
423 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
424 |
- |
425 |
- if [[ $UID -eq 0 ]]; then |
426 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
427 |
- fi |
428 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
429 |
- |
430 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
431 |
- |
432 |
- # Run CTest (test-units) |
433 |
- cmake-utils_src_test |
434 |
- retstatus_unit=$? |
435 |
- |
436 |
- # Ensure that parallel runs don't die |
437 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
438 |
- # Enable parallel testing, auto will try to detect number of cores |
439 |
- # You may set this by hand. |
440 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
441 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
442 |
- |
443 |
- # create directories because mysqladmin might run out of order |
444 |
- mkdir -p "${T}"/var-tests{,/log} |
445 |
- |
446 |
- # Run mysql tests |
447 |
- pushd "${TESTDIR}" || die |
448 |
- |
449 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
450 |
- # false positives: |
451 |
- # |
452 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
453 |
- # main.mysql_client_test_comp: |
454 |
- # segfaults at random under Portage only, suspect resource limits. |
455 |
- |
456 |
- local t |
457 |
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
458 |
- mysql-multilib-r1_disable_test "$t" "False positive due to varying policies" |
459 |
- done |
460 |
- |
461 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
462 |
- main.mysql_client_test_comp ; do |
463 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
464 |
- done |
465 |
- |
466 |
- # run mysql-test tests |
467 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
468 |
- retstatus_tests=$? |
469 |
- |
470 |
- popd || die |
471 |
- |
472 |
- # Cleanup is important for these testcases. |
473 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
474 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
475 |
- |
476 |
- local failures="" |
477 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
478 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
479 |
- |
480 |
- [[ -z "$failures" ]] || eerror "Test failures: $failures" |
481 |
- einfo "Tests successfully completed" |
482 |
-} |
483 |
|
484 |
diff --git a/dev-db/mariadb/mariadb-10.1.25.ebuild b/dev-db/mariadb/mariadb-10.1.25.ebuild |
485 |
deleted file mode 100644 |
486 |
index 9bdb5a8887f..00000000000 |
487 |
--- a/dev-db/mariadb/mariadb-10.1.25.ebuild |
488 |
+++ /dev/null |
489 |
@@ -1,227 +0,0 @@ |
490 |
-# Copyright 1999-2017 Gentoo Foundation |
491 |
-# Distributed under the terms of the GNU General Public License v2 |
492 |
- |
493 |
-EAPI="6" |
494 |
-MY_EXTRAS_VER="20170316-1355Z" |
495 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
496 |
-WSREP_REVISION="25" |
497 |
-SUBSLOT="18" |
498 |
-MYSQL_PV_MAJOR="5.6" |
499 |
- |
500 |
-JAVA_PKG_OPT_USE="jdbc" |
501 |
- |
502 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
503 |
- |
504 |
-HOMEPAGE="http://mariadb.org/" |
505 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
506 |
- |
507 |
-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" |
508 |
-RESTRICT="!bindist? ( bindist )" |
509 |
- |
510 |
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
511 |
- |
512 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
513 |
-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" |
514 |
- |
515 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
516 |
- |
517 |
-PATCHES=( |
518 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch |
519 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
520 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
521 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
522 |
-) |
523 |
- |
524 |
-COMMON_DEPEND=" |
525 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
526 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
527 |
- !bindist? ( |
528 |
- sys-libs/binutils-libs:0= |
529 |
- >=sys-libs/readline-4.1:0= |
530 |
- ) |
531 |
- server? ( |
532 |
- backup? ( app-arch/libarchive:0= ) |
533 |
- cracklib? ( sys-libs/cracklib:0= ) |
534 |
- extraengine? ( |
535 |
- odbc? ( dev-db/unixODBC:0= ) |
536 |
- xml? ( dev-libs/libxml2:2= ) |
537 |
- sys-libs/zlib[minizip] |
538 |
- ) |
539 |
- innodb-lz4? ( app-arch/lz4 ) |
540 |
- innodb-lzo? ( dev-libs/lzo ) |
541 |
- innodb-snappy? ( app-arch/snappy ) |
542 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
543 |
- pam? ( virtual/pam:0= ) |
544 |
- systemd? ( sys-apps/systemd:= ) |
545 |
- tokudb? ( app-arch/snappy ) |
546 |
- ) |
547 |
- >=dev-libs/libpcre-8.35:3= |
548 |
-" |
549 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
550 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
551 |
- ${COMMON_DEPEND}" |
552 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
553 |
- galera? ( |
554 |
- sys-apps/iproute2 |
555 |
- =sys-cluster/galera-${WSREP_REVISION}* |
556 |
- sst-rsync? ( sys-process/lsof ) |
557 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
558 |
- ) |
559 |
- perl? ( !dev-db/mytop |
560 |
- virtual/perl-Getopt-Long |
561 |
- dev-perl/TermReadKey |
562 |
- virtual/perl-Term-ANSIColor |
563 |
- virtual/perl-Time-HiRes ) |
564 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
565 |
-" |
566 |
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
567 |
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
568 |
- |
569 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
570 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
571 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
572 |
- |
573 |
-pkg_setup() { |
574 |
- java-pkg-opt-2_pkg_setup |
575 |
- mysql-multilib-r1_pkg_setup |
576 |
-} |
577 |
- |
578 |
-pkg_preinst() { |
579 |
- java-pkg-opt-2_pkg_preinst |
580 |
- mysql-multilib-r1_pkg_preinst |
581 |
-} |
582 |
- |
583 |
-src_prepare() { |
584 |
- java-pkg-opt-2_src_prepare |
585 |
- mysql-multilib-r1_src_prepare |
586 |
-} |
587 |
- |
588 |
-src_configure(){ |
589 |
- # bug 508724 mariadb cannot use ld.gold |
590 |
- tc-ld-disable-gold |
591 |
- |
592 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
593 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
594 |
- -DWITH_PCRE=system |
595 |
- ) |
596 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
597 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
598 |
- ) |
599 |
- if use server ; then |
600 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
601 |
- if ! use extraengine ; then |
602 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
603 |
- -DPLUGIN_FEDERATED=NO |
604 |
- -DPLUGIN_FEDERATEDX=NO ) |
605 |
- fi |
606 |
- |
607 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
608 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
609 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
610 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
611 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
612 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
613 |
- -DPLUGIN_CASSANDRA=NO |
614 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
615 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
616 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
617 |
- -DCONNECT_WITH_MYSQL=1 |
618 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
619 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
620 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
621 |
- -DWITH_WSREP=$(usex galera) |
622 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
623 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
624 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
625 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
626 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
627 |
- -DWITH_MARIABACKUP=$(usex backup ON OFF) |
628 |
- -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
629 |
- ) |
630 |
- fi |
631 |
- mysql-multilib-r1_src_configure |
632 |
-} |
633 |
- |
634 |
-# Official test instructions: |
635 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
636 |
-# FEATURES='test userpriv -usersandbox' \ |
637 |
-# ebuild mariadb-X.X.XX.ebuild \ |
638 |
-# digest clean package |
639 |
-multilib_src_test() { |
640 |
- |
641 |
- if ! multilib_is_native_abi ; then |
642 |
- einfo "Server tests not available on non-native abi". |
643 |
- return 0; |
644 |
- fi |
645 |
- |
646 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
647 |
- local retstatus_unit |
648 |
- local retstatus_tests |
649 |
- |
650 |
- if ! use server ; then |
651 |
- einfo "Skipping server tests due to minimal build." |
652 |
- return 0 |
653 |
- fi |
654 |
- |
655 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
656 |
- # localhost. Also causes weird failures. |
657 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
658 |
- |
659 |
- if [[ $UID -eq 0 ]]; then |
660 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
661 |
- fi |
662 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
663 |
- |
664 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
665 |
- |
666 |
- # Run CTest (test-units) |
667 |
- cmake-utils_src_test |
668 |
- retstatus_unit=$? |
669 |
- |
670 |
- # Ensure that parallel runs don't die |
671 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
672 |
- # Enable parallel testing, auto will try to detect number of cores |
673 |
- # You may set this by hand. |
674 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
675 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
676 |
- |
677 |
- # create directories because mysqladmin might run out of order |
678 |
- mkdir -p "${T}"/var-tests{,/log} |
679 |
- |
680 |
- # Run mysql tests |
681 |
- pushd "${TESTDIR}" || die |
682 |
- |
683 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
684 |
- # false positives: |
685 |
- # |
686 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
687 |
- # main.mysql_client_test_comp: |
688 |
- # segfaults at random under Portage only, suspect resource limits. |
689 |
- |
690 |
- local t |
691 |
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
692 |
- mysql-multilib-r1_disable_test "$t" "False positive due to varying policies" |
693 |
- done |
694 |
- |
695 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
696 |
- main.mysql_client_test_comp ; do |
697 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
698 |
- done |
699 |
- |
700 |
- # run mysql-test tests |
701 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
702 |
- retstatus_tests=$? |
703 |
- |
704 |
- popd || die |
705 |
- |
706 |
- # Cleanup is important for these testcases. |
707 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
708 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
709 |
- |
710 |
- local failures="" |
711 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
712 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
713 |
- |
714 |
- [[ -z "$failures" ]] || eerror "Test failures: $failures" |
715 |
- einfo "Tests successfully completed" |
716 |
-} |