From a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 10 Nov 2017 00:43:02 +0000
Subject: gentoo resync : 10.11.2017

---
 net-fs/nfs-utils/Manifest                   |   8 +-
 net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild | 190 ----------------------------
 net-fs/nfs-utils/nfs-utils-2.1.2_rc5.ebuild | 190 ----------------------------
 net-fs/nfs-utils/nfs-utils-2.2.1.ebuild     | 188 +++++++++++++++++++++++++++
 net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild | 188 +++++++++++++++++++++++++++
 5 files changed, 380 insertions(+), 384 deletions(-)
 delete mode 100644 net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
 delete mode 100644 net-fs/nfs-utils/nfs-utils-2.1.2_rc5.ebuild
 create mode 100644 net-fs/nfs-utils/nfs-utils-2.2.1.ebuild
 create mode 100644 net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild

(limited to 'net-fs/nfs-utils')

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index e19bd691eb89..36662d854f21 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -24,14 +24,14 @@ AUX rpc.svcgssd.initd 470 SHA256 272905335a7c82034c6bac007bd4477aae21d8ce49e8235
 AUX var-lib-nfs-rpc_pipefs.mount 111 SHA256 59e05e4e6d6af92d5fafaf2d6b8e87670bcda4de5c9fb748d1be40a21f594500 SHA512 f4502bf53fd3014987e53ffc5d4b9b8678103052289dfe9f9304bb7eab66b6b59d80e3a29c19e3bc794657c2e3dbb25e275f78e09bc25808ed9849cc4a748034 WHIRLPOOL c684e43627f4e9ec4c97f0db28ce28682fc5f17627573c0902bb17946b0012969e070bd9030e0c20b9bd10e140e2901a9c2246a7e70700cf7541d90aa7293c76
 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_rc3.tar.gz 475356 SHA256 5b379316a2cc49b07f72042b72eadee0bfe7c88e65d7b5baa4798e6cefca5a82 SHA512 2f948994f275b405678240deecc879900cc0e72476adaf552db059364f08f0929722013d751e0bc7913c30eb3f8183d1fc7693709c063fc92e20b71edd24ccef WHIRLPOOL 6a16a9cc3d22d883b6a8aa2d2f01dce81f9a1df03154a80e4aa43ae9bb878a15f0ca37951702f780341283da94d885b7be3656a950285ef79619e09dc465727f
-DIST nfs-utils-2.1.2_rc5.tar.gz 476401 SHA256 52b32896572e0f81dffd5ccd90c367e5d00b5d371b8deef45dc744ee1b7ad2ab SHA512 28670ca993c1bf953632086ab15cec1b6a525fb1b28243e382f246362cfb2629c9d0416f4f65c6a2f2c46202a4c6855d1924a7f8c984395ddb98b6d4f4b0cbcb WHIRLPOOL f2e2f75c0a989402f75740164870e250a12f29f4b3f0eb7102cecf57aea0d647a0a7860798f9333e8bef9efc4af72f516c885c62cd079e89470d108cdaca4b9d
 DIST nfs-utils-2.1.2_rc6.tar.gz 476695 SHA256 a88b499210eec4fb41414f9ba653570d1845981e414f5de6ae90ecaf14205977 SHA512 d7c054074e2ea4370a5e47922785fa2a0cf595623d0222cb16f910c4946ed7f3d6f093b471557ce139c85ad0dd321bed0222f5c5aa5b7bca04b31d422eb35f75 WHIRLPOOL 6dfec79baa7b37f57a162296b7e5acb07da9144d677cf1f7ec515fc220a844d9a0d7e935ac0f4b9a1db9eaa2816d5d1ea089141f11f6ae9e6ec8bd77d24be0b5
+DIST nfs-utils-2.2.1.tar.bz2 853812 SHA256 0d819d8da358bea6e005e1a6cf0f6fa0c5507a78747d36bc87a0182e6af14291 SHA512 05e2aa4f413a4a4927995847211680baf87f956a435d0d903dd7b6239f72e66a15a089758d41874c05c2137e0626d72c1714010c2a9ce854943fef7798db9a24 WHIRLPOOL 8cd39c83e0a761c3cc846f81184ec6cbe68289b2648c5605ba68a31379f86afafe67f6808f348b30875730a1ee1656d65738b74dd0863a70b48250a3d325f1fc
+DIST nfs-utils-2.2.2_rc1.tar.gz 509381 SHA256 5ed5c50ef20c49a9b96c99bd288d25dc94ecbdb4b314f5d885576692e89345bc SHA512 5cc9a19e1ebf1831f1914419c0e7f12ff12037caa35e5866dfba8bf30c5355dcf2e039928b9b336c6755df856549ccac6ea646d61b57c68f96fd586d21a27f1a WHIRLPOOL 407b721b43308b96ae48553169dfeafb2844dedbce3060860549d85322aea074539bac82bb5579a17d74b2fcc212156d1450feb8a5340570f3d33c763b8fed29
 EBUILD nfs-utils-1.3.4-r1.ebuild 5143 SHA256 14af2bab1372632aa119f64072b31163225a55f5332f1be698a7a2e3cb3fe268 SHA512 0d3c81edc4533db8e37527ba9f56f6456353dc3c926a5d5887e2a5f51ffc428c78fed780758317a991a2803d4031b37b7c715776b3babdb9101384141632ec83 WHIRLPOOL 9e596e0df33eb2ec38a8efa9d0ab1116097a32c35af81116839f1951ce71aaf297f930a637f44798661047a5696238dcea0b6bd02bce9ee958e0224f08d0304e
 EBUILD nfs-utils-2.1.1-r1.ebuild 5064 SHA256 e54c82752ed4b46354eb6e54d70dafa2c6302ec10c0b085359950b094b1d5a90 SHA512 213f9a4905ee77a3e02ee5894cfc2aa8bbedcc81014f0d85eabb54c4994e3e7bb7ab70fe7c501796add31deb8abfc8aaffaf077c0d177067145c9de3802e491c WHIRLPOOL 7c21a5f2b23883ad8614c31cdfebe54e833e1ec199ddc5abcd0fcf9d16bb06e193a2924eced829b39fbc4d5ecdd4cbeaf514d77a2d37bfcf0563290f77ce6ff0
-EBUILD nfs-utils-2.1.2_rc3.ebuild 5289 SHA256 5b4b33d8fd56a614466848030c3e6872a28eafa6b2874c81cdd915ce3fb7d4ff SHA512 81bc8b7e20eb65f451f2c0b4dd5034a603b71cefd0e6dd4bf3c4c96f3e1cba58d32f00c87e61ceb3aa545f0dcca2d74b85448b1d453ec578fb4a38c19b04ad5e WHIRLPOOL 7fc9aa7589ab8843145253bb0e289ca2e2b8a42fb215881f84891fa24aeac49c5ef7e4b95b0c5a98e730dd6dfe122346bc0025b5add1a680a11df0990640717c
-EBUILD nfs-utils-2.1.2_rc5.ebuild 5340 SHA256 98f810df2cd6e69debf60e98ac90ebfc7be36b6c672adc33a02d99c008b9d88b SHA512 7626cec28aeeb377acb2f402fa870a94daea38854ceafeb25dbdf93f36ca5fbdd1439f0e92e51a3f865f50756b5af5051c8caeadf617f3b4fb39dbe4b81e750d WHIRLPOOL e763b6302d3c226c6f7150f3a3473f11f8362ffcbef7f252163144c193f8bd9ffd60245e331fbe3466336f1e1d06e5198249e3b8ef8a7dfbcda220271bdc246d
 EBUILD nfs-utils-2.1.2_rc6.ebuild 5340 SHA256 98f810df2cd6e69debf60e98ac90ebfc7be36b6c672adc33a02d99c008b9d88b SHA512 7626cec28aeeb377acb2f402fa870a94daea38854ceafeb25dbdf93f36ca5fbdd1439f0e92e51a3f865f50756b5af5051c8caeadf617f3b4fb39dbe4b81e750d WHIRLPOOL e763b6302d3c226c6f7150f3a3473f11f8362ffcbef7f252163144c193f8bd9ffd60245e331fbe3466336f1e1d06e5198249e3b8ef8a7dfbcda220271bdc246d
+EBUILD nfs-utils-2.2.1.ebuild 5282 SHA256 49f315d08a2e1b78137918f61ea8fbc53ac5274a2879893f8cd9dacd521af005 SHA512 b2a1e0d368ef803ac8be205708e91f2256cbd8c7a2f304d5db2d8c326550da35eedfb67fae85bcbc68995a20d2f20ea0ad0a94163e5e9e8c85f23252525f01c1 WHIRLPOOL 4cd008ae5ec1dd3820183b4e6e94f5a0cbece3d1a0082bc8cab378d97762ab7ea4c87b76585211ff031d23a48a5aa3d684b945de258e15cda0769e845ac9b5c4
+EBUILD nfs-utils-2.2.2_rc1.ebuild 5282 SHA256 49f315d08a2e1b78137918f61ea8fbc53ac5274a2879893f8cd9dacd521af005 SHA512 b2a1e0d368ef803ac8be205708e91f2256cbd8c7a2f304d5db2d8c326550da35eedfb67fae85bcbc68995a20d2f20ea0ad0a94163e5e9e8c85f23252525f01c1 WHIRLPOOL 4cd008ae5ec1dd3820183b4e6e94f5a0cbece3d1a0082bc8cab378d97762ab7ea4c87b76585211ff031d23a48a5aa3d684b945de258e15cda0769e845ac9b5c4
 MISC ChangeLog 4793 SHA256 332289ca95671a4b5cdef50e7feb9a7ca6dd3932fb5d7dd15edf7cb5a28ef284 SHA512 fba2097f9cbfa7b0d354247415ed85db7ea13b6094da9c43a0b8fdc0c2ee62f4ff17d9d32661ad8e74623ccb2180a00270a3add38b5dd1096358db1236ef999e WHIRLPOOL 0d3b058b419df04477283b53224c71bdea2067af9aee05e10ee9738766e296f8cf9e217381b7599edb8606316c147994dd0ebe3a0d59480766c8c84e04218833
 MISC ChangeLog-2015 46341 SHA256 d909ce1f5fbc93ca1a57f34f3d3567e34bf331462f827b19bf33296a963ab0da SHA512 4140a6ce807d598b6bd3c2e24f3ec4c14f122089f72bfdde7b0985e92013fe0ffaf6c1bf84cf9d532e4784e3d4566541f36c0feae4ec1864365cc137fc07b009 WHIRLPOOL 405b59e201f22161623fab182db72287d7a4a5715ef439e37c9df32330c0446d1ee6d66c04b266284a54d3c3307c86961a890ce66638ca93d3735b5ff0a8ecd6
 MISC metadata.xml 815 SHA256 8ef118718c7d92dbb008dd3cd8bb89e40584967b9c930849ffab396829a43069 SHA512 18aa7723310d1c01653fa49266742b3c00413761af48586977a8979bd34088bd39f281f36d5784c980ada53b981e3654f67363be35d8c1872075d0c5e189da14 WHIRLPOOL 13844feb1774af2e735249a00e1a6bc0db2a08b434740e52b442c181929da4cd0372056606cd7c75d96dd336b73eead6a06d9bd79047a392433e2217bd419fbe
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
deleted file mode 100644
index 4858d85705fd..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	inherit versionator
-	MY_PV="$(replace_all_version_separators -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	caps? ( sys-libs/libcap )
-	sys-libs/e2fsprogs-libs
-	>=net-nds/rpcbind-0.2.4
-	net-libs/libtirpc:=
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			>=sys-apps/keyutils-1.5.9
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON}
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
-		$(use_enable libmount libmount-mount)
-		$(use_with tcpd tcp-wrappers)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable ipv6)
-		$(use_enable caps)
-		$(use_enable uuid)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		--without-gssglue
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	systemd_dounit systemd/*.{mount,service,target}
-	if ! use nfsv4 || ! use kerberos ; then
-		rm "${ED}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
-	fi
-	if ! use nfsv41 ; then
-		rm "${ED}$(systemd_get_unitdir)"/nfs-blkmap.* || die
-	fi
-	sed -i \
-		-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() {
-	# Install default xtab and friends if there's none existing.  In
-	# 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
-	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"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.1.2_rc5.ebuild b/net-fs/nfs-utils/nfs-utils-2.1.2_rc5.ebuild
deleted file mode 100644
index 133e06869f03..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc5.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	inherit versionator
-	MY_PV="$(replace_all_version_separators -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	caps? ( sys-libs/libcap )
-	sys-libs/e2fsprogs-libs
-	>=net-nds/rpcbind-0.2.4
-	net-libs/libtirpc:=
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			>=sys-apps/keyutils-1.5.9
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON}
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
-		$(use_enable libmount libmount-mount)
-		$(use_with tcpd tcp-wrappers)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable ipv6)
-		$(use_enable caps)
-		$(use_enable uuid)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		--without-gssglue
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED%/}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	systemd_dounit systemd/*.{mount,service,target}
-	if ! use nfsv4 || ! use kerberos ; then
-		rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
-	fi
-	if ! use nfsv41 ; then
-		rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
-	fi
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED%/}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# 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
-	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"
-		cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.2.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.1.ebuild
new file mode 100644
index 000000000000..9dcb159618a7
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.2.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	inherit versionator
+	MY_PV="$(replace_all_version_separators -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND_COMMON="
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
+	libmount? ( sys-apps/util-linux )
+	nfsdcld? ( >=dev-db/sqlite-3.3 )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	local myeconfargs=(
+		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		$(use_enable libmount libmount-mount)
+		$(use_with tcpd tcp-wrappers)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable ipv6)
+		$(use_enable caps)
+		$(use_enable uuid)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		--without-gssglue
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED%/}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	systemd_dounit systemd/*.{mount,service,target}
+	if ! use nfsv4 || ! use kerberos ; then
+		rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
+	fi
+	if ! use nfsv41 ; then
+		rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
+	fi
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED%/}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# 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
+	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"
+		cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
+			ewarn "We have switched to upstream systemd unit files. Since"
+			ewarn "they got renamed, you should probably enable the new ones."
+			ewarn "You can run 'equery files nfs-utils | grep systemd'"
+			ewarn "to know what services you need to enable now."
+		fi
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild
new file mode 100644
index 000000000000..9dcb159618a7
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	inherit versionator
+	MY_PV="$(replace_all_version_separators -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND_COMMON="
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
+	libmount? ( sys-apps/util-linux )
+	nfsdcld? ( >=dev-db/sqlite-3.3 )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	local myeconfargs=(
+		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		$(use_enable libmount libmount-mount)
+		$(use_with tcpd tcp-wrappers)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable ipv6)
+		$(use_enable caps)
+		$(use_enable uuid)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		--without-gssglue
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED%/}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	systemd_dounit systemd/*.{mount,service,target}
+	if ! use nfsv4 || ! use kerberos ; then
+		rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
+	fi
+	if ! use nfsv41 ; then
+		rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
+	fi
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED%/}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# 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
+	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"
+		cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
+			ewarn "We have switched to upstream systemd unit files. Since"
+			ewarn "they got renamed, you should probably enable the new ones."
+			ewarn "You can run 'equery files nfs-utils | grep systemd'"
+			ewarn "to know what services you need to enable now."
+		fi
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
-- 
cgit v1.2.3