Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/
Date: Sun, 18 Jun 2017 23:22:18
Message-Id: 1497828129.8a83de6d4d6fdb8f123f29cc8acac6d4ad10a45c.polynomial-c@gentoo
1 commit: 8a83de6d4d6fdb8f123f29cc8acac6d4ad10a45c
2 Author: Chris Mayo <aklhfex <AT> gmail <DOT> com>
3 AuthorDate: Sun Jun 11 18:37:05 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 18 23:22:09 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a83de6d
7
8 net-fs/nfs-utils: Remove obsolete sed transformations of systemd units
9
10 nfs-config.service and use of EnvironmentFile removed by:
11 http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=2662e1ba98707014b6167e1e5bd3162d6d8f52af
12
13 Package-Manager: Portage-2.3.5, Repoman-2.3.2
14 Closes: https://github.com/gentoo/gentoo/pull/4912
15
16 net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild | 4 +---
17 1 file changed, 1 insertion(+), 3 deletions(-)
18
19 diff --git a/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild b/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
20 index 8ed226bc43c..4858d85705f 100644
21 --- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
22 +++ b/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
23 @@ -155,9 +155,7 @@ src_install() {
24 if ! use nfsv41 ; then
25 rm "${ED}$(systemd_get_unitdir)"/nfs-blkmap.* || die
26 fi
27 - sed -i -r \
28 - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
29 - -e '/^(After|Wants)=nfs-config.service$/d' \
30 + sed -i \
31 -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
32 "${ED}$(systemd_get_unitdir)"/* || die