grknight    15/07/28 02:25:51

  Modified:             metadata.xml ChangeLog
  Added:                mariadb-10.0.20-r1.ebuild
  Log:
  Revbumps for new mysql packaging splitting client and server
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0xD1F781EFF9F4A3B6)

Revision  Changes    Path
1.7                  dev-db/mariadb/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/metadata.xml?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/metadata.xml?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mariadb/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml        21 Sep 2014 15:11:55 -0000      1.6
+++ metadata.xml        28 Jul 2015 02:25:51 -0000      1.7
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
 <herd>mysql</herd>
-<!-- 
-Please note that this list is shared between the following packages:
-dev-db/mysql
-dev-db/mariadb
--->
 <use>
+  <flag name='client-libs'>Build the libmysqlclient libraries</flag>
   <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
   <flag name='community'>Enables the community features from upstream.</flag>
   <flag name='embedded'>Build embedded server (libmysqld)</flag>
@@ -17,9 +13,12 @@
   <flag name='max-idx-128'>Raise the max index per table limit from 64 to 
128</flag>
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
+  <flag name='pam'>Enable the optional PAM authentication plugin for the 
server</flag>
   <flag name='profiling'>Add support for statement profiling (requires 
USE=community).</flag>
-  <flag name="systemtap">Build support for profiling and tracing using 
<pkg>dev-util/systemtap</pkg></flag>
+  <flag name='server'>Build the server program</flag>
   <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
+  <flag name="systemtap">Build support for profiling and tracing using 
<pkg>dev-util/systemtap</pkg></flag>
+  <flag name='tools'>Build the command line tools (mysql, mysqldump, 
mysqladmin, etc)</flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
   <flag name='tokudb'>Add support for TokuDB storage engine</flag>
 </use>



1.116                dev-db/mariadb/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.116&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.116&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?r1=1.115&r2=1.116

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog   16 Jul 2015 17:40:06 -0000      1.115
+++ ChangeLog   28 Jul 2015 02:25:51 -0000      1.116
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.115 2015/07/16 
17:40:06 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.116 2015/07/28 
02:25:51 grknight Exp $
+
+*mariadb-10.0.20-r1 (28 Jul 2015)
+
+  28 Jul 2015; Brian Evans <[email protected]> +mariadb-10.0.20-r1.ebuild,
+  metadata.xml:
+  Revbumps for new mysql packaging splitting client and server
 
   16 Jul 2015; Brian Evans <[email protected]> -mariadb-10.0.16.ebuild:
   Drop old version for security Bug 546724



1.1                  dev-db/mariadb/mariadb-10.0.20-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.20-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.20-r1.ebuild?rev=1.1&content-type=text/plain

Index: mariadb-10.0.20-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.20-r1.ebuild,v 
1.1 2015/07/28 02:25:51 grknight Exp $

EAPI="5"
MY_EXTRAS_VER="20150717-1707Z"
HAS_TOOLS_PATCH="1"
SUBSLOT="18"

inherit toolchain-funcs mysql-multilib
IUSE="${IUSE}"

# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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='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

        if use server ; then

                # 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 [[ $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"

                # Create a symlink to provided binaries so the tests can find 
them when client-libs is off
                if ! use client-libs ; then
                        ln -srf /usr/bin/my_print_defaults 
"${BUILD_DIR}/client/my_print_defaults" || die
                        ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || 
die
                        mysql-multilib_disable_test main.perror "String 
mismatch due to not building local perror"
                fi

                # 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 run 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 main.bootstrap
                # 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 main.bootstrap \
                        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" 
--reorder

                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
}




Reply via email to