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/percona-server/, dev-db/mariadb-galera/
Date: Fri, 03 Oct 2014 13:30:44
Message-Id: 1412342991.abecf7fa05cca21638a0d77d57394282e5af8d64.grknight@gentoo
1 commit: abecf7fa05cca21638a0d77d57394282e5af8d64
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 3 13:29:51 2014 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 3 13:29:51 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=abecf7fa
7
8 Remove versions that were not imported to tree
9
10 ---
11 dev-db/mariadb-galera/Manifest | 2 -
12 dev-db/mariadb-galera/mariadb-galera-5.5.38.ebuild | 110 -------------------
13 dev-db/percona-server/Manifest | 2 -
14 .../percona-server-5.5.38.35.2-r1.ebuild | 118 ---------------------
15 4 files changed, 232 deletions(-)
16
17 diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
18 index 28d0312..207d97d 100644
19 --- a/dev-db/mariadb-galera/Manifest
20 +++ b/dev-db/mariadb-galera/Manifest
21 @@ -1,6 +1,4 @@
22 DIST mariadb-galera-10.0.12.tar.gz 51307785 SHA256 e68d6ec7c99e0c361a1d2e986e4adb2436776de8192e39dc9ea08ef24e13b1ef SHA512 8c6a39d3a81a7ea795a1c55e527c85996b4dc227607722e94d3c13051e19109bb9873b9993279407064f1d9dc0d1585234af5d22d9d1940fc05b856076249504 WHIRLPOOL 2d2a2720a5b5289902254549b06dd4cbb1476ad76b6bb2bef2fbd7ae57cb8490a47a0b260507ff93ef5aa647a270d2de48f0fb7a3a9ef8dcfea059734362db7d
23 DIST mariadb-galera-10.0.13.tar.gz 51542182 SHA256 9302c5ca8447e4f33e6f043dbdf56ec0028e1da8dfb713b9f1a81b1d6cd8d2fd SHA512 0274a344ef7da7f663f5822fcd5caa2672e4464e05d06c924050b9f7aaa34c0016067c9dda1f46697519d1eb6b80492f3ac2c7bbb86b0148735fd519b9eb1125 WHIRLPOOL df9c3e1a8fde111f5b1b66d9f556ab4a1b57c42cafd21dabc3a93d8de3add7b46f7f267f17110f19355018c5d2ebc97a8b75a5117106352137a5fdda67fde111
24 -DIST mariadb-galera-5.5.38.tar.gz 45256556 SHA256 85d82d1d7610eae10d49ccb8b0c64598c0da63dd5b90248b8d2c17e7cd45fb34 SHA512 40b8e7d7d5dc19e74bc7f8d1bdb3bc0cff71f5e04ca76f26b107e4267062fc906640df3463d748107df2f23f12750987116197603d32417cce9b9adc1b0310de WHIRLPOOL 7a4f4e3f6a0dd2b29d6315a98db5884ea56531d0a4f1e1b49bc1df7868b3855a198c6473b967079b1e2e18317bc2c018c310091f9fd905cb83ada70c769bc3cc
25 -DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256 84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512 a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc WHIRLPOOL 241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
26 DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
27 DIST mysql-extras-20140903-1928Z.tar.bz2 1494599 SHA256 3a1e4ba87b301751f1964875bdba4c4baafe270267247ee79e4285e256f272f8 SHA512 2fcf08cca2ccf62533058e1994a8aca1ffc17867495d5c7fe588d42978e9c5c2e08f93991f44b0354818db14339a09b156471a7c428de17250c54f48c5aca7c4 WHIRLPOOL fc5983a0cb3c8a8faabdb2b8f8cba183188b5cfa2e40eda0207942ed92cf69675ca1753b7c35420c5b0882d4b77d1daacf586fb08f5cb5c701b7925e549cd2c8
28
29 diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.38.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.38.ebuild
30 deleted file mode 100644
31 index 7ed01f0..0000000
32 --- a/dev-db/mariadb-galera/mariadb-galera-5.5.38.ebuild
33 +++ /dev/null
34 @@ -1,110 +0,0 @@
35 -# Copyright 1999-2014 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Header: $
38 -
39 -EAPI="4"
40 -MY_EXTRAS_VER="20140426-0232Z"
41 -WSREP_REVISION="25"
42 -
43 -# Build system
44 -BUILD="cmake"
45 -
46 -inherit toolchain-funcs mysql-v2
47 -# only to make repoman happy. it is really set in the eclass
48 -IUSE="$IUSE"
49 -
50 -# REMEMBER: also update eclass/mysql*.eclass before committing!
51 -KEYWORDS="~amd64 ~x86"
52 -
53 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
54 -EPATCH_EXCLUDE=''
55 -
56 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
57 -RDEPEND="${RDEPEND}"
58 -
59 -# Please do not add a naive src_unpack to this ebuild
60 -# If you want to add a single patch, copy the ebuild to an overlay
61 -# and create your own mysql-extras tarball, looking at 000_index.txt
62 -
63 -# Official test instructions:
64 -# USE='-cluster embedded extraengine perl ssl static-libs community' \
65 -# FEATURES='test userpriv -usersandbox' \
66 -# ebuild mariadb-galera-X.X.XX.ebuild \
67 -# digest clean package
68 -src_test() {
69 -
70 - local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
71 - local retstatus_unit
72 - local retstatus_tests
73 -
74 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
75 - # localhost. Also causes weird failures.
76 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
77 -
78 - if ! use "minimal" ; then
79 -
80 - if [[ $UID -eq 0 ]]; then
81 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
82 - fi
83 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
84 -
85 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
86 - addpredict /this-dir-does-not-exist/t9.MYI
87 -
88 - # Run CTest (test-units)
89 - cmake-utils_src_test
90 - retstatus_unit=$?
91 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
92 -
93 - # Ensure that parallel runs don't die
94 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
95 -
96 - # create directories because mysqladmin might right out of order
97 - mkdir -p "${S}"/mysql-test/var-tests{,/log}
98 -
99 - # These are failing in MySQL 5.5 for now and are believed to be
100 - # false positives:
101 - #
102 - # main.information_schema, binlog.binlog_statement_insert_delayed,
103 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
104 - # funcs_1.is_columns_mysql
105 - # fails due to USE=-latin1 / utf8 default
106 - #
107 - # main.mysql_client_test, main.mysql_client_test_nonblock:
108 - # segfaults at random under Portage only, suspect resource limits.
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 \
113 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
114 - mysql-v2_disable_test "$t" "False positives in Gentoo"
115 - done
116 -
117 - # Run mysql tests
118 - pushd "${TESTDIR}"
119 -
120 - # run mysql-test tests
121 - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
122 - retstatus_tests=$?
123 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
124 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
125 -
126 - popd
127 -
128 - # Cleanup is important for these testcases.
129 - pkill -9 -f "${S}/ndb" 2>/dev/null
130 - pkill -9 -f "${S}/sql" 2>/dev/null
131 -
132 - failures=""
133 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
134 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
135 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
136 -
137 - [[ -z "$failures" ]] || die "Test failures: $failures"
138 - einfo "Tests successfully completed"
139 -
140 - else
141 -
142 - einfo "Skipping server tests due to minimal build."
143 - fi
144 -}
145
146 diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
147 index ab5d664..8d7310d 100644
148 --- a/dev-db/percona-server/Manifest
149 +++ b/dev-db/percona-server/Manifest
150 @@ -1,4 +1,2 @@
151 -DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
152 DIST mysql-extras-20140817-2331Z.tar.bz2 1494554 SHA256 c2e338b4e6933d87696cf8c15b5c17e41c0227c05cb123ef2c84e78f26b04b0a SHA512 40a181eabbc112d0408883cf280cc14fc694d971601c35c34b8d6bde6f931aab3f909952676a23457773a5d015f17d57d7b409818ff8569a4b8977638ed80456 WHIRLPOOL 24d74c5be9514b59b18673777aa24f358c7ce4f2daddf23598eb910ca05baa22631849c406c581a864ebd0836b56a7f5ff69bf7377c2dae9d21e96c670ed0e3e
153 -DIST percona-server-5.5.38-35.2.tar.gz 22946764 SHA256 2726d8443a4e87e1a1f11c56dfcd1aa79a5a2ff8cbff9f229c8589cdedbf031d SHA512 5813736a4b0a74d20f1fbce9a30b0000023c55c3e7d5c300608d2b0445568c2034c77f3d97951503cc9d568aa0eea2516bb459b0a2d9a0ea161da561c0aaf3fb WHIRLPOOL 25b1680f7a8c1b8290fc7a9a2a0fb0556f88591da108d6b524f6ae18da7c6e155cf1c03516a2234529eba0f454715b88302495c53ce793e9823485e1ccbc31e9
154 DIST percona-server-5.6.20-68.0.tar.gz 33900890 SHA256 68621fdb9cc195309e8d56eacedd9a8b97c86bdd1a6f0f2d8e300816a1a1d7cd SHA512 cf0c52967d5645f3e4bc3b5e2ef2158c94461dbcd21c08cc6027845ac4a46201642db59085dc487111db98539088c3c920c121673452af5e7aca6ae0b89370ff WHIRLPOOL 582ebbd4c6a633ef895936be873bb7b844515e49d5353ffc45d9814f436562595f41e22703a069688c62c186e67f585e6aac664776d83d6b169b8000aa09c85d
155
156 diff --git a/dev-db/percona-server/percona-server-5.5.38.35.2-r1.ebuild b/dev-db/percona-server/percona-server-5.5.38.35.2-r1.ebuild
157 deleted file mode 100644
158 index 494c3b4..0000000
159 --- a/dev-db/percona-server/percona-server-5.5.38.35.2-r1.ebuild
160 +++ /dev/null
161 @@ -1,118 +0,0 @@
162 -# Copyright 1999-2014 Gentoo Foundation
163 -# Distributed under the terms of the GNU General Public License v2
164 -# $Header: $
165 -
166 -EAPI="5"
167 -
168 -MY_EXTRAS_VER="20140729-2200Z"
169 -MY_PV="${PV//_alpha_pre/-m}"
170 -MY_PV="${MY_PV//_/-}"
171 -
172 -# Build type
173 -BUILD="cmake"
174 -
175 -inherit toolchain-funcs mysql-v2
176 -# only to make repoman happy. it is really set in the eclass
177 -IUSE="$IUSE"
178 -
179 -# Define the mysql-extras source
180 -EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
181 -
182 -# REMEMBER: also update eclass/mysql*.eclass before committing!
183 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
184 -
185 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
186 -EPATCH_EXCLUDE=''
187 -
188 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
189 -RDEPEND="${RDEPEND}"
190 -
191 -# Please do not add a naive src_unpack to this ebuild
192 -# If you want to add a single patch, copy the ebuild to an overlay
193 -# and create your own mysql-extras tarball, looking at 000_index.txt
194 -
195 -# Official test instructions:
196 -# USE='-cluster embedded extraengine perl ssl static-libs community' \
197 -# FEATURES='test userpriv -usersandbox' \
198 -# ebuild percona-server-X.X.XX.ebuild \
199 -# digest clean package
200 -src_test() {
201 -
202 - local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
203 - local retstatus_unit
204 - local retstatus_tests
205 -
206 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
207 - # localhost. Also causes weird failures.
208 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
209 -
210 - if ! use "minimal" ; then
211 -
212 - if [[ $UID -eq 0 ]]; then
213 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
214 - fi
215 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
216 -
217 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
218 - addpredict /this-dir-does-not-exist/t9.MYI
219 -
220 - # Run CTest (test-units)
221 - cmake-utils_src_test
222 - retstatus_unit=$?
223 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
224 -
225 - # Ensure that parallel runs don't die
226 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
227 -
228 - # create directories because mysqladmin might right out of order
229 - mkdir -p "${S}"/mysql-test/var-tests{,/log}
230 -
231 - # These are failing in Perocna 5.5 for now and are believed to be
232 - # false positives:
233 - #
234 - # main.information_schema, binlog.binlog_statement_insert_delayed,
235 - # main.mysqld--help-notwin
236 - # fails due to USE=-latin1 / utf8 default
237 - #
238 - # main.mysql_client_test:
239 - # segfaults at random under Portage only, suspect resource limits.
240 - #
241 - # main.percona_bug1289599 main.percona_innodb_version
242 - # Appears to be a syntax error in the test file itself
243 - #
244 -
245 - for t in main.mysql_client_test \
246 - binlog.binlog_statement_insert_delayed main.information_schema \
247 - main.mysqld--help-notwin main.percona_bug1289599 main.percona_innodb_version ; do
248 - mysql-v2_disable_test "$t" "False positives in Gentoo"
249 - done
250 -
251 - # Run mysql tests
252 - pushd "${TESTDIR}"
253 -
254 - # run mysql-test tests
255 - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
256 - --testcase-timeout=30 --parallel=auto
257 - retstatus_tests=$?
258 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
259 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
260 -
261 - popd
262 -
263 - # Cleanup is important for these testcases.
264 - pkill -9 -f "${S}/ndb" 2>/dev/null
265 - pkill -9 -f "${S}/sql" 2>/dev/null
266 -
267 - failures=""
268 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
269 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
270 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
271 -
272 - [[ -z "$failures" ]] || die "Test failures: $failures"
273 - einfo "Tests successfully completed"
274 -
275 - else
276 -
277 - einfo "Skipping server tests due to minimal build."
278 - fi
279 -}