gentoo resync : 15.06.2021

3 files changed, 2 insertions, 65 deletions

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"