Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@×××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
Date: Tue, 25 Feb 2014 14:23:41
Message-Id: 1393338207.1d869d2d8ba338c1fb06e4fc0f9ac584fbcc1491.grknight.pub@gentoo
1 commit: 1d869d2d8ba338c1fb06e4fc0f9ac584fbcc1491
2 Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
3 AuthorDate: Tue Feb 25 14:23:27 2014 +0000
4 Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
5 CommitDate: Tue Feb 25 14:23:27 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1d869d2d
7
8 [mariadb] Remove old
9
10 ---
11 dev-db/mariadb/mariadb-10.0.7.ebuild | 125 ---------------------------------
12 dev-db/mariadb/mariadb-5.5.34.ebuild | 131 -----------------------------------
13 dev-db/mariadb/mariadb-5.5.35.ebuild | 116 -------------------------------
14 3 files changed, 372 deletions(-)
15
16 diff --git a/dev-db/mariadb/mariadb-10.0.7.ebuild b/dev-db/mariadb/mariadb-10.0.7.ebuild
17 deleted file mode 100644
18 index 939a4ca..0000000
19 --- a/dev-db/mariadb/mariadb-10.0.7.ebuild
20 +++ /dev/null
21 @@ -1,125 +0,0 @@
22 -# Copyright 1999-2013 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Header: $
25 -
26 -EAPI="4"
27 -MY_EXTRAS_VER="live"
28 -
29 -# Build system
30 -BUILD="cmake"
31 -
32 -inherit toolchain-funcs mysql-v2
33 -# only to make repoman happy. it is really set in the eclass
34 -IUSE="$IUSE"
35 -
36 -# REMEMBER: also update eclass/mysql*.eclass before committing!
37 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
38 -
39 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
40 -EPATCH_EXCLUDE=''
41 -
42 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
43 -RDEPEND="${RDEPEND}"
44 -
45 -# Official test instructions:
46 -# USE='berkdb -cluster embedded extraengine perl ssl community' \
47 -# FEATURES='test userpriv -usersandbox' \
48 -# ebuild mariadb-X.X.XX.ebuild \
49 -# digest clean package
50 -src_test() {
51 -
52 - local TESTDIR="${BUILD_DIR}/mysql-test"
53 - local retstatus_unit
54 - local retstatus_tests
55 -
56 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
57 - # localhost. Also causes weird failures.
58 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
59 -
60 - if ! use "minimal" ; then
61 -
62 - if [[ $UID -eq 0 ]]; then
63 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
64 - fi
65 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
66 -
67 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
68 - addpredict /this-dir-does-not-exist/t9.MYI
69 -
70 - # Run CTest (test-units)
71 - cmake-utils_src_test
72 - retstatus_unit=$?
73 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
74 -
75 - # Ensure that parallel runs don't die
76 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
77 -
78 - # create directories because mysqladmin might right out of order
79 - mkdir -p "${S}"/mysql-test/var-tests{,/log}
80 -
81 - # These are failing in MySQL 5.5 for now and are believed to be
82 - # false positives:
83 - #
84 - # main.information_schema, binlog.binlog_statement_insert_delayed,
85 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
86 - # funcs_1.is_columns_mysql
87 - # fails due to USE=-latin1 / utf8 default
88 - #
89 - # main.mysql_client_test, main.mysql_client_test_nonblock:
90 - # segfaults at random under Portage only, suspect resource limits.
91 - #
92 - # sys_vars.plugin_dir_basic
93 - # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
94 - # instead of MYSQL_LIBDIR/plugin
95 - #
96 - # main.flush_read_lock_kill
97 - # fails because of unknown system variable 'DEBUG_SYNC'
98 - #
99 - # main.openssl_1
100 - # error message changing
101 - # -mysqltest: Could not open connection 'default': 2026 SSL connection
102 - # error: ASN: bad other signature confirmation
103 - # +mysqltest: Could not open connection 'default': 2026 SSL connection
104 - # error: error:00000001:lib(0):func(0):reason(1)
105 - #
106 - # plugins.unix_socket
107 - # fails because portage strips out the USER enviornment variable
108 - #
109 -
110 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
111 - binlog.binlog_statement_insert_delayed main.information_schema \
112 - main.mysqld--help main.flush_read_lock_kill \
113 - sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
114 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
115 - mysql-v2_disable_test "$t" "False positives in Gentoo"
116 - done
117 -
118 - # Run mysql tests
119 - pushd "${TESTDIR}"
120 -
121 - # run mysql-test tests
122 - # Skip all CONNECT engine tests until upstream respondes to how to reference data files
123 - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
124 - retstatus_tests=$?
125 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
126 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
127 -
128 - popd
129 -
130 - # Cleanup is important for these testcases.
131 - pkill -9 -f "${S}/ndb" 2>/dev/null
132 - pkill -9 -f "${S}/sql" 2>/dev/null
133 -
134 - failures=""
135 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
136 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
137 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
138 -
139 - [[ -z "$failures" ]] || die "Test failures: $failures"
140 - einfo "Tests successfully completed"
141 -
142 - else
143 -
144 - einfo "Skipping server tests due to minimal build."
145 - fi
146 -}
147
148 diff --git a/dev-db/mariadb/mariadb-5.5.34.ebuild b/dev-db/mariadb/mariadb-5.5.34.ebuild
149 deleted file mode 100644
150 index 580a6ac..0000000
151 --- a/dev-db/mariadb/mariadb-5.5.34.ebuild
152 +++ /dev/null
153 @@ -1,131 +0,0 @@
154 -# Copyright 1999-2013 Gentoo Foundation
155 -# Distributed under the terms of the GNU General Public License v2
156 -# $Header: $
157 -
158 -EAPI="4"
159 -MY_EXTRAS_VER="20140121-1138Z"
160 -
161 -# Build system
162 -BUILD="cmake"
163 -
164 -inherit toolchain-funcs mysql-v2
165 -# only to make repoman happy. it is really set in the eclass
166 -IUSE="$IUSE"
167 -
168 -# REMEMBER: also update eclass/mysql*.eclass before committing!
169 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
170 -
171 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
172 -EPATCH_EXCLUDE=''
173 -
174 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
175 -RDEPEND="${RDEPEND}"
176 -
177 -# Please do not add a naive src_unpack to this ebuild
178 -# If you want to add a single patch, copy the ebuild to an overlay
179 -# and create your own mysql-extras tarball, looking at 000_index.txt
180 -
181 -# Official test instructions:
182 -# USE='-cluster embedded extraengine perl ssl community' \
183 -# FEATURES='test userpriv -usersandbox' \
184 -# ebuild mariadb-X.X.XX.ebuild \
185 -# digest clean package
186 -src_test() {
187 -
188 - local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
189 - local retstatus_unit
190 - local retstatus_tests
191 -
192 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
193 - # localhost. Also causes weird failures.
194 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
195 -
196 - if ! use "minimal" ; then
197 -
198 - if [[ $UID -eq 0 ]]; then
199 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
200 - fi
201 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
202 -
203 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
204 - addpredict /this-dir-does-not-exist/t9.MYI
205 -
206 - # Run CTest (test-units)
207 - cmake-utils_src_test
208 - retstatus_unit=$?
209 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
210 -
211 - # Ensure that parallel runs don't die
212 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
213 -
214 - # create directories because mysqladmin might right out of order
215 - mkdir -p "${S}"/mysql-test/var-tests{,/log}
216 -
217 - # create symlink for the tests to find mysql_tzinfo_to_sql
218 - ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
219 -
220 - # These are failing in MySQL 5.5 for now and are believed to be
221 - # false positives:
222 - #
223 - # main.information_schema, binlog.binlog_statement_insert_delayed,
224 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
225 - # funcs_1.is_columns_mysql
226 - # fails due to USE=-latin1 / utf8 default
227 - #
228 - # main.mysql_client_test, main.mysql_client_test_nonblock:
229 - # segfaults at random under Portage only, suspect resource limits.
230 - #
231 - # sys_vars.plugin_dir_basic
232 - # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
233 - # instead of MYSQL_LIBDIR/plugin
234 - #
235 - # main.flush_read_lock_kill
236 - # fails because of unknown system variable 'DEBUG_SYNC'
237 - #
238 - # main.openssl_1
239 - # error message changing
240 - # -mysqltest: Could not open connection 'default': 2026 SSL connection
241 - # error: ASN: bad other signature confirmation
242 - # +mysqltest: Could not open connection 'default': 2026 SSL connection
243 - # error: error:00000001:lib(0):func(0):reason(1)
244 - #
245 - # plugins.unix_socket
246 - # fails because portage strips out the USER enviornment variable
247 - #
248 -
249 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
250 - binlog.binlog_statement_insert_delayed main.information_schema \
251 - main.mysqld--help main.flush_read_lock_kill \
252 - sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
253 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
254 - mysql-v2_disable_test "$t" "False positives in Gentoo"
255 - done
256 -
257 - # Run mysql tests
258 - pushd "${TESTDIR}"
259 -
260 - # run mysql-test tests
261 - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
262 - retstatus_tests=$?
263 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
264 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
265 -
266 - popd
267 -
268 - # Cleanup is important for these testcases.
269 - pkill -9 -f "${S}/ndb" 2>/dev/null
270 - pkill -9 -f "${S}/sql" 2>/dev/null
271 -
272 - failures=""
273 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
274 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
275 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
276 -
277 - [[ -z "$failures" ]] || die "Test failures: $failures"
278 - einfo "Tests successfully completed"
279 -
280 - else
281 -
282 - einfo "Skipping server tests due to minimal build."
283 - fi
284 -}
285
286 diff --git a/dev-db/mariadb/mariadb-5.5.35.ebuild b/dev-db/mariadb/mariadb-5.5.35.ebuild
287 deleted file mode 100644
288 index 6431c06..0000000
289 --- a/dev-db/mariadb/mariadb-5.5.35.ebuild
290 +++ /dev/null
291 @@ -1,116 +0,0 @@
292 -# Copyright 1999-2013 Gentoo Foundation
293 -# Distributed under the terms of the GNU General Public License v2
294 -# $Header: $
295 -
296 -EAPI="4"
297 -MY_EXTRAS_VER="20140121-1138Z"
298 -
299 -# Build system
300 -BUILD="cmake"
301 -
302 -inherit toolchain-funcs mysql-v2
303 -# only to make repoman happy. it is really set in the eclass
304 -IUSE="$IUSE"
305 -
306 -# REMEMBER: also update eclass/mysql*.eclass before committing!
307 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
308 -
309 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
310 -EPATCH_EXCLUDE=''
311 -
312 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
313 -RDEPEND="${RDEPEND}"
314 -
315 -# Please do not add a naive src_unpack to this ebuild
316 -# If you want to add a single patch, copy the ebuild to an overlay
317 -# and create your own mysql-extras tarball, looking at 000_index.txt
318 -
319 -# Official test instructions:
320 -# USE='-cluster embedded extraengine perl ssl community' \
321 -# FEATURES='test userpriv -usersandbox' \
322 -# ebuild mariadb-X.X.XX.ebuild \
323 -# digest clean package
324 -src_test() {
325 -
326 - local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
327 - local retstatus_unit
328 - local retstatus_tests
329 -
330 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
331 - # localhost. Also causes weird failures.
332 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
333 -
334 - if ! use "minimal" ; then
335 -
336 - if [[ $UID -eq 0 ]]; then
337 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
338 - fi
339 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
340 -
341 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
342 - addpredict /this-dir-does-not-exist/t9.MYI
343 -
344 - # Run CTest (test-units)
345 - cmake-utils_src_test
346 - retstatus_unit=$?
347 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
348 -
349 - # Ensure that parallel runs don't die
350 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
351 -
352 - # create directories because mysqladmin might right out of order
353 - mkdir -p "${S}"/mysql-test/var-tests{,/log}
354 -
355 - # create symlink for the tests to find mysql_tzinfo_to_sql
356 - ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
357 -
358 - # These are failing in MySQL 5.5 for now and are believed to be
359 - # false positives:
360 - #
361 - # main.information_schema, binlog.binlog_statement_insert_delayed,
362 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
363 - # funcs_1.is_columns_mysql
364 - # fails due to USE=-latin1 / utf8 default
365 - #
366 - # main.mysql_client_test, main.mysql_client_test_nonblock:
367 - # segfaults at random under Portage only, suspect resource limits.
368 - #
369 - # plugins.unix_socket
370 - # fails because portage strips out the USER enviornment variable
371 - #
372 -
373 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
374 - binlog.binlog_statement_insert_delayed main.information_schema \
375 - main.mysqld--help plugins.unix_socket \
376 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
377 - mysql-v2_disable_test "$t" "False positives in Gentoo"
378 - done
379 -
380 - # Run mysql tests
381 - pushd "${TESTDIR}"
382 -
383 - # run mysql-test tests
384 - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
385 - retstatus_tests=$?
386 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
387 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
388 -
389 - popd
390 -
391 - # Cleanup is important for these testcases.
392 - pkill -9 -f "${S}/ndb" 2>/dev/null
393 - pkill -9 -f "${S}/sql" 2>/dev/null
394 -
395 - failures=""
396 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
397 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
398 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
399 -
400 - [[ -z "$failures" ]] || die "Test failures: $failures"
401 - einfo "Tests successfully completed"
402 -
403 - else
404 -
405 - einfo "Skipping server tests due to minimal build."
406 - fi
407 -}