[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/

[Lars Wendler]

commit:     49c74dfb4ca8cd887923054ff7ff1aa1277c0356
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 20:11:55 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 20:12:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c74dfb

net-fs/nfs-utils: Bump to version 2.1.2_rc3. Removed old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-fs/nfs-utils/Manifest                                            | 2 +-
 .../{nfs-utils-2.1.2_rc2.ebuild => nfs-utils-2.1.2_rc3.ebuild}       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index a5642104b0f..86af6b300a9 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,4 +1,4 @@
 DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 
748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 
304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9
 WHIRLPOOL 
6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592
 DIST nfs-utils-1.3.4.tar.bz2 814545 SHA256 
c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590 SHA512 
765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c
 WHIRLPOOL 
6dc556ef7d00a583c222eb62a600b0d83c6f91ad65d89ca14e1fb3c8aaacf4fbae492e6f0ca3fb0821e2b666f0806ad5fddec041a1124b86b9941540cdfb08b4
 DIST nfs-utils-2.1.1.tar.bz2 820083 SHA256 
0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09 SHA512 
ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448
 WHIRLPOOL 
bb28ae312b64c3493a1393a5b41eda457367594a71e230379ec04ffea3eb29d60ab8254e4981b0aa9cbe778dc1fbe9b08dc8615184a35cdb22bf4e5e04e56a6c
-DIST nfs-utils-2.1.2_rc2.tar.gz 475423 SHA256 
bfcbc8f21d1169e8cacbd9beff7cb1ad500f5b9bf6cc3f1824c4cffc68645305 SHA512 
7190280fea6caafdd80fb1cadc4d20e28b9196383ba17f82d0fc48611b4a009dabfbd27c483184faf43c21a412f5af2084a05b96b117f5fa49c294ff256e80b2
 WHIRLPOOL 
02f9b97ab21ff2a6610ed27f6061410fc6457f0b28caf5110648b43c90460691bbe5355fa08203454a1d3ed6f9011708f4b7e651dbf636945a2e2236ed1a5584
+DIST nfs-utils-2.1.2_rc3.tar.gz 475356 SHA256 
5b379316a2cc49b07f72042b72eadee0bfe7c88e65d7b5baa4798e6cefca5a82 SHA512 
2f948994f275b405678240deecc879900cc0e72476adaf552db059364f08f0929722013d751e0bc7913c30eb3f8183d1fc7693709c063fc92e20b71edd24ccef
 WHIRLPOOL 
6a16a9cc3d22d883b6a8aa2d2f01dce81f9a1df03154a80e4aa43ae9bb878a15f0ca37951702f780341283da94d885b7be3656a950285ef79619e09dc465727f

diff --git a/net-fs/nfs-utils/nfs-utils-2.1.2_rc2.ebuild 
b/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
similarity index 98%
rename from net-fs/nfs-utils/nfs-utils-2.1.2_rc2.ebuild
rename to net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
index 62ab1c43c85..8ed226bc43c 100644
--- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
@@ -160,6 +160,10 @@ src_install() {
                -e '/^(After|Wants)=nfs-config.service$/d' \
                -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
                "${ED}$(systemd_get_unitdir)"/* || die
+
+       keepdir /var/lib/nfs #368505
+       keepdir /var/lib/nfs/v4recovery #603628
+
 }
 
 pkg_postinst() {
@@ -167,7 +171,6 @@ pkg_postinst() {
        # src_install we put them in /usr/lib/nfs for safe-keeping, but
        # the daemons actually use the files in /var/lib/nfs.  #30486
        local f
-       mkdir -p "${EROOT}"/var/lib/nfs #368505
        for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
                [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
                einfo "Copying default ${f##*/} from 
${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"