From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-917290-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 40C41139084
	for <garchives@archives.gentoo.org>; Fri, 16 Dec 2016 21:27:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 92C57E0C88;
	Fri, 16 Dec 2016 21:27:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5B981E0C88
	for <gentoo-commits@lists.gentoo.org>; Fri, 16 Dec 2016 21:27:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 55906341142
	for <gentoo-commits@lists.gentoo.org>; Fri, 16 Dec 2016 21:27:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2427C24B0
	for <gentoo-commits@lists.gentoo.org>; Fri, 16 Dec 2016 21:27:34 +0000 (UTC)
From: "Brian Evans" <grknight@gentoo.org>
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" <grknight@gentoo.org>
Message-ID: <1481923557.3d2933e82b04e927ac6f7817b38da02c7eb4aea8.grknight@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/mariadb/Manifest dev-db/mariadb/mariadb-10.1.20.ebuild
X-VCS-Directories: dev-db/mariadb/
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: 3d2933e82b04e927ac6f7817b38da02c7eb4aea8
X-VCS-Branch: master
Date: Fri, 16 Dec 2016 21:27:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3dcc1cb5-c2da-49a4-aa47-e557423a931c
X-Archives-Hash: b8766c62f85c1166c412621418c73ccd

commit:     3d2933e82b04e927ac6f7817b38da02c7eb4aea8
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 21:25:57 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 21:25:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2933e8

dev-db/mariadb: Version bump for 10.1 series

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-db/mariadb/Manifest               |   1 +
 dev-db/mariadb/mariadb-10.1.20.ebuild | 207 ++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4462031..7e2fb4f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,7 @@
 DIST mariadb-10.0.27.tar.gz 63258508 SHA256 bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd SHA512 c3aa415b7fc766dce34c99795cfcfa424a8d7eb7ee19497f1a61cad7c708914b94d66eabb104dff364b2db77d07471ce810d708ec541efb1bed7291ca1ce7364 WHIRLPOOL 9a90edc10d482140da818bee7598dd1b468076091478fb63e19f475d8a3af6e059f04d85851b701b6e305b9912aefa7bbfa0b0045c075db8d9f16c30944da584
 DIST mariadb-10.0.28.tar.gz 63297461 SHA256 0a5033d56f1c5403df7fabd519ccbdc4da308b30a1ecd52e06a19be182a9bab2 SHA512 af4a0e830902d8916b4727e8d3d70ff5c5b7871b46fedb5d890881b5d22f196a423da0d4b1e9e0e6a25a40cfacd7fb1781d4a85dc1f9b31c89bbde8b50ffabc3 WHIRLPOOL 65c889d663f5ccacd9bebf87d5631d4ccb86df2245008db802697efb54f4db99fa461019b6aa58d3e95a76903de184e17590b2c606a1661a9686c6b448ade6aa
 DIST mariadb-10.1.19.tar.gz 61222929 SHA256 5b9373f314e2d1727422fb3795bcf50c1c59005129b35b6cadafae5663251a81 SHA512 28fb7178b71ec287f91f06ec0939ec877097ed21ff96b013c139a9584ccffbc9fc8694707e0d3c44cd61da33b54311116f858d31931ba289cdb22776c872f285 WHIRLPOOL 8e24d87054ccabde4873a4faae5c9ce82aa5f84c1afd39c9152e9bff6aadc7bc73b5532e7944173fc9ea2ce1bd13d68122deb941718819c617d8b1daee974a3b
+DIST mariadb-10.1.20.tar.gz 61312731 SHA256 c24e83f24d674d9912319f9e9422f093c8ca6be1721a4380cbd74792b89ba0b9 SHA512 926067a30e54354f6482e28152694e747f4deb8b4ba6d054e089955b45f98f628ea8cca4cfbc12f6220fa6b8b6f2ba9fef7c23c09cb82b23f370acdd32a9e892 WHIRLPOOL ff7d3e180ab6e1a546d0e7c0517ec9138ce0dabf1768fe1270a018446c0a5727017ef94e2495295237d54ac21690c96ca7fce0d9f3f416584ce75b38470314b4
 DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
 DIST mariadb-5.5.53.tar.gz 45739935 SHA256 4517296f5686af83c3f67bd9183ca1038c73a9c6c5e680389d167f72c644124e SHA512 43d98de3d392a7598265752433a1443432dd5029ebef22a7b20816194c65a14c480df064cb36875af414b47d994d31f6431c49d6b5988021f314d9518c8af90d WHIRLPOOL f9fa83d709689f1e2aba116d4c16bc2f1226d4cf1fc74b5b7f6a73d0647aa796bd3e92ff8bcd3e62f41d480e8c56ee1f10e765dd5c320a6385e6a3ecfb0f03da
 DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 WHIRLPOOL d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f

diff --git a/dev-db/mariadb/mariadb-10.1.20.ebuild b/dev-db/mariadb/mariadb-10.1.20.ebuild
new file mode 100644
index 00000000..fd663ad
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.20.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+MY_EXTRAS_VER="20160721-1526Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch
+	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+	"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+)
+
+COMMON_DEPEND="
+	mroonga? ( app-text/groonga-normalizer-mysql )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-${WSREP_REVISION}*
+		sst-rsync? ( sys-process/lsof )
+		sst-xtrabackup? ( net-misc/socat[ssl] )
+	)
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	local MYSQL_CMAKE_EXTRA_DEFINES=(
+			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# 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
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# 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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# 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}
+
+	# Run mysql tests
+	pushd "${TESTDIR}" || die
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+	retstatus_tests=$?
+
+	popd || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || eerror "Test failures: $failures"
+	einfo "Tests successfully completed"
+}