net-fs/nfs-utils: remove 'need portmap' from init scripts (-nfsv3)

Closes: https://bugs.gentoo.org/925459
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

net-fs/nfs-utils/files/nfs.initd

@@ -24,7 +24,8 @@ depend() {
 		}' /etc/exports /etc/exports.d/*.exports 2>/dev/null
 	)"
 	config /etc/exports /etc/exports.d/*.exports
-	need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
+	need portmap
+	need rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
 	after quota
 }

net-fs/nfs-utils/files/nfsclient.initd

@@ -14,7 +14,8 @@ depend() {
 		done
 	fi
 	config /etc/fstab
-	need portmap rpc.statd rpc.idmapd ${myneed}
+	need portmap
+	need rpc.statd rpc.idmapd ${myneed}
 	use ypbind dns
 }
 

net-fs/nfs-utils/files/rpc.gssd.initd

@@ -6,7 +6,8 @@
 
 depend() {
 	use ypbind net
-	need portmap rpc.pipefs
+	need portmap
+	need rpc.pipefs
 	after quota
 }
 

net-fs/nfs-utils/files/rpc.idmapd.initd

@@ -8,7 +8,8 @@ rpc_bin=/usr/sbin/rpc.idmapd
 
 depend() {
 	use ypbind net
-	need portmap rpc.pipefs
+	need portmap
+	need rpc.pipefs
 	after quota
 }
 

net-fs/nfs-utils/files/rpc.svcgssd.initd

@@ -6,7 +6,8 @@
 
 depend() {
 	use ypbind net
-	need portmap rpc.pipefs
+	need portmap
+	need rpc.pipefs
 	after quota
 }
 

net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild

@@ -167,14 +167,19 @@ src_install() {
 	doins "${FILESDIR}"/exports
 	keepdir /etc/exports.d
 
-	local f list=() opt_need=""
+	local f list=()
 	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
 		list+=( rpc.idmapd rpc.pipefs )
 		use kerberos && list+=( rpc.gssd rpc.svcgssd )
 	fi
+
+	local sedexp=( -e '#placehoder' )
+	use nfsv3 || sedexp+=( -e '/need portmap/d' )
+
+	mkdir -p "${T}/init.d" || die
 	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
+		sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die
+		doinitd "${T}/init.d/${f}"
 	done
 
 	local systemd_systemunitdir="$(systemd_get_systemunitdir)"