From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78A43139694 for ; Sun, 18 Jun 2017 23:22:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99C75E0B7D; Sun, 18 Jun 2017 23:22:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7484CE0B7D for ; Sun, 18 Jun 2017 23:22:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCB6C34177E for ; Sun, 18 Jun 2017 23:22:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38D60747E for ; Sun, 18 Jun 2017 23:22:14 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1497828129.8a83de6d4d6fdb8f123f29cc8acac6d4ad10a45c.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild X-VCS-Directories: net-fs/nfs-utils/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8a83de6d4d6fdb8f123f29cc8acac6d4ad10a45c X-VCS-Branch: master Date: Sun, 18 Jun 2017 23:22:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7424a9d9-ee8b-4203-9202-37ad406bb279 X-Archives-Hash: 71de5c94601a46b27910d1bcfcc7f72a commit: 8a83de6d4d6fdb8f123f29cc8acac6d4ad10a45c Author: Chris Mayo gmail com> AuthorDate: Sun Jun 11 18:37:05 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Jun 18 23:22:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a83de6d net-fs/nfs-utils: Remove obsolete sed transformations of systemd units nfs-config.service and use of EnvironmentFile removed by: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=2662e1ba98707014b6167e1e5bd3162d6d8f52af Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4912 net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 index 8ed226bc43c..4858d85705f 100644 --- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild @@ -155,9 +155,7 @@ src_install() { if ! use nfsv41 ; then rm "${ED}$(systemd_get_unitdir)"/nfs-blkmap.* || die fi - sed -i -r \ - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \ - -e '/^(After|Wants)=nfs-config.service$/d' \ + sed -i \ -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ "${ED}$(systemd_get_unitdir)"/* || die