From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 59B59159C9B for ; Thu, 8 Aug 2024 16:07:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BDD9E2AC4; Thu, 8 Aug 2024 16:06:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 53DC6E2AC4 for ; Thu, 8 Aug 2024 16:06:59 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92D87335D6D for ; Thu, 8 Aug 2024 16:06:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 314A81EBA for ; Thu, 8 Aug 2024 16:06:57 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1723133187.cccb407280eee0285757834c1cd0769a9a30e8f6.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23-r1.ebuild dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild X-VCS-Directories: dev-db/percona-xtrabackup/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: cccb407280eee0285757834c1cd0769a9a30e8f6 X-VCS-Branch: master Date: Thu, 8 Aug 2024 16:06:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 16220dab-df52-47a4-9fed-87c640019b5f X-Archives-Hash: 3e8fb56e85bf8476812589ed273b5d1d commit: cccb407280eee0285757834c1cd0769a9a30e8f6 Author: Eli Schwartz gentoo org> AuthorDate: Thu Aug 8 04:15:15 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Thu Aug 8 16:06:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cccb4072 dev-db/percona-xtrabackup: fix automagic dependencies There were some dependencies which we tried to link to, which are usually bundled but we ask for system copies. However, we didn't properly depend on it -- and in the case of procps, even though it is in @system we do want to enforce a subslot dependency on it, so it really shouldn't be left out. rapidjson doesn't actually work. You can try to unbundle it but it will simply error out because rapidjson hasn't been released since 2016 (despite active development, they simply ghost anyone requesting a release) and percona states they are using newer features... there is an error check if you try to force system rapidjson and whatever they need isn't present. Signed-off-by: Eli Schwartz gentoo.org> ...0.23.ebuild => percona-xtrabackup-8.0.30.23-r1.ebuild} | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23-r1.ebuild similarity index 86% rename from dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild rename to dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23-r1.ebuild index fd790e55724c..3ec110a05eb1 100644 --- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild +++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23-r1.ebuild @@ -26,6 +26,7 @@ KEYWORDS="amd64 x86" DEPEND=" app-arch/lz4:0= + app-arch/zstd:= app-editors/vim-core dev-libs/icu:= dev-libs/libaio @@ -37,11 +38,12 @@ DEPEND=" 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:=" + sys-libs/zlib:= + sys-process/procps:= +" RDEPEND=" ${DEPEND} @@ -66,6 +68,13 @@ src_prepare() { eerror "Ebuild Boost version: ${MY_BOOST_VERSION}" die "Ebuild needs to fix MY_BOOST_VERSION!" fi + + local extra + # rapidjson: last released in 2016 and totally unviable to devendor + # lz4: in storage/innobase/xtrabackup/src/CMakeLists.txt it is used even when =system + for extra in curl icu libcbor libedit libevent libfido2 zlib zstd; do + rm -r "extra/${extra}/" || die "failed to remove bundled libs" + done } src_configure() { @@ -85,6 +94,8 @@ src_configure() { -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})" -DWITH_MAN_PAGES=ON -DWITH_SYSTEM_LIBS=ON + # not handled via SYSTEM_LIBS + -DWITH_ZLIB=system ) cmake_src_configure