summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2023-02-28 17:28:51 +0100
committerMichał Górny <mgorny@gentoo.org>2023-02-28 17:36:19 +0100
commit5c37575971a57d263e1fc928bb29a38f0a9ad615 (patch)
tree227758aaf536bd96fcec348abc2e6eed7fa4e86d
parentapp-arch/libarchive: eautoconf to fix makedev implicit decl (diff)
downloadgentoo-5c37575971a57d263e1fc928bb29a38f0a9ad615.tar.gz
gentoo-5c37575971a57d263e1fc928bb29a38f0a9ad615.tar.bz2
gentoo-5c37575971a57d263e1fc928bb29a38f0a9ad615.zip
app-arch/libarchive: Fix pkg-config file in 3.6.2
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--app-arch/libarchive/libarchive-3.6.2-r1.ebuild (renamed from app-arch/libarchive/libarchive-3.6.2.ebuild)3
-rw-r--r--profiles/package.mask5
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
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