From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EAC511381FA for ; Wed, 14 May 2014 02:31:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11FD8E0AB6; Wed, 14 May 2014 02:31:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EB10E0AAF for ; Wed, 14 May 2014 02:31:15 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E23E33FF14 for ; Wed, 14 May 2014 02:31:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id DF75B182D1 for ; Wed, 14 May 2014 02:31:12 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1400034662.ebf6e663a90951a7a75da539744c92455c25fea1.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/Manifest dev-db/mariadb/mariadb-10.0.10-r1.ebuild dev-db/mariadb/mariadb-10.0.11.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: ebf6e663a90951a7a75da539744c92455c25fea1 X-VCS-Branch: master Date: Wed, 14 May 2014 02:31:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8491d9cf-3609-495e-a9b9-ccd4dff319da X-Archives-Hash: 743966f69c994ff5812c13ef2426422d commit: ebf6e663a90951a7a75da539744c92455c25fea1 Author: Brian Evans gentoo org> AuthorDate: Wed May 14 02:30:22 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Wed May 14 02:31:02 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ebf6e663 [mariadb] Set extras version on 10.0.11, remove old --- dev-db/mariadb/Manifest | 1 + dev-db/mariadb/mariadb-10.0.10-r1.ebuild | 110 ------------------------------- dev-db/mariadb/mariadb-10.0.11.ebuild | 2 +- 3 files changed, 2 insertions(+), 111 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index a5f91d1..4b914b9 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -6,3 +6,4 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3 DIST mariadb-5.5.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256 84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512 a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc WHIRLPOOL 241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7 +DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc diff --git a/dev-db/mariadb/mariadb-10.0.10-r1.ebuild b/dev-db/mariadb/mariadb-10.0.10-r1.ebuild deleted file mode 100644 index 33c48c8..0000000 --- a/dev-db/mariadb/mariadb-10.0.10-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -MY_EXTRAS_VER="live" - -# Build system -BUILD="cmake" - -inherit toolchain-funcs mysql-v2 -# 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 ~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='' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" -RDEPEND="${RDEPEND}" - -# Official test instructions: -# USE='-cluster embedded extraengine perl ssl static-libs community' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-X.X.XX.ebuild \ -# digest clean package -src_test() { - - 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))" - - # create directories because mysqladmin might right out of order - mkdir -p "${S}"/mysql-test/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: - # segfaults at random under Portage only, suspect resource limits. - # - # plugins.unix_socket - # fails because portage strips out the USER enviornment variable - # - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help plugins.unix_socket \ - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-v2_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # run mysql-test tests - # Skip all CONNECT engine tests until upstream respondes to how to reference data files - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect - 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/dev-db/mariadb/mariadb-10.0.11.ebuild b/dev-db/mariadb/mariadb-10.0.11.ebuild index 33c48c8..bc48682 100644 --- a/dev-db/mariadb/mariadb-10.0.11.ebuild +++ b/dev-db/mariadb/mariadb-10.0.11.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI="4" -MY_EXTRAS_VER="live" +MY_EXTRAS_VER="20140514-0124Z" # Build system BUILD="cmake"