gentoo resync : 21.01.2018

10 files changed, 2 insertions, 202 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 4c525eda957f..4382b63175dd 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
deleted file mode 100644
index 3a4f4c6f9335..000000000000
--- a/net-nds/portmap/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX portmap-6.0-tcpd.patch 341 BLAKE2B 4900d4c6a589a57fee4782f6953611512cdbe6ada8ae0555ea2f80607f3c17fd33c4ece488c553f6fde06d628c2b5fae630d9615818dbfd32f2bd5a293dc84cf SHA512 95788f1adb385d4f06681e7197b4160771c2d27afab1f031ea894ee12f655f787ed47407c5debea9c360ab2410185d75496ca0b1ad31d827f46dd82ebe832a20
-AUX portmap.confd 146 BLAKE2B b11b63cd538b1655d683b6efb019dec1208ca811d916e334a7082fba518e175be410998dcf601edd04da5feed35d326968b8fc8fcd68f99b02bb89d2b3d2a828 SHA512 2558dfc74c08f7844cb2388bd98f34afe935b3c395571f3d55838e818ff437aa936ebb42c7b4aa82f4872e0f7ef6b5d23b42439462bd769cb8eef56a2852619c
-AUX portmap.rc6 1181 BLAKE2B 833d377fadd4084d141f338f37bfb5fadbdf55e041128f72c8f2396dd690fe4329354fec781055a119ad8f60c9a3a9700e8973acab9ecea51fa68b757674801f SHA512 58e8a5364a134736f6d101e85313afe76abdf086838babae71999b3845365a0484ef363f8fe783833c84c6f2edf68fe89a84aab90a090fe995aa10c44bb58bb9
-DIST portmap-6.0.tgz 22251 BLAKE2B 55b222ab6987db4fe843dba0087fb802b9272c6607a8504135eaa0a41b49bc8e04c875690c1cdf547b6f6b39f273e0f261549c2b9e7639b0689c1f35d33affe5 SHA512 cbcbcff34d7f8c82b8e89464467c313a170d3d1756ae47faab1e90bc01fac8c3b6ff8bc8c35bfe32d9e584aafa8248eb37841d1a54f70db6b54ab54ad7e23665
-EBUILD portmap-6.0.ebuild 1215 BLAKE2B 53df717a049eb8f89fe99aad9cb9c93b425c099b41b623268896f4167d396bf69bb753f40a5300ebb1617b7d4a66d8b0bfdb82b1f06e5d052e070c03a9d88dc1 SHA512 9cf9c0882c7e78106b32a1f49042e4f208e210e80b50030c3b4cac1dd5c5cde29b0bda54584ebe7046b361de8c19d099ac0a8f89de0d50fc4020163e726fd83c
-EBUILD portmap-9999.ebuild 868 BLAKE2B 62c4023b5bd6cc180053a994ff827dee3d78cd5a14718823ff886c331a8e4f0aff248930f3cc4161627bfa570f4fc5012f6935e48d450df605a850a3106a168b SHA512 b6f456348da6facffc18c0859b7acd94af18381a9b93d4bf24bf9204bbe31f3ff168616d70bf9ae946638f1c6f1f4bedf8d4000b8542bb3e47fe055d970484cb
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-nds/portmap/files/portmap-6.0-tcpd.patch b/net-nds/portmap/files/portmap-6.0-tcpd.patch
deleted file mode 100644
index c6af8f8c80b4..000000000000
--- a/net-nds/portmap/files/portmap-6.0-tcpd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Enable compile without tcp-wrappers
-
-Patch by Timothy Redaelli <drizzt@gentoo.org>
-
-http://bugs.gentoo.org/178242
-
---- portmap_6.0/pmap_check.c
-+++ portmap_6.0/pmap_check.c
-@@ -44,7 +44,9 @@
- #include <netinet/in.h>
- #include <rpc/rpcent.h>
- #endif
-+#ifdef HOSTS_ACCESS
- #include <tcpd.h>
-+#endif
- #include <arpa/inet.h>
- #include <grp.h>
- 
diff --git a/net-nds/portmap/files/portmap.confd b/net-nds/portmap/files/portmap.confd
deleted file mode 100644
index c2756c992b4a..000000000000
--- a/net-nds/portmap/files/portmap.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/portmap: config file for /etc/init.d/portmap
-
-# Options for `portmap`.
-# For a full list, just run `portmap -h`.
-#PORTMAP_OPTS="-l"
diff --git a/net-nds/portmap/files/portmap.rc6 b/net-nds/portmap/files/portmap.rc6
deleted file mode 100644
index e123f3df1e6f..000000000000
--- a/net-nds/portmap/files/portmap.rc6
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	before inetd
-	before xinetd
-}
-
-checkconfig() {
-	if [ -e /proc/config.gz ] ; then
-		if zcat /proc/config.gz | grep -s SUNRPC_REGISTER_V4=y ; then
-			eerror "portmap does not work with SUNRPC_REGISTER_V4=y;"
-			eerror "disable it or use the net-nds/rpcbind package."
-			return 1
-		fi
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting portmap"
-	start-stop-daemon --start --quiet --exec /sbin/portmap -- ${PORTMAP_OPTS}
-	local ret=$?
-	eend ${ret}
-	# without, if a service depending on portmap is started too fast,
-	# connecting to portmap will fail -- azarah
-	sleep 1
-	return ${ret}
-}
-
-stop() {
-	ebegin "Stopping portmap"
-	start-stop-daemon --stop --quiet --exec /sbin/portmap
-	eend $?
-}
-
-restart() {
-	# Dump the portmapper's table before stopping
-	ebegin "Saving portmap table"
-	local pmap=$(pmap_dump)
-	eend $?
-
-	# Stop and restart portmapper
-	svc_stop
-	sleep 1
-	svc_start
-
-	# Reload the portmapper's table
-	if [ -n "${pmap}" ] ; then
-		ebegin "Reloading portmap table"
-		echo "${pmap}" | pmap_set
-		eend $?
-	fi
-}
diff --git a/net-nds/portmap/metadata.xml b/net-nds/portmap/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/net-nds/portmap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-nds/portmap/portmap-6.0.ebuild b/net-nds/portmap/portmap-6.0.ebuild
deleted file mode 100644
index 6beb27c6e571..000000000000
--- a/net-nds/portmap/portmap-6.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="daemon for implementing remote procedure calls between computer programs"
-HOMEPAGE="http://neil.brown.name/portmap/"
-SRC_URI="http://neil.brown.name/portmap/${P}.tgz"
-
-LICENSE="BSD GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="selinux tcpd"
-
-DEPEND="
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r7 )
-"
-
-RDEPEND="
-	selinux? ( sec-policy/selinux-portmap )
-"
-
-S=${WORKDIR}/${PN}_${PV}
-
-pkg_setup() {
-	enewgroup rpc 111
-	enewuser rpc 111 -1 /dev/null rpc
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-tcpd.patch #178242
-
-	# Once HPPA gets PIE's fixed, this can go away
-	use hppa && sed -e '/LDFLAGS/s/^/#/' -i "${S}/Makefile" #190458
-}
-
-src_compile() {
-	tc-export CC
-	emake NO_TCP_WRAPPER="$(use tcpd || echo NO)" || die
-}
-
-src_install() {
-	into /
-	dosbin portmap || die "portmap"
-	into /usr
-	dosbin pmap_dump pmap_set || die "pmap"
-
-	doman *.8
-	dodoc BLURBv5 CHANGES README*
-
-	newinitd "${FILESDIR}"/portmap.rc6 portmap
-	newconfd "${FILESDIR}"/portmap.confd portmap
-}
diff --git a/net-nds/portmap/portmap-9999.ebuild b/net-nds/portmap/portmap-9999.ebuild
deleted file mode 100644
index 76484e3a2d0e..000000000000
--- a/net-nds/portmap/portmap-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://neil.brown.name/portmap"
-inherit toolchain-funcs user git-r3
-
-DESCRIPTION="Netkit - portmapper"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-SRC_URI=""
-
-LICENSE="BSD GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS=""
-IUSE="selinux tcpd"
-
-DEPEND="
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r7 )
-"
-
-RDEPEND="
-	selinux? ( sec-policy/selinux-portmap )
-"
-
-pkg_setup() {
-	enewgroup rpc 111
-	enewuser rpc 111 -1 /dev/null rpc
-}
-
-src_compile() {
-	tc-export CC
-	emake NO_TCP_WRAPPER="$(use tcpd || echo NO)"
-}
-
-src_install() {
-	into /
-	dosbin portmap
-	into /usr
-	dosbin pmap_dump pmap_set
-
-	doman *.8
-	dodoc BLURBv5 CHANGES README*
-
-	newinitd "${FILESDIR}"/portmap.rc6 portmap
-	newconfd "${FILESDIR}"/portmap.confd portmap
-}
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index e633bf0d6273..1bb7744aa284 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -11,5 +11,5 @@ EBUILD rpcbind-0.2.3-r1.ebuild 1410 BLAKE2B 95d6250decb76c6abca0167c407fffe40c9c
 EBUILD rpcbind-0.2.3-r2.ebuild 1478 BLAKE2B 85e727d0557569c260008af7d553980e959eb2f30bf7bbfc0a2579986462a790e245e7a4d035ba60d56f8d1c74683ba6d0b1b2026d12a15a778d69cca57b0dc0 SHA512 c408d69cf97dace84a85069f567646fbf50baa1971fd465b56c9168978ed9a6fad319b199fe6c8b046286189de5881e406a8331c2bd0ad33f83b93a6787d0995
 EBUILD rpcbind-0.2.4-r1.ebuild 1390 BLAKE2B 25c195b4ab61bad2f55f937cb32d898eecfaafc247abc22a419f9dd17d02c7389545b3de828be515ca6cf77644a023ebb39cf4eec0522ab77bd07e438719b3fe SHA512 970b0bad735da4a16479d21f4e304e7efe90556f3a6155dc2c0665c60fdf1aefadf82e32b171a95f57ee627ea81de19462e5b9de57088f75306ace1263838cc4
 EBUILD rpcbind-0.2.4.ebuild 1316 BLAKE2B f0a157835986a3b78825cd35206dcc32987bf38767c10683bd4530fc3156fd0482d570bb407ba755e51dc238e88a6cf6c335a45faf39212636dc6ac6ce6b546b SHA512 1a80496539d3727c0ce19423d6e8f29f4d2e747c3864fb55d572312668b6c037b80176bb74a91f19af2edfb8503170e39aa36f28189ac97f71aefd2fbca26550
-EBUILD rpcbind-9999.ebuild 1327 BLAKE2B f8eee48efc5517267f860a503d25bafad05e1ad8fc259f64a54556149e6914e4ea079de253c6e6147ca0f0b2c249a6da545dc8fdd4ea43b097dfd506218ba992 SHA512 677c6dce60b05a5b04973968e1e1b7a9735df76cb7bb0d6fb5cc6ae713277dafa55beea7d35f70745f52997c37e6535b2b022cfdd2f813283bc96c0fded5c521
+EBUILD rpcbind-9999.ebuild 1272 BLAKE2B 2e0c6e8ff2c7a70f44d9a32d0db88e2c403f23633268c7d0c265656f4bd8ccec90be051108820fa2f974b192944a0df48add921b8241d92bb8080b846288c8e0 SHA512 69a992076b77d001fc037bbb244f6cb3c93b8ceff1fca253c77d71dc17528aae473182fc7f2ffa63414f57f25d398ea0cd0a0ae81e8f7e2479ea42fd397b3b8c
 MISC metadata.xml 405 BLAKE2B e55c92d34f30b03f0305586b1ec0a5ceca21eae2f5ec21979b0ab21d18162607ad7c6a767d7e6b106820a2c02e11034f4c524816185fda8d0fbf3598a39ffb06 SHA512 accad1ef4202c9ebd7292ae6e1e68a1c59ddbfb741779a635058d54aa1efbf8b70b5e045d53dc9dba61256d5981e11c57b540a1c7b8fb38207863a6f2c50a5af
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild
index 8ed5edc7bbf4..788cb937f34c 100644
--- a/net-nds/rpcbind/rpcbind-9999.ebuild
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -35,9 +35,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--bindir="${EPREFIX}"/sbin \
 		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
 		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
 		$(use_enable tcpd libwrap) \
 		$(use_enable debug) \