9 files changed, 57 insertions, 74 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3a545467f459..c004e7dc7050 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 00e96b3c166d..20dfc96fa427 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -5,5 +5,5 @@ DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad88
 EBUILD grpc-1.38.1.ebuild 2731 BLAKE2B ca17d04e0ad895020cf096eb98dfe01e53c312e8afd0ae868ecb10012cfa1c06749dd0031489996f0d5e7367e4a2e579d713199a31372062cd4bfe62712e118c SHA512 23e9cd3479cf10dd80ae704eda03d9004143bffedc3458904840fd36801d0aa33be1027b2447da02f2f93ee1dbf11112aa7a43aaf5c71eff9632ef0bda862f4c
 EBUILD grpc-1.41.0.ebuild 2731 BLAKE2B bef8c072cc2ba43ead5fb71e4be67d25a5c67cacff38c2cdf095b4a7b8b8b140c4ef08d5afb6b6f5cc5357cf704f99ee55489e1b6bc393127b31afaf97133f8f SHA512 1e776f2f77bca939bd266b7b09dc17f3be1f1a94dfee7840883e8cc6549162b9a78e87c17fd77557cf1ca290c6bcdb9304f2a38aea489784a421a6165fbc4c70
 EBUILD grpc-1.41.1.ebuild 2729 BLAKE2B 37976ad98ac36165558f1bb4c834a9da8f74ca8c5720a983eed0945c1f1dc70e05b3471dc01c64a6fe1977801399ffc5eada1ee730e287f4b5ef8f1c86f1b95e SHA512 4f8e248f9b1105d92eb4b3d16e7b09c66e8e60e8b49e607cb593c2c91a64b6fd52e56c1c95fe62ba688ebe9b1d09cf4f4d75e30c5f92167af1055ac8a6e4ec4d
-EBUILD grpc-1.43.0.ebuild 2682 BLAKE2B 820f5ecc501a6c20db9e05b78699a136ca75c0408789670dca441ba7471b33c7c71cd6c125ff5c1a8515fd66087919595c3c2ec6a7f47f2c4dc8bf96a9046bf4 SHA512 83329a812c62f456363b41628ca99d908980cb339374de235806c064559c82652cbc94618104b9df410b33e26bcd2954694d3f8ce21be9d0f8ab7ccd527e4f28
+EBUILD grpc-1.43.0.ebuild 2687 BLAKE2B 560620a7f3a281c5d61eae346bfeed9a0a8168e31bfab7721385347db640723e99b0d693252a0fb3c5cde2a8bd08f460f309e0430dea9999822f69b15ca3b555 SHA512 3feeb8fcd68c868a1181ef1fd88b818f3af7fcdc9ecf6cd5f184524fcf8863019d2d610871aaabc9d1bebfed43b3c2c16174fd7be3fb38c3b14babd1e5013bec
 MISC metadata.xml 460 BLAKE2B 5cd969a5813d9d872d63cad0ebe0e02381cc8e97d0eb16ae9821f24de78c69f3670dfd6698388b17165d6a3c2029d213dd1f0e88ecda42215b0b3dfc64758657 SHA512 32148c45e964de16405ed7820c2066d5332f85047b3606f0189e9a306825b291478672dd108b0e1869086103e2f9a3a283b7a30379a883c79709cdf0fba18c4d
diff --git a/net-libs/grpc/grpc-1.43.0.ebuild b/net-libs/grpc/grpc-1.43.0.ebuild
index 157b09370a9d..b1bb44b0502a 100644
--- a/net-libs/grpc/grpc-1.43.0.ebuild
+++ b/net-libs/grpc/grpc-1.43.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/21.143"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index 439645046998..3838133f165f 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -2,6 +2,8 @@ AUX libgssglue-0.3-protos.patch 471 BLAKE2B 2b60d3786c74fc104f7bd329560ba348b087
 AUX libgssglue-0.4-implicit-declarations.patch 530 BLAKE2B ee86f8cc22ec18834944c459340fb7b8e9114efb02f3f1b402b4fcb7d21260b4f4ad97d43783ab0dcf0a8a627f4348ca17420bcc2497d0e847c6d8e8d458f82b SHA512 c49ae441600d6f7971778bccbf20b26cc8f37c07d6f73f9f1fb95560d25772f6847322eff9a3e8c89369b11bb3540db1f61645d4fd37db1cb6c7f763c4753dc6
 DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
 DIST libgssglue-libgssglue-0.5.tar.bz2 32115 BLAKE2B cc66e66e76e0cdbc006b22dd81b96a65d444f9f2f0a62da8208b2be16081e47eccf68788d1b35f606caa5b8f3ab1740a308d54019c7a800501c838343f87f245 SHA512 e49088762bb1aee4c1b3d8c8b6f02bc9550abee1cc6bc9814933dc985841dfda56d96d736e56fecf624b4050bfda6ce1059c2dbeb1ab668956c2f941041f20f2
+DIST libgssglue-libgssglue-0.7.tar.bz2 31415 BLAKE2B 4017ff17b876b00d93d5120ca8fe2a1f472b61c7b73dec0194d0ebaa244176b5d6f85fbfe5ce52cd77bcce9e1718f979b36e8926577640bbad38208fcea78f5a SHA512 04ea9af9f56afeca40b1dd22708dfa2e844d587106f370820a8976a22e8b95c646cdc5c5ef4256e34780cdb34c5617c45187fe3866670662f15ac579ef22dcca
 EBUILD libgssglue-0.4-r1.ebuild 903 BLAKE2B a39345262e7bba32ae36f9f5eefa51c67ce2a9b5f814eb7d039b72495705242d9aee2f051ffc28cd3376622f5e60e2d520334c4d2c622aebae49ed0437119cb5 SHA512 46e8474611fc03c69c8de11c3f5bb5d106187e0a49b53284012262af666cdc31cd5eedbe70aec7c627d711ba9571307ec68a6735a9a7fb76106c6c1cbf17c5bf
 EBUILD libgssglue-0.5-r1.ebuild 1340 BLAKE2B edbf69849dcef63ec114c764304627725c73494cb4fc16460b0263de0b19017442f518fd1c1a02ea6c8635609b1c80056bd3f8f3e1c1e806f514e0848cf526ed SHA512 b9ef88ab9e1ca4dce7b2b425c1dced8a7c802cf29d681b11ea8d1a4da390f311f2ae8882e09abcdb83aa30f2a455ff9c29ca06a32e76b0621d8ddd790a871ac4
+EBUILD libgssglue-0.7.ebuild 1154 BLAKE2B f6104b990988254fd401d54791bd285129eb992351ed49e23bbadb936de1c57b21cedba2faab79bb8fe56b37aafed87263c244e21dfd53037ae42f9257580e6b SHA512 16e344fe4f935e514e260ca9729b7c6f418ae6b7ebfebbca30726d6ff1b9ab2f7abdadb3420c297398877bb346239fa9f985bc8b9fa2feedaf5c786f1de6b0f6
 MISC metadata.xml 249 BLAKE2B 83b0c3cbb109f3a5fe471176078244f62b6db5cd38cc72a2a4ca3d7accc1bf39c12bf0e3e902cd8ecf4f80b72159f658e31cd55065893da3882c7b471551ec5a SHA512 235a0cd45a87d913d5f64cb14acad34258055a7f7cac2808aec35cc022fdfb5c76780016dc22131281235634424d23a6ddaafdaa4ee62a577ac5e3ef40cce843
diff --git a/net-libs/libgssglue/libgssglue-0.7.ebuild b/net-libs/libgssglue/libgssglue-0.7.ebuild
new file mode 100644
index 000000000000..89f5f109a7f7
--- /dev/null
+++ b/net-libs/libgssglue/libgssglue-0.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="Exports a gssapi interface which calls other random gssapi libraries"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue"
+SRC_URI="https://gitlab.com/gsasl/libgssglue/-/archive/${P}/${PN}-${P}.tar.bz2"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="virtual/krb5"
+
+DOC_CONTENTS="
+This package allows choosing a Kerberos or GSSAPI implementation
+at runtime.
+
+See
+https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/
+for more details.
+
+A system-wide implementation can be chosen by editing ${EROOT}/etc/gssapi_mech.conf,
+or it can be set per-process via the GSSAPI_MECH_CONF environment variable.
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+
+	insinto /etc
+	doins doc/gssapi_mech.conf
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 14d4a4ee11a2..1822be569cc1 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,8 +1,5 @@
-DIST nDPI-4.0-patches.tar.bz2 8744 BLAKE2B 48bfb2cf240823b64ab15a3f8a21acece878102ebb4cc807648b264ef091107a05d66fc672cccd1bc721ad3ea0edde786a1f133dfc84c91422604a9929e327ed SHA512 99a780c18c048ceec29c42828c420fe3f9624906eaef70f92af6abdbf7bc29133e048d7f8de85d8b73aa6667066e7ab5843fa293221d5ec8bbe87803dde83db6
-DIST nDPI-4.0.tar.gz 120053617 BLAKE2B ea0f333bd62622c1ab792137f9bbf2e35cb3790aae191c5caeaea36c7ce376bfa84633e99e321c16bcfbe5812d6674b825bdc4197297cee76064ed88f344a577 SHA512 2526041bc02a210e65bad31323a66167d79a37d14697cf4459054cc54715e53f9673b0000cefa6b452bbe3b3e6c25f0bafcf59d24323d210e2ce6782d9153f81
 DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
 DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468
-EBUILD nDPI-4.0-r1.ebuild 1425 BLAKE2B 5085e685f10038dad0b6f22f4e03cb933725f2dcdec5e011065ad1ad21413ef11fed9b82b2e6ff9d5ab142c9d15f6e9a558579c2503d7b21dab4459e9bebae4e SHA512 6eb175d07df79f2750721f3d4c5880bbdb6aa6106e052c4b5ecea2192a034e95c9f18543f36171992e67536bd0c482246eb12fd1e72c50c48f38b3e2a1e5d82f
 EBUILD nDPI-4.2.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
 EBUILD nDPI-4.4.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
 EBUILD nDPI-9999.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
diff --git a/net-libs/nDPI/nDPI-4.0-r1.ebuild b/net-libs/nDPI/nDPI-4.0-r1.ebuild
deleted file mode 100644
index 4be4dd426cc0..000000000000
--- a/net-libs/nDPI/nDPI-4.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ntop/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.bz2"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3+"
-SLOT="0/$(ver_cut 1)"
-
-DEPEND="dev-libs/json-c:=
-	dev-libs/libgcrypt:=
-	dev-libs/libgpg-error
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patches/
-)
-
-# Also sent a patch upstream https://github.com/ntop/nDPI/pull/1392 for
-# AR/CC etc but doesn't apply cleanly (at all) to 4.0.
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
-		src/lib/Makefile.in || die
-
-	eautoreconf
-
-	# Should be able to drop in next version.
-	# Taken from autogen.sh (bug #704074):
-	sed -i \
-		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
-		-e "s/#define VERSION/#define NDPI_VERSION/g" \
-		configure || die
-}
-
-src_test() {
-	pushd tests || die
-
-	./do.sh || die "Failed tests"
-	./do-unit.sh || die "Failed unit tests"
-
-	popd || die
-}
-
-src_install() {
-	default
-
-	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a1a4b4b29ee6..e0f2a5d1dc04 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -6,5 +6,5 @@ DIST webkitgtk-2.36.6.tar.xz 26593904 BLAKE2B 95ea4b17350b148fe6cc9bbaa4aab3bbb9
 EBUILD webkit-gtk-2.36.3.ebuild 7409 BLAKE2B e2f941a57bb827f86ae95e98af0187b0a4a301402470165be293e03efd9cd96834866bf7c69eefe3369d26a7926afb6b5b46061362b166652dcf29e581f120c5 SHA512 3d6226815a55d0b67550c6a0a405f7f4442715c528ed653858b6152f61ac36db6c080e9eb44fc504d61830a84da56a265e6f6dd2abb38227d9ff752393bd2cc8
 EBUILD webkit-gtk-2.36.4.ebuild 7425 BLAKE2B 1f261d15a60f1d07895652c369cdf572cea2bdd19236abd2a2de2b31b1f8994a644d85185368a07a708c7c4e956f4547b12ae14a8befd5b1c33fd02ebfb1b9fa SHA512 459a52070c6c83950dd278c3325bc83d184314ec4e613ccf3f34fc9cd4ce7d45d854a892452e9f620da37937050c470e21614daac03189cf082cfb07f50d92a6
 EBUILD webkit-gtk-2.36.5-r1.ebuild 7474 BLAKE2B 66f02387a52c0a8ef7661a176db8704bfff4efcbebc6bc022116830df416200004b6cde1bade215beaefe446bf3e48b33c19b4431aed0b1cfb1a07c2a5ccc1e9 SHA512 63eba5340d80c46f39dc670318926ac3b0088eff499b5088690d167ba193f09b8f66e4ddcb7a0b596de5f74bcaabdfbbc69ef744b6c3032862aa0fd72aaba06b
-EBUILD webkit-gtk-2.36.6.ebuild 7429 BLAKE2B 541f21d5860fe131f2e28a7d93a468ce214a6f0820e146917113f5ae9f1a34b288aae42e23c57dca754e3582674ef867268dde89de41bddb02f626f0aac5218d SHA512 3a95a19e510b84ccb796291d3bb2b77cbab41f3d812645e573ef27cf282373c2a660ba4ae712a7cea51a329d62b78e009c36276bfddf0f0a892be96221f8aa73
+EBUILD webkit-gtk-2.36.6.ebuild 7428 BLAKE2B 597109c9f689698a0ed6decf9336a06b7f2c6a82524992c174377942d4b60dd86294962e75dcc9c42ee03fec9e5e5713915d7d246d7f6b6ba0a047bf299c6d86 SHA512 f52585eba0bcde253cae7d84ac18f3eb08d9081e5669a9be55275dae4f36e90958ca5f4c7f7799a00da5f8ea5e37d4cdbe4d831c56313cf896fc2a805643bf9a
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
index 79e452c58aae..d69ff514c6db 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"