gentoo resync : 12.11.2017

3 files changed, 108 insertions, 37 deletions

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 2455399fdb8a..70b6d4974bf6 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,8 +5,8 @@ DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 SHA256 53b6692d25ad85772c19593f8b0
 DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 SHA256 f1966c721c7ed83b59f9ae2cc5e4df56071e358907deef2329d579d5c03601b1 SHA512 eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f WHIRLPOOL 1ad8b4b48ff4e4d0e5ada9f14c5d1fb4a23d8c211121ccc53f20051dfcecb0463d45c2b24178d87174f0950db6bb606e259144c4f1f9052759865644a9277f5a
 DIST mysql-extras-20171108-2050Z.tar.bz2 313241 SHA256 a8ae0806728f5308f96fe07fe2348b9c72629968e6480ae45995ca0a3693b9aa SHA512 830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6 WHIRLPOOL 7ea7aabe9fc93418297522529c2fb0cfe43c7c28019000c25e100838e8ac545cab0611a08f2931157b99acee9704c441832e037c28232079e57a0718ddb4591c
 EBUILD mysql-cluster-7.2.31.ebuild 4305 SHA256 e4b578bf70f23321a3362e6f513c9272611665c7019f5bbe581930eae2860a5d SHA512 930bd60377563298a1b596685c2b5bf43d995415f06fc8f6b9e1e10c97cbbe43a97de255450bb177873033b99bf303bc3c4fa41bef124d2b29a7767923b39a24 WHIRLPOOL e4f180d633dff3e5c43acd71dce449f2fda25105198980a496f0a10d0f5c19a93c8da7501fdea0a4e49ba2a7949c16173bce7415c2fe6def80cf6e94439c90f9
-EBUILD mysql-cluster-7.3.19.ebuild 4762 SHA256 b3af371f9a9f1fe681f433348b2b6bbc6077ee7af73286aa64a869a4f718a4b2 SHA512 3b5662b84dd23c3fe0c37979679e9446982f3db15b22d4ed3a9dbc2a4c48e8dbecb3b9ac7cc9f385cd0c45c896d25d2257aee184bad7910f8ad5f450f07826e0 WHIRLPOOL 770c991029686f7d2d3d08ec649dadb361ecaaeeac12e41f74864c013bb0149e426a3588a1e70f2978e704030051a2acfc99522ad3c8c23907e4ff91a7d841d6
-EBUILD mysql-cluster-7.4.17.ebuild 5532 SHA256 9cf84d8f1db31fa729377d30e45cb318ac9dceafefdcdc1f0d37b34b72a82e07 SHA512 32506c81247fdb28bb58dce50a8bf908bbda50d25b99ee8f7f8474a9009c1d0804d306fcaf59ef94d576364f036c8640c9e9cd8be8e5d3c751fb2d6e7ba92cf3 WHIRLPOOL 3de45e125d2c000d97b1e70e50c6e10a428692a452015ecf5125b91bce815c076af27a5a240942f4154399800e8d88806d825c08720d40a3f09f18c5f8cf08ce
+EBUILD mysql-cluster-7.3.19.ebuild 6237 SHA256 3c149227efcaef774be8fc1afac0de83cc9ef3ef7319c725625335d14379cfdf SHA512 a805b952e034f125511806c6e98d38e2612cf46cf6d55fc6e504f488335b429587ae8fa45e0c5a955c4a5a22db005d2d33657fc8ff6ac9dde4ae3b8873bc95ec WHIRLPOOL 66c1e5d160e8fd715cefb2e629a8d315b9c4797614d2dbbb94ad89dd94618be77cc928999e0e33201bb44530a28ed0505e8c19d8a862812656512b3074bd62f7
+EBUILD mysql-cluster-7.4.17.ebuild 6237 SHA256 3c149227efcaef774be8fc1afac0de83cc9ef3ef7319c725625335d14379cfdf SHA512 a805b952e034f125511806c6e98d38e2612cf46cf6d55fc6e504f488335b429587ae8fa45e0c5a955c4a5a22db005d2d33657fc8ff6ac9dde4ae3b8873bc95ec WHIRLPOOL 66c1e5d160e8fd715cefb2e629a8d315b9c4797614d2dbbb94ad89dd94618be77cc928999e0e33201bb44530a28ed0505e8c19d8a862812656512b3074bd62f7
 MISC ChangeLog 4144 SHA256 07b9aaf673d386476ecf94e5efd8f36b29bcd6c03a8ed98477705cf1b8a2a04f SHA512 b6ba5accdb4963a66fd2ec137c5d35850d15a8da7891252eec32c381cbb93ffaa92c36d1c49a0b7545063eb58c3f9b79a75d1e5815d9890a403563601634242e WHIRLPOOL fd6aee40cc89ac8da2e1b33acb992963e6bc60f6f9f722ca5779047abb696c26e7dfcd4c07094887639005eb80f8ec699960399022804cf2320b4efaaccf49aa
 MISC ChangeLog-2015 2348 SHA256 343f777d9569de16f5ff95232ebc908eabee68ce641474776aaa8665357e498c SHA512 cc53b01580c21a312d77b59e8d653dcf3c2a8576cf8cf664784d94c60d266224155ed5a2b409c457f8104e05be56bfa449ffb526e42226ece9abd2549d481468 WHIRLPOOL 13ef8138e6c990e173c1042a8b146bcdb6d86121636c79f48226c75931bd3f36f0db0c9d55a348be4ef3e9ef3e7d3a4b00cd6450c524bcbb3472a474c48dc65c
 MISC metadata.xml 1657 SHA256 d9bfb8c2a39756a9f2fe07acd1d692f1b2464c955f7d747bec91a0b27e558448 SHA512 594c4282f0ca9fd8b207778f5fcb00397a8779564b95f50ac99b22f48a4df80372675243a62a68f6e026733a31a383c43820450eb3f00cb13bce974b7e7368ae WHIRLPOOL d3c3a59a78dec7ae522bfa763db03a5a514a29c3e5ee1ea1ef79125aac8cfc8edf3dfd8082a6d769a7c4a21f0ebc1ca2b7845aa3dcf9d2dc4b387ec82887b5e4
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
index 7a18a355e0a1..01e3c5a94122 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
@@ -1,38 +1,71 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 MY_EXTRAS_VER="20171108-2050Z"
 SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
 #fails to build with ninja
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
+inherit java-utils-2 mysql-multilib-r1
 # only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
+IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
+COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= ${JAVA_PKG_E_DEPEND}"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
+PATCHES=(
+	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+#	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+	"${MY_PATCH_DIR}"/30000_all_mysql-cluster-multilib-property.patch
+)
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
 
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+pkg_setup() {
+	mysql-multilib-r1_pkg_setup
+	java-pkg_init
+}
+
 src_prepare() {
-	mysql-multilib_src_prepare
+	mysql-multilib-r1_src_prepare
+	java-utils-2_src_prepare
 	if use libressl ; then
 		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
 			"${S}/cmake/ssl.cmake" || die
 	fi
 }
 
+src_configure() {
+	# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+	# disable until we see what happens with it
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+		-DWITHOUT_VALIDATE_PASSWORD=1
+		-DWITH_NUMA=$(usex numa ON OFF)
+		-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
+	mysql-multilib-r1_src_configure
+}
+
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
 # Official test instructions:
 # USE='extraengine perl openssl' \
 # FEATURES='test userpriv -usersandbox' \
@@ -45,6 +78,14 @@ multilib_src_test() {
 		return 0;
 	fi
 
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
 	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
 	local retstatus_unit
 	local retstatus_tests
@@ -53,7 +94,7 @@ multilib_src_test() {
 	# localhost. Also causes weird failures.
 	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
 
-	if ! use "minimal" ; then
+	if use server ; then
 
 		if [[ $UID -eq 0 ]]; then
 			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
@@ -61,12 +102,6 @@ multilib_src_test() {
 		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))"
@@ -78,6 +113,10 @@ multilib_src_test() {
 		# create directories because mysqladmin might right out of order
 		mkdir -p "${T}"/var-tests{,/log}
 
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		touch "${T}/disabled.def"
 		# These are failing in MySQL 5.5/5.6 for now and are believed to be
 		# false positives:
 		#
@@ -105,26 +144,31 @@ multilib_src_test() {
 			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
 			perfschema.binlog_edge_mix \
 			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load main.mysql \
+			main.mysql_upgrade \
 		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+				_disable_test  "$t" "False positives in Gentoo"
 		done
 		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
 		for t in \
-			ndb.ndbinfo \
+			ndb.ndbinfo ndb.ndb_tools_connect \
 			ndb_binlog.ndb_binlog_index ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo (NDB)"
+				_disable_test  "$t" "False positives in Gentoo (NDB) (Latin1/UTF8)"
 		done
 
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
 		# Run mysql tests
-		pushd "${TESTDIR}"
+		pushd "${TESTDIR}" > /dev/null || die
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000 --reorder --skip-test-list="${T}/disabled.def" \
+			--nounit-tests
 		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
 
-		popd
+		popd > /dev/null || die
 
 		# Cleanup is important for these testcases.
 		pkill -9 -f "${S}/ndb" 2>/dev/null
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
index f7d2b65e0eb7..01e3c5a94122 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
@@ -8,15 +8,15 @@ MYSQL_PV_MAJOR="5.6"
 #fails to build with ninja
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit mysql-multilib-r1
+inherit java-utils-2 mysql-multilib-r1
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl )"
-RDEPEND="!media-sound/amarok[embedded]  numa? ( sys-process/numactl )"
+COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= ${JAVA_PKG_E_DEPEND}"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
@@ -30,12 +30,20 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/30000_all_mysql-cluster-multilib-property.patch
 )
 
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
+
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+pkg_setup() {
+	mysql-multilib-r1_pkg_setup
+	java-pkg_init
+}
+
 src_prepare() {
 	mysql-multilib-r1_src_prepare
+	java-utils-2_src_prepare
 	if use libressl ; then
 		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
 			"${S}/cmake/ssl.cmake" || die
@@ -45,10 +53,19 @@ src_prepare() {
 src_configure() {
 	# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
 	# disable until we see what happens with it
-	local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 -DWITH_NUMA=$(usex numa ON OFF) )
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+		-DWITHOUT_VALIDATE_PASSWORD=1
+		-DWITH_NUMA=$(usex numa ON OFF)
+		-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
 	mysql-multilib-r1_src_configure
 }
 
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
 # Official test instructions:
 # USE='extraengine perl openssl' \
 # FEATURES='test userpriv -usersandbox' \
@@ -61,6 +78,14 @@ multilib_src_test() {
 		return 0;
 	fi
 
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
 	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
 	local retstatus_unit
 	local retstatus_tests
@@ -91,6 +116,7 @@ multilib_src_test() {
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
 
+		touch "${T}/disabled.def"
 		# These are failing in MySQL 5.5/5.6 for now and are believed to be
 		# false positives:
 		#
@@ -118,16 +144,16 @@ multilib_src_test() {
 			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
 			perfschema.binlog_edge_mix \
 			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load ndb.ndb_tools_connect main.mysql \
-			main.mysql_upgrade unit_tests \
+			rpl.rpl_plugin_load main.mysql \
+			main.mysql_upgrade \
 		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+				_disable_test  "$t" "False positives in Gentoo"
 		done
 		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
 		for t in \
-			ndb.ndbinfo \
+			ndb.ndbinfo ndb.ndb_tools_connect \
 			ndb_binlog.ndb_binlog_index ; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo (NDB)"
+				_disable_test  "$t" "False positives in Gentoo (NDB) (Latin1/UTF8)"
 		done
 
 		# Set file limits higher so tests run
@@ -138,7 +164,8 @@ multilib_src_test() {
 
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
+			--suite-timeout=5000 --reorder --skip-test-list="${T}/disabled.def" \
+			--nounit-tests
 		retstatus_tests=$?
 
 		popd > /dev/null || die