gentoo resync : 29.06.2020

5 files changed, 140 insertions, 5 deletions

diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 39d3848ef73d..d0095dcf4f93 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,9 +1,13 @@
 AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e
+AUX percona-xtrabackup-2.4.20-fix-gcc10.patch 931 BLAKE2B 77c433ab006f2fc5c36c5cee17fd37d98136779884ad0075b4547671690307a253dec9ac7aa80998bb1ee02b5568d053d7b41b5df348b5338c83497c744d421f SHA512 2a6f4f745a57df0f8df4f684e8ab194de0b00c1578e91823c7cafce1338bbfea873d1fb7d34f94233e40fb7a0b9d7edd869a482e7cb46f3706caf3d297983397
 AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906
+AUX percona-xtrabackup-8.0.13-remove-rpm.patch 1139 BLAKE2B c2ada7337f6596ac5c37b1ebe7f2324fb4ee43e14ec41cfeb8d861bc2df0614ca1957c9d44cf81530b1f4bac9d6143edc906721aeebfe4551fe37dec9a41ed7b SHA512 99d4e92c5f979b4d3e9edb6ebae73e88f81d5696826d4f477f8cd885d8c54d955c879eed45779aca092facfef7aa29f818cf467c3302a7e8db6ca89fa5e38e28
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_69_0.tar.gz 111710205 BLAKE2B 4a6d151ba10553641045a08bf4658c165862e05903b48bc700437104be468070785c67eed6dfcf1ed0923d5cf583a684b448e2a985e201bda298a3b839e62407 SHA512 89da45aca0774f68f897434882e8ec58f0673807c3a862315b90e893be90184722c098ad5822b89602b98ac3cc5a9f89c807079fd0f7e9c3f97be0d415414014
+DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
-DIST percona-xtrabackup-8.0.7.tar.gz 149143566 BLAKE2B 0a6c832f44725230023c01b50ed3d188358e7d2ba073422652a258cdf416b9d3c2a18bda4730bc5d9eb77aab17612bf93204fc2838c521e90b8571706a31d3c6 SHA512 9947b4a943f52e4d07fbde4d3b590146da19b94ce40305fc0230fc67c39e93fa4f3a30a55029cdcdb582cce7efe93831164a96f985d19d1f7b64a75aea552f47
+DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
+DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
 EBUILD percona-xtrabackup-2.4.15.ebuild 1778 BLAKE2B 74e30f27b5dc192c2fe8050cb881b1c5450a0f0d39c630580bf93b8bb95312602b30fa827a06df1794410b2d655f8adc2be9fef596ea26bdf00d071800f99f72 SHA512 fa47544c2b83c281d04a3b9f2e435a36a47d94bce872b3b0fce45071cdffc196c0bd03ca41837a2d2132a09880c1a443216f9b7d98ffe856a3323f8de9067bed
-EBUILD percona-xtrabackup-8.0.7.ebuild 1429 BLAKE2B bf48714752ff3c18035b8ff456820d64048a1e99d0c07b3c18efbe60edb122465a3e18124085657cadca2863e36d92c367a9d8316e8c1219d6a589863a796fa2 SHA512 6e154f9e6168da154c4869ddd56c951a521456fd7f745ac2c97cd24b20335952796d42022525d31746746f717c9488fa1bcfb25161bdab575a45438ca200f416
+EBUILD percona-xtrabackup-2.4.20.ebuild 1535 BLAKE2B 41170fcaab472910dde609fb7b12aa6918a708018a7fde9cc182276b8383fd041c322141aea8dcf599752a88e2ed5872f4087ac11cc27387495f7574af1be594 SHA512 592dacff26ec640eec56853e8a9bbe63ba8ecae859463e55aac9478c393d05409e3b0bd9a7aefbd4795f37ef213e183c9e24f9929ea05f470c33a6034e5a1fd3
+EBUILD percona-xtrabackup-8.0.13.ebuild 1572 BLAKE2B 04e9412cf2c65c49aeb71762c6e9ffc4438593a2cdcf2b9d5015d37960d9d040613da48f5c3d9e041077595228a062acab7b6a0113fec20500604ddaf5fe6b44 SHA512 1e1c4b232a72bbe58e7e17c991ca2cce8b59b231066808b5cac69484a913322f9ceab280f824d4da73519697c99c568089a96fd595d7a97ea9d9cb4366a1926d
 MISC metadata.xml 564 BLAKE2B 428ee8f4bba052e58061a5eb643feee71e5f02728b17d63a228436d0988babdb60b1d8acc887e7f142fc715994d1c4fef26cfb4644b5afac65869cdc3f02e887 SHA512 5eead923c1daed6ed5663b9d9d9b6995e5f8fc248064d48da2e2c89cbe1957ac3aee07781df37979cbdb41c37351f25bb6530f2aa0531008437899f82459ba31
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
new file mode 100644
index 000000000000..8987082d1f9c
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
@@ -0,0 +1,26 @@
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index 3801448b..83098498 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -625,7 +625,7 @@ struct system_variables global_system_variables;
+ struct system_variables max_system_variables;
+ struct system_status_var global_status_var;
+ 
+-MY_TMPDIR mysql_tmpdir_list;
++extern MY_TMPDIR mysql_tmpdir_list;
+ MY_BITMAP temp_pool;
+ 
+ CHARSET_INFO *system_charset_info, *files_charset_info ;
+diff --git a/storage/innobase/xtrabackup/src/xbstream.c b/storage/innobase/xtrabackup/src/xbstream.c
+index 611f8c04..f0c57588 100644
+--- a/storage/innobase/xtrabackup/src/xbstream.c
++++ b/storage/innobase/xtrabackup/src/xbstream.c
+@@ -55,7 +55,7 @@ datasink_t datasink_xbstream;
+ datasink_t datasink_compress;
+ datasink_t datasink_tmpfile;
+ datasink_t datasink_encrypt;
+-datasink_t datasink_buffer;
++extern datasink_t datasink_buffer;
+ 
+ static run_mode_t	opt_mode;
+ static char *		opt_directory = NULL;
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
new file mode 100644
index 000000000000..759598637a82
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b9865e2..e3c82cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,27 +181,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+ 
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+-  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+-  IF(MY_UNAME)
+-    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+-      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_UNAME_RESULT
+-      )
+-  ENDIF()
+-  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+-  IF(MY_RPM)
+-    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+-      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_RPM_RESULT
+-      )
+-  ENDIF()
+-ENDIF()
+-
+ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
+     AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
+   # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below.
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
new file mode 100644
index 000000000000..f15f04741bfc
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake 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/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/libaio
+	dev-libs/libedit
+	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/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CONFIG=xtrabackup_release
+		-DBUILD_SHARED_LIBS=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+		-DWITH_EDITLINE=system
+		-DWITH_LIBEVENT=system
+		-DWITH_LZ4=system
+		-DWITH_SSL=bundled # uses yassl, which isn't packaged
+		-DWITH_ZLIB=system
+		-DWITH_PIC=ON
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
+	dosym xtrabackup /usr/bin/innobackupex
+
+	einstalldocs
+	doman "${p}"/doc/source/build/man/*
+}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
index 3776aa32ffd3..edbb5af4c04a 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake flag-o-matic
 
-BOOST_VER="1_69_0"
+BOOST_VER="1_70_0"
 MY_PV="$(ver_rs 2 '-')"
 
 DESCRIPTION="Hot backup utility for MySQL based servers"
@@ -42,6 +42,10 @@ RDEPEND="
 	!dev-db/percona-xtrabackup-bin
 	dev-perl/DBD-mysql"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-8.0.13-remove-rpm.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_CONFIG=xtrabackup_release
@@ -59,5 +63,7 @@ src_install() {
 	dobin "${p}"/xbcloud_osenv
 	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
 
+	dolib.so "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
 	doman "${p}"/doc/source/build/man/*
 }