commit: 54539886d17960e92f03cc7865feda2965105728
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 02:13:13 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 02:13:44 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=54539886
[mariadb] Version bump for 10.1 series to beta
dev-db/mariadb/ChangeLog | 7 +-
dev-db/mariadb/Manifest | 23 ++++++
dev-db/mariadb/mariadb-10.1.3_beta.ebuild | 116 ++++++++++++++++++++++++++++++
eclass/mysql-cmake.eclass | 1 -
4 files changed, 145 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index dfc3b0e..58d3c00 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for dev-db/mariadb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-10.1.3_beta (16 Mar 2015)
+
+ 16 Mar 2015; Brian Evans <grkni...@gentoo.org> +mariadb-10.1.3_beta.ebuild:
+ [mariadb] Version bump for 10.1 series to beta
+
*mariadb-5.5.39 (05 Aug 2014)
05 Aug 2014; <grkni...@gentoo.org> +mariadb-5.5.39.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d3493dc..c2eb76b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST mariadb-10.0.16.tar.gz 55656968 SHA256
44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512
8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3
WHIRLPOOL
916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
DIST mariadb-10.1.0.tar.gz 51216842 SHA256
994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512
479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a
WHIRLPOOL
edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
DIST mariadb-10.1.2.tar.gz 52586559 SHA256
411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512
cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421
WHIRLPOOL
67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff
+DIST mariadb-10.1.3.tar.gz 52935207 SHA256
565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512
c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae
WHIRLPOOL
08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
@@ -9,3 +13,22 @@ DIST mariadb-5.5.42.tar.gz 45586372 SHA256
3c868e768f4c24b4aa2f8f1725460d15a5485
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
WHIRLPOOL
371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256
4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512
7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed
WHIRLPOOL
99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVBjw5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2ctoQAMXw+w23CmNm+hs0BlY6ZLgW
+A487nSZIXz2h7LEhROfJ/9VZat5x+RG5xMGmCZD2DaZfqrfXiQpuBraf3o8fMf0z
+ttNwqMLWxUhlehv3QsIbITkMKP67SV6zWkIgJ1zApLEJ7T77qNtI0ga9WK5/Er28
+ej4L56Pk52XAaJyHgOOy75QKV1H5l2+9w/jBclSVZViMq6Ryu7uvo4cY6d67W+H/
+tBRS5DJyEM1gx2ovYmQWhs9BUaVwKOIJA3AJ3JYp9Cf70FvFf6yE4L8VRc1a+ojS
+xprKgs/ouP49e1qsXxiQke2T77OxZ/uRSSHIXIjZGJTacjVBKHkM3pHmvua1QypG
+Oakch21s4/HrUFhm5GJLBKGiNZXL/wUhFdKkFGJ5rh2X0wnfJ+wzoVS7Zy5FxTgS
+W3oYzPsM/GGmVAZaIAl5CKnvx3UzP1pUi7oRhmD1c6is9S1WLpFTSh2upKDz2Ql8
+6hK2j3Zg4N8Fbb1/C8HVBs+QGi7Q7dRozPh1Whr5kSplHCtzGFZwPqzq+/OLUaX/
+C4LKb58dElweqm16W/twdnUZ5TtN3SzU95CLRSD5SpMKIiTWhaqUpD+g8VsAM1IJ
+Kav6t8zfSqQw2AZ5zWJIrFvKa75/JZl0R1t20ChSGLoAcPm+9OYEmF+dS59blNTt
+ojAUoVhh769Gg6wduHvO
+=m8ig
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.3_beta.ebuild
b/dev-db/mariadb/mariadb-10.1.3_beta.ebuild
new file mode 100644
index 0000000..681e55a
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.3_beta.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+MY_EXTRAS_VER="live"
+WSREP_REVISION="25"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE='20014_all_mariadb-innodb-compression.patch'
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+ if ! multilib_is_native_abi ; then
+ einfo "Server tests not available on non-native abi".
+ return 0;
+ fi
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be
named localhost"
+
+ if ! use "minimal" ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer
supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+ # Enable parallel testing, auto will try to detect number of
cores
+ # You may set this by hand.
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${T}"/var-tests{,/log}
+
+ # These are failing in MariaDB 10.0 for now and are believed to
be
+ # false positives:
+ #
+ # main.information_schema,
binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help, funcs_1.is_triggers,
funcs_1.is_tables_mysql,
+ # funcs_1.is_columns_mysql
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource
limits.
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock
\
+ main.mysql_client_test_comp \
+ binlog.binlog_statement_insert_delayed
main.information_schema \
+ main.mysqld--help \
+ funcs_1.is_triggers funcs_1.is_tables_mysql
funcs_1.is_columns_mysql ; do
+ mysql-multilib_disable_test "$t" "False
positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index aa1fabc..fd41702 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -212,7 +212,6 @@ configure_cmake_standard() {
$(mysql-cmake_use_plugin extraengine SPIDER)
$(mysql-cmake_use_plugin extraengine CONNECT)
-DCONNECT_WITH_MYSQL=1
- -DPLUGIN_CONNECT_WITH_MYSQL=YES
$(cmake-utils_use xml CONNECT_WITH_LIBXML2)
$(cmake-utils_use odbc CONNECT_WITH_ODBC)
)
