Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
Date: Sun, 28 May 2017 23:40:21
Message-Id: 1496014807.26ade4403754c1075490afb98a515fcb7159ad02.grknight@gentoo
1 commit: 26ade4403754c1075490afb98a515fcb7159ad02
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 28 23:40:07 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sun May 28 23:40:07 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=26ade440
7
8 dev-db/mariadb: Drop old versions
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
12
13 dev-db/mariadb/ChangeLog | 6 +
14 dev-db/mariadb/Manifest | 35 ++---
15 dev-db/mariadb/mariadb-10.0.25.ebuild | 185 --------------------------
16 dev-db/mariadb/mariadb-10.1.12.ebuild | 212 -----------------------------
17 dev-db/mariadb/mariadb-10.1.13.ebuild | 212 -----------------------------
18 dev-db/mariadb/mariadb-10.1.14.ebuild | 217 ------------------------------
19 dev-db/mariadb/mariadb-10.2.1.ebuild | 216 ------------------------------
20 dev-db/mariadb/mariadb-10.2.2.ebuild | 223 -------------------------------
21 dev-db/mariadb/mariadb-10.2.4.ebuild | 242 ----------------------------------
22 dev-db/mariadb/mariadb-10.2.5.ebuild | 242 ----------------------------------
23 10 files changed, 19 insertions(+), 1771 deletions(-)
24
25 diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
26 index ffea8ea..de24545 100644
27 --- a/dev-db/mariadb/ChangeLog
28 +++ b/dev-db/mariadb/ChangeLog
29 @@ -2,6 +2,12 @@
30 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
31 # $Id$
32
33 + 28 May 2017; Brian Evans <grknight@g.o> -mariadb-10.0.25.ebuild,
34 + -mariadb-10.1.12.ebuild, -mariadb-10.1.13.ebuild, -mariadb-10.1.14.ebuild,
35 + -mariadb-10.2.1.ebuild, -mariadb-10.2.2.ebuild, -mariadb-10.2.4.ebuild,
36 + -mariadb-10.2.5.ebuild:
37 + dev-db/mariadb: Drop old versions
38 +
39 *mariadb-10.2.6 (28 May 2017)
40
41 28 May 2017; Brian Evans <grknight@g.o> +mariadb-10.2.6.ebuild:
42
43 diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
44 index 293ae9c..45774f7 100644
45 --- a/dev-db/mariadb/Manifest
46 +++ b/dev-db/mariadb/Manifest
47 @@ -1,14 +1,6 @@
48 -----BEGIN PGP SIGNED MESSAGE-----
49 Hash: SHA256
50
51 -DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c
52 -DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
53 -DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d
54 -DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a
55 -DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
56 -DIST mariadb-10.2.2.tar.gz 62683612 SHA256 55cf9e357ae4511fc1330e7cb8a15746d99b3a7875b6da9bcf1acfb1aa6f893a SHA512 f1d0671e31db2f3aef86c26d9dd8765732e609e7d5ea9c1a452fb0f42cf449bfd17c80a4d11f8bf64074b6536070602e11cedb16b0f36acf1c9e889f0c106e4e WHIRLPOOL b9117275adff53c44fa81b255324d806c9f4dcbfd4f40c3b0cd2fd50d898207617e35543e3aab32104a5151ec290ed79ecd25793271b860f5bb05abd29064db7
57 -DIST mariadb-10.2.4.tar.gz 63235247 SHA256 b73e353c29a0171d1057f14191c83d1f17e6f58ca09a79dda4b12c0e12b7f975 SHA512 bb6b35b6abd834d4ce2e27f4e06abbf790769e3d56b89d25d06126c21abb1bcce3d8f19c49e2c2052bf89e5ebc3c67c5092dfb25577870f8f561ce87777367ae WHIRLPOOL e2ba3b38e80b47dcca02e741ecc91ec8a1f96d72836422fb890be6d4ffa9cfebcd85c09bf11b1a492ad1edd9923299ff516b0428564c33ac0482c0443229a5f9
58 -DIST mariadb-10.2.5.tar.gz 67183039 SHA256 6629bd2392ccba2fb30ce3a27efddba1f695ac739538007ad1d15caeed19ff50 SHA512 1a1911266110e86ef93aad73521d9ddde154357613a6ea7198cc1409aa4532998ddda69d64abcde2a6cf6b8c38c29bf730a6605253fb0f43d5bd4e1db48ed50e WHIRLPOOL d544341ade0705980fc72acdf97428100d5439ed6f2ca747d0fe291d85f597b7bd54e8c162a4771e042e3f31eb6c1ded473f31b5f233e84dec1095d16547ddb7
59 DIST mariadb-10.2.6.tar.gz 67599197 SHA256 c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 SHA512 142628085f42ef15ceef6aca5e47ba56cc38cbfc0ac4f35f6b37512c14a60430ef4805e54fd51c47e101b7692781e174426bdb49cae6807c4c18cc3d876f8732 WHIRLPOOL e5920a6f0833fa39b706b067037fb6e432e77ba4e7beee51300e408c92cf5962db91013b1958e649947006f0ac2775c70996d9c7f0dcd98d3b40e87ae5abc049
60 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
61 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
62 @@ -16,24 +8,23 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
63 DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
64 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
65 DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
66 -DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
67 DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
68 -----BEGIN PGP SIGNATURE-----
69 Version: GnuPG v2
70
71 -iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrXLpfFIAAAAAALgAo
72 +iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrX9RfFIAAAAAALgAo
73 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
74 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
75 -o7aHRw/3bnUIu2LKwPhI/RguY9izGM7lcaysGe/cMJfYNqSupJhBJTlfEmdQt6Ct
76 -9rRQbsaQQvFA+3RkdhUxqHojHLw4Zf9DYLNldhlvQbSWETTne8K1xwz1vHZ46B3q
77 -md1QObh/RWj70/0fwF+7rDMfAFdMJuV+4rHVV6hSgc56EDCjz4LNUpCQ/vSByYcc
78 -gjfOiwZFDfElNpaFXXZwv/XX9ioti/dcan8m4XjolrFWTFE0lRRVNviXgBzJODPO
79 -QyvPsrrtN9Zcx58kpW9rGlSTxr+LLRCKWxwicw53bdiwGxe1ibt03mEqOgGIIDuO
80 -TQvYNg2bHMknqIjYag6NEHMqszm0ThEYJNV/aKj/fRzrap3BDZ76CkiVWL2REmcx
81 -MYb7ItNnyfR8yLiHXfayUTZ8R6kWGbkcJVBDC+nwyNDO9RromrKWl5fKQRX53KAY
82 -9QDRdJ10epfNzUajdQ+EkX9yFr6IQEqYNsxIfSCzxUqDa38UarNgWGMSLt2DVKb0
83 -HZMr5CyRRTdmwLhy/SJdlwhgvuErsABWaVBA37wXLFewbCHp2fShcz573vlmjlKw
84 -HEuDJIynxgUxyPpjA3eB4fFP7HpB+lREqCSe3+JJPyIZJ3glUHVWO4EYTe9lDHhF
85 -VxAGnPSL/fYxZDE4NrUgrwkpLRP1gWIeqvZJVWL9bxM0/AGA8Q==
86 -=zvn5
87 +o7bzVQ/+Lk0CFEadZsjrmRIJfrpRyfG9dkb5uJjf75UC3EzXF8S3gJXr8pBIG23I
88 +73e73A7X4FXfsG8wV358yh2M2O8btlXCKlDkQH6hU0CUemh8J6tet7bTDh9JtJP1
89 +wfA5Himi2ANoVGjOHPxkqpIspfAdNXkU1zdD6iyps+fUeYLLwi9lZTu7qW1AbPag
90 +75HwwtTvYedbXyGZsosrk+yNekwxL7MuVdfo7ddtXV2vFEmWVAC9npK0CW6v/le9
91 +AEioRn78cQRapfgLA9soBN8Ky8JKYbqzT5/aDB837dJX6cFO/ADV01lkFy2SlQ1F
92 +TB3Vv68v+/jpevFbR6/2iTqTKiwfMHbnHIdJBGXnR8Op6xRMQFdQGEK+sZwZvjva
93 +Vhg1m3JqdBMr7biosVrcx0Aifp9gyBF8STNxVxXPnD+Z+GITigFl6lKFpLOkRIDC
94 +9wtK/0oJMm0YBczls5FbfmjQgWpli7dq/AdRCD5TxrZ3PM7xckiA0KLQfebq+TR8
95 +/o9CtVGrFDVd7FbcIXxwPtEqoy2BXyQ3JO3pgqrc3Uhdo4gAtEXXgJuFWx6FNaIc
96 +3fMlQgo09lqyjD5P/p1lVzFcELFfyeEOELatP6vFZ8m5zSX3amDvL1EV/HK2pb0k
97 +LM0qW6zaTbKzvZ5zpCXKcOQHxRK0XeBM2piHv/u7Yk2kVJQKPRc=
98 +=eNDx
99 -----END PGP SIGNATURE-----
100
101 diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild
102 deleted file mode 100644
103 index 791bdcd..0000000
104 --- a/dev-db/mariadb/mariadb-10.0.25.ebuild
105 +++ /dev/null
106 @@ -1,185 +0,0 @@
107 -# Copyright 1999-2017 Gentoo Foundation
108 -# Distributed under the terms of the GNU General Public License v2
109 -
110 -EAPI="6"
111 -MY_EXTRAS_VER="20151223-1501Z"
112 -SUBSLOT="18"
113 -MYSQL_PV_MAJOR="5.6"
114 -
115 -inherit toolchain-funcs mysql-multilib-r1
116 -
117 -HOMEPAGE="http://mariadb.org/"
118 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
119 -
120 -IUSE="bindist odbc oqgraph pam sphinx tokudb xml"
121 -RESTRICT="!bindist? ( bindist )"
122 -
123 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
124 -
125 -# REMEMBER: also update eclass/mysql*.eclass before committing!
126 -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"
127 -
128 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
129 -PATCHES=(
130 - "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
131 - "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch"
132 - "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.15.patch"
133 - "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
134 - "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
135 -)
136 -COMMON_DEPEND="
137 - !bindist? ( >=sys-libs/readline-4.1:0= )
138 - server? (
139 - extraengine? (
140 - odbc? ( dev-db/unixODBC:0= )
141 - xml? ( dev-libs/libxml2:2= )
142 - )
143 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
144 - pam? ( virtual/pam:0= )
145 - tokudb? ( app-arch/snappy )
146 - )
147 - >=dev-libs/libpcre-8.35:3=
148 -"
149 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
150 - ${COMMON_DEPEND}"
151 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
152 - perl? ( !dev-db/mytop
153 - virtual/perl-Getopt-Long
154 - dev-perl/TermReadKey
155 - virtual/perl-Term-ANSIColor
156 - virtual/perl-Time-HiRes )
157 -"
158 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
159 -
160 -src_configure(){
161 - # bug 508724 mariadb cannot use ld.gold
162 - tc-ld-disable-gold
163 - local MYSQL_CMAKE_NATIVE_DEFINES=(
164 - -DWITH_JEMALLOC=$(usex jemalloc system)
165 - -DWITH_PCRE=system
166 - )
167 - if use server ; then
168 - # Federated{,X} must be treated special otherwise they will not be built as plugins
169 - if ! use extraengine ; then
170 - MYSQL_CMAKE_NATIVE_DEFINES+=(
171 - -DWITHOUT_FEDERATED=1
172 - -DWITHOUT_FEDERATEDX=1 )
173 - fi
174 -
175 - MYSQL_CMAKE_NATIVE_DEFINES+=(
176 - $(mysql-cmake_use_plugin oqgraph OQGRAPH)
177 - $(mysql-cmake_use_plugin sphinx SPHINX)
178 - $(mysql-cmake_use_plugin tokudb TOKUDB)
179 - $(mysql-cmake_use_plugin pam AUTH_PAM)
180 - -DWITHOUT_CASSANDRA=0
181 - $(mysql-cmake_use_plugin extraengine SEQUENCE)
182 - $(mysql-cmake_use_plugin extraengine SPIDER)
183 - $(mysql-cmake_use_plugin extraengine CONNECT)
184 - -DCONNECT_WITH_MYSQL=1
185 - -DCONNECT_WITH_LIBXML2=$(usex xml)
186 - -DCONNECT_WITH_ODBC=$(usex odbc)
187 - -DWITHOUT_MROONGA=1
188 - )
189 - fi
190 - mysql-multilib-r1_src_configure
191 -}
192 -
193 -# Official test instructions:
194 -# USE='embedded extraengine perl server openssl static-libs' \
195 -# FEATURES='test userpriv -usersandbox' \
196 -# ebuild mariadb-X.X.XX.ebuild \
197 -# digest clean package
198 -multilib_src_test() {
199 -
200 - if ! multilib_is_native_abi ; then
201 - einfo "Server tests not available on non-native abi".
202 - return 0;
203 - fi
204 -
205 - local TESTDIR="${BUILD_DIR}/mysql-test"
206 - local retstatus_unit
207 - local retstatus_tests
208 -
209 - if use server ; then
210 -
211 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
212 - # localhost. Also causes weird failures.
213 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
214 -
215 - if [[ $UID -eq 0 ]]; then
216 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
217 - fi
218 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
219 -
220 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
221 - addpredict /this-dir-does-not-exist/t9.MYI
222 -
223 - # Run CTest (test-units)
224 - cmake-utils_src_test
225 - retstatus_unit=$?
226 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
227 -
228 - # Ensure that parallel runs don't die
229 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
230 - # Enable parallel testing, auto will try to detect number of cores
231 - # You may set this by hand.
232 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
233 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
234 -
235 - # create directories because mysqladmin might run out of order
236 - mkdir -p "${T}"/var-tests{,/log}
237 -
238 - # These are failing in MariaDB 10.0 for now and are believed to be
239 - # false positives:
240 - #
241 - # main.information_schema, binlog.binlog_statement_insert_delayed,
242 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
243 - # funcs_1.is_columns_mysql main.bootstrap
244 - # fails due to USE=-latin1 / utf8 default
245 - #
246 - # main.mysql_client_test, main.mysql_client_test_nonblock
247 - # main.mysql_client_test_comp:
248 - # segfaults at random under Portage only, suspect resource limits.
249 - #
250 - # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
251 - # fails due to bad cleanup of previous tests when run in parallel
252 - # The tool is deprecated anyway
253 - # Bug 532288
254 -
255 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
256 - main.mysql_client_test_comp \
257 - binlog.binlog_statement_insert_delayed main.information_schema \
258 - main.mysqld--help main.bootstrap \
259 - archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
260 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
261 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
262 - done
263 -
264 - # Run mysql tests
265 - pushd "${TESTDIR}" || die
266 -
267 - # run mysql-test tests
268 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
269 -
270 - retstatus_tests=$?
271 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
272 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
273 -
274 - popd || die
275 -
276 - # Cleanup is important for these testcases.
277 - pkill -9 -f "${S}/ndb" 2>/dev/null
278 - pkill -9 -f "${S}/sql" 2>/dev/null
279 -
280 - failures=""
281 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
282 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
283 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
284 -
285 - [[ -z "$failures" ]] || die "Test failures: $failures"
286 - einfo "Tests successfully completed"
287 -
288 - else
289 - einfo "Skipping server tests due to minimal build."
290 - fi
291 -}
292
293 diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
294 deleted file mode 100644
295 index 613209b..0000000
296 --- a/dev-db/mariadb/mariadb-10.1.12.ebuild
297 +++ /dev/null
298 @@ -1,212 +0,0 @@
299 -# Copyright 1999-2017 Gentoo Foundation
300 -# Distributed under the terms of the GNU General Public License v2
301 -
302 -EAPI="6"
303 -MY_EXTRAS_VER="20160131-0252Z"
304 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
305 -WSREP_REVISION="25"
306 -SUBSLOT="18"
307 -MYSQL_PV_MAJOR="5.6"
308 -
309 -inherit toolchain-funcs mysql-multilib-r1
310 -
311 -HOMEPAGE="http://mariadb.org/"
312 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
313 -
314 -IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
315 -RESTRICT="!bindist? ( bindist )"
316 -
317 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
318 -
319 -# REMEMBER: also update eclass/mysql*.eclass before committing!
320 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
321 -
322 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
323 -
324 -PATCHES=(
325 - "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
326 - "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
327 - "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
328 - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
329 - "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
330 -)
331 -
332 -COMMON_DEPEND="
333 - mroonga? ( app-text/groonga-normalizer-mysql )
334 - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
335 - systemd? ( sys-apps/systemd:= )
336 - !bindist? ( >=sys-libs/readline-4.1:0= )
337 - server? (
338 - cracklib? ( sys-libs/cracklib:0= )
339 - extraengine? (
340 - odbc? ( dev-db/unixODBC:0= )
341 - xml? ( dev-libs/libxml2:2= )
342 - )
343 - innodb-lz4? ( app-arch/lz4 )
344 - innodb-lzo? ( dev-libs/lzo )
345 - innodb-snappy? ( app-arch/snappy )
346 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
347 - pam? ( virtual/pam:0= )
348 - tokudb? ( app-arch/snappy )
349 - )
350 - >=dev-libs/libpcre-8.35:3=
351 -"
352 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
353 - ${COMMON_DEPEND}"
354 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
355 - galera? (
356 - sys-apps/iproute2
357 - =sys-cluster/galera-${WSREP_REVISION}*
358 - sst-rsync? ( sys-process/lsof )
359 - sst-xtrabackup? ( net-misc/socat[ssl] )
360 - )
361 - perl? ( !dev-db/mytop
362 - virtual/perl-Getopt-Long
363 - dev-perl/TermReadKey
364 - virtual/perl-Term-ANSIColor
365 - virtual/perl-Time-HiRes )
366 -"
367 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
368 -PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
369 -
370 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
371 -
372 -src_configure(){
373 - # bug 508724 mariadb cannot use ld.gold
374 - tc-ld-disable-gold
375 -
376 - local MYSQL_CMAKE_NATIVE_DEFINES=(
377 - -DWITH_JEMALLOC=$(usex jemalloc system)
378 - -DWITH_PCRE=system
379 - )
380 - local MYSQL_CMAKE_EXTRA_DEFINES=(
381 - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
382 - )
383 - if use server ; then
384 - # Federated{,X} must be treated special otherwise they will not be built as plugins
385 - if ! use extraengine ; then
386 - MYSQL_CMAKE_NATIVE_DEFINES+=(
387 - -DPLUGIN_FEDERATED=NO
388 - -DPLUGIN_FEDERATEDX=NO )
389 - fi
390 -
391 - MYSQL_CMAKE_NATIVE_DEFINES+=(
392 - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
393 - -DPLUGIN_SPHINX=$(usex sphinx YES NO)
394 - -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
395 - -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
396 - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
397 - -DPLUGIN_CASSANDRA=NO
398 - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
399 - -DPLUGIN_SPIDER=$(usex extraengine YES NO)
400 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
401 - -DCONNECT_WITH_MYSQL=1
402 - -DCONNECT_WITH_LIBXML2=$(usex xml)
403 - -DCONNECT_WITH_ODBC=$(usex odbc)
404 - -DWITH_WSREP=$(usex galera)
405 - -DWITH_INNODB_LZ4=$(usex innodb-lz4)
406 - -DWITH_INNODB_LZO=$(usex innodb-lzo)
407 - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
408 - -DPLUGIN_MROONGA=$(usex mroonga YES NO)
409 - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
410 - )
411 - fi
412 - mysql-multilib-r1_src_configure
413 -}
414 -
415 -# Official test instructions:
416 -# USE='embedded extraengine perl server openssl static-libs' \
417 -# FEATURES='test userpriv -usersandbox' \
418 -# ebuild mariadb-X.X.XX.ebuild \
419 -# digest clean package
420 -multilib_src_test() {
421 -
422 - if ! multilib_is_native_abi ; then
423 - einfo "Server tests not available on non-native abi".
424 - return 0;
425 - fi
426 -
427 - local TESTDIR="${BUILD_DIR}/mysql-test"
428 - local retstatus_unit
429 - local retstatus_tests
430 -
431 - if use server ; then
432 -
433 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
434 - # localhost. Also causes weird failures.
435 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
436 -
437 - if [[ $UID -eq 0 ]]; then
438 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
439 - fi
440 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
441 -
442 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
443 - addpredict /this-dir-does-not-exist/t9.MYI
444 -
445 - # Run CTest (test-units)
446 - cmake-utils_src_test
447 - retstatus_unit=$?
448 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
449 -
450 - # Ensure that parallel runs don't die
451 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
452 - # Enable parallel testing, auto will try to detect number of cores
453 - # You may set this by hand.
454 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
455 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
456 -
457 - # create directories because mysqladmin might run out of order
458 - mkdir -p "${T}"/var-tests{,/log}
459 -
460 - # These are failing in MariaDB 10.0 for now and are believed to be
461 - # false positives:
462 - #
463 - # main.information_schema, binlog.binlog_statement_insert_delayed,
464 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
465 - # funcs_1.is_columns_mysql main.bootstrap
466 - # fails due to USE=-latin1 / utf8 default
467 - #
468 - # main.mysql_client_test, main.mysql_client_test_nonblock
469 - # main.mysql_client_test_comp:
470 - # segfaults at random under Portage only, suspect resource limits.
471 - #
472 - # plugins.cracklib_password_check
473 - # Can randomly fail due to cracklib return message
474 -
475 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
476 - main.mysql_client_test_comp main.bootstrap \
477 - binlog.binlog_statement_insert_delayed main.information_schema \
478 - main.mysqld--help plugins.cracklib_password_check \
479 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
480 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
481 - done
482 -
483 - # Run mysql tests
484 - pushd "${TESTDIR}" || die
485 -
486 - # run mysql-test tests
487 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
488 -
489 - retstatus_tests=$?
490 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
491 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
492 -
493 - popd || die
494 -
495 - # Cleanup is important for these testcases.
496 - pkill -9 -f "${S}/ndb" 2>/dev/null
497 - pkill -9 -f "${S}/sql" 2>/dev/null
498 -
499 - failures=""
500 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
501 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
502 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
503 -
504 - [[ -z "$failures" ]] || die "Test failures: $failures"
505 - einfo "Tests successfully completed"
506 -
507 - else
508 - einfo "Skipping server tests due to minimal build."
509 - fi
510 -}
511
512 diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild
513 deleted file mode 100644
514 index 613209b..0000000
515 --- a/dev-db/mariadb/mariadb-10.1.13.ebuild
516 +++ /dev/null
517 @@ -1,212 +0,0 @@
518 -# Copyright 1999-2017 Gentoo Foundation
519 -# Distributed under the terms of the GNU General Public License v2
520 -
521 -EAPI="6"
522 -MY_EXTRAS_VER="20160131-0252Z"
523 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
524 -WSREP_REVISION="25"
525 -SUBSLOT="18"
526 -MYSQL_PV_MAJOR="5.6"
527 -
528 -inherit toolchain-funcs mysql-multilib-r1
529 -
530 -HOMEPAGE="http://mariadb.org/"
531 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
532 -
533 -IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
534 -RESTRICT="!bindist? ( bindist )"
535 -
536 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
537 -
538 -# REMEMBER: also update eclass/mysql*.eclass before committing!
539 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
540 -
541 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
542 -
543 -PATCHES=(
544 - "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
545 - "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
546 - "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
547 - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
548 - "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
549 -)
550 -
551 -COMMON_DEPEND="
552 - mroonga? ( app-text/groonga-normalizer-mysql )
553 - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
554 - systemd? ( sys-apps/systemd:= )
555 - !bindist? ( >=sys-libs/readline-4.1:0= )
556 - server? (
557 - cracklib? ( sys-libs/cracklib:0= )
558 - extraengine? (
559 - odbc? ( dev-db/unixODBC:0= )
560 - xml? ( dev-libs/libxml2:2= )
561 - )
562 - innodb-lz4? ( app-arch/lz4 )
563 - innodb-lzo? ( dev-libs/lzo )
564 - innodb-snappy? ( app-arch/snappy )
565 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
566 - pam? ( virtual/pam:0= )
567 - tokudb? ( app-arch/snappy )
568 - )
569 - >=dev-libs/libpcre-8.35:3=
570 -"
571 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
572 - ${COMMON_DEPEND}"
573 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
574 - galera? (
575 - sys-apps/iproute2
576 - =sys-cluster/galera-${WSREP_REVISION}*
577 - sst-rsync? ( sys-process/lsof )
578 - sst-xtrabackup? ( net-misc/socat[ssl] )
579 - )
580 - perl? ( !dev-db/mytop
581 - virtual/perl-Getopt-Long
582 - dev-perl/TermReadKey
583 - virtual/perl-Term-ANSIColor
584 - virtual/perl-Time-HiRes )
585 -"
586 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
587 -PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
588 -
589 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
590 -
591 -src_configure(){
592 - # bug 508724 mariadb cannot use ld.gold
593 - tc-ld-disable-gold
594 -
595 - local MYSQL_CMAKE_NATIVE_DEFINES=(
596 - -DWITH_JEMALLOC=$(usex jemalloc system)
597 - -DWITH_PCRE=system
598 - )
599 - local MYSQL_CMAKE_EXTRA_DEFINES=(
600 - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
601 - )
602 - if use server ; then
603 - # Federated{,X} must be treated special otherwise they will not be built as plugins
604 - if ! use extraengine ; then
605 - MYSQL_CMAKE_NATIVE_DEFINES+=(
606 - -DPLUGIN_FEDERATED=NO
607 - -DPLUGIN_FEDERATEDX=NO )
608 - fi
609 -
610 - MYSQL_CMAKE_NATIVE_DEFINES+=(
611 - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
612 - -DPLUGIN_SPHINX=$(usex sphinx YES NO)
613 - -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
614 - -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
615 - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
616 - -DPLUGIN_CASSANDRA=NO
617 - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
618 - -DPLUGIN_SPIDER=$(usex extraengine YES NO)
619 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
620 - -DCONNECT_WITH_MYSQL=1
621 - -DCONNECT_WITH_LIBXML2=$(usex xml)
622 - -DCONNECT_WITH_ODBC=$(usex odbc)
623 - -DWITH_WSREP=$(usex galera)
624 - -DWITH_INNODB_LZ4=$(usex innodb-lz4)
625 - -DWITH_INNODB_LZO=$(usex innodb-lzo)
626 - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
627 - -DPLUGIN_MROONGA=$(usex mroonga YES NO)
628 - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
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 -
652 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
653 - # localhost. Also causes weird failures.
654 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
655 -
656 - if [[ $UID -eq 0 ]]; then
657 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
658 - fi
659 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
660 -
661 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
662 - addpredict /this-dir-does-not-exist/t9.MYI
663 -
664 - # Run CTest (test-units)
665 - cmake-utils_src_test
666 - retstatus_unit=$?
667 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
668 -
669 - # Ensure that parallel runs don't die
670 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
671 - # Enable parallel testing, auto will try to detect number of cores
672 - # You may set this by hand.
673 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
674 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
675 -
676 - # create directories because mysqladmin might run out of order
677 - mkdir -p "${T}"/var-tests{,/log}
678 -
679 - # These are failing in MariaDB 10.0 for now and are believed to be
680 - # false positives:
681 - #
682 - # main.information_schema, binlog.binlog_statement_insert_delayed,
683 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
684 - # funcs_1.is_columns_mysql main.bootstrap
685 - # fails due to USE=-latin1 / utf8 default
686 - #
687 - # main.mysql_client_test, main.mysql_client_test_nonblock
688 - # main.mysql_client_test_comp:
689 - # segfaults at random under Portage only, suspect resource limits.
690 - #
691 - # plugins.cracklib_password_check
692 - # Can randomly fail due to cracklib return message
693 -
694 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
695 - main.mysql_client_test_comp main.bootstrap \
696 - binlog.binlog_statement_insert_delayed main.information_schema \
697 - main.mysqld--help plugins.cracklib_password_check \
698 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
699 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
700 - done
701 -
702 - # Run mysql tests
703 - pushd "${TESTDIR}" || die
704 -
705 - # run mysql-test tests
706 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
707 -
708 - retstatus_tests=$?
709 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
710 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
711 -
712 - popd || die
713 -
714 - # Cleanup is important for these testcases.
715 - pkill -9 -f "${S}/ndb" 2>/dev/null
716 - pkill -9 -f "${S}/sql" 2>/dev/null
717 -
718 - failures=""
719 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
720 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
721 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
722 -
723 - [[ -z "$failures" ]] || die "Test failures: $failures"
724 - einfo "Tests successfully completed"
725 -
726 - else
727 - einfo "Skipping server tests due to minimal build."
728 - fi
729 -}
730
731 diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild
732 deleted file mode 100644
733 index 7774cbb..0000000
734 --- a/dev-db/mariadb/mariadb-10.1.14.ebuild
735 +++ /dev/null
736 @@ -1,217 +0,0 @@
737 -# Copyright 1999-2017 Gentoo Foundation
738 -# Distributed under the terms of the GNU General Public License v2
739 -
740 -EAPI="6"
741 -MY_EXTRAS_VER="20160131-0252Z"
742 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
743 -WSREP_REVISION="25"
744 -SUBSLOT="18"
745 -MYSQL_PV_MAJOR="5.6"
746 -
747 -inherit toolchain-funcs mysql-multilib-r1
748 -
749 -HOMEPAGE="http://mariadb.org/"
750 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
751 -
752 -IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
753 -RESTRICT="!bindist? ( bindist )"
754 -
755 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
756 -
757 -# REMEMBER: also update eclass/mysql*.eclass before committing!
758 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
759 -
760 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
761 -
762 -PATCHES=(
763 - "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
764 - "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
765 - "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
766 - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
767 - "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
768 -)
769 -
770 -COMMON_DEPEND="
771 - mroonga? ( app-text/groonga-normalizer-mysql )
772 - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
773 - systemd? ( sys-apps/systemd:= )
774 - !bindist? (
775 - sys-libs/binutils-libs:0=
776 - >=sys-libs/readline-4.1:0=
777 - )
778 - server? (
779 - cracklib? ( sys-libs/cracklib:0= )
780 - extraengine? (
781 - odbc? ( dev-db/unixODBC:0= )
782 - xml? ( dev-libs/libxml2:2= )
783 - )
784 - innodb-lz4? ( app-arch/lz4 )
785 - innodb-lzo? ( dev-libs/lzo )
786 - innodb-snappy? ( app-arch/snappy )
787 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
788 - pam? ( virtual/pam:0= )
789 - tokudb? ( app-arch/snappy )
790 - )
791 - >=dev-libs/libpcre-8.35:3=
792 -"
793 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
794 - ${COMMON_DEPEND}"
795 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
796 - galera? (
797 - sys-apps/iproute2
798 - =sys-cluster/galera-${WSREP_REVISION}*
799 - sst-rsync? ( sys-process/lsof )
800 - sst-xtrabackup? ( net-misc/socat[ssl] )
801 - )
802 - perl? ( !dev-db/mytop
803 - virtual/perl-Getopt-Long
804 - dev-perl/TermReadKey
805 - virtual/perl-Term-ANSIColor
806 - virtual/perl-Time-HiRes )
807 -"
808 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
809 -PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
810 -
811 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
812 - /usr/include/mysql/private/probes_mysql_nodtrace.h
813 - /usr/include/mysql/private/probes_mysql_dtrace.h )
814 -
815 -src_configure(){
816 - # bug 508724 mariadb cannot use ld.gold
817 - tc-ld-disable-gold
818 -
819 - local MYSQL_CMAKE_NATIVE_DEFINES=(
820 - -DWITH_JEMALLOC=$(usex jemalloc system)
821 - -DWITH_PCRE=system
822 - )
823 - local MYSQL_CMAKE_EXTRA_DEFINES=(
824 - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
825 - )
826 - if use server ; then
827 - # Federated{,X} must be treated special otherwise they will not be built as plugins
828 - if ! use extraengine ; then
829 - MYSQL_CMAKE_NATIVE_DEFINES+=(
830 - -DPLUGIN_FEDERATED=NO
831 - -DPLUGIN_FEDERATEDX=NO )
832 - fi
833 -
834 - MYSQL_CMAKE_NATIVE_DEFINES+=(
835 - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
836 - -DPLUGIN_SPHINX=$(usex sphinx YES NO)
837 - -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
838 - -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
839 - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
840 - -DPLUGIN_CASSANDRA=NO
841 - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
842 - -DPLUGIN_SPIDER=$(usex extraengine YES NO)
843 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
844 - -DCONNECT_WITH_MYSQL=1
845 - -DCONNECT_WITH_LIBXML2=$(usex xml)
846 - -DCONNECT_WITH_ODBC=$(usex odbc)
847 - -DWITH_WSREP=$(usex galera)
848 - -DWITH_INNODB_LZ4=$(usex innodb-lz4)
849 - -DWITH_INNODB_LZO=$(usex innodb-lzo)
850 - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
851 - -DPLUGIN_MROONGA=$(usex mroonga YES NO)
852 - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
853 - )
854 - fi
855 - mysql-multilib-r1_src_configure
856 -}
857 -
858 -# Official test instructions:
859 -# USE='embedded extraengine perl server openssl static-libs' \
860 -# FEATURES='test userpriv -usersandbox' \
861 -# ebuild mariadb-X.X.XX.ebuild \
862 -# digest clean package
863 -multilib_src_test() {
864 -
865 - if ! multilib_is_native_abi ; then
866 - einfo "Server tests not available on non-native abi".
867 - return 0;
868 - fi
869 -
870 - local TESTDIR="${BUILD_DIR}/mysql-test"
871 - local retstatus_unit
872 - local retstatus_tests
873 -
874 - if use server ; then
875 -
876 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
877 - # localhost. Also causes weird failures.
878 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
879 -
880 - if [[ $UID -eq 0 ]]; then
881 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
882 - fi
883 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
884 -
885 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
886 - addpredict /this-dir-does-not-exist/t9.MYI
887 -
888 - # Run CTest (test-units)
889 - cmake-utils_src_test
890 - retstatus_unit=$?
891 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
892 -
893 - # Ensure that parallel runs don't die
894 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
895 - # Enable parallel testing, auto will try to detect number of cores
896 - # You may set this by hand.
897 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
898 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
899 -
900 - # create directories because mysqladmin might run out of order
901 - mkdir -p "${T}"/var-tests{,/log}
902 -
903 - # These are failing in MariaDB 10.0 for now and are believed to be
904 - # false positives:
905 - #
906 - # main.information_schema, binlog.binlog_statement_insert_delayed,
907 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
908 - # funcs_1.is_columns_mysql main.bootstrap
909 - # fails due to USE=-latin1 / utf8 default
910 - #
911 - # main.mysql_client_test, main.mysql_client_test_nonblock
912 - # main.mysql_client_test_comp:
913 - # segfaults at random under Portage only, suspect resource limits.
914 - #
915 - # plugins.cracklib_password_check
916 - # Can randomly fail due to cracklib return message
917 -
918 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
919 - main.mysql_client_test_comp main.bootstrap \
920 - binlog.binlog_statement_insert_delayed main.information_schema \
921 - main.mysqld--help plugins.cracklib_password_check \
922 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
923 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
924 - done
925 -
926 - # Run mysql tests
927 - pushd "${TESTDIR}" || die
928 -
929 - # run mysql-test tests
930 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
931 -
932 - retstatus_tests=$?
933 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
934 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
935 -
936 - popd || die
937 -
938 - # Cleanup is important for these testcases.
939 - pkill -9 -f "${S}/ndb" 2>/dev/null
940 - pkill -9 -f "${S}/sql" 2>/dev/null
941 -
942 - failures=""
943 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
944 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
945 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
946 -
947 - [[ -z "$failures" ]] || die "Test failures: $failures"
948 - einfo "Tests successfully completed"
949 -
950 - else
951 - einfo "Skipping server tests due to minimal build."
952 - fi
953 -}
954
955 diff --git a/dev-db/mariadb/mariadb-10.2.1.ebuild b/dev-db/mariadb/mariadb-10.2.1.ebuild
956 deleted file mode 100644
957 index 6981240..0000000
958 --- a/dev-db/mariadb/mariadb-10.2.1.ebuild
959 +++ /dev/null
960 @@ -1,216 +0,0 @@
961 -# Copyright 1999-2017 Gentoo Foundation
962 -# Distributed under the terms of the GNU General Public License v2
963 -
964 -EAPI="6"
965 -MY_EXTRAS_VER="20160131-0252Z"
966 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
967 -WSREP_REVISION="25"
968 -SUBSLOT="18"
969 -MYSQL_PV_MAJOR="5.6"
970 -
971 -inherit toolchain-funcs mysql-multilib-r1
972 -
973 -HOMEPAGE="http://mariadb.org/"
974 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
975 -
976 -IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
977 -RESTRICT="!bindist? ( bindist )"
978 -
979 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
980 -
981 -# REMEMBER: also update eclass/mysql*.eclass before committing!
982 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
983 -
984 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
985 -
986 -# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
987 -PATCHES=(
988 - "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
989 - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
990 - "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
991 -)
992 -
993 -COMMON_DEPEND="
994 - mroonga? ( app-text/groonga-normalizer-mysql )
995 - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
996 - systemd? ( sys-apps/systemd:= )
997 - !bindist? (
998 - sys-libs/binutils-libs:0=
999 - >=sys-libs/readline-4.1:0=
1000 - )
1001 - server? (
1002 - cracklib? ( sys-libs/cracklib:0= )
1003 - extraengine? (
1004 - odbc? ( dev-db/unixODBC:0= )
1005 - xml? ( dev-libs/libxml2:2= )
1006 - )
1007 - innodb-lz4? ( app-arch/lz4 )
1008 - innodb-lzo? ( dev-libs/lzo )
1009 - innodb-snappy? ( app-arch/snappy )
1010 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
1011 - pam? ( virtual/pam:0= )
1012 - tokudb? ( app-arch/snappy )
1013 - )
1014 - >=dev-libs/libpcre-8.35:3=
1015 -"
1016 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
1017 - ${COMMON_DEPEND}"
1018 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
1019 - galera? (
1020 - sys-apps/iproute2
1021 - =sys-cluster/galera-${WSREP_REVISION}*
1022 - sst-rsync? ( sys-process/lsof )
1023 - sst-xtrabackup? ( net-misc/socat[ssl] )
1024 - )
1025 - perl? ( !dev-db/mytop
1026 - virtual/perl-Getopt-Long
1027 - dev-perl/TermReadKey
1028 - virtual/perl-Term-ANSIColor
1029 - virtual/perl-Time-HiRes )
1030 -"
1031 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
1032 -PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
1033 -
1034 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
1035 - /usr/include/mysql/private/probes_mysql_nodtrace.h
1036 - /usr/include/mysql/private/probes_mysql_dtrace.h )
1037 -
1038 -src_configure(){
1039 - # bug 508724 mariadb cannot use ld.gold
1040 - tc-ld-disable-gold
1041 -
1042 - local MYSQL_CMAKE_NATIVE_DEFINES=(
1043 - -DWITH_JEMALLOC=$(usex jemalloc system)
1044 - -DWITH_PCRE=system
1045 - )
1046 - local MYSQL_CMAKE_EXTRA_DEFINES=(
1047 - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
1048 - )
1049 - if use server ; then
1050 - # Federated{,X} must be treated special otherwise they will not be built as plugins
1051 - if ! use extraengine ; then
1052 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1053 - -DPLUGIN_FEDERATED=NO
1054 - -DPLUGIN_FEDERATEDX=NO )
1055 - fi
1056 -
1057 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1058 - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
1059 - -DPLUGIN_SPHINX=$(usex sphinx YES NO)
1060 - -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
1061 - -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
1062 - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
1063 - -DPLUGIN_CASSANDRA=NO
1064 - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
1065 - -DPLUGIN_SPIDER=$(usex extraengine YES NO)
1066 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
1067 - -DCONNECT_WITH_MYSQL=1
1068 - -DCONNECT_WITH_LIBXML2=$(usex xml)
1069 - -DCONNECT_WITH_ODBC=$(usex odbc)
1070 - -DWITH_WSREP=$(usex galera)
1071 - -DWITH_INNODB_LZ4=$(usex innodb-lz4)
1072 - -DWITH_INNODB_LZO=$(usex innodb-lzo)
1073 - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
1074 - -DPLUGIN_MROONGA=$(usex mroonga YES NO)
1075 - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
1076 - )
1077 - fi
1078 - mysql-multilib-r1_src_configure
1079 -}
1080 -
1081 -# Official test instructions:
1082 -# USE='embedded extraengine perl server openssl static-libs' \
1083 -# FEATURES='test userpriv -usersandbox' \
1084 -# ebuild mariadb-X.X.XX.ebuild \
1085 -# digest clean package
1086 -multilib_src_test() {
1087 -
1088 - if ! multilib_is_native_abi ; then
1089 - einfo "Server tests not available on non-native abi".
1090 - return 0;
1091 - fi
1092 -
1093 - local TESTDIR="${BUILD_DIR}/mysql-test"
1094 - local retstatus_unit
1095 - local retstatus_tests
1096 -
1097 - if use server ; then
1098 -
1099 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
1100 - # localhost. Also causes weird failures.
1101 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1102 -
1103 - if [[ $UID -eq 0 ]]; then
1104 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
1105 - fi
1106 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1107 -
1108 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
1109 - addpredict /this-dir-does-not-exist/t9.MYI
1110 -
1111 - # Run CTest (test-units)
1112 - cmake-utils_src_test
1113 - retstatus_unit=$?
1114 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
1115 -
1116 - # Ensure that parallel runs don't die
1117 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
1118 - # Enable parallel testing, auto will try to detect number of cores
1119 - # You may set this by hand.
1120 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
1121 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
1122 -
1123 - # create directories because mysqladmin might run out of order
1124 - mkdir -p "${T}"/var-tests{,/log}
1125 -
1126 - # These are failing in MariaDB 10.0 for now and are believed to be
1127 - # false positives:
1128 - #
1129 - # main.information_schema, binlog.binlog_statement_insert_delayed,
1130 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
1131 - # funcs_1.is_columns_mysql main.bootstrap
1132 - # fails due to USE=-latin1 / utf8 default
1133 - #
1134 - # main.mysql_client_test, main.mysql_client_test_nonblock
1135 - # main.mysql_client_test_comp:
1136 - # segfaults at random under Portage only, suspect resource limits.
1137 - #
1138 - # plugins.cracklib_password_check
1139 - # Can randomly fail due to cracklib return message
1140 -
1141 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
1142 - main.mysql_client_test_comp main.bootstrap \
1143 - binlog.binlog_statement_insert_delayed main.information_schema \
1144 - main.mysqld--help plugins.cracklib_password_check \
1145 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
1146 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
1147 - done
1148 -
1149 - # Run mysql tests
1150 - pushd "${TESTDIR}" || die
1151 -
1152 - # run mysql-test tests
1153 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
1154 -
1155 - retstatus_tests=$?
1156 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
1157 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1158 -
1159 - popd || die
1160 -
1161 - # Cleanup is important for these testcases.
1162 - pkill -9 -f "${S}/ndb" 2>/dev/null
1163 - pkill -9 -f "${S}/sql" 2>/dev/null
1164 -
1165 - failures=""
1166 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
1167 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
1168 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1169 -
1170 - [[ -z "$failures" ]] || die "Test failures: $failures"
1171 - einfo "Tests successfully completed"
1172 -
1173 - else
1174 - einfo "Skipping server tests due to minimal build."
1175 - fi
1176 -}
1177
1178 diff --git a/dev-db/mariadb/mariadb-10.2.2.ebuild b/dev-db/mariadb/mariadb-10.2.2.ebuild
1179 deleted file mode 100644
1180 index 8e9d409..0000000
1181 --- a/dev-db/mariadb/mariadb-10.2.2.ebuild
1182 +++ /dev/null
1183 @@ -1,223 +0,0 @@
1184 -# Copyright 1999-2017 Gentoo Foundation
1185 -# Distributed under the terms of the GNU General Public License v2
1186 -
1187 -EAPI="6"
1188 -MY_EXTRAS_VER="20160131-0252Z"
1189 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
1190 -WSREP_REVISION="25"
1191 -SUBSLOT="19"
1192 -MYSQL_PV_MAJOR="5.6"
1193 -
1194 -inherit toolchain-funcs mysql-multilib-r1
1195 -
1196 -HOMEPAGE="http://mariadb.org/"
1197 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
1198 -LICENSE="GPL-2 LGPL-2.1+"
1199 -
1200 -IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
1201 -RESTRICT="!bindist? ( bindist )"
1202 -
1203 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
1204 -
1205 -# REMEMBER: also update eclass/mysql*.eclass before committing!
1206 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
1207 -
1208 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
1209 -
1210 -# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
1211 -# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
1212 -# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
1213 -PATCHES=(
1214 - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
1215 -)
1216 -
1217 -COMMON_DEPEND="
1218 - mroonga? ( app-text/groonga-normalizer-mysql )
1219 - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
1220 - systemd? ( sys-apps/systemd:= )
1221 - !bindist? (
1222 - sys-libs/binutils-libs:0=
1223 - >=sys-libs/readline-4.1:0=
1224 - )
1225 - server? (
1226 - cracklib? ( sys-libs/cracklib:0= )
1227 - extraengine? (
1228 - odbc? ( dev-db/unixODBC:0= )
1229 - xml? ( dev-libs/libxml2:2= )
1230 - )
1231 - innodb-lz4? ( app-arch/lz4 )
1232 - innodb-lzo? ( dev-libs/lzo )
1233 - innodb-snappy? ( app-arch/snappy )
1234 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
1235 - pam? ( virtual/pam:0= )
1236 - tokudb? ( app-arch/snappy )
1237 - )
1238 - >=dev-libs/libpcre-8.35:3=
1239 -"
1240 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
1241 - ${COMMON_DEPEND}"
1242 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
1243 - galera? (
1244 - sys-apps/iproute2
1245 - =sys-cluster/galera-${WSREP_REVISION}*
1246 - sst-rsync? ( sys-process/lsof )
1247 - sst-xtrabackup? ( net-misc/socat[ssl] )
1248 - )
1249 - perl? ( !dev-db/mytop
1250 - virtual/perl-Getopt-Long
1251 - dev-perl/TermReadKey
1252 - virtual/perl-Term-ANSIColor
1253 - virtual/perl-Time-HiRes )
1254 -"
1255 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
1256 -PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
1257 -
1258 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
1259 - /usr/include/mariadb/mariadb_version.h
1260 - /usr/include/mysql/private/probes_mysql_nodtrace.h
1261 - /usr/include/mysql/private/probes_mysql_dtrace.h )
1262 -MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
1263 -
1264 -src_configure(){
1265 - # bug 508724 mariadb cannot use ld.gold
1266 - tc-ld-disable-gold
1267 -
1268 - local MYSQL_CMAKE_NATIVE_DEFINES=(
1269 - -DWITH_JEMALLOC=$(usex jemalloc system)
1270 - -DWITH_PCRE=system
1271 - )
1272 - local MYSQL_CMAKE_EXTRA_DEFINES=(
1273 - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
1274 - -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
1275 - -DCONC_WITH_EXTERNAL_ZLIB=YES
1276 - -DWITH_EXTERNAL_ZLIB=YES
1277 - -DSUFFIX_INSTALL_DIR=""
1278 - )
1279 - if use server ; then
1280 - # Federated{,X} must be treated special otherwise they will not be built as plugins
1281 - if ! use extraengine ; then
1282 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1283 - -DPLUGIN_FEDERATED=NO
1284 - -DPLUGIN_FEDERATEDX=NO )
1285 - fi
1286 -
1287 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1288 - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
1289 - -DPLUGIN_SPHINX=$(usex sphinx YES NO)
1290 - -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
1291 - -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
1292 - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
1293 - -DPLUGIN_CASSANDRA=NO
1294 - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
1295 - -DPLUGIN_SPIDER=$(usex extraengine YES NO)
1296 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
1297 - -DCONNECT_WITH_MYSQL=1
1298 - -DCONNECT_WITH_LIBXML2=$(usex xml)
1299 - -DCONNECT_WITH_ODBC=$(usex odbc)
1300 - -DWITH_WSREP=$(usex galera)
1301 - -DWITH_INNODB_LZ4=$(usex innodb-lz4)
1302 - -DWITH_INNODB_LZO=$(usex innodb-lzo)
1303 - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
1304 - -DPLUGIN_MROONGA=$(usex mroonga YES NO)
1305 - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
1306 - )
1307 - fi
1308 - mysql-multilib-r1_src_configure
1309 -}
1310 -
1311 -# Official test instructions:
1312 -# USE='embedded extraengine perl server openssl static-libs' \
1313 -# FEATURES='test userpriv -usersandbox' \
1314 -# ebuild mariadb-X.X.XX.ebuild \
1315 -# digest clean package
1316 -multilib_src_test() {
1317 -
1318 - if ! multilib_is_native_abi ; then
1319 - einfo "Server tests not available on non-native abi".
1320 - return 0;
1321 - fi
1322 -
1323 - local TESTDIR="${BUILD_DIR}/mysql-test"
1324 - local retstatus_unit
1325 - local retstatus_tests
1326 -
1327 - if use server ; then
1328 -
1329 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
1330 - # localhost. Also causes weird failures.
1331 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1332 -
1333 - if [[ $UID -eq 0 ]]; then
1334 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
1335 - fi
1336 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1337 -
1338 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
1339 - addpredict /this-dir-does-not-exist/t9.MYI
1340 -
1341 - # Run CTest (test-units)
1342 - cmake-utils_src_test
1343 - retstatus_unit=$?
1344 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
1345 -
1346 - # Ensure that parallel runs don't die
1347 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
1348 - # Enable parallel testing, auto will try to detect number of cores
1349 - # You may set this by hand.
1350 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
1351 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
1352 -
1353 - # create directories because mysqladmin might run out of order
1354 - mkdir -p "${T}"/var-tests{,/log}
1355 -
1356 - # These are failing in MariaDB 10.0 for now and are believed to be
1357 - # false positives:
1358 - #
1359 - # main.information_schema, binlog.binlog_statement_insert_delayed,
1360 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
1361 - # funcs_1.is_columns_mysql main.bootstrap
1362 - # fails due to USE=-latin1 / utf8 default
1363 - #
1364 - # main.mysql_client_test, main.mysql_client_test_nonblock
1365 - # main.mysql_client_test_comp:
1366 - # segfaults at random under Portage only, suspect resource limits.
1367 - #
1368 - # plugins.cracklib_password_check
1369 - # Can randomly fail due to cracklib return message
1370 -
1371 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
1372 - main.mysql_client_test_comp main.bootstrap \
1373 - binlog.binlog_statement_insert_delayed main.information_schema \
1374 - main.mysqld--help plugins.cracklib_password_check \
1375 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
1376 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
1377 - done
1378 -
1379 - # Run mysql tests
1380 - pushd "${TESTDIR}" || die
1381 -
1382 - # run mysql-test tests
1383 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
1384 -
1385 - retstatus_tests=$?
1386 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
1387 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1388 -
1389 - popd || die
1390 -
1391 - # Cleanup is important for these testcases.
1392 - pkill -9 -f "${S}/ndb" 2>/dev/null
1393 - pkill -9 -f "${S}/sql" 2>/dev/null
1394 -
1395 - failures=""
1396 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
1397 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
1398 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1399 -
1400 - [[ -z "$failures" ]] || die "Test failures: $failures"
1401 - einfo "Tests successfully completed"
1402 -
1403 - else
1404 - einfo "Skipping server tests due to minimal build."
1405 - fi
1406 -}
1407
1408 diff --git a/dev-db/mariadb/mariadb-10.2.4.ebuild b/dev-db/mariadb/mariadb-10.2.4.ebuild
1409 deleted file mode 100644
1410 index d19c155..0000000
1411 --- a/dev-db/mariadb/mariadb-10.2.4.ebuild
1412 +++ /dev/null
1413 @@ -1,242 +0,0 @@
1414 -# Copyright 1999-2017 Gentoo Foundation
1415 -# Distributed under the terms of the GNU General Public License v2
1416 -
1417 -EAPI="6"
1418 -MY_EXTRAS_VER="20160131-0252Z"
1419 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
1420 -WSREP_REVISION="25"
1421 -SUBSLOT="19"
1422 -MYSQL_PV_MAJOR="5.6"
1423 -
1424 -inherit toolchain-funcs mysql-multilib-r1
1425 -
1426 -HOMEPAGE="http://mariadb.org/"
1427 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
1428 -LICENSE="GPL-2 LGPL-2.1+"
1429 -
1430 -IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
1431 -RESTRICT="!bindist? ( bindist )"
1432 -
1433 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
1434 -
1435 -# REMEMBER: also update eclass/mysql*.eclass before committing!
1436 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
1437 -
1438 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
1439 -
1440 -# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
1441 -# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
1442 -# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
1443 -PATCHES=(
1444 - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
1445 -)
1446 -
1447 -COMMON_DEPEND="
1448 - mroonga? ( app-text/groonga-normalizer-mysql )
1449 - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
1450 - systemd? ( sys-apps/systemd:= )
1451 - !bindist? (
1452 - sys-libs/binutils-libs:0=
1453 - >=sys-libs/readline-4.1:0=
1454 - )
1455 - server? (
1456 - cracklib? ( sys-libs/cracklib:0= )
1457 - extraengine? (
1458 - odbc? ( dev-db/unixODBC:0= )
1459 - xml? ( dev-libs/libxml2:2= )
1460 - )
1461 - innodb-lz4? ( app-arch/lz4 )
1462 - innodb-lzo? ( dev-libs/lzo )
1463 - innodb-snappy? ( app-arch/snappy )
1464 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
1465 - pam? ( virtual/pam:0= )
1466 - tokudb? ( app-arch/snappy )
1467 - )
1468 - >=dev-libs/libpcre-8.35:3=
1469 -"
1470 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
1471 - ${COMMON_DEPEND}"
1472 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
1473 - server? ( galera? (
1474 - sys-apps/iproute2
1475 - =sys-cluster/galera-${WSREP_REVISION}*
1476 - sst-rsync? ( sys-process/lsof )
1477 - sst-xtrabackup? ( net-misc/socat[ssl] )
1478 - ) )
1479 - perl? ( !dev-db/mytop
1480 - virtual/perl-Getopt-Long
1481 - dev-perl/TermReadKey
1482 - virtual/perl-Term-ANSIColor
1483 - virtual/perl-Time-HiRes )
1484 -"
1485 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
1486 -PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
1487 -
1488 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
1489 - /usr/include/mariadb/mariadb_version.h
1490 - /usr/include/mysql/private/probes_mysql_nodtrace.h
1491 - /usr/include/mysql/private/probes_mysql_dtrace.h )
1492 -MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
1493 -
1494 -src_configure(){
1495 - # bug 508724 mariadb cannot use ld.gold
1496 - tc-ld-disable-gold
1497 -
1498 - local MYSQL_CMAKE_NATIVE_DEFINES=(
1499 - -DWITH_JEMALLOC=$(usex jemalloc system)
1500 - -DWITH_PCRE=system
1501 - )
1502 - local MYSQL_CMAKE_EXTRA_DEFINES=(
1503 - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
1504 - -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
1505 - -DCONC_WITH_EXTERNAL_ZLIB=YES
1506 - -DWITH_EXTERNAL_ZLIB=YES
1507 - -DSUFFIX_INSTALL_DIR=""
1508 - -DINSTALL_INCLUDEDIR=include/mariadb
1509 - -DINSTALL_INFODIR=share/info
1510 - -DINSTALL_LIBDIR=$(get_libdir)
1511 - -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
1512 - -DINSTALL_MANDIR=share/man
1513 - -DINSTALL_MYSQLSHAREDIR=share/mariadb
1514 - -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
1515 - -DINSTALL_SCRIPTDIR=share/mariadb/scripts
1516 - -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
1517 - )
1518 -
1519 - if use test ; then
1520 - MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
1521 - fi
1522 -
1523 - if use server ; then
1524 - # Federated{,X} must be treated special otherwise they will not be built as plugins
1525 - if ! use extraengine ; then
1526 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1527 - -DPLUGIN_FEDERATED=NO
1528 - -DPLUGIN_FEDERATEDX=NO )
1529 - fi
1530 -
1531 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1532 - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
1533 - -DPLUGIN_SPHINX=$(usex sphinx YES NO)
1534 - -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
1535 - -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
1536 - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
1537 - -DPLUGIN_CASSANDRA=NO
1538 - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
1539 - -DPLUGIN_SPIDER=$(usex extraengine YES NO)
1540 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
1541 - -DCONNECT_WITH_MYSQL=1
1542 - -DCONNECT_WITH_LIBXML2=$(usex xml)
1543 - -DCONNECT_WITH_ODBC=$(usex odbc)
1544 - -DWITH_WSREP=$(usex galera)
1545 - -DWITH_INNODB_LZ4=$(usex innodb-lz4)
1546 - -DWITH_INNODB_LZO=$(usex innodb-lzo)
1547 - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
1548 - -DPLUGIN_MROONGA=$(usex mroonga YES NO)
1549 - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
1550 - -DINSTALL_SQLBENCHDIR=share/mariadb
1551 - )
1552 - fi
1553 - mysql-multilib-r1_src_configure
1554 -}
1555 -
1556 -# Official test instructions:
1557 -# USE='embedded extraengine perl server openssl static-libs' \
1558 -# FEATURES='test userpriv -usersandbox' \
1559 -# ebuild mariadb-X.X.XX.ebuild \
1560 -# digest clean package
1561 -multilib_src_test() {
1562 -
1563 - if ! multilib_is_native_abi ; then
1564 - einfo "Server tests not available on non-native abi".
1565 - return 0;
1566 - fi
1567 -
1568 - local TESTDIR="${BUILD_DIR}/mysql-test"
1569 - local retstatus_unit
1570 - local retstatus_tests
1571 -
1572 - if use server ; then
1573 -
1574 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
1575 - # localhost. Also causes weird failures.
1576 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1577 -
1578 - if [[ $UID -eq 0 ]]; then
1579 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
1580 - fi
1581 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1582 -
1583 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
1584 - addpredict /this-dir-does-not-exist/t9.MYI
1585 -
1586 - # Run CTest (test-units)
1587 - cmake-utils_src_test
1588 - retstatus_unit=$?
1589 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
1590 -
1591 - # Ensure that parallel runs don't die
1592 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
1593 - # Enable parallel testing, auto will try to detect number of cores
1594 - # You may set this by hand.
1595 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
1596 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
1597 -
1598 - # create directories because mysqladmin might run out of order
1599 - mkdir -p "${T}"/var-tests{,/log}
1600 -
1601 - # These are failing in MariaDB 10.0 for now and are believed to be
1602 - # false positives:
1603 - #
1604 - # main.information_schema, binlog.binlog_statement_insert_delayed,
1605 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
1606 - # funcs_1.is_columns_mysql main.bootstrap
1607 - # fails due to USE=-latin1 / utf8 default
1608 - #
1609 - # main.mysql_client_test, main.mysql_client_test_nonblock
1610 - # main.mysql_client_test_comp:
1611 - # segfaults at random under Portage only, suspect resource limits.
1612 - #
1613 - # plugins.cracklib_password_check
1614 - # Can randomly fail due to cracklib return message
1615 - #
1616 - # plugins.two_password_validations
1617 - # Varying policies make it unsuitable for automated testing
1618 -
1619 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
1620 - main.mysql_client_test_comp main.bootstrap \
1621 - binlog.binlog_statement_insert_delayed main.information_schema \
1622 - main.mysqld--help plugins.cracklib_password_check \
1623 - plugins.two_password_validations \
1624 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
1625 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
1626 - done
1627 -
1628 - # Run mysql tests
1629 - pushd "${TESTDIR}" || die
1630 -
1631 - # run mysql-test tests
1632 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
1633 -
1634 - retstatus_tests=$?
1635 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
1636 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1637 -
1638 - popd || die
1639 -
1640 - # Cleanup is important for these testcases.
1641 - pkill -9 -f "${S}/ndb" 2>/dev/null
1642 - pkill -9 -f "${S}/sql" 2>/dev/null
1643 -
1644 - failures=""
1645 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
1646 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
1647 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1648 -
1649 - [[ -z "$failures" ]] || die "Test failures: $failures"
1650 - einfo "Tests successfully completed"
1651 -
1652 - else
1653 - einfo "Skipping server tests due to minimal build."
1654 - fi
1655 -}
1656
1657 diff --git a/dev-db/mariadb/mariadb-10.2.5.ebuild b/dev-db/mariadb/mariadb-10.2.5.ebuild
1658 deleted file mode 100644
1659 index d19c155..0000000
1660 --- a/dev-db/mariadb/mariadb-10.2.5.ebuild
1661 +++ /dev/null
1662 @@ -1,242 +0,0 @@
1663 -# Copyright 1999-2017 Gentoo Foundation
1664 -# Distributed under the terms of the GNU General Public License v2
1665 -
1666 -EAPI="6"
1667 -MY_EXTRAS_VER="20160131-0252Z"
1668 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
1669 -WSREP_REVISION="25"
1670 -SUBSLOT="19"
1671 -MYSQL_PV_MAJOR="5.6"
1672 -
1673 -inherit toolchain-funcs mysql-multilib-r1
1674 -
1675 -HOMEPAGE="http://mariadb.org/"
1676 -DESCRIPTION="An enhanced, drop-in replacement for MySQL"
1677 -LICENSE="GPL-2 LGPL-2.1+"
1678 -
1679 -IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
1680 -RESTRICT="!bindist? ( bindist )"
1681 -
1682 -REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
1683 -
1684 -# REMEMBER: also update eclass/mysql*.eclass before committing!
1685 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
1686 -
1687 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
1688 -
1689 -# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
1690 -# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
1691 -# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
1692 -PATCHES=(
1693 - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
1694 -)
1695 -
1696 -COMMON_DEPEND="
1697 - mroonga? ( app-text/groonga-normalizer-mysql )
1698 - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
1699 - systemd? ( sys-apps/systemd:= )
1700 - !bindist? (
1701 - sys-libs/binutils-libs:0=
1702 - >=sys-libs/readline-4.1:0=
1703 - )
1704 - server? (
1705 - cracklib? ( sys-libs/cracklib:0= )
1706 - extraengine? (
1707 - odbc? ( dev-db/unixODBC:0= )
1708 - xml? ( dev-libs/libxml2:2= )
1709 - )
1710 - innodb-lz4? ( app-arch/lz4 )
1711 - innodb-lzo? ( dev-libs/lzo )
1712 - innodb-snappy? ( app-arch/snappy )
1713 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
1714 - pam? ( virtual/pam:0= )
1715 - tokudb? ( app-arch/snappy )
1716 - )
1717 - >=dev-libs/libpcre-8.35:3=
1718 -"
1719 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
1720 - ${COMMON_DEPEND}"
1721 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
1722 - server? ( galera? (
1723 - sys-apps/iproute2
1724 - =sys-cluster/galera-${WSREP_REVISION}*
1725 - sst-rsync? ( sys-process/lsof )
1726 - sst-xtrabackup? ( net-misc/socat[ssl] )
1727 - ) )
1728 - perl? ( !dev-db/mytop
1729 - virtual/perl-Getopt-Long
1730 - dev-perl/TermReadKey
1731 - virtual/perl-Term-ANSIColor
1732 - virtual/perl-Time-HiRes )
1733 -"
1734 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
1735 -PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
1736 -
1737 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
1738 - /usr/include/mariadb/mariadb_version.h
1739 - /usr/include/mysql/private/probes_mysql_nodtrace.h
1740 - /usr/include/mysql/private/probes_mysql_dtrace.h )
1741 -MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
1742 -
1743 -src_configure(){
1744 - # bug 508724 mariadb cannot use ld.gold
1745 - tc-ld-disable-gold
1746 -
1747 - local MYSQL_CMAKE_NATIVE_DEFINES=(
1748 - -DWITH_JEMALLOC=$(usex jemalloc system)
1749 - -DWITH_PCRE=system
1750 - )
1751 - local MYSQL_CMAKE_EXTRA_DEFINES=(
1752 - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
1753 - -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
1754 - -DCONC_WITH_EXTERNAL_ZLIB=YES
1755 - -DWITH_EXTERNAL_ZLIB=YES
1756 - -DSUFFIX_INSTALL_DIR=""
1757 - -DINSTALL_INCLUDEDIR=include/mariadb
1758 - -DINSTALL_INFODIR=share/info
1759 - -DINSTALL_LIBDIR=$(get_libdir)
1760 - -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
1761 - -DINSTALL_MANDIR=share/man
1762 - -DINSTALL_MYSQLSHAREDIR=share/mariadb
1763 - -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
1764 - -DINSTALL_SCRIPTDIR=share/mariadb/scripts
1765 - -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
1766 - )
1767 -
1768 - if use test ; then
1769 - MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
1770 - fi
1771 -
1772 - if use server ; then
1773 - # Federated{,X} must be treated special otherwise they will not be built as plugins
1774 - if ! use extraengine ; then
1775 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1776 - -DPLUGIN_FEDERATED=NO
1777 - -DPLUGIN_FEDERATEDX=NO )
1778 - fi
1779 -
1780 - MYSQL_CMAKE_NATIVE_DEFINES+=(
1781 - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
1782 - -DPLUGIN_SPHINX=$(usex sphinx YES NO)
1783 - -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
1784 - -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
1785 - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
1786 - -DPLUGIN_CASSANDRA=NO
1787 - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
1788 - -DPLUGIN_SPIDER=$(usex extraengine YES NO)
1789 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
1790 - -DCONNECT_WITH_MYSQL=1
1791 - -DCONNECT_WITH_LIBXML2=$(usex xml)
1792 - -DCONNECT_WITH_ODBC=$(usex odbc)
1793 - -DWITH_WSREP=$(usex galera)
1794 - -DWITH_INNODB_LZ4=$(usex innodb-lz4)
1795 - -DWITH_INNODB_LZO=$(usex innodb-lzo)
1796 - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
1797 - -DPLUGIN_MROONGA=$(usex mroonga YES NO)
1798 - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
1799 - -DINSTALL_SQLBENCHDIR=share/mariadb
1800 - )
1801 - fi
1802 - mysql-multilib-r1_src_configure
1803 -}
1804 -
1805 -# Official test instructions:
1806 -# USE='embedded extraengine perl server openssl static-libs' \
1807 -# FEATURES='test userpriv -usersandbox' \
1808 -# ebuild mariadb-X.X.XX.ebuild \
1809 -# digest clean package
1810 -multilib_src_test() {
1811 -
1812 - if ! multilib_is_native_abi ; then
1813 - einfo "Server tests not available on non-native abi".
1814 - return 0;
1815 - fi
1816 -
1817 - local TESTDIR="${BUILD_DIR}/mysql-test"
1818 - local retstatus_unit
1819 - local retstatus_tests
1820 -
1821 - if use server ; then
1822 -
1823 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
1824 - # localhost. Also causes weird failures.
1825 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1826 -
1827 - if [[ $UID -eq 0 ]]; then
1828 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
1829 - fi
1830 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1831 -
1832 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
1833 - addpredict /this-dir-does-not-exist/t9.MYI
1834 -
1835 - # Run CTest (test-units)
1836 - cmake-utils_src_test
1837 - retstatus_unit=$?
1838 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
1839 -
1840 - # Ensure that parallel runs don't die
1841 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
1842 - # Enable parallel testing, auto will try to detect number of cores
1843 - # You may set this by hand.
1844 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
1845 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
1846 -
1847 - # create directories because mysqladmin might run out of order
1848 - mkdir -p "${T}"/var-tests{,/log}
1849 -
1850 - # These are failing in MariaDB 10.0 for now and are believed to be
1851 - # false positives:
1852 - #
1853 - # main.information_schema, binlog.binlog_statement_insert_delayed,
1854 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
1855 - # funcs_1.is_columns_mysql main.bootstrap
1856 - # fails due to USE=-latin1 / utf8 default
1857 - #
1858 - # main.mysql_client_test, main.mysql_client_test_nonblock
1859 - # main.mysql_client_test_comp:
1860 - # segfaults at random under Portage only, suspect resource limits.
1861 - #
1862 - # plugins.cracklib_password_check
1863 - # Can randomly fail due to cracklib return message
1864 - #
1865 - # plugins.two_password_validations
1866 - # Varying policies make it unsuitable for automated testing
1867 -
1868 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
1869 - main.mysql_client_test_comp main.bootstrap \
1870 - binlog.binlog_statement_insert_delayed main.information_schema \
1871 - main.mysqld--help plugins.cracklib_password_check \
1872 - plugins.two_password_validations \
1873 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
1874 - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
1875 - done
1876 -
1877 - # Run mysql tests
1878 - pushd "${TESTDIR}" || die
1879 -
1880 - # run mysql-test tests
1881 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
1882 -
1883 - retstatus_tests=$?
1884 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
1885 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1886 -
1887 - popd || die
1888 -
1889 - # Cleanup is important for these testcases.
1890 - pkill -9 -f "${S}/ndb" 2>/dev/null
1891 - pkill -9 -f "${S}/sql" 2>/dev/null
1892 -
1893 - failures=""
1894 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
1895 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
1896 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
1897 -
1898 - [[ -z "$failures" ]] || die "Test failures: $failures"
1899 - einfo "Tests successfully completed"
1900 -
1901 - else
1902 - einfo "Skipping server tests due to minimal build."
1903 - fi
1904 -}