gentoo resync : 06.05.2018

4 files changed, 126 insertions, 85 deletions

diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index bdac29d6c598..7247e282c0bc 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,12 +1,11 @@
 AUX percona-xtrabackup-2.4.10-fix-gcc6-isystem.patch 3822 BLAKE2B 796553a8760ecbf1c64e8aa349168a6a3c3ee2b03ee0ce123b574f20b2056b7238733486d78ecb90b2681ae15431aecf67dab26734324840c1b0ad5af319d69e SHA512 223ce359c662be6b67f5bb056c468aa14f73a54657a737e76d674e9549a18f924a34f34f0ab5a27a00f42f16c50b32553ee64f72e7bb8c76305c6d72aa34a7fd
+AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e
 AUX percona-xtrabackup-2.4.6-fix-gcc6-isystem.patch 3801 BLAKE2B 2494f55253e820c6b9bc079ff96d7894c9c16aedb6ed6017c7d5474007ebf19ef03b735a5b76bc67265b858205285f82f626f1058a216e0094c11a9440a11cd0 SHA512 8ab3cb41092f3ce324213917842d0cf72d2b501c60238007b57702458c572ea0d7faa159dec10367bfef97584b0b2dfc0a153bba5f13ac9efebeae2f1e2c7a39
 AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906
 DIST percona-xtrabackup-2.4.10.tar.gz 59217573 BLAKE2B 3a4485b6d8c5b9ad2ca4b60603383b18ec0a3da7e4cca3b5a1ee2d24b6ca17844cc406123bbaf9313fc17570db0168c13af16d17404e075fc8140731ef9b79c2 SHA512 a4ebbebabc8b9b5fec9777fc3569c530b4a88a1b75d3e78d2edf7627a2e8cadf7aa2d8988963136b331a274c80371ff9b7fafcc7d8a129f446eb58777ce1764f
-DIST percona-xtrabackup-2.4.7.tar.gz 54119422 BLAKE2B 41ae661efe53e0ede92dc1e1555e05f68c2fd2848d32c5ae9df3244a5b3e9d996c23cd3b9b79e5a0630140ea02e04f3560679b4c493484e7c2a1b0bcc5847aa0 SHA512 7aaf82975cd4c0b7af119902eddf96b8ce75c0fbcbd6835991e33f1f89347361fbe3c9040762c9989df5d53199b628aa6b2b45004ef440bb46e2415fbab13009
-DIST percona-xtrabackup-2.4.8.tar.gz 57965576 BLAKE2B 5cca947549181413ef68bcc7a5fd935404ebf2aaccc2e8de42221cbc0007371ca3499e26f2ab312b7fb94fe74a7079c48a11405df18cc3c809329403a83840cd SHA512 a613c41169c6ebdba27c6cb8111d388ff656d4daf0e69b52e401b293a6ac6499d81d0f028afd805fa60018ad5f2007e70db7a9ba931d6829272f0ce273ba9739
+DIST percona-xtrabackup-2.4.11.tar.gz 59267058 BLAKE2B 1de9905a2c191a58290e87a90e36c263f66935ce0846af205e1a0accc6e9b2938dd8679f65acc4b51ca956f2bcbca831cd10c9d50c01c2ecfd9d059fde500e20 SHA512 2fa4757fe944fb4c8113dca1fa25beaa23de5d5f9fc830b36a6d9eb4efb7e7fb1eec10f91be5e91fd3b7980bc157832ed52c9da59a342f6aae05ceae8ecdf760
 DIST percona-xtrabackup-2.4.9.tar.gz 58001052 BLAKE2B d2a25a5ca2190ccf82a600245a0e21848abd9a33ea937a81b2ba9c7e518b24291080a3d3c4b8e6d02f51523e5cf2e78680e4b351c4f2bcd8f122c58f62c14418 SHA512 913431f0fa648731efa2e9bc87c9431a28816b0eca12e1c6df6e7ab04a4148ddd8fa03c9792335ad152b05bede5b9fe64ce94a393b5e4e37d4b18f4989b0ccdb
 EBUILD percona-xtrabackup-2.4.10.ebuild 2055 BLAKE2B 9fc3b57d1f24e80c5925eff40aa0822a1742756f897f1980341fe2778c47b12a35102422c703cbc44f5734377c8be2678ea0c05a32caf0f0fa34d631eaf31199 SHA512 5fe655f9fba940d50af9b633d4f5f8b6d88eb9add49ee5fa1233bd71e1f67f60b998b3775800e527f54c4f8fd4c39c527eb48fa8badaddac257622615dece9f8
-EBUILD percona-xtrabackup-2.4.7.ebuild 1757 BLAKE2B 7c6066f3b07036640671fd0d647bc1ec3c1752f20b2c634af72eb243ad9ab0e3fdba12ba9da36beeb1493119627e6d1bce002ce3591361edab3aea2945d10bff SHA512 12837447a0a2f63db110d93b7f736658e6c34aaf478bf1d94589ef48d881fea24085b55c1a71aeea85a315ac3843309292ef35a95d566b19dbf2971f62d8bf48
-EBUILD percona-xtrabackup-2.4.8.ebuild 1804 BLAKE2B ff7c593ef58016456633261f0fe4c0ebf918e077c6f8c98470422373f687c968a98a312571c332e50df1146bfd0fc202879f65891d124a40ccb27553b113534b SHA512 d598f38cc0266ca845b81a83a273f83e59dd44aa797ab22602be86e01572af021f28b07c8b1aca0497cdd5752bacc5572c76aa4e3c00a55aa82124b03eb20480
+EBUILD percona-xtrabackup-2.4.11.ebuild 2055 BLAKE2B 99a8568224308799d84c2ccfbebb1935e065b53ae2bdd3ca07e3cb33d5be6b53042389483941e06a7d58284a79bd09b96c15584456fbb051c516b5979c9d8117 SHA512 d353ded350a186cd244e8fdda2081cfe79bc78ee0a5ea4a9104afd4795b7a827096dec0ada7e1d268561cf910da0004b0015ac0b2e20a333bb972b15895c7bde
 EBUILD percona-xtrabackup-2.4.9.ebuild 1804 BLAKE2B db219c17e234b628a1730f23fa96f1766353b0de1615f1f93cc3b5ebb45faf405ea31215547fe0c1778dd65e48b743ea2b68727792695ca014e2d6f13bc20839 SHA512 25a54c649707d02e84ae5504122d725b1045fed258ed12d3643022c5d03fa1a008f13982cb7c5dbb02d212225ba8230057634dc867ab082bc9fc9692155c2dc2
 MISC metadata.xml 563 BLAKE2B 5c657288a3cd0ece118920159db14756bad6a2faa308e5495cdf1eca6dd160dfbd05c979857fd55a031bc0acacdc7a81db628c0ca31a9b2d3dae226838e2abf5 SHA512 050e1a78c8c7f4b024b207754005dcec28188697b3be2d93c30f800f8a91da1a3376b4501a4a6e061dcd096a958a9a4cba62251f5003b2056dfadee5bfda6716
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch
new file mode 100644
index 000000000000..4fed659cdae6
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch
@@ -0,0 +1,113 @@
+Do not use -isystem to add headers, as they break GCC 6's header wrapping.
+See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
+
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index dbf1c48..e5d7347 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -52,7 +52,7 @@ IF(NOT WITHOUT_SERVER)
+     upgrade/program.cc
+   )
+ ADD_COMPILE_FLAGS(
+-  upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++  upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
+diff --git a/client/base/CMakeLists.txt b/client/base/CMakeLists.txt
+index b206de7..91cce4c 100644
+--- a/client/base/CMakeLists.txt
++++ b/client/base/CMakeLists.txt
+@@ -49,7 +49,7 @@ ADD_COMPILE_FLAGS(
+   mutex.cc
+   mysql_query_runner.cc
+   show_variable_query_extractor.cc
+-  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ 
+ TARGET_LINK_LIBRARIES(client_base mysqlclient)
+diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt
+index fdbb631..bae2ce7 100644
+--- a/client/dump/CMakeLists.txt
++++ b/client/dump/CMakeLists.txt
+@@ -50,7 +50,7 @@ IF(USING_LOCAL_BOOST)
+ 
+   ADD_COMPILE_FLAGS(
+     ${BOOST_LIB_SOURCES}
+-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+     )
+ 
+   IF(HAVE_clock_gettime_IN_rt)
+@@ -145,7 +145,7 @@ TARGET_LINK_LIBRARIES(mysqlpump_lib
+ 
+ ADD_COMPILE_FLAGS(
+   ${MYSQLPUMP_LIB_SOURCES}
+-  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+   )
+ 
+ # Files that use Boost sources that trigger compilation warnings
+@@ -179,7 +179,7 @@ ADD_COMPILE_FLAGS(
+ )
+ MYSQL_ADD_EXECUTABLE(mysqlpump  program.cc)
+ ADD_COMPILE_FLAGS(
+-  program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++  program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ 
+ TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB})
+diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
+index 44c1d26..dac03d9 100644
+--- a/libmysqld/CMakeLists.txt
++++ b/libmysqld/CMakeLists.txt
+@@ -123,7 +123,7 @@ ADD_COMPILE_FLAGS(
+   ../sql/item_geofunc_setops.cc
+   ../sql/item_json_func.cc
+   ../sql/spatial.cc
+-  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ 
+ ADD_COMPILE_FLAGS(
+diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
+index 1d1231f..9a35fa8 100644
+--- a/sql/CMakeLists.txt
++++ b/sql/CMakeLists.txt
+@@ -312,7 +312,7 @@ ADD_COMPILE_FLAGS(
+   item_geofunc_setops.cc
+   item_json_func.cc
+   spatial.cc
+-  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ 
+ ADD_COMPILE_FLAGS(
+diff --git a/unittest/gunit/CMakeLists.txt b/unittest/gunit/CMakeLists.txt
+index f0123b8..f2169f9 100644
+--- a/unittest/gunit/CMakeLists.txt
++++ b/unittest/gunit/CMakeLists.txt
+@@ -385,7 +385,7 @@ IF (MERGE_UNITTESTS)
+   ENDIF()
+   ADD_COMPILE_FLAGS(
+     ${MERGE_SMALL_TESTS}
+-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+   )
+   # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
+   IF(WIN32)
+@@ -467,11 +467,11 @@ ENDIF(MERGE_UNITTESTS)
+   ENDIF()
+   ADD_COMPILE_FLAGS(
+     bounded_queue-t.cc
+-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+   )
+   ADD_COMPILE_FLAGS(
+     pump_object_filter-t.cc
+-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+   )
+ 
+   FOREACH(test ${SERVER_TESTS})
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.8.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.11.ebuild
index a7de4a224d03..8842c1a74b73 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.8.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	app-arch/lz4:0=
@@ -25,7 +25,7 @@ DEPEND="
 	dev-libs/libgpg-error
 	dev-python/sphinx
 	net-misc/curl
-	sys-libs/zlib"
+	sys-libs/zlib:="
 
 RDEPEND="
 	${DEPEND}
@@ -34,16 +34,16 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
-	"${FILESDIR}"/${PN}-2.4.6-fix-gcc6-isystem.patch
+	"${FILESDIR}"/${PN}-2.4.11-fix-gcc6-isystem.patch
 )
 
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# remove bundled lz4, boost, libedit, libevent, zlib
+	# remove bundled boost, libedit, libevent, zlib
 	# just to be safe...
+	# We keep lz4 directory because we use extra/lz4/xxhash.c in cmake/libutils.cmake
 	rm -rv \
-		extra/lz4 \
 		include/boost_1_59_0 \
 		cmd-line-utils/libedit \
 		libevent \
@@ -57,6 +57,10 @@ src_configure() {
 	#
 	append-cppflags -DDBUG_OFF
 
+	# Upstream doesn't support C++14 -- build will fail with -fpermissive error
+	# https://bugs.mysql.com/bug.php?id=87956
+	append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
+
 	local mycmakeargs=(
 		-DBUILD_CONFIG=xtrabackup_release
 		-DWITH_EDITLINE=system
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.7.ebuild
deleted file mode 100644
index 7a3720c1107d..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	<dev-libs/boost-1.65.0:=
-	dev-libs/libaio
-	<dev-libs/libedit-20170329.3.1
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	!dev-db/xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
-	"${FILESDIR}"/${PN}-2.4.6-fix-gcc6-isystem.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled lz4, boost, libedit, libevent, zlib
-	# just to be safe...
-	rm -r extra/lz4 include/boost_1_59_0 \
-		cmd-line-utils/libedit libevent zlib || die
-}
-
-src_configure() {
-	# Needed, due to broken handling of CMAKE_BUILD_TYPE leading to
-	#
-	#   error: 'fts_ast_node_type_get' was not declared in this scope
-	#
-	append-cppflags -DDBUG_OFF
-
-	local mycmakeargs=(
-		-DBUILD_CONFIG=xtrabackup_release
-		-DWITH_EDITLINE=system
-		-DWITH_LIBEVENT=system
-		-DWITH_LZ4=system
-		-DWITH_SSL=bundled # uses yassl, which isn't packaged
-		-DWITH_ZLIB=system
-		-DWITH_PIC=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/src/{xbcloud,xbcrypt,xbstream,xtrabackup}
-	dosym xtrabackup /usr/bin/innobackupex
-
-	einstalldocs
-	doman "${p}"/doc/source/build/man/*
-}