1 |
commit: b2af5bc5c86860caaa07704c800e2fe24875ffbb |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 14 23:15:06 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 14 23:15:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2af5bc5 |
7 |
|
8 |
dev-db/mysql: Drop old version of 5.5 |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
dev-db/mysql/Manifest | 1 - |
13 |
dev-db/mysql/metadata.xml | 9 --- |
14 |
dev-db/mysql/mysql-5.5.60.ebuild | 133 --------------------------------------- |
15 |
3 files changed, 143 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
18 |
index 07571be616a..6a1d0831051 100644 |
19 |
--- a/dev-db/mysql/Manifest |
20 |
+++ b/dev-db/mysql/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST mysql-5.5.60.tar.gz 21025041 BLAKE2B c4010c64b30ca72aff011053189981cc0676806ed9f18a0ac584e07f71e1f7fe062a3ca78db6f109a2b96d324d778b239880f96852fdc058892b09d0d09e740b SHA512 734395f3ce2c12e7703fe48d5bb2ce85ff8d7f04ae51cbe2d04a46b72b9689f804e5b498ae0b4722b0c098e2eed43d4f93b622964059525e6d9d14a47d55f775 |
23 |
DIST mysql-5.5.61.tar.gz 21027098 BLAKE2B b7589f632a211349fc34cec94e333b878e07113969bf5cf6f78cd37435d95b15c03eaf188ed09768033b182de125c9f018a5fe902094f17ab891f94cab9de6dd SHA512 978384915c145ec8f0d85deb764154d8d4a9764f2d342928bda6ad43a00bc110aa888895416d2ba5684a4432e433037990dd3fe8c5caf024faa487bc2e153f49 |
24 |
DIST mysql-5.6.38.tar.gz 32197625 BLAKE2B 5edd6d05e562568d2418edd81c6822b397103013e92beacc00964401c6df67f8a934f05b57c6679aa25a49ef6db2e4a06056f3f1850e0f2afe4de895c7b8f686 SHA512 8144aec822f053fbdfa11ae542e96d3e7da93552b60ed131f041ec4832f48c95025b322340a2e90a82c18b6ee6bfd708f209735f82e37532198245aad697b93d |
25 |
DIST mysql-5.6.39.tar.gz 32110958 BLAKE2B 2f279c6745bc995c860bb4f2868409136e112cc8b9fb0c04fa7673bb6d5612f3ef6d3462666de736d6e7fe5439275ab49908a6609175d1cb8c096d5db5ecb59c SHA512 e1e60854c82d71f9600bf611df964f441815d9d0f896134110a749b29fe340fa216d7c89f4da63d492929565f19a2502463549b8c8c038c658e0be8409a3ffb5 |
26 |
|
27 |
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml |
28 |
index 82e3cca3197..64ee7730fb5 100644 |
29 |
--- a/dev-db/mysql/metadata.xml |
30 |
+++ b/dev-db/mysql/metadata.xml |
31 |
@@ -5,23 +5,14 @@ |
32 |
<email>mysql-bugs@g.o</email> |
33 |
<name>MySQL</name> |
34 |
</maintainer> |
35 |
-<!-- |
36 |
-Please note that this list is shared between the following packages: |
37 |
-dev-db/mysql |
38 |
-dev-db/mariadb |
39 |
---> |
40 |
<use> |
41 |
<flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag> |
42 |
- <flag name="cluster">Add support for NDB clustering (deprecated)</flag> |
43 |
- <flag name="community">Enables the community features from upstream.</flag> |
44 |
<flag name="embedded">Build embedded server (libmysqld)</flag> |
45 |
<flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag> |
46 |
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag> |
47 |
<flag name="latin1">Use LATIN1 encoding instead of UTF8</flag> |
48 |
<flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag> |
49 |
<flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag> |
50 |
- <flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag> |
51 |
- <flag name="minimal">Install client programs only, no server</flag> |
52 |
<flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag> |
53 |
<flag name="profiling">Add support for statement profiling (requires USE=community).</flag> |
54 |
<flag name="server">Build the server program</flag> |
55 |
|
56 |
diff --git a/dev-db/mysql/mysql-5.5.60.ebuild b/dev-db/mysql/mysql-5.5.60.ebuild |
57 |
deleted file mode 100644 |
58 |
index 881a4ffb831..00000000000 |
59 |
--- a/dev-db/mysql/mysql-5.5.60.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,133 +0,0 @@ |
62 |
-# Copyright 1999-2018 Gentoo Foundation |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
- |
65 |
-EAPI="5" |
66 |
- |
67 |
-MY_EXTRAS_VER="20180214-0024Z" |
68 |
-MY_PV="${PV//_alpha_pre/-m}" |
69 |
-MY_PV="${MY_PV//_/-}" |
70 |
- |
71 |
-# Build type |
72 |
-BUILD="cmake" |
73 |
-#fails to build with ninja |
74 |
-CMAKE_MAKEFILE_GENERATOR=emake |
75 |
- |
76 |
-inherit toolchain-funcs mysql-v2 |
77 |
-# only to make repoman happy. it is really set in the eclass |
78 |
-IUSE="$IUSE" |
79 |
- |
80 |
-# Define the mysql-extras source |
81 |
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" |
82 |
- |
83 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
84 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
85 |
- |
86 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
87 |
-EPATCH_EXCLUDE='' |
88 |
- |
89 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
90 |
-RDEPEND="${RDEPEND}" |
91 |
- |
92 |
-SLOT="0/18" |
93 |
- |
94 |
-# Please do not add a naive src_unpack to this ebuild |
95 |
-# If you want to add a single patch, copy the ebuild to an overlay |
96 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
97 |
- |
98 |
-# Official test instructions: |
99 |
-# USE='extraengine perl ssl static-libs community' \ |
100 |
-# FEATURES='test userpriv -usersandbox' \ |
101 |
-# ebuild mysql-X.X.XX.ebuild \ |
102 |
-# digest clean package |
103 |
-src_test() { |
104 |
- |
105 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
106 |
- local retstatus_unit |
107 |
- local retstatus_tests |
108 |
- |
109 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
110 |
- # localhost. Also causes weird failures. |
111 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
112 |
- |
113 |
- if ! use "minimal" ; then |
114 |
- |
115 |
- if [[ $UID -eq 0 ]]; then |
116 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
117 |
- fi |
118 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
119 |
- |
120 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
121 |
- addpredict /this-dir-does-not-exist/t9.MYI |
122 |
- |
123 |
- # Run CTest (test-units) |
124 |
- cmake-utils_src_test |
125 |
- retstatus_unit=$? |
126 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
127 |
- |
128 |
- # Ensure that parallel runs don't die |
129 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
130 |
- # Enable parallel testing, auto will try to detect number of cores |
131 |
- # You may set this by hand. |
132 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
133 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
134 |
- |
135 |
- # create directories because mysqladmin might right out of order |
136 |
- mkdir -p "${T}"/var-tests{,/log} |
137 |
- |
138 |
- # create symlink for the tests to find mysql_tzinfo_to_sql |
139 |
- ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
140 |
- |
141 |
- # These are failing in MySQL 5.5 for now and are believed to be |
142 |
- # false positives: |
143 |
- # |
144 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
145 |
- # main.mysqld--help-notwin |
146 |
- # fails due to USE=-latin1 / utf8 default |
147 |
- # |
148 |
- # main.mysql_client_test: |
149 |
- # segfaults at random under Portage only, suspect resource limits. |
150 |
- # |
151 |
- # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
152 |
- # fails due to bad cleanup of previous tests when run in parallel |
153 |
- # The tool is deprecated anyway |
154 |
- # Bug 532288 |
155 |
- |
156 |
- for t in main.mysql_client_test main.openssl_1 \ |
157 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
158 |
- main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do |
159 |
- mysql-v2_disable_test "$t" "False positives in Gentoo" |
160 |
- done |
161 |
- |
162 |
- for t in main.mysql main.mysql_upgrade ; do |
163 |
- mysql-v2_disable_test "$t" "Test $t broken upstream - error return value not updated" |
164 |
- done |
165 |
- |
166 |
- # Run mysql tests |
167 |
- pushd "${TESTDIR}" |
168 |
- |
169 |
- # run mysql-test tests |
170 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
171 |
- --testcase-timeout=30 --reorder |
172 |
- retstatus_tests=$? |
173 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
174 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
175 |
- |
176 |
- popd |
177 |
- |
178 |
- # Cleanup is important for these testcases. |
179 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
180 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
181 |
- |
182 |
- failures="" |
183 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
184 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
185 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
186 |
- |
187 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
188 |
- einfo "Tests successfully completed" |
189 |
- |
190 |
- else |
191 |
- |
192 |
- einfo "Skipping server tests due to minimal build." |
193 |
- fi |
194 |
-} |