gentoo resync : 28.04.2021

20 files changed, 150 insertions, 229 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 65c3a6e56fde..5615ade47e4d 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index e7d4552d3405..485ba09c44d0 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -1,10 +1,6 @@
-AUX 3.3-disable-jxworkbench.patch 507 BLAKE2B ea412c4eab6d71fa11e6b165d5cc68d3678a81675cd94f9b8c1d115cd4dc1f1cdaefa85a6775368bcaeca1fb905bb86b43e446d6840525b99f8be356f336ece4 SHA512 b89c2b1831de506e437c4094ee0312a06280e5ddf88ba4882a22f9a2e2c8422a28ab7c47ebd75b52c9c303645b46b90b69a0f0d37bd17e1994683b5fa6070a0a
+AUX 3.3-disable-jxworkbench.patch 475 BLAKE2B cee976aa6468def72fe0dcfaf6d68a3377f26a3ec07697b373c2ca5e1529688fbbc014675c5263a7fadb116cc1fced9680317a08d842ef74f269d3d553f173cc SHA512 07e7a464140fa14085dac6b7e31368ddda2168d915c5b8bd4ff985a54f415c8e0a98f028752cea2fd9eaf097ecefb8f923956b19b2611b751fbe95cc33c6b7d1
 AUX build.xml 1871 BLAKE2B 0edb1b98c8b2f8b2de5996b1ce8ef8558d08fdff034d5187460a3d6a01962bf01f4c3d4bfa02d320e80445b61f3b49291825ccfa413d7f7dd7438e285c41d34c SHA512 39434bad8cb85692fe65feb927ba675135e0da5401518f22ff6a17c1edfea950342bde9f7530cd48e603f41547451020aa4e0c96dbbf664548cd812ce777fa00
 AUX jxplorer-3-pre 663 BLAKE2B d7311e13b367c74af7ebc005c15ef14af80057c995f2d30dd684a49c09c10e165d5c18721f7c266ff4066a904f0ad34e3570e250ebebe2b8486fe54cd7d26875 SHA512 11acb8c28a063825678ec3fe7bafc1cd1d0f99c96d49e62500d06b0584967017efb050c561826ce8b6db8a73da66ea1742f4a361fddc4e17abddad5174106f9f
-DIST jxplorer-3.3.1-project.zip 4500476 BLAKE2B 6e5fb357c19ab9fd8a40f38d01fc650b793e8a6058c5e94336a46690283afb8e8a0a489cbab225da8f85f10d9a54fe938cab752b3648264d43c751441fd0991a SHA512 a40bfd8a4c868a1ced1e31d45298916b4371ae781521755d784e4c027781d298f066af5390918b42024022cff5d3f0ab6a79bc6b15a1ff0adcfc1e8b79a67ca9
-DIST jxplorer-3.3.1.1-project.zip 4566815 BLAKE2B 420277d44da94d5c54b0ac4a1bb67381785a4f4270be9ce1e5a07da00d7056bde8ab799a524e891176229579085e606482357f11d5567024017119ff09492995 SHA512 aa7c1c976f5987055abeb97aba865e9cdbc657d5baca199ff83c97ac5017c9d48869c8ee6346a7cf07b236b04059043256d0545c7b6cc37d97c81de2f9015d03
 DIST jxplorer-3.3.1.2-project.zip 4625538 BLAKE2B b1bfb552dd4524f4d0fde4ff15617bf3e50629c0f879f05ee87c9f301afa9a5a4c544c8bb85d5b9639fe809f030752f9e96c321a4e6d20fda7aa55097363bdeb SHA512 6c95de48b2abd41a4926de3bd9bd203e266676028e12d1f1c93d8ef6f10b233eefcb122c8c075d6758b43c85e30fdc4b01d55811e5fcbdcd64d353c6f0fef94a
-EBUILD jxplorer-3.3.1.1.ebuild 1645 BLAKE2B 9d50c7a71c4ee02d8e0a265a799add552bc076f12dccc111118c51d52e97fe590dc2548cee65a193445f065bfb9ece012a157a0f089202c8b00fb65708916b53 SHA512 7e7e43e8af0add77baa0bb11a5f78f0fa7a050b6c8b1096c2970d22cfd48f3aac016e51481dcd4c98afd2ba5aa7d77e83cf9d86cd7f1d2b7b2753a3a679bd4a6
-EBUILD jxplorer-3.3.1.2.ebuild 1680 BLAKE2B 5a2327c75dab4c6b05804a0ab00c4d0791987bf1d3267c04899ca76916c9b64ffc88bbc2ae3dc41e6a88b05b4cde8ecfa61ba8ef1b4d7cf6a24172562a7f1a94 SHA512 571ce1951eaa38cb8e3386b76c142806673125583071425e8c5d71d74b32657004ac49470728932398bb9ae6ca24a7c7f7d65b64c3e406f27a1199ddf6b70d2f
-EBUILD jxplorer-3.3.1.ebuild 1643 BLAKE2B 3db5aa47b60b5bf64c061394ed80dac93cadf4690b89c3103b8a61c810b58c0c261874533101a95347af7897417aa3e0149606716628dcdb4ef5f79b32b1687f SHA512 6be611580e3e5ecb6d0df336be48bfeab0c054db5c3644417e564146f14db8d2dc60ff725ff38684000f855ee8fda59c00697d9bd35a2292253025b55b39f06d
+EBUILD jxplorer-3.3.1.2.ebuild 1708 BLAKE2B acf35724b8fb16f5dd53da77aa0329f64324fb02acf0127130262e6df4d350a1b0dda00ba7a4dc1438ef7b050b2816c40debe9a4a7da6ba827e7da200a5988ab SHA512 e542a1e5dd0584c38d78f992eb95f4f2709bb9fe979b14c6fada97d571942f1b6dfb195d3967be6f2a0d19fa7079ed5ce6bff0b8326e2a7dd0374d8dbfc72b7e
 MISC metadata.xml 314 BLAKE2B f90c3010c15a26ffb04114d4049aadedb720df7d6bf04801603d6fb4f63331d6a5f7b135d4d926e0cbc8504849c1677b04b9d61e0fe67ee97ec41d5e30375b88 SHA512 28b10ef2e247491aac4d9868d8c42ccef74abdc9806820b84a29d479e8f53218e1aab497c3f450c289cacf40ea8fbd193a508203ffc915ad2fb7582258bc7d96
diff --git a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
index 302b37c0061f..4b1009159f46 100644
--- a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
+++ b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
@@ -1,6 +1,6 @@
-diff -Nru /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java
---- /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:53:59.869914047 +0300
-+++ src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:54:47.836311029 +0300
+diff -Nru a/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java
+--- a/src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:53:59.869914047 +0300
++++ b/src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:54:47.836311029 +0300
 @@ -502,7 +502,7 @@
  
          // look for JXWorkBenchBrowser 'add on' module...
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
deleted file mode 100644
index c780b19b163a..000000000000
--- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix virtualx
-
-DESCRIPTION="A fully functional ldap browser written in java"
-HOMEPAGE="http://jxplorer.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip"
-LICENSE="CAOSL"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.5
-	>=dev-java/javahelp-2.0.02_p46:0"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="javahelp"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-src_prepare() {
-	rm -v jars/*.jar || die
-	sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die
-
-	epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch
-
-	if use test ; then
-		EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit)
-	else
-		find . -iname '*Test*.java' -delete || die
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
-}
-
-src_install() {
-	java-pkg_dojar jars/${PN}.jar
-
-	insinto /usr/share/${PN}
-	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
-
-	dodoc README*.TXT
-
-	# By default the config dir is ${HOME}/jxplorer
-	java-pkg_dolauncher ${PN} \
-		--main com.ca.directory.jxplorer.JXplorer \
-		--pwd '"${HOME}/.jxplorer"' \
-		-pre "${FILESDIR}/${PN}-3-pre"
-
-	eprefixify "${ED}/usr/bin/${PN}"
-
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadoc docs/api
-
-	make_desktop_entry ${PN} JXplorer /usr/share/jxplorer/images/logo_32_trans.gif System
-}
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
index ff20bda345bc..bb3b3a84fc6d 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
@@ -1,45 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+inherit desktop java-pkg-2 java-ant-2 prefix virtualx
 
-inherit java-pkg-2 java-ant-2 prefix virtualx
-
-DESCRIPTION="A fully functional ldap browser written in Java"
+DESCRIPTION="Fully functional LDAP browser written in Java"
 HOMEPAGE="http://jxplorer.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-project.zip"
-LICENSE="CAOSL"
+S="${WORKDIR}/${PN}"
 
-IUSE=""
+LICENSE="CAOSL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"
 
-CDEPEND="
-	>=dev-java/javahelp-2.0.02_p46:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="
-	${CDEPEND}
+COMMON_DEPEND="
+	>=dev-java/javahelp-2.0.02_p46:0
+"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5
+"
+DEPEND="${COMMON_DEPEND}
 	virtual/jdk:1.8
-	test? ( dev-java/junit:0 )"
-
-S="${WORKDIR}/${PN}"
+	test? ( dev-java/junit:0 )
+"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_GENTOO_CLASSPATH="javahelp"
 EANT_TEST_ANT_TASKS="ant-junit"
 
+PATCHES=( "${FILESDIR}"/3.3-disable-jxworkbench.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch
+	default
 
 	rm -v jars/*.jar || die
-	sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die
+	sed -i -e 's/<fileset dir="${jasper}.*//g' build.xml || die
 
 	if use test; then
 		EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit)
@@ -49,7 +48,7 @@ src_prepare() {
 }
 
 src_test() {
-	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
+	VIRTUALX_COMMAND="java-pkg-2_src_test" virtx emake -j1
 }
 
 src_install() {
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
deleted file mode 100644
index 8c647ff0f984..000000000000
--- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix virtualx
-
-DESCRIPTION="A fully functional ldap browser written in java"
-HOMEPAGE="http://jxplorer.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip"
-LICENSE="CAOSL"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.5
-	>=dev-java/javahelp-2.0.02_p46:0"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="javahelp"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-src_prepare() {
-	rm -v jars/*.jar || die
-	sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die
-
-	epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch
-
-	if use test ; then
-		EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit)
-	else
-		find . -iname '*Test*.java' -delete || die
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
-}
-
-src_install() {
-	java-pkg_dojar jars/${PN}.jar
-
-	insinto /usr/share/${PN}
-	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
-
-	dodoc README*.TXT
-
-	# By default the config dir is ${HOME}/jxplorer
-	java-pkg_dolauncher ${PN} \
-		--main com.ca.directory.jxplorer.JXplorer \
-		--pwd '"${HOME}/.jxplorer"' \
-		-pre "${FILESDIR}/${PN}-3-pre"
-
-	eprefixify "${ED}/usr/bin/${PN}"
-
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadoc docs/api
-
-	make_desktop_entry ${PN} JXplorer /usr/share/jxplorer/images/logo_32_trans.gif System
-}
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index e01ec1c13de9..e6c42df4bbd0 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -1,6 +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
-EBUILD rpcbind-1.2.5.ebuild 1497 BLAKE2B 5be5bc06cc74a74165dd2d9b297aab106edf1fa1400ca31746c253c5e6be3c260be935a1e764f9bbea2c1501c65891476ee406189ad0891cd50368c6ff52bfa0 SHA512 f69ef85d380a18b3f0909d44bb4c703a1d5718e71c949aed06987871a5e8796657d6ef9cda7d28b09722a62602f555161617a32918e8d9b3bf694a79f154a54b
+EBUILD rpcbind-1.2.5.ebuild 1498 BLAKE2B 597f622a5050305b71d7cd305cb08b537ac56c16e224cef1636f4260f234bde83558961a98f1677ca440cbdce28afc6284912a4bb540243db10457f8ad8df7ba SHA512 2d46136470fefbee110e9705e29ee6f37833783d7d6a119c55a02ec8538813f34890f6fafa0614161369e267f294abfe90630b8128bd86dbff495e814ecf3c2e
 EBUILD rpcbind-9999.ebuild 1499 BLAKE2B a2a10f910420e58e43d76e5f8d8a355cffcae690f3d11410de4cec8e0a566abb22e7db46c22a4fb381aa27745dabcb77f1adc2121858bb82ce4fbe5796ae6807 SHA512 1f22558ea813f25f977c0696f3384ca1c517576eba3f7a16c10ef536dac7ec86ec020da22fa59a81db7c811b1decc28ea72440426c9e9ecdc4c8a303efae7001
 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
index 5662759cd0f7..dba9155d7bdb 100644
--- a/net-nds/rpcbind/rpcbind-1.2.5.ebuild
+++ b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
diff --git a/net-nds/shelldap/Manifest b/net-nds/shelldap/Manifest
index 8392bb4952de..8f3dea3c0986 100644
--- a/net-nds/shelldap/Manifest
+++ b/net-nds/shelldap/Manifest
@@ -1,3 +1,3 @@
 DIST shelldap-1.5.1.tar.gz 22817 BLAKE2B 8ec41edf8c7d024f5eaed286284445cc9d41fbdf93ae34229d32392dd6f4862b8b3e66b5735679a9019d505753994f3d1d8f0d6cefec9b55708ef982d757b009 SHA512 64e5f58aa2d930ff869abb0c88ba36a5aac1272f118af8d17a0db847d6ce4bdd9fe3b8fb6b2e9d08f89bec57a102adf170f2c9f6b98b5f3fe5c30ac3636a060a
-EBUILD shelldap-1.5.1.ebuild 1001 BLAKE2B bff4f6a0801141c33c6e706e864c20935bf39dfffbd39e0469335f92a46e6dba8f721ce6e4621c0165d4b44d89769c753be4dc52ada4677a077f5ae63d6ecffd SHA512 568811d84261abbf026eeb3270d3e3161ff32ef0c0f269e333ff6dfcbda80959e38c27a1667ce0af149d8dd839f33ba701d31ef095ec1bcb5783d8abf36cf7c2
+EBUILD shelldap-1.5.1.ebuild 994 BLAKE2B 2ebf30720de7685576dc3b33f20dafbe557246cc010150b52eb17b1398cc07f0e85a01af36a2ceb86ee1790d9f0e702ac2f0a10c35de8ce70cd9c46460a01f0a SHA512 7b3dd02ad44264e6893bc1c1d4f33ca51fdc24c895c9f550962a8e7d223c5977dbe084bd3142917fe13bf05dd3e746b48730277b695f83d2aa3422b15acde45f
 MISC metadata.xml 858 BLAKE2B 84805f4e0648b39f02f836241ba4292aa0b20763e1cbf835c3109f11aa562cf2beb9922cf04bb03ac03e4e08f10ffe121334b1844f4683c5629e89eaca82a041 SHA512 9c2067a5e37081c1b54ed9c921c7bdbdc6ae12006deca6009bd9d40c5f556509ad82bae28794bf188bcd65e85160ac09bff8042625a481ae0e6f3a14d4bdaeaa
diff --git a/net-nds/shelldap/shelldap-1.5.1.ebuild b/net-nds/shelldap/shelldap-1.5.1.ebuild
index da6e2624d28a..b10db458f867 100644
--- a/net-nds/shelldap/shelldap-1.5.1.ebuild
+++ b/net-nds/shelldap/shelldap-1.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=noslotop
-inherit eutils perl-module
+inherit perl-module
 
 DESCRIPTION="A handy shell-like interface for browsing LDAP servers and editing their content"
 HOMEPAGE="https://github.com/mahlonsmith/shelldap"
diff --git a/net-nds/tac_plus/Manifest b/net-nds/tac_plus/Manifest
index 3aed1c3c295d..905d55c40b28 100644
--- a/net-nds/tac_plus/Manifest
+++ b/net-nds/tac_plus/Manifest
@@ -1,15 +1,15 @@
-AUX tac_plus-4.0.4.19-deansification.patch 335 BLAKE2B 721888b6be031e5dad01e87951068c4fd7da7cacb0a860eb627fcf26f918094b320e99efa69d6734fa82a4ef23c9f17a8e04bb22955e3cdecdbc14d0599a87d7 SHA512 5b759671c14f42e7d2fbbd7806dc83c7c24edd7ed3b2af6e208a922604c99abd3304e567bcf359bae1192160b3a7738a1f34f01569ed89062fba288593bb61d7
-AUX tac_plus-4.0.4.19-parallelmake.patch 442 BLAKE2B d2ba2fe78ec74df96352ff8166f5e76becbad31ad361879aa3fb8da7d9ddeb79385e95afee7edffffe2407c4c33b0c50235c164785b79234893eacdcbd7d8d3b SHA512 94f16af40ddfaef5e22f8bee848e4b9f2a3c0658cbe14dd31d33476d181fe8801ec23b4b4b3fa8cbd3e9f07355e696f401bbbe54c1617cdbd732828ea305a9d5
-AUX tac_plus-4.0.4.27a-deansification.patch 339 BLAKE2B 8007f968ba4c2b98d55db025ed205e4962a3a7d46cb82217ae52219fbb423af1eab68d7a7721441e3f55c15c0ee80d4a16679d4d44a238a02d69263d329ad9fc SHA512 fe8b1cb1f949de8b79ab45cea8ee42acfe848f2a74cf516d54a183c2ffdfa618debc375741d28688f799a3862649af1c9c6c06688a4d53b9a227ca8b46c44f3c
-AUX tac_plus-4.0.4.27a-parallelmake.patch 497 BLAKE2B f16320e2f13cdf8f1d51b3d942514db2be17f6d6053de385206d53fd3b1025c687b2778b529a66c9ad9ac0363c3d37bcd0d3b3b1b8d6a2f91e73a68fbec60c65 SHA512 cff259983b43e2f7a3e371749533a00844bc33c4d2a4d3d076f52dd800455b559c2632d41823dba0269405efabad88074b2972cc7c4167aa5914cd06349cd4b7
-AUX tac_plus.conf 266 BLAKE2B 9b5bdb132ace972a5cf253f25517fcfb2387145840cb5feecd21468791119aa098cf206195ea83752278a61de66a246ef6781b84e28813f5126f9338b99ea08c SHA512 22562fb073920a70bae215a763af0a6cb9e92b34880f23dbb97c6476a8b0253c86e54cb0ac4f30ee8e975053a3ad620e423ed1b72ddb32fdc09c854d132ac4dd
-AUX tac_plus.conf2 760 BLAKE2B 8c8177e418cf85755f6cf4bb6c7b3db4bc773f8af15e891aed6c435e6f4583a96a8dea0cbb496539cf46ddb642e4323c263a88fb77ceafa582781b9ae4cfb9de SHA512 3a1fcc76f912761919fb8005b57754b608cb9af8231f8ccb140f9729ce5cc13e2fbf322ccde3cd0113f6dd6725f9bc514a31fd762b372f1afecdf86a3585fdec
+AUX tac_plus-4.0.4.19-deansification.patch 149 BLAKE2B 53d37a23418e9faf46e9112306cdf983cedae8de180e59237e19a341858ef65e7a6ceb89dc2e55cd9d13a86e9baf5fedf002d48f98f80fb258a5e528f830e5f3 SHA512 75d00e4dd2b0a35bbeb73696683180724c937ecb3248b355aee9fc0cfe42d7e2cc0e8e6c3c4f53f6c12e40133d511400511bd0541377d3d5c05b60e23518214e
+AUX tac_plus-4.0.4.19-parallelmake.patch 300 BLAKE2B c6b28c34a10584a2db35d14f7a156de0b39d33f7f9af1ea846d1d7f4e52ad121c02b7058c1f153175ef15f86729b4e73c3af2c3687fb8d2cba217123941e98d6 SHA512 ab5d4dae2f77f758a6b91cb472809ec0c804d3a1a39a39204b3d6b2576f8627f862672a33251b4e520700ccc83529f606daa804d167a5025bea9a46403ac9c16
+AUX tac_plus-4.0.4.27a-parallelmake.patch 309 BLAKE2B 8e61ac627870c47824a7d5166bf68b4b896a9356947e699cefbbeac14b6bc66aeb690925a8e3b9de27f554608280c6e16e5709549638cc5eda107db3640d4d62 SHA512 f507eba01c2d140fd31167f50d0e129fe517459d4c88b436fc58cea30c7696117258e79ff9c32881df08ad6934f82078e1d85d0dad76766cf1425a4614832e96
+AUX tac_plus.conf 264 BLAKE2B 61f9285ceb35edc6aa99c66babe21d38531f846911ebb61972109497ecbb9bfd1482c339648b800adf1d7a5dfb13619efcdba032665391d5cbabde0b06a803b7 SHA512 aa66adb6baead44cd0b8b7ac2f2380df5a92f460356119f12e5237b5efa0336726b85a99856b685a624e227a338fe07345ae7bb540af4372868bcc5140cf7de7
+AUX tac_plus.conf2 759 BLAKE2B c03b70d040e26d97ffdb571c55550cf520be4e84d7c159333903d9dc24d7b20f84a4dfb7bcaf5af25bd2d357d2558878c79de90bf513b418f3d1b758ce935303 SHA512 cb23c329607256f101946f3c505620490f65b42d70ae6a97f83bac851e450a5d714c78cfc240204a93dea05778320d6df313b9e2e5d6e080ac04f554807f286f
 AUX tac_plus.confd 172 BLAKE2B ca6b99c9f078b0597c64acad66100fc94516fadf21f87733610750974313e86b516a99221b4c5bca706d8339959e049e59a1afe80320902375c64c848dbfa305 SHA512 3d817c617795897d1b8d4826d9b7540240e6b270ac5c6507a344ea0e2b969b045405fff9b2049ec2da021daef75fd8aeccb27034c56e8e0a9cbff890e9e7afb0
 AUX tac_plus.confd2 165 BLAKE2B 6b6eb180785ad55f3c0898bc96a2d467f2a9a179165e0d44a622e2e658917077252bc40329a0d4e202b3fa96f0d9e29f5d446626ba654b3ba15294dc71c21422 SHA512 b601f86e46995cc7297875c3cde09fc9335f573583e031adecb9282794b4c60959121254f23603bd53323312085f9eaf82cb8ea90f4e23ec293a63338c95e87d
 AUX tac_plus.init 457 BLAKE2B d295e7a5bd8d744431d164da3a5db21e38f7d56b5d39c2fc8a883ca8f6f8550655f68566a9acd431638079d2373b3c281900cc4afbb4e8ebf91704d8bac2c9f6 SHA512 0f074e699549348d40687668056ccd468dc3a3b6fb76595789f41633cfac9023a4e9acdf53879a52bb94b51fed168dc79e03d305d64d692d60661fa94ede3756
 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 1315 BLAKE2B d1345ef2c5d8db9617df52c11f264b7cb2e06e17ebe48b40ccb70e31d191e80daff79dbc39ac5bcabe8a1baa8bd3bef58217a045dd3f2727ff890a07b7b209e4 SHA512 201681e9dd33ff710ce4a4d3861fb3ad3e1a97b50757a39dfaae1f7ba24d906a1e587ca0b1a31fd06b9fe8dcd2a60824e5b43aaa3f2d3cacddfb966ced03c518
-EBUILD tac_plus-4.0.4.27a.ebuild 1404 BLAKE2B 4f41cdad0fe1b8a1b80fac6d0a6e4a5b73c19cb2a2ab5f68617164864ab45cb3e8d0207452cd47ca12664a554306df75fb7c68771e57ff4fd09a0ea78ac91727 SHA512 a61ee09e500d363e684d67a793446354916e3b3bcf3961665087acdc8d95a735015baf8ac0c8c2c2b41f708a7152c2b53fc6e146e87305aebf783455ee1c3f79
+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
 MISC metadata.xml 424 BLAKE2B 1763e51535979013a89d3c9b0b707df068442effdbdaa005c4c3196a66ec5391c84d231f82d15ba6c503a57e93ec57ef38834e0d1b36f46524d2a5be7718e274 SHA512 6f10f5226894b8b6ea6ad298835b7e5322bfbe3470410ec46bb8107203e1788b256192756031bd92e9eca4409765b47bd696a7c3de0c708bf36cef59df7b0a38
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
index 4dbc33707263..4a1f579c62e0 100644
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
+++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
@@ -1,6 +1,5 @@
-diff -uNr tacacs+-F4.0.4.19.ORIG/configure.in tacacs+-F4.0.4.19/configure.in
---- tacacs+-F4.0.4.19.ORIG/configure.in	2013-02-28 21:26:31.724310410 +0000
-+++ tacacs+-F4.0.4.19/configure.in	2013-02-28 21:26:41.936309960 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -126,7 +126,6 @@
  
  # compiler specifics
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
index 556f75806fbd..a8ca67e73626 100644
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
+++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
@@ -1,7 +1,5 @@
-Index: tacacs+-F4.0.4.19/Makefile.am
-===================================================================
---- tacacs+-F4.0.4.19.orig/Makefile.am
-+++ tacacs+-F4.0.4.19/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -16,7 +16,7 @@ if TACSKEY
  tac_plus_SOURCES += skey_fn.c
  endif
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch
deleted file mode 100644
index ee1bcb231838..000000000000
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr tacacs+-F4.0.4.27a.ORIG/configure.in tacacs+-F4.0.4.27a/configure.in
---- tacacs+-F4.0.4.27a.ORIG/configure.in	2015-03-25 11:13:06.976024203 +0000
-+++ tacacs+-F4.0.4.27a/configure.in	2015-03-25 11:13:36.816025689 +0000
-@@ -126,7 +126,6 @@
- 
- # compiler specifics
- AC_PROG_CC
--AM_C_PROTOTYPES
- AC_PROG_CPP
- AC_C_CONST
- AC_C_INLINE
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
index c75a05b0cd12..d77c4714e384 100644
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
+++ b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
@@ -1,6 +1,5 @@
-diff -uNr tacacs+-F4.0.4.27a.ORIG/Makefile.am tacacs+-F4.0.4.27a/Makefile.am
---- tacacs+-F4.0.4.27a.ORIG/Makefile.am	2015-03-25 11:10:26.821016226 +0000
-+++ tacacs+-F4.0.4.27a/Makefile.am	2015-03-25 11:11:04.954018126 +0000
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -19,7 +19,7 @@
  tac_plus_SOURCES += aceclnt_fn.c
  endif
diff --git a/net-nds/tac_plus/files/tac_plus.conf b/net-nds/tac_plus/files/tac_plus.conf
index 83403e0bc1cc..dfdf2186a816 100644
--- a/net-nds/tac_plus/files/tac_plus.conf
+++ b/net-nds/tac_plus/files/tac_plus.conf
@@ -6,7 +6,6 @@
 #key = kEy4U
 
 #user = youruser {
-#  login = des ndkKAzNoc37VA 
+#  login = des ndkKAzNoc37VA
 #  enable = des ndkKAzNoc37VA
 #}
-
diff --git a/net-nds/tac_plus/files/tac_plus.conf2 b/net-nds/tac_plus/files/tac_plus.conf2
index 617e34420281..406fff33b800 100644
--- a/net-nds/tac_plus/files/tac_plus.conf2
+++ b/net-nds/tac_plus/files/tac_plus.conf2
@@ -6,7 +6,7 @@
 #key = kEy4U
 
 #user = youruser {
-#  login = des ndkKAzNoc37VA 
+#  login = des ndkKAzNoc37VA
 #  enable = des ndkKAzNoc37VA
 #}
 
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-r4.ebuild
index f94caec0a181..6f9e32eef0dd 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-r4.ebuild
@@ -1,36 +1,38 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools base libtool
+inherit autotools
 
 MY_P="tacacs+-F${PV}"
-S="${WORKDIR}/${MY_P}"
-
 DESCRIPTION="An updated version of Cisco's TACACS+ server"
 HOMEPAGE="http://www.shrubbery.net/tac_plus/"
 SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND RSA GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug finger maxsess tcpd skey static-libs"
 
-DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
+DEPEND="
+	net-libs/libnsl
+	sys-libs/pam
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	sys-libs/pam"
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-"${FILESDIR}/${P}-parallelmake.patch"
-"${FILESDIR}/${P}-deansification.patch"
+	"${FILESDIR}"/${P}-parallelmake.patch
+	"${FILESDIR}"/${P}-deansification.patch
 )
 
 src_prepare() {
-	base_src_prepare
+	default
+
 	AT_M4DIR="." eautoreconf
-	elibtoolize
 }
 
 src_configure() {
@@ -46,7 +48,10 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
+	if use static-libs ; then
+		find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
+	fi
+
 	dodoc CHANGES FAQ
 
 	newinitd "${FILESDIR}/tac_plus.init2" tac_plus
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-r1.ebuild
new file mode 100644
index 000000000000..b4ca875a4c3c
--- /dev/null
+++ b/net-nds/tac_plus/tac_plus-4.0.4.27a-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam
+
+MY_P="tacacs+-F${PV}"
+DESCRIPTION="An updated version of Cisco's TACACS+ server"
+HOMEPAGE="http://www.shrubbery.net/tac_plus/"
+SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND RSA GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug finger maxsess tcpd skey static-libs"
+
+DEPEND="
+	net-libs/libnsl
+	sys-libs/pam
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-parallelmake.patch"
+	"${FILESDIR}/${PN}-4.0.4.19-deansification.patch"
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die "Unable to quiet autoconf deprecation warning"
+	AT_M4DIR="." eautoreconf
+
+}
+
+src_configure() {
+	econf \
+		$(use_with skey) \
+		$(use_with tcpd libwrap) \
+		$(use_enable debug) \
+		$(use_enable finger) \
+		$(use_enable maxsess) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
+	fi
+
+	dodoc CHANGES FAQ
+
+	newinitd "${FILESDIR}/tac_plus.init2" tac_plus
+	newconfd "${FILESDIR}/tac_plus.confd2" tac_plus
+
+	# bug #474860
+	pamd_mimic_system tac_plus auth account password session
+
+	insinto /etc/tac_plus
+	newins "${FILESDIR}/tac_plus.conf2" tac_plus.conf
+}
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.ebuild
index 710eeb83ce89..97fcdb15581c 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
@@ -1,37 +1,40 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools base libtool
+inherit autotools
 
 MY_P="tacacs+-F${PV}"
-S="${WORKDIR}/${MY_P}"
-
 DESCRIPTION="An updated version of Cisco's TACACS+ server"
 HOMEPAGE="http://www.shrubbery.net/tac_plus/"
 SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND RSA GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug finger maxsess tcpd skey static-libs"
 
-DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
+DEPEND="
+	net-libs/libnsl
+	sys-libs/pam
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	sys-libs/pam"
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-parallelmake.patch"
-	"${FILESDIR}/${P}-deansification.patch"
+	"${FILESDIR}/${PN}-4.0.4.19-deansification.patch"
 )
 
 src_prepare() {
-	base_src_prepare
+	default
+
 	mv configure.in configure.ac || die "Unable to quiet autoconf deprecation warning"
 	AT_M4DIR="." eautoreconf
-	elibtoolize
+
 }
 
 src_configure() {
@@ -47,7 +50,10 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
+	if use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
+	fi
+
 	dodoc CHANGES FAQ
 
 	newinitd "${FILESDIR}/tac_plus.init2" tac_plus