gentoo resync : 03.07.2021

10 files changed, 37 insertions, 26 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 693e5d2adbe4..8368d8da56b6 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index f22df509cce0..e8a9ebe527f1 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -1,3 +1,3 @@
 DIST ldapvi-1.7_p20101214.tar.bz2 1490491 BLAKE2B 21bb7b6113e89ce848e7a8efcec063dbfe9c32331c1125456a96dc6edc4e09d17245307a041a7d7804fac20bcce5b38677d719fb53d993fb874134bbd4d4df19 SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925
-EBUILD ldapvi-1.7_p20101214-r1.ebuild 929 BLAKE2B 8cad6b904f674f86516cf74ebdf533f1eb98b83a422772753dc78abed27d4962b2203f2d603ea4fe26b39172fc69167c4827d4b6e7b4552241f0289f8f5d44ea SHA512 24aafb6897669961fe02ad6d40c5d0b454d36d9bdb569df741bc97852ddf33831472ead01d1154e42a0e46d5c4bc0b66d262ac5b964630379fc33893a1f34008
+EBUILD ldapvi-1.7_p20101214-r2.ebuild 1013 BLAKE2B bfbd8833cc620faa9cb4322d7159ee88fedbc60b0a7850285162f9a789e1a0f9024df8f6c87285bd9aa4c508a07388bca9616b27fc84a983c3c3ab1851fb45c0 SHA512 2ff77b829383aac452db4661ca62baea52a92105135a04f28894fb71beb6df3519c62dc28eca8333a57f482c896c3c4ce923f402a29c6ecd378b5bacb02951ad
 MISC metadata.xml 256 BLAKE2B e359587434ae69bc9db48bc0dbc2071c4b5c487ad9f65dea534f5a9ef38585191088f8cdf58d2803f50bd97b871d3d68d16b011cce3af71bf5953eb1b5a72e56 SHA512 3ac9c3945f86b6121a94e460be21c5ce62dd0de5ff42efa05e74d04b9baf7fd72e2479c8b8b7e7c913d773d6262ab63cf095d6ef32507d871dab24bc2dac3360
diff --git a/net-nds/ldapvi/ldapvi-1.7_p20101214-r1.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214-r2.ebuild
index b299a4ee9a11..018f387af4a0 100644
--- a/net-nds/ldapvi/ldapvi-1.7_p20101214-r1.ebuild
+++ b/net-nds/ldapvi/ldapvi-1.7_p20101214-r2.ebuild
@@ -1,42 +1,48 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="Manage LDAP entries with a text editor"
 HOMEPAGE="http://www.lichteblau.com/ldapvi/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}"/${P}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ~sparc x86"
 IUSE="gnutls sasl"
 
-RDEPEND="
-	sys-libs/ncurses:0
-	net-nds/openldap
-	dev-libs/popt
+RDEPEND="dev-libs/popt
 	dev-libs/glib:2
-	sys-libs/readline
-	gnutls? ( net-libs/gnutls )
+	net-nds/openldap
+	sys-libs/readline:=
+	sys-libs/ncurses:0=
+	virtual/libcrypt:=
+	gnutls? ( net-libs/gnutls:= )
 	!gnutls? ( dev-libs/openssl:0= )
 	sasl? ( dev-libs/cyrus-sasl:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}/${PN}
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	#bug 459478
-	sed -e '/^AC_SEARCH_LIBS/s:curses ncurses:curses ncurses tinfo:' \
-		-i configure.in || die
+	default
+
+	# bug #459478
+	sed -i \
+		-e '/^AC_SEARCH_LIBS/s:curses ncurses:curses ncurses tinfo:' \
+		configure.in || die
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
 src_configure() {
-	econf --with-libcrypto=$(usex gnutls gnutls openssl)
+	econf \
+		--with-libcrypto=$(usex gnutls gnutls openssl)
 }
 
 src_install() {
diff --git a/net-nds/tac_plus/Manifest b/net-nds/tac_plus/Manifest
index 7d8ce9dc8561..c85db8e4790d 100644
--- a/net-nds/tac_plus/Manifest
+++ b/net-nds/tac_plus/Manifest
@@ -9,7 +9,7 @@ AUX tac_plus.init 457 BLAKE2B d295e7a5bd8d744431d164da3a5db21e38f7d56b5d39c2fc8a
 AUX tac_plus.init2 430 BLAKE2B cbbfe931274f7ac4927f38b1521e3a773fdf19892320c5f92d4243481d5978bf522a3019fab2a16a9c8d86e2743f9d45618ff73c9eb0d526c7b21ce2bed398e9 SHA512 9abb9573929c88dfe084432bb7ba7b85796b3bf05663a7596644805b04175d2b7fe36c6eb60fb70579445f03dd9fc8040fc88e5160c2de20ab25b8e8b9a93f55
 DIST tacacs+-F4.0.4.19.tar.gz 500593 BLAKE2B 8e6733e1af83d4cc5234bdb99100350eb91911965fa77a0b4ca9e75cc3d0a32739cb0a867ecb59c3c0c307469db4c9ee86964c9b6e142a86ab013a22ed968cdb SHA512 8482b81514ba91397f613a0593be8bd3ca66d6f4d79ed67a881aa01b3da44cdcfedae59bda6fae9e99a4c006fe54cd8a6ebfd6bc37e998f6b0ae19bd0831c0da
 DIST tacacs+-F4.0.4.27a.tar.gz 504395 BLAKE2B 8cd58d451c28e16d3804e9dcf5a82ae5ec0d1a783088f6ca6d4a4084bdab09fe9e402cf709c46822749edb5df5b9f20a225c420d1430ddd903b725a8f1cefe01 SHA512 2251a21f609d516b3ebc7d3d2d7d030ea1bb491e0fe5e08e7639d2d9bdb0ef9a1ab4d17f340e50e83771dc9a512c5dacc99716fd882ba3f6db2fafb0915e86bd
-EBUILD tac_plus-4.0.4.19-r4.ebuild 1313 BLAKE2B 49e33974ed1d4c677d7e2ba4d6fda3e733fc94ca650b0851287e6d32fc22b23a0a243fcab087424dea45b89a14927ec9515f2ef1ff82aa5e13432b30854ae6a2 SHA512 bbce5450c2ec2bc988744f99a985f20e1f2bef138ecae0e9f0624084963ee2ab07fde543b1cbfeb196422fd469cd0673dfbf5ab79baa23127b6b346b8fe63c66
-EBUILD tac_plus-4.0.4.27a-r1.ebuild 1490 BLAKE2B 4b5c942a3d036aeef740f4d772cde7c6ad7b3342cee0a443c35207be9d1f5b1c94df16c16b0b26463c485dd7e04d08020ddb0b84a10ba0b002c1919dc7d8088a SHA512 68c71f9531ce91268cfd53c88c2eec37bef1c1fda2ab4557b0fa23e5c544a0c7e8ea1d29eecffe64a0f8e886773216f50cea9a24fd871cd9da995adc78f9cab4
-EBUILD tac_plus-4.0.4.27a.ebuild 1412 BLAKE2B 8a4e164060f5aa464172725dc4cee2f6c00fb1e416604f930aae5e31f83798bd9016a76deb99dad87cec7b08fa1372933fd70fbad1e34bb71bcdc5b2ba031ea6 SHA512 b1e2865138d58784f726472e2025887ab9475b66d83a90d08d91576d34e466f9d49d40f83de960d908ee07780384358fd233b83de3b5f5327a4119a346bf3a9f
+EBUILD tac_plus-4.0.4.19-r5.ebuild 1335 BLAKE2B 0ed7044750cdfe7c0806cbe805092393bdde34bd54f0323408a1ac5f16c4ae26a5400befbfbf447d7d2e10ad77c2ec602680bed6a3e4aba7906c50c5ad1f841d SHA512 206f052c0aaace001ec9120cf53aae366d8c982d404c1dd9780b9cff7e31c507fc712e97f20d2d1f7d20cde638afb29f53be6d75e88d906098cf45018ac2869b
+EBUILD tac_plus-4.0.4.27a-r2.ebuild 1434 BLAKE2B c8e60d045e95bd6938872e24a1a7992815a92560e58186ef314b70c818b4a4cb8b32c583aec9a1c0582b82ea9c0826bfcbd8c1a43ee775563ee34446b46db602 SHA512 e10cb51c2ed054b4b3c92efc1a75bd151ae0b33cc95bdb5bf8bcd8eba84801225a5c57459923f975904a805f7a236ec55f149e5ab35c984af1a14223b4046964
+EBUILD tac_plus-4.0.4.27a-r3.ebuild 1512 BLAKE2B 4ca5d4d0d6e04f19c0fc343333da790049979702103ff42cac80c3fee6137bc37eb98f1868f5aa78d7b048d626ea7c964dacfb18fac27bcaa2a3e4ff2866a739 SHA512 f436ec91b575bd865c6d7cb8e7c297029f3cf0da932943557b519ca1fde91d1c4802a1fcebf9e15eb80d6afe12417b3d007ff7a4802e64f59bc3dc227c61fd0d
 MISC metadata.xml 346 BLAKE2B af6ab8c1a15ae2a4cc33278ad0ae51ec94f990f7037a71d90cbf78fab0d66e0cdc0291af09ae0c16d23525a24609ed994e1808c24255d0b819821b31bf876650 SHA512 82dc7debafb808d8af76dff04d781f90724159fd33f655243125d354e629099c583a7d9e9478bf370543dc7ca4fb0c42392aedd661088dd1f8a44a65219491cc
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild
index 6f9e32eef0dd..fd2de5db4e58 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild
@@ -17,8 +17,9 @@ KEYWORDS="amd64 ppc x86"
 IUSE="debug finger maxsess tcpd skey static-libs"
 
 DEPEND="
-	net-libs/libnsl
+	net-libs/libnsl:=
 	sys-libs/pam
+	virtual/libcrypt:=
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild
index 97fcdb15581c..09fda604c646 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild
@@ -17,8 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug finger maxsess tcpd skey static-libs"
 
 DEPEND="
-	net-libs/libnsl
+	net-libs/libnsl:=
 	sys-libs/pam
+	virtual/libcrypt:=
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a-r1.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a-r3.ebuild
index b4ca875a4c3c..694c6a330c3f 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.27a-r1.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.27a-r3.ebuild
@@ -17,8 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug finger maxsess tcpd skey static-libs"
 
 DEPEND="
-	net-libs/libnsl
+	net-libs/libnsl:=
 	sys-libs/pam
+	virtual/libcrypt:=
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
diff --git a/net-nds/yp-tools/Manifest b/net-nds/yp-tools/Manifest
index 261ad6372672..5a065f9fc2cf 100644
--- a/net-nds/yp-tools/Manifest
+++ b/net-nds/yp-tools/Manifest
@@ -1,5 +1,5 @@
 AUX domainname.service 165 BLAKE2B b36bb4877585f69503c319743a2e78f62f419852f235498791b007c4477d8622934263e3690cc2ba619d1c8ba925ca682b379720126915e5057210d893027105 SHA512 dc6cc79a1e6636f31706901bec45adc479231c883e149748989c038d4a9e2d3b1e15e3ba45ca7276700c68600cf6489b92bc4ada0c8ba630921a6d8cb8368de6
 AUX domainname.service.conf 89 BLAKE2B 22b81d78eb5df449658413dd2b23ceab02376fca3c061e328a3db36f88b3840296db961748679c8df9719dfb6cf3f4fd100ad6ed79916585aa79edbcf27c7577 SHA512 529f85f41e8204cc3dda72eb3c94c81443b8aa9f5af1ce4cab4510cbc42da79a4554d223893f0a968afb4476898b8a74ea061f8e9f40518b3066584ea9c7ad6c
 DIST yp-tools-4.2.3.tar.gz 195247 BLAKE2B 5e068f6856876dbf55c25030730195222fd331a06b8d57aa8a797a42c90538289a61ea8de1a2fee2d173e3444f76f82d111fc1120c287f90b7dbad1a2be23313 SHA512 2fcdaaeb8af4c3f62aa571a488c04561356681fc18b919ef728cfc1941578870cce74b136959f49e4ab04f988a79252163c1abe30b357788cb0b5faca7b5d147
-EBUILD yp-tools-4.2.3.ebuild 923 BLAKE2B 0684e76b536707c3b1317ec1c65ae08f9df5b29aabde866acea491d0b77f4700ff77d932545d180b556bf9ddea99aeab1f825b1089a3a65f5e496f77f0277773 SHA512 d40526fd1ba358e18f51f1a0db8ab0a8d0aa09fd23010daaa45f2bda687098f8b575d12cc3e2a71ce15a47f4f0525397a46ba0c08485a705ddfda7622ee45872
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD yp-tools-4.2.3-r1.ebuild 962 BLAKE2B 3e5c94c7a12934e4700716209540dd250b7db84808ee8f70e929cd1585af8faefd9b2ffd61e95cb9ec9455d4f8103102b7897923a52424bf2fecd9f5a42c347f SHA512 7eb9606b1832a856bb125c6f065445ece2b6b6b9451b10e21c4eea4aec86f1d0ff284729007880bdeda0beefe6c9c44a02273ce3477fa44cbd40716afb2bb2bb
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-nds/yp-tools/metadata.xml b/net-nds/yp-tools/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/net-nds/yp-tools/metadata.xml
+++ b/net-nds/yp-tools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-nds/yp-tools/yp-tools-4.2.3.ebuild b/net-nds/yp-tools/yp-tools-4.2.3-r1.ebuild
index 029b6b4d1448..9c758522b57f 100644
--- a/net-nds/yp-tools/yp-tools-4.2.3.ebuild
+++ b/net-nds/yp-tools/yp-tools-4.2.3-r1.ebuild
@@ -18,9 +18,11 @@ IUSE="nls"
 DEPEND="
 	net-libs/libtirpc:=
 	>=net-libs/libnsl-1.2.0:0=
+	virtual/libcrypt:=
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 src_prepare() {
 	default