From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/, profiles/
Date: Tue, 28 Feb 2023 16:36:23 +0000 (UTC) [thread overview]
Message-ID: <1677602179.5c37575971a57d263e1fc928bb29a38f0a9ad615.mgorny@gentoo> (raw)
commit: 5c37575971a57d263e1fc928bb29a38f0a9ad615
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 16:28:51 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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 <sam@gentoo.org> (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 <sultan@gentoo.org> (2023-01-15)
# Dev channel releases are only for people who
# are developers or want more experimental features
reply other threads:[~2023-02-28 16:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1677602179.5c37575971a57d263e1fc928bb29a38f0a9ad615.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox