gentoo resync : 12.05.2022

13 files changed, 56 insertions, 151 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-1.4.4.19-r2.ebuild b/net-nds/389-ds-base/389-ds-base-1.4.4.19-r3.ebuild
index bae1ed6a51d4..5cec7c2d5ab3 100644
--- a/net-nds/389-ds-base/389-ds-base-1.4.4.19-r2.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-1.4.4.19-r3.ebuild
@@ -153,7 +153,7 @@ DEPEND="
 		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}" ; done)
 	)
 	sys-libs/cracklib
-	|| ( sys-fs/e2fsprogs sys-libs/e2fsprogs-libs )
+	sys-fs/e2fsprogs
 	pam-passthru? ( sys-libs/pam )
 	selinux? (
 		$(python_gen_cond_dep '
diff --git a/net-nds/389-ds-base/389-ds-base-2.1.0-r1.ebuild b/net-nds/389-ds-base/389-ds-base-2.1.0-r2.ebuild
index 42d9bf5bd2a5..adbe88602684 100644
--- a/net-nds/389-ds-base/389-ds-base-2.1.0-r1.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-2.1.0-r2.ebuild
@@ -124,7 +124,7 @@ SRC_URI="https://github.com/389ds/${PN}/archive/refs/tags/${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 LICENSE="GPL-3+ Apache-2.0 BSD MIT MPL-2.0"
 SLOT="$(ver_cut 1-2)/0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE_PLUGINS="+accountpolicy +bitwise +dna +pam-passthru"
 IUSE="${IUSE_PLUGINS} +autobind auto-dn-suffix debug doc +ldapi selinux systemd"
 
@@ -150,7 +150,7 @@ DEPEND="
 	net-nds/openldap:=[sasl]
 	sys-libs/cracklib
 	sys-libs/db:5.3
-	|| ( sys-fs/e2fsprogs sys-libs/e2fsprogs-libs )
+	sys-fs/e2fsprogs
 	pam-passthru? ( sys-libs/pam )
 	selinux? (
 		$(python_gen_cond_dep '
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 7511945521b0..b3f5312fb30f 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -109,6 +109,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zeroize-1.5.0.crate 17017 BLAKE2B a729d12a0a97e59d80dd024fd351c434829dc2819d9c3179c6d0781d5d80dffac10bf431d6e36ed14444680ef6d3328ab1ea6c4077eb2c31cb6f077d3552ccaf SHA512 6b6d1c5f85111f0f83ee02c633effb0bad87bb8b334d3f4e13d8722cf9c4ff252fc15c73de044c33d11ff62cbf3d2b6d33834cf08830e5b9ce9c8c298442a05c
 DIST zeroize_derive-1.3.1.crate 10268 BLAKE2B cfca89267374c562dc89dbddcad9bc889b33a489d2519fce69b74cbf95d7e8a6b29641a660635f77d303a5f785133caad59560e44b4973f2def52b610f364b9e SHA512 070619a664c404610cac48ad4a831e3f449a2b022c5e55c9f0ba3b19ecb0f737445ae5577f7cb9c314661efeb19801488b158961a9db0cf16e636c2df8758503
-EBUILD 389-ds-base-1.4.4.19-r2.ebuild 7053 BLAKE2B da4092d1ec34570f8f9ec42416ceab335dec3c81deb5e3b10032ebfdfb39bc936b743041411b37e639c3c9b9dbe3011263e409fe481389ead9bad4383ebcd89a SHA512 396f93fcad61a0bbbe774ed7a8ef4b7169cba4affc53507d29278ed114c35afd017b3d0292a25cb3c216cc23340f7cc1d543749f79ad12712a31b6b6bbe072c6
-EBUILD 389-ds-base-2.1.0-r1.ebuild 6950 BLAKE2B dbc03da839ed55acc8a2ab6e21eae9dc94994ac30dd663dd7276c7c166a9d66d27bf1c2bce52cc8ce13196439957bbba01949fc6fd55b4190ed24e66e85f3c06 SHA512 ad3e98ad0253d744db3c665dfecf6968629d34190d31be358938baf7ca49c511df4d68bb70aa84daf53994fb4683dd5748bf78edd7268899a041cb7904f5c56c
+EBUILD 389-ds-base-1.4.4.19-r3.ebuild 7022 BLAKE2B 7c708ecc90ee4a7e63f209240899fabd037cd555a44d6ff3533011e4064502527096634e41257745413ec488a2527998af5911f84231f7d77c7441751fa43637 SHA512 31f2b8519caa8ba258022018dd6a53413172773f9cd536eb025a3bbfa1c7c6f4ff49d402233bfdef5effdeaa9e6c97d1cb2bac0c4031521108d493eef48f66cb
+EBUILD 389-ds-base-2.1.0-r2.ebuild 6926 BLAKE2B 828d0291d527d162020853f2a06ea7f52d50e765d738b97c391aa37fc45bcc1cb4aae149664473aaad814a9b0ba770af038806742b5ea49ffbed148bc53fb97d SHA512 5fe25ed985ddf9fe9c188f5545e39b7778795bbff03803ce9b9f1d76022cf7b702b0658d661e586a5559ffb266a9841a7a9c48fee8969f50ab8f5152410df9e6
 MISC metadata.xml 1582 BLAKE2B b29c4633cc0264cfc762327d8b24f21abed6a0e7b92d093d46826945f500d73898a488003d00a4c1fd2feef469a095ef3fc3d55c710f1c6543fb469e088ce2fd SHA512 6413a53a8494cb491bfdabfb4f097f657f86163e33e60ea0c7c1f02079a44d2e487ab2fd72a15f0e34d66ce840d52f058212b97213e45f50069d333a910dc83f
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index ca591b83ee8b..24d95f056345 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index b7ddaa72605c..67a7536a87dc 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -18,6 +18,7 @@ AUX openldap-2.6.1-fix-bashism-configure.patch 419 BLAKE2B 2910734bd9e8a0e53efb0
 AUX openldap-2.6.1-fix-missing-mapping.patch 458 BLAKE2B f0137f614b7fe07f80ae5ec7f2be8c08643166fe69358cba174e9d4c8c0c3e94e6901e1a75eb2d85ad62876234223b877ca1a2f689dc154985c591a8bb2f8872 SHA512 4083b99cb97f8511a9f44c8e0b6c63cffb351b20d50e5ebecb1e73b0a1441e6449db21c1af2f43112db365d193d4395a814cf7afcac730ae7a04f260370c9d0c
 AUX openldap-2.6.1-flags.patch 10275 BLAKE2B 0c851a90dd2befe44d0671782676b8692ccb027ccbee2e52989a409b70fa8e917f26452bc6838e04111c6479bfa49fa138140cccec82026b53c6a0a23aac7f73 SHA512 a068987ee75de99e442d279bd3789f401e31342cac0cd699b0b06f9c3ccb51381ff7f947b339db1ee2330ed7d00e4ba5d1f56ba12824eac31e0d4cb8a605ae9a
 AUX openldap-2.6.1-make-flags.patch 2052 BLAKE2B b556799ddebbee51b4480ac379b15303e557ecab319342ed87e4a5fbbab9a640733045149fb5fdc8013f71cc850170477a1959c7aa8f34e06a2d93d25db9c6ab SHA512 a8ae365f9e907b0668774b01b50d042e2ab12fd32e41956fe98f7d9747bfde5d48f3571467be4213a4f8070b3726d14f0567915363b2e57bde438ec4f0c71b07
+AUX openldap-2.6.1-parallel-build.patch 1789 BLAKE2B 2859123ae00f02efeae1978256a6c94ef92a2983f13b046715d3f6c386427bf15c5384bc729264c31b60c21f9f5060998501d21726a27f27f4d4113bd4291b90 SHA512 212dea163e3bf6f5f9d7cb8d9e970f74e15aab1089c141fab59c75f19b3699f3990fa255f1ee2a63b92907064e0182ea91514603aae3d53956635a88a7100040
 AUX openldap-2.6.1-system-mdb.patch 3679 BLAKE2B 9d9eb3dad904564cb453424743091c471ba52ea8fa6c98b4138f068d2b6d57eb7a3ce903df1ee9eb7bae0219cc762cff8dc1f10515c376c40e2ff9b7d25d44a2 SHA512 fc1d17e57b9596b4e744272f0e28400fbaeafe6fe6de8e050be8b934f4e4f977637e6b8ca9f43255f2b59f9640a70b4c9ff91b2f741850c5f1d04d5c34cdc34c
 AUX slapd-2.6.1.service 283 BLAKE2B 47f0d19eecc4ab3f026853f0a1aa75b3691db7e064cd721751e74acdd932464347e919285536b01eea64bf596761755034a7e281216bad9baad2541a2bb708f3 SHA512 cb619ca423cac1fc71e553c0633d45babb4a138a9bd791a874851c2afc92c9388543cc7ce3fb9f8c553d8db9fb01464939bfd224f8b78aeed0d47c4ccb29b46f
 AUX slapd-confd 614 BLAKE2B 1f82964ade38adce868c28551ba9c5fbda4d1fcfc640ef51850ef934374a35520ffcf912547d7fe14f93d2aabce6ca24c11f1867bf16b3503addf04ecb1e11ba SHA512 e4ae52d10294da787016cf39adfd68c6ad812ac1758b00845810ee7936d21734d2ef3793252b878d88f21788414071adffb5f484381d4dc6a29f71a8729486b7
@@ -38,5 +39,5 @@ EBUILD openldap-2.4.57-r2.ebuild 28999 BLAKE2B 5e1836649112dd13d481acf1187748a85
 EBUILD openldap-2.4.58-r2.ebuild 29000 BLAKE2B 114b2f837d5e35d472d8404e02020a0508ac871ab40e31684535dad85102d9ca78a41548550606d334a92ce54fcc418a74ee70732cfe2ae04a5d28fe8e161f4a SHA512 ba507e64fa9b3266e68eca64a63450acc0c58e89b21c73d1e29bdbae3dae2894c362002fd05bb07f0d27c8c942e8cbc05943db7ed80b0124f9c641cec6ffee78
 EBUILD openldap-2.4.59-r2.ebuild 29006 BLAKE2B 50dbead8923aa438b3fc3ef4df689daf19632f758aeede75a101706d26d4cbe71d0fe9f628fdec091e6d5b4388e7d3bf2ab1cd52dc1c36547111679a915be795 SHA512 2ce1bef71ad542768f1a715fba3ec366a9005b6cae103744b3d125ad158c3b63f2ff49ae65a2faa7cc3dbe7493075d3ed42d04434fb60b14aa414a6298188c29
 EBUILD openldap-2.5.4-r1.ebuild 27110 BLAKE2B f2cd62e2af7fe301500b6249ad547a378605688419f90ecd20919f5289da2bfc24eea50e93a27303f70bda14a7f671a2e20445012d0060fdc8df3824424acf6b SHA512 e5d6267f8b7d74f32a3964d424497c40e01ce637fb945c2dbdf07fb3cecad60cca7b66452edda644b925887c0a02e392bf33cafe6066c47d67fa029c3e7933e9
-EBUILD openldap-2.6.1-r1.ebuild 25178 BLAKE2B 3ab2e47dfd404bb911a64b99534101903bb697e034e61736876353c0df85a27fa51b692c831e10a911fac8f8ba92fc563f3e219b8b73fe73092b2aa68cfb825c SHA512 c8ad10bc3c453680ef2fd6c0b55dd83e535bb62ba1a5e9a09b0d727d1272c67e18071f76a680059322d2350c59645bf55a4ebc592627eb1e6ad8a82619bcd424
+EBUILD openldap-2.6.1-r1.ebuild 25226 BLAKE2B d6b51fcf17dc0e4b7bef4f7c7eb3886ff80072aa3c110cbe24fc5d0f475e976fa980a6f99e992899e8d22a5cf231423731418dff2d4741bd97b4ab1a69dadf25 SHA512 58b0a124f567aa9ddc89d56cc7ea60fc28b05a5ae6c1ba6f9ad941de434f04a72b5eed574160e11db041ff82d1b6a4f2134d3c1a46a481dd9825083e9313421d
 MISC metadata.xml 1367 BLAKE2B 35e372297f9326624bc685e271f31a57eff14158e8000ca310e6bd48b201ceb97823eeaf180429a36f65e0a0e89a79802eafbff261cf29b54ac334d36a058f23 SHA512 f3ce6b12c039b55d21d8fed09a6f89731853fc6311dc0ba9bff4e85c219d03a8ccfb70983c9641319645137e803e378bf238ac83ac0b525c87767a8fc432c663
diff --git a/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch b/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch
new file mode 100644
index 000000000000..757a33c602b2
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch
@@ -0,0 +1,46 @@
+https://github.com/openldap/openldap/commit/d7c0417bcfba5400c0be2ce83eaf43ec97c97edd.patch
+https://github.com/openldap/openldap/commit/d75de4d6e98e9501ada2b6a1d527669bd7eb2fa3.patch
+https://bugs.gentoo.org/836557
+
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Thu, 2 Dec 2021 11:38:15 +0800
+Subject: [PATCH] ITS#9840 - ldif-filter: fix parallel build failure
+
+Add slapd-common.o as dependency for ldif-filter to fix the parallel
+build failure:
+  ld: cannot find slapd-common.o: No such file or directory
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+--- a/tests/progs/Makefile.in
++++ b/tests/progs/Makefile.in
+@@ -56,7 +56,7 @@ slapd-modify: slapd-modify.o $(OBJS) $(XLIBS)
+ slapd-bind: slapd-bind.o $(OBJS) $(XLIBS)
+ 	$(LTLINK) -o $@ slapd-bind.o $(OBJS) $(LIBS)
+ 
+-ldif-filter: ldif-filter.o $(XLIBS)
++ldif-filter: ldif-filter.o $(OBJS) $(XLIBS)
+ 	$(LTLINK) -o $@ ldif-filter.o $(OBJS) $(LIBS)
+ 
+ slapd-mtread: slapd-mtread.o $(OBJS) $(XLIBS)
+
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Mon, 10 Jan 2022 10:13:51 +0800
+Subject: [PATCH] ITS#9840 - libraries/Makefile.in: ignore the mkdir errors
+
+Ignore the mkdir errors to fix the parallel build failure:
+
+../../build/shtool mkdir -p TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib
+mkdir: cannot create directory 'TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib': File exists
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+--- a/libraries/Makefile.in
++++ b/libraries/Makefile.in
+@@ -24,7 +24,7 @@ PKGCONFIG_DIR=$(DESTDIR)$(libdir)/pkgconfig
+ PKGCONFIG_SRCDIRS=liblber libldap
+ 
+ install-local:
+-	@$(MKDIR) $(PKGCONFIG_DIR)
++	@-$(MKDIR) $(PKGCONFIG_DIR)
+ 	@for i in $(PKGCONFIG_SRCDIRS); do \
+ 	    $(INSTALL_DATA) $$i/*.pc $(PKGCONFIG_DIR); \
+ 	done
diff --git a/net-nds/openldap/openldap-2.6.1-r1.ebuild b/net-nds/openldap/openldap-2.6.1-r1.ebuild
index f90979e12030..6c594f6880be 100644
--- a/net-nds/openldap/openldap-2.6.1-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.1-r1.ebuild
@@ -141,6 +141,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
 	"${FILESDIR}"/${PN}-2.6.1-make-flags.patch
 	"${FILESDIR}"/${PN}-2.6.1-fix-bashism-configure.patch
+	"${FILESDIR}"/${PN}-2.6.1-parallel-build.patch
 )
 
 openldap_filecount() {
diff --git a/net-nds/smbldap-tools/Manifest b/net-nds/smbldap-tools/Manifest
index 81bc3b61dd78..8c879fd1e82f 100644
--- a/net-nds/smbldap-tools/Manifest
+++ b/net-nds/smbldap-tools/Manifest
@@ -1,4 +1,4 @@
 AUX smbldap-tools-0.9.10-smbldap-config-pod.patch 974 BLAKE2B b8ab4c2a910dfa8794b2f7366da54f7398822c9e65a2e18bc2ec157140d16fabb12a757f1529ba5a2e71c4b4b41902ad3bdd5789fff18eeda1df3fac3f525c03 SHA512 c4801c4b411c95c9c6495809b045c9c1bc641f8fc4b3797f34b44d9bec67428bb0ab86a07414c935f1b882fb27091e0a6286f1559dd9554a9451ada75f804eba
 DIST smbldap-tools-0.9.10.tar.gz 336840 BLAKE2B 8df7cf34d1fedb54ece3f5c018b7bf03a1b0f0ca8813980eaa21d338113fe30535d7627c0d61b8d30c331e20ebb81449ae4a0ddcdfd4a93cb028f2c376a2ce76 SHA512 e1aef98d91ec722427b27f3aed25d8ef4cd4a6c845f98935e2f99075dea93275fc0335760d517398be8ca7898084bfee457ada0a718b66226e6ce3f38fdf2b2e
-EBUILD smbldap-tools-0.9.10-r1.ebuild 1557 BLAKE2B adef47fa24922738facb9caaedb166951bc2454a8069bd90c0a833edb7aa9b344716523b94b43a28cd3b82de4169f079bfaf6039ec567e33dc7be746b1199074 SHA512 b76d5bdde5fd81e34c370f090a0295bfa12e0dbae2065f98345631ff95b0b79af813e4e9af00f50249f40f68ea1e249a4141afbd0c3b2f6698a62e91cd2e1203
+EBUILD smbldap-tools-0.9.10-r1.ebuild 1551 BLAKE2B d80c7d8b764187cc09d1c3336f0b2b9ebb14fc3da799c0471065044de105577897c780a29a087a7dd2b827736f0bc6d20297e2f3aa78588147c9e512fd327faf SHA512 e14c61d5ccef77f1b245470313dbb29069449238584b971b25942a5bed9eb64cfdc0ee440f933bb2d83ddec7d3a2b84c7c2c03037f0badb8690f6ed7b9166d9c
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
index f9b979ba5f58..d0c0f958b66d 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.gna.org/smbldap-tools/sources/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-perl/perl-ldap
diff --git a/net-nds/tac_plus/Manifest b/net-nds/tac_plus/Manifest
index c6975ac671c8..4689921dbcee 100644
--- a/net-nds/tac_plus/Manifest
+++ b/net-nds/tac_plus/Manifest
@@ -1,5 +1,4 @@
 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
@@ -7,9 +6,6 @@ AUX tac_plus.confd 172 BLAKE2B ca6b99c9f078b0597c64acad66100fc94516fadf21f877336
 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-r5.ebuild 1337 BLAKE2B 27ec9a6c3334cb00d81362ac3ecb4841056e2a189aa1924a69d599c1045b7aac539dceabbb39af71f34e0b03028c69292f14c8b2d9ad7465eebb3e298a5ddd8c SHA512 c0c11f61fb02d917c91a597936626dbf1091b598e844b6e2e2421630734ef5a197bcef50a6334c14c0dd79870d7603c7751a81ee0e8e548fa35abda269d444a9
-EBUILD tac_plus-4.0.4.27a-r2.ebuild 1435 BLAKE2B 0d8f730736040f2a1c0fa621cca61d5fdb4f71334e6a67ad0b6d5c2734de7cfe1b9eed3dbc08db95948f5db5047ceecd29c767c8af517833826a8388f57dc51b SHA512 6e803a347ec70c6d3f5e75dd937808a0f8a560f5b55156db8d669cb914efa7fdc74637cd762a0b9c9499e05f75a7426a1d150fbdbf3ab2fb974ba463657ae725
 EBUILD tac_plus-4.0.4.27a-r3.ebuild 1511 BLAKE2B 1a42729492eff8cc7bd973dd86111d6685159fad5cbbdd493404846a9fdb98e8c3e6161ff58ee6aedb547fae2546f02e283cec6b840a6ffe1dd0db4f9b93000d SHA512 e8d718c25ec4caf69f076457022935b3bf83297d33758967782fa2c66881dd29b69a0f157c77c9b0b12f7e1a0378aa79c1add489dd54903c98a30c3449091d9c
 MISC metadata.xml 347 BLAKE2B f3a5e8ac1da978c0bb203b48b4461c149b80ba8761444d327d309daf3556d250118dd0f349441f4fbfe6c6820a5f6f164e7ad22cbc6c915a8de0dd1bf112b296 SHA512 65614032fac0718ee5e56c8f167b0a4164bddefb6a1277822af82dd85d22ec9ce507136e31367983b5dfee7a967e54befb3b135c08ca496be67c9b241b536011
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
deleted file mode 100644
index a8ca67e73626..000000000000
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,7 +16,7 @@ if TACSKEY
- tac_plus_SOURCES += skey_fn.c
- endif
- tac_plus_LDFLAGS = -L$(top_srcdir)
--tac_plus_LDADD = $(WRAPLIBS) -ltacacs
-+tac_plus_LDADD = $(WRAPLIBS) libtacacs.la
- 
- lib_LTLIBRARIES = libtacacs.la
- libtacacs_la_SOURCES = md4.c md5.c packet.c
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild
deleted file mode 100644
index 22217527ea78..000000000000
--- a/net-nds/tac_plus/tac_plus-4.0.4.19-r5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="tacacs+-F${PV}"
-DESCRIPTION="An updated version of Cisco's TACACS+ server"
-HOMEPAGE="https://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
-	virtual/libcrypt:=
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallelmake.patch
-	"${FILESDIR}"/${P}-deansification.patch
-)
-
-src_prepare() {
-	default
-
-	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 "${D}" -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
-
-	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-r2.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild
deleted file mode 100644
index a5026cae2b98..000000000000
--- a/net-nds/tac_plus/tac_plus-4.0.4.27a-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="tacacs+-F${PV}"
-DESCRIPTION="An updated version of Cisco's TACACS+ server"
-HOMEPAGE="https://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
-	virtual/libcrypt:=
-	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
-
-	insinto /etc/tac_plus
-	newins "${FILESDIR}/tac_plus.conf2" tac_plus.conf
-}