6 files changed, 4 insertions, 93 deletions
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 6c2d1434d390..68bab0b14421 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/gssproxy/Manifest b/net-nds/gssproxy/Manifest
index 7ff63bf47b0e..1b6fe13d2d7c 100644
--- a/net-nds/gssproxy/Manifest
+++ b/net-nds/gssproxy/Manifest
@@ -1,6 +1,4 @@
 AUX gssproxy 276 BLAKE2B f529b72cc589910a8c7c5f76428359e6bbca612e3ce78f1a02213655183942d1c362a3c48d7d60ceb408d4ae0a8dd75f12ebaa30d7cff59d1f0ea2537c2b1dcc SHA512 883a9a82e9f7e92aee212f9cdc8a5c5eb5204d03a928a48d5826ef4de273907a8d4f1bbf2e9351d19f88fb35cd499ea1103d7aaa0e97ed23fc2e5a0b35be0fee
-DIST gssproxy-0.8.2.tar.gz 563300 BLAKE2B 104637af6f43d118ef5194ee8bdfd0a8a8155df43691ac80394de0482f718f2672996b698a80d5c4db7bdc1b164be7f8dc6ffd9a5346affd5923b78362f10333 SHA512 68ce39b36ee83d77da19e9a9fb322ba901366999828a2b427bc2275c4187b4d2291de140c202cce02bdf53eb5cf64da2fafa022ea482258c102f28b0af5d7c63
 DIST gssproxy-0.8.3.tar.gz 565100 BLAKE2B a8b3d96ca0b1cc314af3b63cc5959c9b48287ea0169ea75f8a8902bbd5757542fd24e1fa3f603b2a7d4c15878600145bf5a27e880e935a7a037ca3ebc9fcfb9c SHA512 144b10ec4e19ad2ded5ae57adf1ca311e2fc6c2b97e202eedde69d82c8d50afc0459ac36c7fc5d5290184eb68547a696b33e8a069fde43478104ac26b2c98bc2
-EBUILD gssproxy-0.8.2.ebuild 2786 BLAKE2B 0eadc99c60f0cde3ca9a5dc9554b9934d606878d0bc3d047559e4f2d93355d24736a103bbe4699bc078238b762bc07db4c754c62d6b860acf406907c544260ff SHA512 1637d3c7aed33f4cf09a4b1de93be4b3873ceb869565137e316f3216fe6c3882d793b3303737c7f95805638b5eb1d6c3741175ffae8f026d639cbc9f9d7f1475
-EBUILD gssproxy-0.8.3.ebuild 2806 BLAKE2B 924da7d53d734711ea8891f8eef913ea5e0702910b87a87137ddbc3a089bb7288f847113a8e03bdfb4f0e6e95f62a7bed164bb7904afe3da535aedb68ca856ea SHA512 0939d858e8e8aae2d62a6d981fa88e3205dfd9376152ef290cda992902c63da8bc082bcffe22b90d72007cf1d8569913a69965493532ebad25ca0655bb226ef9
+EBUILD gssproxy-0.8.3.ebuild 2807 BLAKE2B fd06a46cd3fd392ef0e75a2a5b6599d65289a88b1cbde9c76776258fc6eabcea6df888ab8d7c8dca2c275691f63a155c9ed89c0d40726b95331e7e58b30b78b8 SHA512 0e0b49feb105c9dae277ea23ccfd3ce36fd4b32781c1109ff996c7ae491857b92495e47af4b0c9d293c62a5f5449b9ccc584f7dd2104ff3ae7907b9b35b94696
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/net-nds/gssproxy/gssproxy-0.8.2.ebuild b/net-nds/gssproxy/gssproxy-0.8.2.ebuild
deleted file mode 100644
index f2c8e0ea7fbc..000000000000
--- a/net-nds/gssproxy/gssproxy-0.8.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
-HOMEPAGE="https://pagure.io/gssproxy"
-SRC_URI="http://releases.pagure.org/gssproxy/${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug selinux systemd hardened"
-
-COMMON_DEPEND=">=dev-libs/libverto-0.2.2
-	>=dev-libs/ding-libs-0.6.1
-	virtual/krb5
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-gssproxy )"
-# We need xml stuff to build the man pages, and people really want/need
-# the man pages for this package :). #585200
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-# Many requirements to run tests, including running slapd as root, hence
-# unfeasible.
-RESTRICT="test"
-
-# pkg_setup() {
-# 	# Here instead of flag-logic in DEPEND, since virtual/krb5 does not
-# 	# allow to specify the openldap use flag, which heimdal doesn't
-# 	# support.
-# 	# Using mit-krb5 explicitly because heimdal doesn't install kerberos
-# 	# schemata required for the tests of gss-proxy.
-# 	if use test && ! has_version "app-crypt/mit-krb5[openldap]"; then
-# 		eerror "Tests of this package require the kerberos schemata installed from app-crypt/mit-krb5[openldap]."
-# 		die "Tests enabled but no app-crypt/mit-krb5[openldap] being installed."
-# 	fi
-# }
-
-# Was required in 0.7.0 to fix the schema- and slapd-path. Reason for
-# comment: see RESTRICT comment
-# src_prepare() {
-# 	default
-# 	# The tests look for kerberos schemata in the documentation
-# 	# directory of krb5, however these are installed in /etc/openldap
-# 	# and only if the openldap useflag is supplied
-# 	sed -i \
-# 		-e 's#/usr/share/doc/krb5-server-ldap*#/etc/openldap/schema#' \
-# 		-e "s#\(subprocess.Popen..\"\)slapd#\1/usr/$(get_libdir)/openldap/slapd#" \
-# 		"${S}/tests/testlib.py" || die
-# }
-
-src_configure() {
-	local myeconfargs=(
-		# The build assumes localstatedir is /var and takes care of
-		# using all the right subdirs itself.
-		"--localstatedir=${EPREFIX}/var"
-		"--with-os=gentoo"
-		"--with-initscript=$(usex systemd systemd none)"
-		"$(use_with selinux)"
-		"$(use_with debug gssidebug)"
-		"$(use_with hardened hardening)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# This is a plugin module, so no need for la file.
-	find "${ED%/}"/usr -name proxymech.la -delete
-
-	doinitd "${FILESDIR}"/gssproxy
-	insinto /etc/gssproxy
-	doins examples/*.conf
-	insinto /etc/gss/mech.d
-	newins examples/mech gssproxy.conf
-
-	keepdir /var/lib/gssproxy
-
-	# The build installs a bunch of empty dirs, so prune them.
-	find "${ED}" -depth -type d -empty -delete || die
-}
diff --git a/net-nds/gssproxy/gssproxy-0.8.3.ebuild b/net-nds/gssproxy/gssproxy-0.8.3.ebuild
index 6dc581cb5c9a..9c813bc18bea 100644
--- a/net-nds/gssproxy/gssproxy-0.8.3.ebuild
+++ b/net-nds/gssproxy/gssproxy-0.8.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gssapi/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="debug selinux systemd hardened"
 
 COMMON_DEPEND=">=dev-libs/libverto-0.2.2
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 360ab98cfd0a..630b5ff5ffb4 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -23,5 +23,5 @@ AUX slapd.service.conf 443 BLAKE2B 7cf9d3935ea100006fe4f8667b792d32627c933c72220
 AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d0513cd33ee5d31acdbe19c0af72a6478576acfaa88a2f063213cb9fd3025f4dda6ac401a8b9488719 SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec
 DIST openldap-2.4.56.tgz 5885444 BLAKE2B cebb189346f9114ed6e2dbb11a836c0b802e28f42d49351d6e807cba9c0f49e85ab3dbb34260b7c5eb3849c181eb51046ef48f555083647e3ce83209d6224bbb SHA512 cf371db5595d5b6643db3e6788ce56e34fe271c244dd39d781cadd2a7f85cec421a51c11a4857a7e286ba94a27c1f0dab0ff27e8de20208587471f4a589588e6
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.56.ebuild 29199 BLAKE2B 6d693fef69dbdfeb0d9484422cc46c27293a773f19db39844c6271dcb783c3cf76884dd6d4d0d3629957260a03261d99412d46b8a30699489e179b386272e437 SHA512 c76272db30ea30b78f689eaedfa49d36805e95a9772e42c94ab031a3c8a9555c6081ccbdd717ff624d5e05591e34069378b07da74f3059d811715b6a7ccedbf9
+EBUILD openldap-2.4.56.ebuild 29190 BLAKE2B bce5a9e62ec7e27c16ee3388c55aae25a0e982d868655ff66afa57dc78c48f4ba0cc43b0f73f03a48ad14e0ee1dc0b5e8a248b32894b47a8fd5d9b80637f3835 SHA512 1db0d457208583b17bc02ebfcdff16ec1b18f60e3a85be1b908bfc8b9e46ee7b76adff0a4bf3c7a928570bdbd0d29273d05db0c458682df0914b0ec8a8895d37
 MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/openldap-2.4.56.ebuild b/net-nds/openldap/openldap-2.4.56.ebuild
index 019498b6bf95..229f43df9b21 100644
--- a/net-nds/openldap/openldap-2.4.56.ebuild
+++ b/net-nds/openldap/openldap-2.4.56.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"