dev-db/percona-server: Final touches to new revision

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

2 files changed, 23 insertions, 25 deletions

diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 9d4c986..9ed8f85 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mysql-extras-20180312-2011Z.tar.bz2 319047 SHA256 5d83747593b2276ecaf253b193814df2bfe170de57ceb7565e3d9f215df92254 SHA512 b0aa9fc8fbc050451ef147cee99b00cf10d34a71641837821e78655241f7d79a94fe2efb4cef9a23fe9741e08ada2fc0b58ef3b3663752bc567babfbcaa547c8 WHIRLPOOL 29085d38c285e62fa5925e70e01fda98ce5582e660b84fa09992049b5c222d1c14e73b94c63cb754bd94df00ce154b24ea5d4ee472de1766b6941cb05503c493
+DIST mysql-extras-20180329-0129Z.tar.bz2 319349 SHA256 28a78255c5394ec9ce67c051bbef544c96abdd9aa38fc7036d4e77b9dd154001 SHA512 6cd96b2cd3d1361fc838f6914b630ec24595849344ac2f54bc96bfcad64a38eca6562a76f26b92ecdf4c75ad7b874530181555b8a72b25f30bd49bf3eb08bd73 WHIRLPOOL dbb2d84367da842c4eb53b4a925bad60cd0152d2950afad62c758e47eb13a96410a7705b91b58b7704fc192980794fdda4a6ecdff05090e95c20508b59d666ab
 DIST percona-server-5.6.39-83.1.tar.gz 56307662 SHA256 48939062738cd5e7769381e31ec581492317ff48c19d0b7ce362e0e61b5d01e2 SHA512 d014bc0ebf8d8f1842b4a79eb0a868e3c9e0e33d3eb3cbf301b5504dcb341e1f2a0d6c2c4003666f59fbf75eb274356ee6b059ff2cddf2b457143ee5e1aba471 WHIRLPOOL 505b784cec2ef81e9bb82c73efb9ae465463b93e465ba6b4e2ec21f55d310acea4b4203dcba8a7e39ad0c8d4060a94c9eab6a26f5f4bed1024e1a81212246783
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlq78tlfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlq8Q11fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7YObQ//czIaC6V6fDr/k1phFto282lp04HFJkt2xRO2eKoIuGZMx9Q387Lx3pkN
-HYJ12tUzAHXwoFGFHnFyi4KM4l3lr35oiNWbsDhov6mpkFh5NBerBeC7sVw4R0wF
-n620tlgSU7i3YmA8iH2ZXoSfg4nud1cA4KKziZiHWFs3LNOe0XX2IssUuisWRLbF
-Ki4jpP9HwK/LV1DqZm7KtFKzUUxhkfKWh2Y7ZNGV+u/q09r+GKdwEhZX0j+lz8Cq
-Pau8wTFbQMFRAlu3Ei4lwL2jmjClg48V7q90nuyvDnqXsboQUBBmXfXIoAQhrOpM
-OgExtfgjvljHRj6z5oaqvkeWoOY9qgh8+5dcNNadZZXNYnxGlAy0+ennrHeImZQ6
-IbPxpytFvFY7Ak1VLvyUnv6JeIKNWkEHCyiYFUN/HGvr/7RhtIic2Na/wbF7YpVr
-yzaMbLecQ3L3i7ZqY8zNdgrG/4WJoIPMCJbZ7xcQaG18LGmF5c3WtbwZR7TDFwc5
-l8ub/UH23Ds9BSpjmt7Hqcs2qKKsal2Jb3sazakDkPpqgBkuawp6g7jCpRQ2AdR1
-Rz7R/9G95EbPuc+28wGm8wVSinbfwGUUMjO7Td+k2MX4LMvbq89qaPWd9PiTY1sz
-Wo6Ss7b5GDv87BDdFtrsSEt9UD0jGR5oOYRA05NAeNRChXg2yfU=
-=ErVg
+o7ZayA//S96Ao7rJ/2L35OmI2vsXOLUZ8JGlNhhc4of7M1VWwVBab2yKYBaTwYau
+C/kLH/zYjTUYCkUYUL8pQJd8Tb353rPcp1HJIyTF10g3QgxTr6QzNCqcg2pJwRui
+wkqAsUVP64EX6spUMlngWWxREywn/p9GsFi6MZUJ4QK8V/7yRMg+gENl1oPq04Vl
+fw8HQn8LICRbLfhSjdaLcFxQr2TJBoTXBg7LAT549Q1jfMNZpt3zvhrI1/IWIrvr
+RM6QTwUd2viJl8OMmTEVl5pZ5dJMW6jiUIazu5IG88lcPastN4iamdjiDWjxKZcB
+ASfRReG9Jgu9cAshTsqlSOsUZgqwRE0cbZ0q4r/Sy4/ekIyRNZy3MxfsmZtf9vmr
+LfQ1YWwtLvff/k1LbcCm+BAC34KcyYHtbNQtM0kcbGx1wB7MUWIgqT2hHDB1D1IC
+XskzodgGwPTuZaAEZjL5o4PA9qy5qYUFBTS2szhRPBfHgvDAnP9NB47jDutjllxz
+slG2f/aQFKRvuqyXG7wGyFi8nsSaCLWmyjIoQjltYOcK+147liPbbCMgB9r26/QS
+kyXnLfkac8cf/utdYXilr37nFOZnQR3BZm5tDXXGrdOLINv47QB1oYwAdx4W0kOE
+oyeQ2DzjyNikXpUZzfA/cniu+Q+qOHEM0+U1eJrKwKb1uS+rLz8=
+=BeQ7
 -----END PGP SIGNATURE-----
diff --git a/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild b/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild
index 2083794..d422eb5 100644
--- a/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.39.83.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180312-2011Z"
+MY_EXTRAS_VER="20180329-0129Z"
 PYTHON_COMPAT=( python2_7 )
 CMAKE_MAKEFILE_GENERATOR=emake
 
@@ -57,11 +57,10 @@ 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}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.34.patch
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
 	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
 	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
-	"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.39-without-clientlibs-tools.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -298,6 +297,7 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_SQLBENCHDIR=NO
 		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
 		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
@@ -401,6 +401,7 @@ multilib_src_configure() {
 			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
 			-DWITH_MYISAM_STORAGE_ENGINE=1
 			-DWITH_PARTITION_STORAGE_ENGINE=1
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
 			-DWITH_INNODB_MEMCACHED=0
 			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
 			$(usex tokudb '' -DWITHOUT_TOKUDB=1)
@@ -534,9 +535,8 @@ multilib_src_install_all() {
 }
 
 # Official test instructions:
-# USE='perl server static-libs' \
 # FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild percona-server-X.X.XX.ebuild \
 # digest clean package
 src_test() {
 
@@ -616,12 +616,10 @@ src_test() {
 		fi
 	fi
 
-	if ! use extraengine ; then
-		# bug 401673, 530766
-		for t in federated.federated_plugin ; do
-			_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
-		done
-	fi
+	# bug 401673, 530766
+#	for t in federated.federated_plugin ; do
+#		_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
+#	done
 
 	# Set file limits higher so tests run
 	if ! ulimit -n 16500 1>/dev/null 2>&1; then