gentoo resync : 10.11.2017

5 files changed, 179 insertions, 9 deletions

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 3c36194a10ab..2455399fdb8a 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,10 +1,12 @@
 AUX my.cnf-5.5 4732 SHA256 c016291a43c4fddd535fe8b6a27dcdb6b960cc41be47ee8f4494928cf7858c59 SHA512 617d5be2b84eb6207c8e26db15597f3477d69aed756b05897f5ac3b7df4bef599ed932e4b27f39ac20272ea5907b31ca42e01f2b317899bdbe19db7b7c4dfc2d WHIRLPOOL 8d6d9a6356f4834a3676019ad862ad24aebc77ef8c211ef02719f41e143648da81608328d1e030107faf6f2a3792dcd731ea3a8cabc2a786608604ec62775b85
 AUX my.cnf-5.6 4504 SHA256 d6bfb754105464643f8f2efa14337c2f78a6a6e7e812e998b2ebcdd4b7c6f450 SHA512 866aa700460c2962bad6294b271efad09ef285dd428ab01551078be9972d2f961fbdf56aef7927439784711022e92a96f2eba30cd297f056f6562e8817c89aae WHIRLPOOL c91bb1ea6ef0b974377a60ef7ceb434ffcbf46d3fb57412deaa92930ab83e57bee3771b44a7b374f1df02211562ed5296182a218763145a7c41d96aa9b709afd
-DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e WHIRLPOOL 1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
-DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5 WHIRLPOOL f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
-DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a WHIRLPOOL f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d
-EBUILD mysql-cluster-7.2.22-r1.ebuild 4072 SHA256 59707164db3dd16798912ec03123fe8089476f6523fe7e399399f303b9eca401 SHA512 80fc2e252b524e981626ba617157b83f17f5c3508f930b6946867146d45795b7af04406d1b06ddab5c7b908751b5cd894bdd65c45f343539ec8700d8bca602a7 WHIRLPOOL 077136326af7652f90d766e5d1d725f33298d20c081e49cfd52e8e0d58b9f32f84df56c5f5390cfe12ea77ceee248a5837959e477f385b657c2c8f3b7edb103f
-EBUILD mysql-cluster-7.3.11-r1.ebuild 4704 SHA256 ab09a1942a00f72b4adcc256ffda39757c7c04d6e105d47aeb8ea73b8f575134 SHA512 6b2baae1c3e9c878d4ce37d33afd282cfa11d9479ab37d0f5287571c2c744e4f56d9ccc89118262038b30e706f6e9e9ce7c269ee71530b59d8a4ae55de9e2e70 WHIRLPOOL 4020a60de973e555cdf4b43b0a7de74c55fc86fca2fe796cabd010adb242e1464b8edd8e92c9ef094b3d9ec64cc1c44e092facd1d34678d6f82c51f30f1447ab
+DIST mysql-cluster-gpl-7.2.31.tar.gz 25109340 SHA256 d798180114d8c1966abb86c798fc8230d50df478e73f1e2c6fbdb7ffb4cdd9ba SHA512 ab6a7ad2bb981e8351d1d337eb0a75ad952da6f100a6c17a02c629936c4a3bad5701ead6ccf9b912ba0412d3442b6ad87c8e0c5409b84f10af8ec86a7c44b881 WHIRLPOOL c53a32c42f0a3c0c8848d20fa4d66f778926221ef381c8a26ccb60c07126a55af8c77f712cd71462b8345367c3c9e3d03b2b83b06f68b5bddd046328d755965b
+DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 SHA256 53b6692d25ad85772c19593f8b098c9ad26b7d8acd4a74db5f8308567e214aad SHA512 2d12124ec6b7ffa904538f21b676b15e093b3720d067b6eaffe609310ffd6261308ddcfbba4ce259f73d8e905f96bdcd21c5b7ec8fb940d2e9a8ec64c0f397a3 WHIRLPOOL 308ccc771acc72ec9558510edb5491a775a76afb5455cf98f942229d3d706a087aa38d97beb9bc2acbe3248c10893841764f08fdcb29ca47ca830c8c661cf369
+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
 MISC ChangeLog 4144 SHA256 07b9aaf673d386476ecf94e5efd8f36b29bcd6c03a8ed98477705cf1b8a2a04f SHA512 b6ba5accdb4963a66fd2ec137c5d35850d15a8da7891252eec32c381cbb93ffaa92c36d1c49a0b7545063eb58c3f9b79a75d1e5815d9890a403563601634242e WHIRLPOOL fd6aee40cc89ac8da2e1b33acb992963e6bc60f6f9f722ca5779047abb696c26e7dfcd4c07094887639005eb80f8ec699960399022804cf2320b4efaaccf49aa
 MISC ChangeLog-2015 2348 SHA256 343f777d9569de16f5ff95232ebc908eabee68ce641474776aaa8665357e498c SHA512 cc53b01580c21a312d77b59e8d653dcf3c2a8576cf8cf664784d94c60d266224155ed5a2b409c457f8104e05be56bfa449ffb526e42226ece9abd2549d481468 WHIRLPOOL 13ef8138e6c990e173c1042a8b146bcdb6d86121636c79f48226c75931bd3f36f0db0c9d55a348be4ef3e9ef3e7d3a4b00cd6450c524bcbb3472a474c48dc65c
-MISC metadata.xml 1480 SHA256 5f8896f7960f7c265619b41261ff6fccfbcedd29d9a70c4d6f63f960e40d7c50 SHA512 cfb6a753bb071b39f52e8db35b07f70efeae4cb943d57d010a6d42a641c50b6f28b38bf4068536b3c70604da1cb5a428ea5525d0c776ef46cfc4c4c5a37cbbe4 WHIRLPOOL 76bea8ae26e55982611ee7fa24767692327eb53ef386fa11cd128d5e1918e1eb25f639b9a581e83b4c0ce51b8c03630e80ccd3f0a6b1dfb15cc17ba7fc7d6935
+MISC metadata.xml 1657 SHA256 d9bfb8c2a39756a9f2fe07acd1d692f1b2464c955f7d747bec91a0b27e558448 SHA512 594c4282f0ca9fd8b207778f5fcb00397a8779564b95f50ac99b22f48a4df80372675243a62a68f6e026733a31a383c43820450eb3f00cb13bce974b7e7368ae WHIRLPOOL d3c3a59a78dec7ae522bfa763db03a5a514a29c3e5ee1ea1ef79125aac8cfc8edf3dfd8082a6d769a7c4a21f0ebc1ca2b7845aa3dcf9d2dc4b387ec82887b5e4
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
index 9dc67c64a895..0efe3d7675fa 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -16,7 +16,9 @@
   <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <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="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
   <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
+  <flag name="server">Build the server program</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name="test">Install upstream testsuites for end use.</flag>
   <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
index 09d32b5a664e..d5e946e39e0e 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.31.ebuild
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-MY_EXTRAS_VER="20151117-2040Z"
+MY_EXTRAS_VER="20171108-2050Z"
 BUILD="cmake"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit toolchain-funcs java-pkg-opt-2 mysql-v2
 # only to make repoman happy. it is really set in the eclass
@@ -14,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still
-#EPATCH_EXCLUDE=''
+EPATCH_EXCLUDE='20006_all_cmake_elib-mysql-cluster-5.5.37.patch 20008_all_mysql-tzinfo-symlink.patch 20019_all_mysql-5.5-mtr-perl-deprecation.patch 20020_all_mysql-5.6-events_1-bug-78899.patch'
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="!media-sound/amarok[embedded]"
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.11-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
index f8fb8c1896af..7a18a355e0a1 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.11-r1.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-MY_EXTRAS_VER="20151117-2040Z"
+MY_EXTRAS_VER="20171108-2050Z"
 SUBSLOT="18"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
 # only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
new file mode 100644
index 000000000000..f7d2b65e0eb7
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_EXTRAS_VER="20171108-2050Z"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit 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 )"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+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
+)
+
+# 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
+
+src_prepare() {
+	mysql-multilib-r1_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) )
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='extraengine perl openssl' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-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="${CMAKE_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 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."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+		# 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}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysqld--help-notwinfuncs_1.is_triggers \
+			main.mysql_client_test \
+			mysqld--help-notwin \
+			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 \
+		; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
+		for t in \
+			ndb.ndbinfo \
+			ndb_binlog.ndb_binlog_index ; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo (NDB)"
+		done
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# Run mysql tests
+		pushd "${TESTDIR}" > /dev/null || die
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000 --reorder
+		retstatus_tests=$?
+
+		popd > /dev/null || die
+
+		# 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
+}