From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1552043-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B83DD158089
for <garchives@archives.gentoo.org>; Mon, 4 Sep 2023 18:54:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A473A2BC01E;
Mon, 4 Sep 2023 18:54:34 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 83BE22BC01E
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Sep 2023 18:54:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8C34D335CEC
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Sep 2023 18:54:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 041B81129
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Sep 2023 18:54:32 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1693853650.b537cd6ac3b9c413dc0077c252ff8a3d14ba2efa.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/percona-xtrabackup/Manifest dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
X-VCS-Directories: dev-db/percona-xtrabackup/ dev-db/percona-xtrabackup/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: b537cd6ac3b9c413dc0077c252ff8a3d14ba2efa
X-VCS-Branch: master
Date: Mon, 4 Sep 2023 18:54:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2fad140a-4e39-42a5-ace6-8e1fc89f9710
X-Archives-Hash: 7e5b9f4c78deae3add2136cc1f58adba
commit: b537cd6ac3b9c413dc0077c252ff8a3d14ba2efa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 4 18:15:20 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 4 18:54:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b537cd6a
dev-db/percona-xtrabackup: drop 2.4.15, 8.0.26.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-db/percona-xtrabackup/Manifest | 3 -
...ercona-xtrabackup-2.4.11-fix-gcc6-isystem.patch | 113 ---------------------
.../percona-xtrabackup-8.0.26.18-gcc-12.patch | 21 ----
.../percona-xtrabackup-2.4.15.ebuild | 79 --------------
.../percona-xtrabackup-8.0.26.18.ebuild | 86 ----------------
5 files changed, 302 deletions(-)
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 7935294f6a94..5cc9e51a3fa0 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,7 +1,4 @@
DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
-DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
DIST percona-xtrabackup-2.4.24.tar.gz 61985764 BLAKE2B 99531853b7e125bfe1d133d3dd902f3f68d50a6c127c09ac87652d70aee5c4d764ba7b102879bea0eb67c0a2f1a94633889786c0a7a1f6bc3f9ed54fe51a217d SHA512 de25639a6e204d2e4018c922ccbd5119c5696d03e0b445f81968b15c2179a46ae8844014e78aa89f6a0a3cd5aef20adc744c979926366673f78c347d6a4e0201
-DIST percona-xtrabackup-8.0.26-18.tar.gz 294169182 BLAKE2B 250437badd9bcaea92b0f254fad27a775014f17215e764114bba3d1cf0882135127738a4db78349cb9d519e6a9b5bc015f04747ad8ebfc09245ebad3aa890400 SHA512 0cceb6758364c31167ef0b47176e1950273e80e5266b91e12353287dfae6e3a87382b29a466920e5e58add1f461295199a70bb070a225458ed8a7de844e012ea
DIST percona-xtrabackup-8.0.30-23.tar.gz 338259133 BLAKE2B 3b73731497013aea6abae7d83cd96914cb5300dd867f6066514c71d68f8a1420227e33512a5f2faf082029ccd2c871394acbf43fb58c029472cbeb5605f354fc SHA512 acada88f3509526259281b7f9805fcabb31c5924eb50c5ed761b0813f89adda046b060a57825b6a49178171daec8b4388e99202ef9c9def4b2b0932e73b4d535
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
deleted file mode 100644
index 4fed659cdae6..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-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/files/percona-xtrabackup-8.0.26.18-gcc-12.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch
deleted file mode 100644
index f9d1f79c97ea..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/840335
---- a/client/logger.cc
-+++ b/client/logger.cc
-@@ -27,6 +27,7 @@
- #include <time.h>
- #include <iostream>
- #include <locale>
-+#include <memory>
-
- using namespace std;
-
---- a/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
-+++ b/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
-@@ -25,6 +25,7 @@
- #include <cstring>
- #include <iostream>
- #include <locale>
-+#include <memory>
- #include <sstream>
-
- #include <m_string.h>
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
deleted file mode 100644
index 9e800bfb475a..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 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/XtraBackup/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.11-fix-gcc6-isystem.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # remove bundled libedit, libevent, zlib
- # just to be safe...
- # We keep lz4 directory because we use extra/lz4/xxhash.c in cmake/libutils.cmake
- rm -rv \
- cmd-line-utils/libedit \
- libevent \
- zlib || die
-}
-
-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.26.18.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
deleted file mode 100644
index a295c5613862..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 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.26-remove-rpm.patch
- "${FILESDIR}"/${PN}-8.0.26.18-gcc-12.patch
-)
-
-S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
-
-src_configure() {
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- local mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
- -DBUILD_SHARED_LIBS=OFF
- -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
- -DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
- -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
- -DWITH_MAN_PAGES=ON
- -DWITH_SYSTEM_LIBS=ON
- )
-
- 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}
-
- # cannot use dolib.so because helper would append libdir to target dir
- insinto /usr/$(get_libdir)/${PN}/plugin
- insopts -m 0755
- doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
-
- doman "${p}"/doc/source/build/man/*
-}