Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/
Date: Sun, 28 Nov 2021 01:33:07
Message-Id: 1638063111.aabfcc2020b0c52c53418bdc6667603f0bfbd6da.floppym@gentoo
1 commit: aabfcc2020b0c52c53418bdc6667603f0bfbd6da
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 28 01:31:51 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 28 01:31:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabfcc20
7
8 net-fs/nfs-utils: depend on sys-libs/queue-standalone for musl
9
10 Closes: https://bugs.gentoo.org/827542
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild | 7 +++++--
14 net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild | 7 +++++--
15 2 files changed, 10 insertions(+), 4 deletions(-)
16
17 diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
18 index 75b24ff6761b..08059cd37886 100644
19 --- a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
20 +++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
21 @@ -27,7 +27,7 @@ RESTRICT="test" #315573
22 # files, and nfs-utils doesn't build against heimdal either,
23 # so don't depend on virtual/krb.
24 # (04 Feb 2005 agriffis)
25 -DEPEND="
26 +COMMON_DEPEND="
27 >=dev-db/sqlite-3.3
28 dev-libs/libxml2
29 net-libs/libtirpc:=
30 @@ -49,7 +49,10 @@ DEPEND="
31 )
32 tcpd? ( sys-apps/tcp-wrappers )
33 uuid? ( sys-apps/util-linux )"
34 -RDEPEND="${DEPEND}
35 +DEPEND="${COMMON_DEPEND}
36 + elibc_musl? ( sys-libs/queue-standalone )
37 +"
38 +RDEPEND="${COMMON_DEPEND}
39 !net-libs/libnfsidmap
40 !net-nds/portmap
41 !<sys-apps/openrc-0.13.9
42
43 diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
44 index 704a37b9d642..0f2697c12830 100644
45 --- a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
46 +++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
47 @@ -27,7 +27,7 @@ RESTRICT="test" #315573
48 # files, and nfs-utils doesn't build against heimdal either,
49 # so don't depend on virtual/krb.
50 # (04 Feb 2005 agriffis)
51 -DEPEND="
52 +COMMON_DEPEND="
53 dev-db/sqlite:3
54 dev-libs/libxml2
55 net-libs/libtirpc:=
56 @@ -55,7 +55,10 @@ DEPEND="
57 )
58 tcpd? ( sys-apps/tcp-wrappers )
59 uuid? ( sys-apps/util-linux )"
60 -RDEPEND="${DEPEND}
61 +DEPEND="${COMMON_DEPEND}
62 + elibc_musl? ( sys-libs/queue-standalone )
63 +"
64 +RDEPEND="${COMMON_DEPEND}
65 !net-libs/libnfsidmap
66 !net-nds/portmap
67 !<sys-apps/openrc-0.13.9