gentoo resync : 22.01.2021

6 files changed, 215 insertions, 2 deletions

diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 06cf7ae189b4..15364776e6d1 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -2,12 +2,19 @@ AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d46794
 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
+AUX percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch 1094 BLAKE2B 25b43fc6ca621e6f7a93a214580fb491d7c8c4ac7d4fbaca93e521eebb6b63b48e5526cd8aeff4d92c7715416833ed16df4c258ebbd8c5ce8015a0afdd32e11d SHA512 c0b9fe123766b70d324dd9388bd0762e734bc728c3dd8f750f06ac7432a1907fc45aaad7b1c79418446af0c416e962c116a15e17ac7091607df09f2fa04fa555
+AUX percona-xtrabackup-8.0.22-remove-rpm.patch 1086 BLAKE2B fdac1fa3f83cd7b3b82ca7dd443ba9d170051d1b2e92fbb267524b46c8272c28586cce58de6b71eae1372f08fd5e89b0faee567885bc3de7650cb42c4749ec8a SHA512 2362805b7937b9b1922f4d8be86031b58df9c1475c849052727f190ec08b32cbf07bee98ac38fe7a362e8e10fa1dcb4ee16f9bbeb6f36ddfc2931b9f14c05553
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
 DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
+DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
 DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
+DIST percona-xtrabackup-2.4.21.tar.gz 61901220 BLAKE2B 77245818015d4e9c22d05cfeb254ff570ab490c43f9d2fd0e1c499e1e3fefb143b4659fb929740a563e2344b3cd7dfb408931c6d24b277f6df06886dfa83126e SHA512 8b14ef4620fdf836a090d07e5aeb78141eacf081a2cf1069d91af1ba5206e36e3e195f8acb06609f334661d6ad27937b31e997b0f1aabb9cef612d35fabd0284
 DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
+DIST percona-xtrabackup-8.0.22-15.tar.gz 294237178 BLAKE2B 819d7594bc41e0adc1e6f2632e6ad50de7a2416c7577f48ea83948bed1b14c0c552c4c44597c84c86fa292bcbbaace185978956acdc39070f81ede6701f4af52 SHA512 f5295e2f1e3ee71931295f89dbd708eed936c4912ab3b6c122eb63795ee2e5154011ddf95cfad005a89c7f086f087f7fb19068d098b49202c697a95b58ee7672
 EBUILD percona-xtrabackup-2.4.15.ebuild 1778 BLAKE2B 74e30f27b5dc192c2fe8050cb881b1c5450a0f0d39c630580bf93b8bb95312602b30fa827a06df1794410b2d655f8adc2be9fef596ea26bdf00d071800f99f72 SHA512 fa47544c2b83c281d04a3b9f2e435a36a47d94bce872b3b0fce45071cdffc196c0bd03ca41837a2d2132a09880c1a443216f9b7d98ffe856a3323f8de9067bed
 EBUILD percona-xtrabackup-2.4.20.ebuild 1535 BLAKE2B 41170fcaab472910dde609fb7b12aa6918a708018a7fde9cc182276b8383fd041c322141aea8dcf599752a88e2ed5872f4087ac11cc27387495f7574af1be594 SHA512 592dacff26ec640eec56853e8a9bbe63ba8ecae859463e55aac9478c393d05409e3b0bd9a7aefbd4795f37ef213e183c9e24f9929ea05f470c33a6034e5a1fd3
+EBUILD percona-xtrabackup-2.4.21.ebuild 1499 BLAKE2B 00e2dcb73eee4fcc85847e8524c67195d50e53675dfd9e65d2c4e2ad286cdf18416809f185be81256c59fb5908cf5b44893d365c3f0fb535c8025334350c573c SHA512 b436b90f4aa3bd37471c30f3cf23d35327f6d06d67ba4def513e49528fcc6569c22afee356392c877b951c49d60f2235e408ac18e11d61606105bb5ff00aa7a7
 EBUILD percona-xtrabackup-8.0.13.ebuild 1545 BLAKE2B 42ea67173b4c4f462e0acbe4a5ebdf2cae8ea7764df7d5353c73f65dd5d9023a2833e8e8c7baf9b4f8316d5179ea5aa3a7ca1b55eebd88d43fb89cbea333928d SHA512 5967bb6a3e95187d13c4b6995cfd8b151aa1d1fa9c4dadfa1bf0791ff8748a73705a750214115c62c92c41c483d48872e38c7915e82fbc4ef90d79f594a135c2
-MISC metadata.xml 258 BLAKE2B 0ed1f43157a23ac7477592c1eeab36b0b85a0352c488b93df9fe605cf9d3eb40aac636a8791f906ce78bd6a453928f81b9497ffdb0df936c35c919872f9bb33a SHA512 cdce5f5e2e7f2fa95a7fea95b60d014c6e6853ab8adc829a0f9ad5b9baa15d353a3756bc7c38b44e1e8989254a23232f8e539d054a66d2ad79f7fd8d7f3ba40c
+EBUILD percona-xtrabackup-8.0.22.15.ebuild 1867 BLAKE2B 626bc0a244a6335f0b8f65ea586e1d26bd2215b239338160f6dcf5a0cb832a810d1a128de7c0599c74fa6c61a8389b002ab9a800d4fd9dfd7ef924d3f32ff0c5 SHA512 d5387d3a5ddf1232786b4d477b404f856484f4d2c9ef4a1b3edc7b4d9f0fb001e18137f0ac597da9ea7c6feed96fe74503126e17d0ff2f890bf12f33ff9c06d9
+MISC metadata.xml 334 BLAKE2B dcc722d923e0f35bd57d67664edf99e7bc159816aa88b4ea210b72a643326c64ed26082088e0468c2b51670b1bd913e66e5f8a99adcb847b42e7f61e7a354223 SHA512 035813d50369063ec1da627ed05ad625045a52e252441bbd4ada2035913525fb18dbf443a57af587aa0f1f18a4e87168e4b683cd33b701e1f115d7e852a81add
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
new file mode 100644
index 000000000000..b3e1662a0cf6
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
@@ -0,0 +1,28 @@
+From 16048ed60bef16d4bf1e361a59e7899845b9426a Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Sun, 20 Dec 2020 21:47:33 +0100
+Subject: [PATCH 10/10] Fix building against >=ICU-68
+
+Link: https://github.com/unicode-org/icu/commit/a18df7ba2834afc2b577a1d5a7d906868ade6fa9
+Bug: https://bugs.gentoo.org/759070
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ sql/mysqld.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index c400e5584..5d2ebfaea 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -7323,7 +7323,7 @@ int mysqld_main(int argc, char **argv)
+   if (opt_keyring_migration_source || opt_keyring_migration_destination ||
+       migrate_connect_options) {
+     Migrate_keyring mk;
+-    my_getopt_skip_unknown = TRUE;
++    my_getopt_skip_unknown = true;
+     if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
+                 opt_keyring_migration_destination, opt_keyring_migration_user,
+                 opt_keyring_migration_host, opt_keyring_migration_password,
+-- 
+2.29.2
+
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
new file mode 100644
index 000000000000..91f67c437168
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
@@ -0,0 +1,31 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,28 +222,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
+-      )
+-    EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
+-  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()
+-
+ # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
+ IF(APPLE)
+   IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
diff --git a/dev-db/percona-xtrabackup/metadata.xml b/dev-db/percona-xtrabackup/metadata.xml
index 5a6137a144a5..379f247efeb0 100644
--- a/dev-db/percona-xtrabackup/metadata.xml
+++ b/dev-db/percona-xtrabackup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">percona/percona-xtrabackup</remote-id>
 	</upstream>
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.21.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.21.ebuild
new file mode 100644
index 000000000000..967e9fa2e0e1
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.21.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 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=system
+		-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.22.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild
new file mode 100644
index 000000000000..1f27bfcbcf14
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+MY_BOOST_VERSION="1.73.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-XtraBackup"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+
+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/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/icu:=
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-libs/openssl:0=
+	dev-libs/protobuf:=
+	dev-libs/rapidjson
+	dev-libs/re2:=
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.22-remove-rpm.patch
+	"${FILESDIR}"/${PN}-8.0.22-fix-building-against-ICU-68.patch
+)
+
+S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CONFIG=xtrabackup_release
+		-DBUILD_SHARED_LIBS=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+		-DWITH_SYSTEM_LIBS=ON
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	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/*
+}