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 E13EF158030 for ; Tue, 28 Feb 2023 16:36:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F17BE076B; Tue, 28 Feb 2023 16:36:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 17850E076B for ; Tue, 28 Feb 2023 16:36:26 +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 3CAA3335D55 for ; Tue, 28 Feb 2023 16:36:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A6F478C7 for ; Tue, 28 Feb 2023 16:36:23 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1677602179.5c37575971a57d263e1fc928bb29a38f0a9ad615.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/libarchive/libarchive-3.6.2-r1.ebuild app-arch/libarchive/libarchive-3.6.2.ebuild profiles/package.mask X-VCS-Directories: app-arch/libarchive/ profiles/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5c37575971a57d263e1fc928bb29a38f0a9ad615 X-VCS-Branch: master Date: Tue, 28 Feb 2023 16:36:23 +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: d0d5581d-5d11-45ac-a95d-aeba6445f347 X-Archives-Hash: 9f78d9bef47a378ca0aa62e997f31328 commit: 5c37575971a57d263e1fc928bb29a38f0a9ad615 Author: Michał Górny gentoo org> AuthorDate: Tue Feb 28 16:28:51 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Feb 28 16:36:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c375759 app-arch/libarchive: Fix pkg-config file in 3.6.2 Signed-off-by: Michał Górny gentoo.org> .../{libarchive-3.6.2.ebuild => libarchive-3.6.2-r1.ebuild} | 3 +++ profiles/package.mask | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app-arch/libarchive/libarchive-3.6.2.ebuild b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild similarity index 95% rename from app-arch/libarchive/libarchive-3.6.2.ebuild rename to app-arch/libarchive/libarchive-3.6.2-r1.ebuild index 9efe314e09d9..66242292e6c3 100644 --- a/app-arch/libarchive/libarchive-3.6.2.ebuild +++ b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild @@ -126,4 +126,7 @@ multilib_src_install() { # Libs.private: should be used from libarchive.pc instead find "${ED}" -type f -name "*.la" -delete || die + # https://github.com/libarchive/libarchive/issues/1766 + sed -e '/Requires\.private/s:iconv::' \ + -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die } diff --git a/profiles/package.mask b/profiles/package.mask index 3cff95056c22..2b1b8e56befd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -461,11 +461,6 @@ net-p2p/vuze-coreplugins # This version currently is not compatible with kernel build (yet) ~dev-util/bindgen-0.63.0 -# Sam James (2022-12-09) -# Breaks compilation of reverse dependencies with broken pkgconfig (pc) file -# bug #885075, https://github.com/libarchive/libarchive/issues/1766 -=app-arch/libarchive-3.6.2 - # Stephan Hartmann (2023-01-15) # Dev channel releases are only for people who # are developers or want more experimental features