dev-db/mysql: Final version of 5.7.21

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

3 files changed, 37 insertions, 88 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 35a9450..33b27be 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,25 +13,25 @@ DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
-DIST mysql-extras-20180308-1938Z.tar.bz2 318238 SHA256 d4545caff9bf9efb9578cacbb0435a68fe5d84a9f35b642f0c589aa088c67c27 SHA512 12e39c97ebb23e8ae3db5f4a344779fe47f59e32d7e39258f1d8f527ef5ab7470cd6dda0b2980f67472ae4a10a21249aed87eeac18e7fea58c22aebd7f838d2c WHIRLPOOL a8e5d0d390d642114ff63ae0ef1f4ff896d151186066a67cb918e0923d87a69ea2fd7ecbe22d5c9824c44d92c612a3165cffd6f2ca1fb5fccfd66d3c3f46ac07
+DIST mysql-extras-20180312-2011Z.tar.bz2 319047 SHA256 5d83747593b2276ecaf253b193814df2bfe170de57ceb7565e3d9f215df92254 SHA512 b0aa9fc8fbc050451ef147cee99b00cf10d34a71641837821e78655241f7d79a94fe2efb4cef9a23fe9741e08ada2fc0b58ef3b3663752bc567babfbcaa547c8 WHIRLPOOL 29085d38c285e62fa5925e70e01fda98ce5582e660b84fa09992049b5c222d1c14e73b94c63cb754bd94df00ce154b24ea5d4ee472de1766b6941cb05503c493
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlqmfLJfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlqm4mdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7aiQQ//cdhAxZAmpHf6hGttdAJNFJeVRBW6RssniKDmf6iShXQJxs9Q7zcJOPge
-rw+RwOzIitT6NhKiYKGRRbTVjBWGceaex3TL0F1Hs0umH0si2I55c6VbrivkzIn+
-nzYdqTy9k/92CISHIAUamI4AZN4y2xQ39PeyVytHTMFCjBOakK4o4amDvWoEUsB7
-cs99cIY7p7mgyJohyjV9nqDiK9B1Dx9PKTSIBPH9WE6OUFEhAEmnRLEcP6hkNWoK
-RajNhVTl4/ja/ElYG3QqhmylP21rXnGP0ph1E6ROp03EK1GEn2EPMYUCR26fKYtx
-6G5E6uwtfcfN2eoZ8GYZhL+bf1YettIQCgYPTVmtYnMa5/I+DUWpx46SvXYVYg3d
-npWfC83FIq3GDO+h4gvZF2iz98evyOwzalXweemq2ofps1tbnJshPoHTmreBKtMx
-c4W3VVBk3+g3Uq/MzB3Poe4qZ5eqSjN1crSrFB0QGgR8hEf7jTYSTxaIT2ufY18L
-J4wyofyVblJJiNd6MiBolgibsxmr4nrCRwqe+49oKZZXuAQ7BCxKoB1huuISnf8I
-z5G2chfOi7aaiBFtuGiss2vUHIRTnVtLYD1N4VbjlDnx5KTiAmlwPVyeDp44VvC7
-9HkjiceozloXBOhAS0oVSyhVZLiHqY99ICBSGLNJ2+JKQwNe9Sk=
-=qsUI
+o7ad7Q//RtIMkOS207JdXNF9CIwO7CneIsjI/Vft1P6eucBHVGJsd35bD4i4Q6om
+VNqhfStQAY1c8dnsCEsJIUE65jR03YXQKgowsxCZYYgo+QnIL7FUM4ISAKVtWzrJ
+dOYmpSu/qpdMjP8nowkju4+uGGhLNMFIKwyxBJHxigRabn1ZF/f/OskRzKqFOWnY
+ULeFcCR6NByphZ9G9Qmj59AwLs85ND3Vd9meoRW07pkqjlQBCr36DY4/6SkuUnoY
+7cGpsii09BIDEXhZg5Egy3EsY3LfAVdVjewkFcNHNTnCsjvrVewKMPc+akHdOx3R
+FeVQHPLSSXRvJEPGUihL6dLgVWjdpPdZBWDBzRMNbrrlq/JfL8+JTN3PdKTg1wDy
+IIkZgiNydz7gT+oYrd6k+yIWI2TeOFTjDEEwZsxQg8M73Rf77UrzKNEFYgs8mBfa
+CNSdezlbXwwNS2CKFt3MK46Eu3YjvTqSDztkbHcqMblWwJWjEMcQrrPBq48GL9Lw
+byrxAcoEs+rsfQn2ucULMeM/nYQk43izavauR5J9AKByXqBUEUt5SA9gYP32d+QR
+VznQEIwky+Bk/zT/BPepCmH+k829Ap7izpWm425Ue9B8titpa+ATr7Nz1CLH3Jh0
+nOeglQVAnRk/lx63U9dlx8ORhO4jonz9RwdrgxM+tJfIKt9kFe0=
+=xvZh
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 9c8a620..c89ecc4 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -12,9 +12,6 @@
   <flag name="community">Enables the community features from upstream.</flag>
   <flag name="embedded">Build embedded server (libmysqld)</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag>
-  <flag name="innodb-lzo">Enables lzo compression methods for InnoDB/XtraDB</flag>
-  <flag name="innodb-snappy">Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
diff --git a/dev-db/mysql/mysql-5.7.21.ebuild b/dev-db/mysql/mysql-5.7.21.ebuild
index dc87677..b82d76e 100644
--- a/dev-db/mysql/mysql-5.7.21.ebuild
+++ b/dev-db/mysql/mysql-5.7.21.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180308-1938Z"
-SUBSLOT="18"
+MY_EXTRAS_VER="20180312-2011Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
 # Keeping eutils in EAPI=6 for emktemp in pkg_config
 
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+inherit eutils flag-o-matic prefix toolchain-funcs \
 	user cmake-utils multilib-minimal
 
 SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
 	http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.tar.gz"
 
 # Gentoo patches to MySQL
@@ -28,19 +28,14 @@ fi
 HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="client-libs cracklib debug extraengine innodb-lz4
-	innodb-lzo innodb-snappy jemalloc kerberos latin1 libressl
-	numa odbc pam +perl profiling selinux +server static
-	static-libs systemd systemtap tcmalloc test xml yassl"
+SLOT="0/20"
+IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
+	+server static static-libs systemtap tcmalloc test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
 RESTRICT="libressl? ( test )"
 
-REQUIRED_USE="
-	!server? ( !extraengine )
-	?? ( tcmalloc jemalloc )
-	static? ( yassl !pam )"
+REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
@@ -63,7 +58,7 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
 #	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
 	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -74,6 +69,7 @@ COMMON_DEPEND="
 		sys-process/procps:0=
 		dev-libs/libaio:0=
 	)
+	net-misc/curl
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
 	jemalloc? ( dev-libs/jemalloc:0= )
@@ -89,26 +85,14 @@ COMMON_DEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	)
-	!client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) )
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
+	!client-libs? ( >=sys-libs/zlib-1.2.3:0= )
 	sys-libs/ncurses:0=
 	server? (
 		>=app-arch/lz4-0_p131:=
 		>=dev-libs/boost-1.65.0:=
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-		)
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy )
 		numa? ( sys-process/numactl )
-		pam? ( virtual/pam:0= )
-		systemd? ( sys-apps/systemd:= )
 	)
-	>=dev-libs/libpcre-8.41-r1:3=
 "
 DEPEND="virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
@@ -126,8 +110,8 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 # xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
-	 server? ( ~virtual/mysql-5.6[static=] )"
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+	 server? ( ~virtual/mysql-5.6 )"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then
@@ -156,7 +140,7 @@ pkg_preinst() {
 	# Here we need to see if the implementation switched client libraries
 	# We check if this is a new instance of the package and a client library already exists
 	local SHOW_ABI_MESSAGE libpath
-	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
 		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
 		elog "Due to ABI changes when switching between different client libraries,"
 		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
@@ -173,14 +157,6 @@ pkg_postinst() {
 	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
 
 	if use server ; then
-		if use pam; then
-			einfo
-			elog "This install includes the PAM authentication plugin."
-			elog "To activate and configure the PAM plugin, please read:"
-			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
-			einfo
-		fi
-
 		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 			einfo
 			elog "You might want to run:"
@@ -284,28 +260,22 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
 		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
 		-DWITH_EDITLINE=bundled
 		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
+		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
 		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
-		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-		-DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
-#		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-#		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
-		-DWITH_EXTERNAL_ZLIB=YES
-		-DSUFFIX_INSTALL_DIR=""
-		-DWITH_UNITTEST=OFF
+		-DWITH_RAPID=OFF
+		-DWITH_LIBEVENT=NO
+		-DWITH_CURL=system
 	)
 	if use test ; then
 		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
@@ -339,26 +309,9 @@ multilib_src_configure() {
 
 	if multilib_is_native_abi && use server ; then
 
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=( -DWITH_FEDERATED_STORAGE_ENGINE=NO )
-		fi
-
 		mycmakeargs+=(
 			-DWITH_BOOST="${S}/boost"
 			-DWITH_LZ4=system
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-#			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-#			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-#			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-#			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			# systemd is only linked to for server notification
-			-DWITH_SYSTEMD=$(usex systemd yes no)
 			-DWITH_NUMA=$(usex numa ON OFF)
 		)
 
@@ -385,11 +338,10 @@ multilib_src_configure() {
 		fi
 		mycmakeargs+=(
 			-DEXTRA_CHARSETS=all
-			-DMYSQL_USER=mysql
 			-DDISABLE_SHARED=$(usex static YES NO)
 			-DWITH_DEBUG=$(usex debug)
 			-DWITH_EMBEDDED_SERVER=OFF
-			-DWITH_PROFILING=$(usex profiling)
+			-DENABLED_PROFILING=$(usex profiling)
 		)
 
 		if use static; then
@@ -402,6 +354,7 @@ multilib_src_configure() {
 
 		# Storage engines
 		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
 			-DWITH_ARCHIVE_STORAGE_ENGINE=1
 			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 			-DWITH_CSV_STORAGE_ENGINE=1
@@ -410,6 +363,7 @@ multilib_src_configure() {
 			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
 			-DWITH_MYISAM_STORAGE_ENGINE=1
 			-DWITH_PARTITION_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
 		)
 
 	else
@@ -417,8 +371,6 @@ multilib_src_configure() {
 			-DWITHOUT_SERVER=1
 			-DWITH_EMBEDDED_SERVER=OFF
 			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-			-DWITH_SYSTEMD=no
 		)
 	fi
 
@@ -535,7 +487,7 @@ multilib_src_install_all() {
 }
 
 # Official test instructions:
-# USE='extraengine perl server static-libs' \
+# USE='perl server static-libs' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package