gentoo resync : 22.05.2021

6 files changed, 71 insertions, 98 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index a399bacfaeed..5e2efa3f1f6f 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/gssproxy/Manifest b/net-nds/gssproxy/Manifest
index ac7afbd60306..08ca0fa74a8a 100644
--- a/net-nds/gssproxy/Manifest
+++ b/net-nds/gssproxy/Manifest
@@ -1,6 +1,4 @@
 AUX gssproxy 276 BLAKE2B f529b72cc589910a8c7c5f76428359e6bbca612e3ce78f1a02213655183942d1c362a3c48d7d60ceb408d4ae0a8dd75f12ebaa30d7cff59d1f0ea2537c2b1dcc SHA512 883a9a82e9f7e92aee212f9cdc8a5c5eb5204d03a928a48d5826ef4de273907a8d4f1bbf2e9351d19f88fb35cd499ea1103d7aaa0e97ed23fc2e5a0b35be0fee
-DIST gssproxy-0.8.3.tar.gz 565100 BLAKE2B a8b3d96ca0b1cc314af3b63cc5959c9b48287ea0169ea75f8a8902bbd5757542fd24e1fa3f603b2a7d4c15878600145bf5a27e880e935a7a037ca3ebc9fcfb9c SHA512 144b10ec4e19ad2ded5ae57adf1ca311e2fc6c2b97e202eedde69d82c8d50afc0459ac36c7fc5d5290184eb68547a696b33e8a069fde43478104ac26b2c98bc2
 DIST gssproxy-0.8.4.tar.gz 567579 BLAKE2B 55519d2d439e168df0346cfa2655e01bc90191e17ea7d8c72c5f29c22ed6adca39e5adb4fd900f6dc756147b2fbee23212bfc097c38ab927e6c9679b0186fa2c SHA512 ab81c40d6c7b1908751feb107d8da66603b7681fb67aa7a1f30194a81d542ca89e6c2f34425e9356b9c55eb3691bfa240ba41441c01498af45e862a133cd088a
-EBUILD gssproxy-0.8.3.ebuild 2807 BLAKE2B fd06a46cd3fd392ef0e75a2a5b6599d65289a88b1cbde9c76776258fc6eabcea6df888ab8d7c8dca2c275691f63a155c9ed89c0d40726b95331e7e58b30b78b8 SHA512 0e0b49feb105c9dae277ea23ccfd3ce36fd4b32781c1109ff996c7ae491857b92495e47af4b0c9d293c62a5f5449b9ccc584f7dd2104ff3ae7907b9b35b94696
 EBUILD gssproxy-0.8.4.ebuild 2807 BLAKE2B 018f555f13754fd0673e2597ad55ff019e7d5d7d177ebc3b889d4c1debc4477ca3ba1e852e411064477a55711138b9d3cf0418b18c294b63750a78d62ca52d46 SHA512 8318e5c635a5e5177277f6614e30149fadde1044bdabb4f0eb95ad7cefaa0fed01a9ca071a34fffca025bad56b341db30160cb9b2ce9e8da38cfbccbc86f55c8
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/net-nds/gssproxy/gssproxy-0.8.3.ebuild b/net-nds/gssproxy/gssproxy-0.8.3.ebuild
deleted file mode 100644
index 9c813bc18bea..000000000000
--- a/net-nds/gssproxy/gssproxy-0.8.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
-HOMEPAGE="https://github.com/gssapi/gssproxy"
-SRC_URI="https://github.com/gssapi/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug selinux systemd hardened"
-
-COMMON_DEPEND=">=dev-libs/libverto-0.2.2
-	>=dev-libs/ding-libs-0.6.1
-	virtual/krb5
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-gssproxy )"
-# We need xml stuff to build the man pages, and people really want/need
-# the man pages for this package :). #585200
-BDEPEND="
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-# Many requirements to run tests, including running slapd as root, hence
-# unfeasible.
-RESTRICT="test"
-
-# pkg_setup() {
-# 	# Here instead of flag-logic in DEPEND, since virtual/krb5 does not
-# 	# allow to specify the openldap use flag, which heimdal doesn't
-# 	# support.
-# 	# Using mit-krb5 explicitly because heimdal doesn't install kerberos
-# 	# schemata required for the tests of gss-proxy.
-# 	if use test && ! has_version "app-crypt/mit-krb5[openldap]"; then
-# 		eerror "Tests of this package require the kerberos schemata installed from app-crypt/mit-krb5[openldap]."
-# 		die "Tests enabled but no app-crypt/mit-krb5[openldap] being installed."
-# 	fi
-# }
-
-# Was required in 0.7.0 to fix the schema- and slapd-path. Reason for
-# comment: see RESTRICT comment
-# src_prepare() {
-# 	default
-# 	# The tests look for kerberos schemata in the documentation
-# 	# directory of krb5, however these are installed in /etc/openldap
-# 	# and only if the openldap useflag is supplied
-# 	sed -i \
-# 		-e 's#/usr/share/doc/krb5-server-ldap*#/etc/openldap/schema#' \
-# 		-e "s#\(subprocess.Popen..\"\)slapd#\1/usr/$(get_libdir)/openldap/slapd#" \
-# 		"${S}/tests/testlib.py" || die
-# }
-
-src_configure() {
-	local myeconfargs=(
-		# The build assumes localstatedir is /var and takes care of
-		# using all the right subdirs itself.
-		"--localstatedir=${EPREFIX}/var"
-		"--with-os=gentoo"
-		"--with-initscript=$(usex systemd systemd none)"
-		"$(use_with selinux)"
-		"$(use_with debug gssidebug)"
-		"$(use_with hardened hardening)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# This is a plugin module, so no need for la file.
-	find "${ED}"/usr -name proxymech.la -delete || die
-
-	doinitd "${FILESDIR}"/gssproxy
-	insinto /etc/gssproxy
-	doins examples/*.conf
-	insinto /etc/gss/mech.d
-	newins examples/mech gssproxy.conf
-
-	keepdir /var/lib/gssproxy
-
-	# The build installs a bunch of empty dirs, so prune them.
-	find "${ED}" -depth -type d -empty -delete || die
-}
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index e6c42df4bbd0..2b85fc2e2f16 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -1,6 +1,8 @@
 AUX rpcbind.confd 68 BLAKE2B 2309602d38fd5119fc5e6c123ca9da7a6f86526a0dddad12e1be24a7af9724b5d1b389cf44299722fb4af7932b26fc2a62996bb815cebd258e56a3248e63b393 SHA512 f11f6785708bde3ace7b55c1585e283ed07078faf310077c3d26e8e584baec6152d3f86f3d99d7a34fd10f22a7de4d8d70568c9e7f914a82eeb786b08b379044
 AUX rpcbind.initd 414 BLAKE2B 38636c24567ab930a5222711112bb197f7bdf2289773adda1e19421459eee23ad3ea77118a053c72cda96d8d2ba8a2ab63faf8bf74d9b238ec4f37b059f62108 SHA512 43f26570fbff0970c5aa0a1ee5f4f561645d31c90e3bb997bd63e05678814f199263a5aaa5051bfe88622a156f8260825ffd905301d158cb410f25631d75cc55
 DIST rpcbind-1.2.5.tar.bz2 123502 BLAKE2B de0d10406aeffd75195c1fa1d0179b2c7c0ba54c3f3ac58ce9d7e9448d1dbe91a296ad69c45dee115e0a739aa9cfec53b750d3a5ca405e16605a92bbb2006859 SHA512 e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4
+DIST rpcbind-1.2.6.tar.bz2 124590 BLAKE2B bb0e9f81e4747f8a732c9e25af561e79f2b6cd1c1955db586833871901b6da73f4b7ef32149a81b75daa81359b9c0554726670460b28857042dd66a2f861cac2 SHA512 fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7
 EBUILD rpcbind-1.2.5.ebuild 1498 BLAKE2B 597f622a5050305b71d7cd305cb08b537ac56c16e224cef1636f4260f234bde83558961a98f1677ca440cbdce28afc6284912a4bb540243db10457f8ad8df7ba SHA512 2d46136470fefbee110e9705e29ee6f37833783d7d6a119c55a02ec8538813f34890f6fafa0614161369e267f294abfe90630b8128bd86dbff495e814ecf3c2e
-EBUILD rpcbind-9999.ebuild 1499 BLAKE2B a2a10f910420e58e43d76e5f8d8a355cffcae690f3d11410de4cec8e0a566abb22e7db46c22a4fb381aa27745dabcb77f1adc2121858bb82ce4fbe5796ae6807 SHA512 1f22558ea813f25f977c0696f3384ca1c517576eba3f7a16c10ef536dac7ec86ec020da22fa59a81db7c811b1decc28ea72440426c9e9ecdc4c8a303efae7001
+EBUILD rpcbind-1.2.6.ebuild 1495 BLAKE2B dd6f81064866d04bef23c668e589b612ab7d9a7f01c3bfc24e3a23c210ceef37496df7061d369f5b71d236116690b9378f5f4b84a7144034058cfd6a4fb72263 SHA512 edeaa4c058963be5384c65bfdf1d22db71c206a2f28cc86d88c078e3bddda507594360edb76c36dfbb2085fb69a0bb1e10030e12f40021c911964c8b5833844b
+EBUILD rpcbind-9999.ebuild 1495 BLAKE2B dd6f81064866d04bef23c668e589b612ab7d9a7f01c3bfc24e3a23c210ceef37496df7061d369f5b71d236116690b9378f5f4b84a7144034058cfd6a4fb72263 SHA512 edeaa4c058963be5384c65bfdf1d22db71c206a2f28cc86d88c078e3bddda507594360edb76c36dfbb2085fb69a0bb1e10030e12f40021c911964c8b5833844b
 MISC metadata.xml 459 BLAKE2B d3625a12679bb29b5402e397618cb007079ca84ada8ef79ced347338a6dacb4473a58fcdf7350e16f8623442f601563acaa247f5f605df1d289876cb3fc4dde1 SHA512 1aa9e72521a4c4c22c78e5a5e9f32c89d66b50079b9e42dc4cb4a043561d6a48e9e76ab52c2803609479161bfd7b21c18689d5088594762c4e09fa1fa58dd3b1
diff --git a/net-nds/rpcbind/rpcbind-1.2.6.ebuild b/net-nds/rpcbind/rpcbind-1.2.6.ebuild
new file mode 100644
index 000000000000..51778b3ddf63
--- /dev/null
+++ b/net-nds/rpcbind/rpcbind-1.2.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="portmap replacement which supports RPC over various protocols"
+HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug remotecalls selinux systemd tcpd warmstarts"
+REQUIRED_USE="systemd? ( warmstarts )"
+
+DEPEND=">=net-libs/libtirpc-0.2.3:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rpcbind )"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		--sbindir="${EPREFIX}"/sbin
+		--with-statedir="${EPREFIX}"/run/${PN}
+		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_systemunitdir)" "no")
+		$(use_enable debug)
+		$(use_enable remotecalls rmtcalls)
+		$(use_enable warmstarts)
+		$(use_enable tcpd libwrap)
+	)
+
+	# Avoid using rpcsvc headers
+	# https://bugs.gentoo.org/705224
+	export ac_cv_header_rpcsvc_mount_h=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild
index aada63a85850..51778b3ddf63 100644
--- a/net-nds/rpcbind/rpcbind-9999.ebuild
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="portmap replacement which supports RPC over various protocols"
@@ -21,13 +21,13 @@ SLOT="0"
 IUSE="debug remotecalls selinux systemd tcpd warmstarts"
 REQUIRED_USE="systemd? ( warmstarts )"
 
-CDEPEND=">=net-libs/libtirpc-0.2.3:=
+DEPEND=">=net-libs/libtirpc-0.2.3:=
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-rpcbind )"
+BDEPEND="
+	virtual/pkgconfig"
 
 src_prepare() {
 	default