commit: e871aa4cb418e91b28592acdc08263bfa13f416f Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Fri Jun 26 21:17:35 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Jun 26 22:59:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e871aa4c
dev-db/percona-xtrabackup: bump to 8.0.13, drop old Closes: https://bugs.gentoo.org/722266 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16438 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> dev-db/percona-xtrabackup/Manifest | 4 +-- .../percona-xtrabackup-8.0.13-remove-rpm.patch | 32 ++++++++++++++++++++++ ...0.7.ebuild => percona-xtrabackup-8.0.13.ebuild} | 10 +++++-- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest index 65b4fc69f84..f81887d0dc0 100644 --- a/dev-db/percona-xtrabackup/Manifest +++ b/dev-db/percona-xtrabackup/Manifest @@ -1,5 +1,5 @@ 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-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478 -DIST percona-xtrabackup-8.0.7.tar.gz 149143566 BLAKE2B 0a6c832f44725230023c01b50ed3d188358e7d2ba073422652a258cdf416b9d3c2a18bda4730bc5d9eb77aab17612bf93204fc2838c521e90b8571706a31d3c6 SHA512 9947b4a943f52e4d07fbde4d3b590146da19b94ce40305fc0230fc67c39e93fa4f3a30a55029cdcdb582cce7efe93831164a96f985d19d1f7b64a75aea552f47 +DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff 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 00000000000..759598637a8 --- /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-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild similarity index 87% rename from dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild rename to dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild index 3776aa32ffd..edbb5af4c04 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/* }
