gentoo resync : 03.11.2017

3 files changed, 12 insertions, 8 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ca4690396016..f10cf6ec1623 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -11,8 +11,8 @@ DIST mysql-extras-20171018-1948Z.tar.bz2 313540 SHA256 6b910637f7ac2d5132154357d
 EBUILD mysql-5.5.58.ebuild 4402 SHA256 f90aaf2c42115fd18c583cc2069f7d3e8a9525dfd9633456f4d24e024620cd3f SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916 WHIRLPOOL c7d790a65fb55a1676bf079ed8c18c710e41958a72cb9678c88a756a3d96d6894ac3adca9933b3ad3728bbae5ebebf3979b28146b0b5ee6bd1276fc675f85611
 EBUILD mysql-5.6.36-r1.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730
 EBUILD mysql-5.6.37-r1.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3
-EBUILD mysql-5.6.38.ebuild 6233 SHA256 59e4e3d8a7529b8ad6d382045f283ff4f96b6c48940f82a0eacb57b7cce604c3 SHA512 f20d08986a7259cb402d4f6207f6a67eba1c3257507a083a0f11c14f7741235bd76a3feb17d102ead26e5dd1d36eafa4853f1163632204df72ece15e3743b0bf WHIRLPOOL 33761b4d5dbb9a7a9d36cc8d9abb02e471d2769e0b92bb2ccf199b9a373a6129bf2ef8eeb42585b279022500636df060677f1e16131fc07aa777eabe1921fcb1
+EBUILD mysql-5.6.38.ebuild 6362 SHA256 528bf9ebea455f90b01b726e142f51431c21e9eb9c913bebe38f50ed3b62a08b SHA512 8c9813ea4c8d289d7293f2ff0f991e51aeccd44bfd5f33956e99cbe8f71a94b95ebc0c86517c8796e201068f94a740c4eed8fc6bb8bc19171cbfb512ca909606 WHIRLPOOL 1337b2a3576b8076f6d19c6f21ffe240945b5fee64cf6ac93827d5151399b66970504d4025d6d830b646ad9e5f418adf2a229271481d9993f5530a4b2b65f6f9
 MISC ChangeLog 18776 SHA256 3ff64ef7497a470510146081692817768857fd4f297b98a184202f5fd06f0a47 SHA512 bfcb679245574135e7e0b7f0592771954bba01b6977ca4ffc8a37de181fb7fb60e6bd8b7c23cee0d41c4397341d282f28d43fed11eb176f12178123e0f8032e4 WHIRLPOOL c4601fb0d1ac3238f2d69a439463d66a67d843c197a55f4d9b436493e979393047b9549053fa00b46a3ed3719d72565ebad38c35ace3abab145e751212c047a8
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f
-MISC metadata.xml 1654 SHA256 16592a197951904e3eb76dd8c1d3aab1017ad91bc7f00075eee29739987ba324 SHA512 18a59971c3eb563ca835c61719b67a4466abbacbbf13139acda8fd3a3197eb40d15d1b230b0514472a53c7870a3dbdc1b875c83842737fc4e91a077b2507704b WHIRLPOOL e2aa493c466978bba4b1ff6b9ecdf9d7595f2930995e1da5c535d3a863881e174524138665762213ebe4794bc057082ee88344c5b96c460c59167bd2d4e14ead
+MISC metadata.xml 1777 SHA256 f21f0c4cd84c90f568c8ce06d53fc35ce28817d5a3be185ed4196dbbb3e1aa3c SHA512 089e8752a6658ada634a019a4a77cdd70560ef001d9f7e83d38b0818253563f2819c3fd78186b6194b3dd3c34b2103ca75f7cd60d6a8a84f96041f338d771eb5 WHIRLPOOL 22777c696f8dd443872f6c5627932d89280af7c85efde3d9176602a4753f9d9b1020e87839b636a96fe190c31991b898f383f597eb3730c418f4b1d3c67ed499
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 8e45aa661e8f..83ee85b777f9 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -21,6 +21,7 @@ dev-db/mariadb
   <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>
diff --git a/dev-db/mysql/mysql-5.6.38.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild
index 050b1e092c8f..01d0263e17be 100644
--- a/dev-db/mysql/mysql-5.6.38.ebuild
+++ b/dev-db/mysql/mysql-5.6.38.ebuild
@@ -13,12 +13,12 @@ CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit 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="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl )"
 RDEPEND="${RDEPEND}"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
@@ -38,10 +38,6 @@ PATCHES=(
 # 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
 
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
-
 src_prepare() {
 	mysql-multilib-r1_src_prepare
 	if use libressl ; then
@@ -50,6 +46,13 @@ src_prepare() {
 	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='server embedded extraengine perl openssl static-libs' \
 # FEATURES='test userpriv -usersandbox' \