Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/
Date: Sat, 28 Aug 2021 02:46:23
Message-Id: 1630118670.662e98dacb0da927fec0f9e66961c73cf658988b.sam@gentoo
1 commit: 662e98dacb0da927fec0f9e66961c73cf658988b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 28 02:42:59 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 28 02:44:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662e98da
7
8 sys-fs/fuse: add iconv/gettext macro to avoid dependency in :2
9
10 Closes: https://bugs.gentoo.org/809920
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-fs/fuse/Manifest | 1 +
14 sys-fs/fuse/fuse-2.9.9-r1.ebuild | 5 +++++
15 2 files changed, 6 insertions(+)
16
17 diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
18 index c22aef3b2f0..8cf24bf0342 100644
19 --- a/sys-fs/fuse/Manifest
20 +++ b/sys-fs/fuse/Manifest
21 @@ -2,3 +2,4 @@ DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe88
22 DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942
23 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
24 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
25 +DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55
26
27 diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
28 index d7a2b42e611..c8d15352dff 100644
29 --- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
30 +++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
31 @@ -8,6 +8,9 @@ inherit autotools flag-o-matic linux-info udev
32 DESCRIPTION="An interface for filesystems implemented in userspace"
33 HOMEPAGE="https://github.com/libfuse/libfuse"
34 SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
35 +# For bug #809920 to avoid a gettext dependency
36 +# extracted from sys-devel/gettext-0.21-r1
37 +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/iconv.m4.bz2"
38
39 LICENSE="GPL-2"
40 SLOT="0"
41 @@ -38,6 +41,8 @@ pkg_setup() {
42 src_prepare() {
43 default
44
45 + # Can be dropped along with additional SRC_URI if dropping eautoreconf
46 + cp "${WORKDIR}"/iconv.m4 m4/ || die
47 eautoreconf
48 }