gentoo resync : 15.06.2021

8 files changed, 8 insertions, 71 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index a63c70aaa911..f9b9ade8004e 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index e1fd372a403e..9ff5413347e6 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -24,7 +24,7 @@ DIST openldap-2.4.57.tgz 5883912 BLAKE2B 439605e1bebcf34968f0a552aaade1b72b7671a
 DIST openldap-2.4.58.tgz 5885225 BLAKE2B effb618dba03497796a497cd7f53ec52e389133769321dd242433bed5ec4b1f66cf7353f08a49d5f3465880f6bcfc9afc9c7d2a28e075b66f5fd926b02213541 SHA512 2fa2aa36117692eca44e55559f162c8c796f78469e6c2aee91b06d46f2b755d416979c913a3d89bbf9db14cc84881ecffee69af75b48e1d16b7aa9d2e3873baa
 DIST openldap-2.5.4.tgz 6415235 BLAKE2B 16e466d01dc7642786bb88a101854513f1239f1e817fd05145e89deb54bc1b911a5dc5f42b132747f14bdd2a3355e7c398b8b14937e7093361f4a96bfb7e9197 SHA512 00b57c9179acf3b1bde738e91604f3b09b5f5309106362bb947154d131868f233713eaa75c9af9771bfad731902d67406e8fb429851bad227fc48054cace16a8
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.57.ebuild 29051 BLAKE2B 26a5fdfa25f485e7cb91a6d5186b2c2d71aed09acfb29d466bcdb0c6f2f24133100face57ad9a3afe6f6b5adedd59fc34df7ca3dfa80957a8bd821a984a89922 SHA512 03707d1611916104c7050761ce7297ec7587e10d4d9a72fa259434ed157fe0db17776f1533d946e61816abcf2470c92247bbb0e34ff0a5c3aeceb5930fd4a388
-EBUILD openldap-2.4.58.ebuild 29059 BLAKE2B 04461be6bc33bbeb68e94dac3b1e510453e35e5caae631043995f63dd030c4a63f96c2857d2bf397dca5a3f446b3d8d6127b9b2aa2e4a2d90fc2a4be281db67d SHA512 2e0fafdf30ae499f34bea6e96ab733b8002c4a89a6d0bd694ccec4e4f795b2f3dc46ea0a44792fbfa00844fb612d85391ccba149cb29a9d8a311ae1225afeafc
-EBUILD openldap-2.5.4.ebuild 27170 BLAKE2B f9650c9355af9ef24cb8a93bc7511a93494d3c4f55154c5e7c6164fdcce1700a459e8004d0b3565a59532a47aca619964a4134ef4603916a67a36a1608b2de4e SHA512 58a130b7c3d5a7b29117f9d76d417af2c156d322571ee037ab0563e1b2ae02f676a74c5bd63d29fcfffc29958913e50bc8be751f4280e16175a3abf78f512c3f
+EBUILD openldap-2.4.57.ebuild 29050 BLAKE2B a73dd889eb95afc1e3e2f876de7fdb16dc196ccd1ea96f1287573426821cd1b9b16d5b5622f61b3d9a69a09795863c51c1d6d67bfbe8cf886c22f16ea807b9ae SHA512 700728da1a2f29260f2ba25c44973be7683cb576d8ab7b0c2dbee24d7c792ad15704dde67d2240d40ab37975fa87c353f5dc7ddb394165ca4edf0c73c10b61e7
+EBUILD openldap-2.4.58.ebuild 29058 BLAKE2B e4bea3d25005107536c156f776d5af9d05d4ac8a5be9b144085d13221515e2f73f6d41ade12f613c425dd8aab351e94169ce92cf1d0990fb900c03c686c9f5c1 SHA512 56c0fe945991bb15cfcc27da3ce83c3c5ce699487f5409e27b4a27ad970d4ff7efc5174bafcf49cafba66dc84536ce8b9398a23ad7a4d62e38df15d6b2b7045c
+EBUILD openldap-2.5.4.ebuild 27169 BLAKE2B 8886673fd34cbf7c88450532867342560dff544b4f882788d92268a4db4e90038a07dd638e62c05cc99c45367bce8893346a6aedea0fe3b65062e03548ec4069 SHA512 88e914dc5f143762ebb02fa57818edd39335059ae4bd13f8ed9888ee4bfde44dfea2ce623f8f432e3989f844dd7a591f53346cdd39376aeedd99988e289a82fa
 MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/openldap-2.4.57.ebuild b/net-nds/openldap/openldap-2.4.57.ebuild
index 275d24ff2e0b..2a461032a16c 100644
--- a/net-nds/openldap/openldap-2.4.57.ebuild
+++ b/net-nds/openldap/openldap-2.4.57.ebuild
@@ -29,7 +29,7 @@ IUSE_BACKEND="+berkdb"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
 IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 RESTRICT="!test? ( test )"
diff --git a/net-nds/openldap/openldap-2.4.58.ebuild b/net-nds/openldap/openldap-2.4.58.ebuild
index 02f6d9096b6b..67b024653c5f 100644
--- a/net-nds/openldap/openldap-2.4.58.ebuild
+++ b/net-nds/openldap/openldap-2.4.58.ebuild
@@ -29,7 +29,7 @@ IUSE_BACKEND="+berkdb"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
 IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 RESTRICT="!test? ( test )"
diff --git a/net-nds/openldap/openldap-2.5.4.ebuild b/net-nds/openldap/openldap-2.5.4.ebuild
index dccb2e94a857..b43e411f2758 100644
--- a/net-nds/openldap/openldap-2.5.4.ebuild
+++ b/net-nds/openldap/openldap-2.5.4.ebuild
@@ -28,7 +28,7 @@ IUSE_DAEMON="crypt samba tcpd experimental minimal"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
 IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 RESTRICT="!test? ( test )"
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 2b85fc2e2f16..631fc1bbf794 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -1,8 +1,6 @@
 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-1.2.6.ebuild 1495 BLAKE2B dd6f81064866d04bef23c668e589b612ab7d9a7f01c3bfc24e3a23c210ceef37496df7061d369f5b71d236116690b9378f5f4b84a7144034058cfd6a4fb72263 SHA512 edeaa4c058963be5384c65bfdf1d22db71c206a2f28cc86d88c078e3bddda507594360edb76c36dfbb2085fb69a0bb1e10030e12f40021c911964c8b5833844b
+EBUILD rpcbind-1.2.6.ebuild 1487 BLAKE2B 7440892bec73c28266202335922472b29a6d826426e4ab454c4f93d3a7f1a7ce7faec76627e8383a06f2fae3de8c22b034d81c1ecb54afa91009bb6761a2dc8c SHA512 b31561523f59350cf14b45f9b44c85d5ce55e4acf62892501c354339df4770a0286d656ecafa0926e24548e850d2e59dc022d19449865b7826aafe6cd09bd9b1
 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.5.ebuild b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
deleted file mode 100644
index dba9155d7bdb..000000000000
--- a/net-nds/rpcbind/rpcbind-1.2.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 )"
-
-CDEPEND=">=net-libs/libtirpc-0.2.3:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-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-1.2.6.ebuild b/net-nds/rpcbind/rpcbind-1.2.6.ebuild
index 51778b3ddf63..6107f2e5bec6 100644
--- a/net-nds/rpcbind/rpcbind-1.2.6.ebuild
+++ b/net-nds/rpcbind/rpcbind-1.2.6.ebuild
@@ -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 ~riscv ~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"