| 1 |
commit: 5c37575971a57d263e1fc928bb29a38f0a9ad615 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 16:28:51 2023 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 16:36:19 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c375759 |
| 7 |
|
| 8 |
app-arch/libarchive: Fix pkg-config file in 3.6.2 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{libarchive-3.6.2.ebuild => libarchive-3.6.2-r1.ebuild} | 3 +++ |
| 13 |
profiles/package.mask | 5 ----- |
| 14 |
2 files changed, 3 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-arch/libarchive/libarchive-3.6.2.ebuild b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild |
| 17 |
similarity index 95% |
| 18 |
rename from app-arch/libarchive/libarchive-3.6.2.ebuild |
| 19 |
rename to app-arch/libarchive/libarchive-3.6.2-r1.ebuild |
| 20 |
index 9efe314e09d9..66242292e6c3 100644 |
| 21 |
--- a/app-arch/libarchive/libarchive-3.6.2.ebuild |
| 22 |
+++ b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild |
| 23 |
@@ -126,4 +126,7 @@ multilib_src_install() { |
| 24 |
|
| 25 |
# Libs.private: should be used from libarchive.pc instead |
| 26 |
find "${ED}" -type f -name "*.la" -delete || die |
| 27 |
+ # https://github.com/libarchive/libarchive/issues/1766 |
| 28 |
+ sed -e '/Requires\.private/s:iconv::' \ |
| 29 |
+ -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die |
| 30 |
} |
| 31 |
|
| 32 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 33 |
index 3cff95056c22..2b1b8e56befd 100644 |
| 34 |
--- a/profiles/package.mask |
| 35 |
+++ b/profiles/package.mask |
| 36 |
@@ -461,11 +461,6 @@ net-p2p/vuze-coreplugins |
| 37 |
# This version currently is not compatible with kernel build (yet) |
| 38 |
~dev-util/bindgen-0.63.0 |
| 39 |
|
| 40 |
-# Sam James <sam@g.o> (2022-12-09) |
| 41 |
-# Breaks compilation of reverse dependencies with broken pkgconfig (pc) file |
| 42 |
-# bug #885075, https://github.com/libarchive/libarchive/issues/1766 |
| 43 |
-=app-arch/libarchive-3.6.2 |
| 44 |
- |
| 45 |
# Stephan Hartmann <sultan@g.o> (2023-01-15) |
| 46 |
# Dev channel releases are only for people who |
| 47 |
# are developers or want more experimental features |
Archives