gentoo resync : 06.12.2017

2 files changed, 39 insertions, 6 deletions

diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 7d4265446e53..552ea64d8477 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,6 +1,6 @@
 AUX my.cnf-5.5 4795 BLAKE2B 0b8e6af4bcbefd600a85b7a12ca66af07d0a261a02da5067fbf162cc9ccb9e236dc5ca68474512307227666cfa2c5fe8f885f6318e44ba75efb6251cbef1cde5 SHA512 664b81a1621507104fa843fdda01c3bc60e1f39a6c397329ac8a9f00a63d9298b656d374b819b62ba0de5c1a380e9b16b75ebeaaa2d4614274ff2c168cdc5736
 AUX my.cnf-5.6 4568 BLAKE2B 633cc45bcc751046ef766dcabd1c8db2cd474f13cde436d41698a810787bc52cc8c11aee79c49ed884f4b01ea26fad11f9ffab08471eb10d6752007fd44d372b SHA512 498826f147ad01615358111511c88f671ff823c400782dbad5f359aff99fa88a7be66e3c3b42fd58a5634f17e12f6a18e1896340f1a5a7acecd75320671c3a10
-DIST mysql-extras-20171121-1518Z.tar.bz2 313539 SHA256 1afb0cd5cd7eb71b0cfa34d6f0b970ab3e00f8a3ab08a6a09a8fb829c4121f01 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda WHIRLPOOL 67b7d6b4239b43f906477624137946c015f7d1430e309874858d40c8c55dfb633ad1f116b7bb08057c924c5a92a66a296016273ae984ba13d6c5d89ae1e054fc
-DIST percona-server-5.6.37-82.2.tar.gz 56296960 SHA256 3cf04b64c8bf5b9cc1ea1a68c54ba77a4709d9c9051314e70a4cbd4c904da702 SHA512 38905c2429bee6e6ba9c35b232c87c27c414726b349ff5a878cc94bbc4a333bbf76019478f8e82a10274ffeea5ac71c4520ff534cc434c4844b496b48801ea4e WHIRLPOOL 9e3988072d00f60af467a21092cc737529bd9250ce4ebbfa20834455791a3fb093b11da8bb845bd62e3fa33ad37e63bfbda483139700bd4147e1b7be64578659
-EBUILD percona-server-5.6.37.82.2-r1.ebuild 7481 BLAKE2B 633b0e8224eb288c4fcf78494d9ffa8c4f7755540e40deeddc5f780439abc5a91d3f492c238b2e4827d0792aaa7c6444a279b06f0b751a1a5c651bc02d85a8af SHA512 7a015cce010f6528ff6be5e032dbc8db3af20aaec08e47297152704ad3b338285bcfbda25660b133128bc3f6ee1211bf85208eb9a030cc252d5155c8d275abcb
+DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda
+DIST percona-server-5.6.37-82.2.tar.gz 56296960 BLAKE2B 70d0c40c96be3c3f674466d2406b5622a7a37cc59d9daee7f0315ce6dd2ce13751f48d440646a0f377ca86aecd6bc749d050ab4f58bfa7400bcd35167ab8d480 SHA512 38905c2429bee6e6ba9c35b232c87c27c414726b349ff5a878cc94bbc4a333bbf76019478f8e82a10274ffeea5ac71c4520ff534cc434c4844b496b48801ea4e
+EBUILD percona-server-5.6.37.82.2-r2.ebuild 8859 BLAKE2B 162163f63ec4f4c6c82f914bdc4cf8912fdb32714037f08ef4fb4e3d1374edc87a7a8d0098c26193eaf8c963c3892730ad3fff98073b8a465d773499f857a451 SHA512 d896ab7598c072e39e7cbe322d019350052bf0a9dbd296bd6e7ba0d1ff81d5d80d279b6c4a8f5d497f7588800de91cd314db43a300b413cfe0c36fb5d280adea
 MISC metadata.xml 1505 BLAKE2B 63c11ed734843c7f07a7b71525f21113828cf7bea4fe9f15cbfde952f5e27fbeb8ad1942306a3224478c1a2d19f2ea22d26ee124db19fa7122d573095f98847e SHA512 0ccb7a31827fa15606e060522daf9364bc843a64cfca8538292e989546e07784ea7a8af54ea7a1b02675c64515a1f2225b22971cda4110610836770d1ff33dd6
diff --git a/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild b/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
index bb675e545336..e56e97809f8b 100644
--- a/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
@@ -5,7 +5,9 @@ EAPI="6"
 MY_EXTRAS_VER="20171121-1518Z"
 SUBSLOT="18"
 PYTHON_COMPAT=( python2_7 )
-inherit linux-info python-any-r1 mysql-multilib-r1
+# Build fails with ninja
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit linux-info python-any-r1 mysql-multilib-r1 toolchain-funcs
 
 IUSE="numa pam tokudb tokudb-backup-plugin"
 
@@ -25,7 +27,10 @@ COMMON_DEPEND="numa? ( sys-process/numactl:= )
 
 DEPEND="${COMMON_DEPEND}
 	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
+	test? (
+		$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
+		dev-perl/JSON
+	)"
 RDEPEND="${COMMON_DEPEND}"
 
 REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc )"
@@ -51,6 +56,15 @@ PATCHES=(
 pkg_pretend() {
 	mysql-multilib-r1_pkg_pretend
 
+	if [[ ${MERGE_TYPE} != binary && tc-is-gcc ]]; then
+		if [[ $(gcc-major-version) -gt 6 ]]; then
+			# https://bugs.gentoo.org/639936
+			eerror "${P} is incompatible with >gcc-6.x."
+			eerror "Please use gcc-config or package.env file to switch to <gcc-7.x for this package."
+			die
+		fi
+	fi
+
 	if use numa; then
 		local CONFIG_CHECK="~NUMA"
 
@@ -193,7 +207,26 @@ multilib_src_test() {
 	pushd "${TESTDIR}" || die
 
 	# Set file limits higher so tests run
-	ulimit -n 3000
+	if ! ulimit -n 16500 1>/dev/null 2>&1; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
 	python_setup
 	# run mysql-test tests
 	perl mysql-test-run.pl --force --vardir="${T}/var-tests" \