gentoo resync : 20.10.2021

28 files changed, 153 insertions, 625 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e7ef528ab0d0..f982ec10072e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index dd74e3ff7c75..4a3e91368209 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,4 +1,6 @@
 AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4d6bcd31d980283c6e8f2307bec19d442d45687fad1ca126e50a6443d3eee2ce75b0d9f5c5a8 SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
+DIST czmq-4.2.1.tar.gz 1617066 BLAKE2B 5b635ccd7e85f05cd4f81f1ddaef80f7478feccfb916b1a7317f539354d0a4dabb7bf14a9dbee4dae3f6fbfcaf402c51ee9ba9810d952fc837c03c14304d4dab SHA512 776c524ffeba3dbe2534351f91623a6f9db31268aa2e794e29b7eca99c9fd0a726de0f7fba4376a5b3d7321b1033314e86644efaa5a9c7226fc1f06805f7aa9f
 EBUILD czmq-4.2.0.ebuild 1167 BLAKE2B 6aeb3a671a4ec525a361ba558848cbe65bab7bc9e831f04a3eb3b2c4470207460f15385e304e2293ad260967ac5ef9fe39a2e943315ef3783fb17d82bfa4f4d8 SHA512 a31dd593f9d2537e71e16320eefcd6785f9338395cb51a30de30b3d9ffdfa41f143174934d0ec794f67f2b06d35ceb10151846dadecd2fdce8dc8a314bf4a99f
-MISC metadata.xml 686 BLAKE2B 55be8f598357ed89149c78c91686b78766f9de76fc3f5594b4241bf9e65aa9d50aab0b0fb24daa5d5fb22423b9596031898f51d92022e0b48f61cd9b02414817 SHA512 4c74eca95f87584a3cedb6b4164249a01e98df7a43f1725a05f566ff1bc144178971f83fff7ee2af530edb7058cc9a1413e7031d18467173edcda02dd06fd855
+EBUILD czmq-4.2.1.ebuild 1241 BLAKE2B 1c12101965f679c95c09b020c20d8a23076e76a685fea160c210b71a44bf3257aa97b5e9917db768f1739f2158e574b1626e230be08d0dd0d8e3d1028e245e05 SHA512 5692e9a199e75224436e632bb8c0ecbea0bd22a59c8112e3b0e36e86e3e74afcb589f6419ee9e7c53b6d669762250ad9a0bbebf621faf412505234cfd31dc6ad
+MISC metadata.xml 786 BLAKE2B 0b02a6b39b849b994c1c1e053b8156795804fcbfaefaaaa74895215f9f3394c131888a561798abafbf3a16f46bfbf00f1609ebeac3c1e5b63b1d25d6616eec09 SHA512 1dc7f022ee9fe463b647a750e13442254b6b9dbc144068401fd76ece667a1c570bca99e0558fb29738c6de68365d87584b7c4aa922e69c1ce47c903116c0fe10
diff --git a/net-libs/czmq/czmq-4.2.1.ebuild b/net-libs/czmq/czmq-4.2.1.ebuild
new file mode 100644
index 000000000000..4811dcd20d22
--- /dev/null
+++ b/net-libs/czmq/czmq-4.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="High-level C Binding for ZeroMQ"
+HOMEPAGE="http://czmq.zeromq.org"
+SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="curl drafts http-client http-server lz4 nss static-libs systemd +uuid"
+
+BDEPEND="app-text/asciidoc
+	app-text/xmlto
+	virtual/pkgconfig"
+
+RDEPEND=">=net-libs/zeromq-4:=[drafts?]
+	http-client? ( net-misc/curl )
+	http-server? ( net-libs/libmicrohttpd:= )
+	lz4? ( app-arch/lz4:= )
+	nss? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	systemd? ( sys-apps/systemd )
+	uuid? ( sys-apps/util-linux:0 )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+	local myeconfargs=(
+		--enable-drafts=$(usex drafts)
+		--with-docs=no
+		--with-uuid=$(usex uuid)
+		--with-libcurl=$(usex http-client)
+		--with-libmicrohttpd=$(usex http-server)
+		--with-libsystemd=$(usex systemd)
+		--with-liblz4=$(usex lz4)
+		--with-nss=$(usex nss)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs ; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/net-libs/czmq/metadata.xml b/net-libs/czmq/metadata.xml
index 25a5bec4901f..bbd0bd05fd80 100644
--- a/net-libs/czmq/metadata.xml
+++ b/net-libs/czmq/metadata.xml
@@ -10,6 +10,7 @@
 		</flag>
 		<flag name="http-client">Build support for HTTP client using <pkg>net-misc/curl</pkg></flag>
 		<flag name="http-server">Build support for HTTP server using <pkg>net-libs/libmicrohttpd</pkg></flag>
+		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for SHA instead of an internal implementation</flag>
 		<flag name="uuid">Enable UUID support using <pkg>sys-apps/util-linux</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 09e26bd435bf..24ffa39ba912 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,3 @@
-AUX grpc-1.41.0-link-system-gtest.patch 623 BLAKE2B 5619ee7d605a15baa0a2b362f1083d1d00afe5c9f70808638b29faa04b12efd96377fc6e6c38cc64335ab28adc0964ae4bc6c50f9cc924b0b220f29ceae15619 SHA512 a2ce0b529472d9228e5d6fa7a779c2fed852ce241b38afe682fe20fbec5af659229dcef2e3c250c453438b8ee9bbc5180b3ff14c538182dcc13279727bdf5cf7
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
 DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902
diff --git a/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch b/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
deleted file mode 100644
index 4901678bfd6c..000000000000
--- a/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0e8fbdee8b..3662aabdfe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2309,6 +2309,7 @@ target_include_directories(grpc_test_util
-     ${_gRPC_ZLIB_INCLUDE_DIR}
- )
- target_link_libraries(grpc_test_util
-+    PRIVATE
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   absl::failure_signal_handler
-   absl::stacktrace
-@@ -2322,7 +2323,8 @@ endif()
- 
- endif()
- if(gRPC_BUILD_TESTS)
--
-+find_package(GTest REQUIRED)
-+target_link_libraries(grpc_test_util PUBLIC GTest::gtest GTest::gmock)
- add_library(grpc_test_util_unsecure
-   test/core/util/cmdline.cc
-   test/core/util/fuzzer_util.cc
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index 4f872285c8ae..a97c1ad7a047 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,4 +1,4 @@
 DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139
-EBUILD libhackrf-2021.03.1.ebuild 995 BLAKE2B 0208bfdc780b55dddae07348cd34ff9d4f7e4080e3e1494dc894fd4dff858d94b09dfc33e74cac0b8c3965d6dab015b52d0ed7b7407b471f795fd9968fbca7f9 SHA512 f1a49089308790edc0547d870adb9a7c75c7a7017026f3b5501cebd29881a7547bd5721fd0ffec3b41dfadc4efb5173cfcf4ea5e598336754b6c1831eb875281
+EBUILD libhackrf-2021.03.1.ebuild 993 BLAKE2B 3eae69695b801a91c18fb55e235516219f8c2cf69e9f1b0524bf9f8132ddcb9cf9ad7bb017dc175440d1e31708ab14d4325920b9d1cf26b230fe66d706720a16 SHA512 2298ed53c62680d114db9a84845bbe2851b52c37338ee7218e3b6029f256a6906176de4682fa6dfd1c2ca514f9e61629873063140256e885f053684521bf5c9a
 EBUILD libhackrf-9999.ebuild 995 BLAKE2B 0208bfdc780b55dddae07348cd34ff9d4f7e4080e3e1494dc894fd4dff858d94b09dfc33e74cac0b8c3965d6dab015b52d0ed7b7407b471f795fd9968fbca7f9 SHA512 f1a49089308790edc0547d870adb9a7c75c7a7017026f3b5501cebd29881a7547bd5721fd0ffec3b41dfadc4efb5173cfcf4ea5e598336754b6c1831eb875281
 MISC metadata.xml 478 BLAKE2B b9dc4d583a6d8d6f4f495b4c9cf911f127133087f00ebf696be9f603ce3be1e93f5f112dd57fa557602daf67709176ab082cf07f7945cc6abc396fb445da5bc0 SHA512 11196ffe3e3b7a746be9191dc28188b56fa5e1238c26bfb878ee891e3564f7360e7169c469797e199bc77a1b1c1d8ab951891e4830f266ff4d19d71c33b919b2
diff --git a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
index fd72ef016bea..68fc002026d0 100644
--- a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
 	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 18c582c0cdc7..959c3fcb440d 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-21.04.3.tar.xz 607516 BLAKE2B 5dfea2102fc865d61f2ebf2b1f7045c7ce0f542830f9c7e511d5139f910ff3797a949f85a593a17c56287c3433c086a198f96353a61a4cfc923d96aa30ab4545 SHA512 2c8ee156b0b1e51b96b2670c5fe3f00aa131a34bcebdfdd69898a723fd01a8d2da52a94a1914c13e82b7362a71beaefc03b27eb450dbc84bc43953771bf9b886
 DIST libktorrent-21.08.2.tar.xz 607048 BLAKE2B fe095e15c0b3bb522a9d7b22e03962051b2314696fc25744caa717af60ec0484f112f61213babd72d267420c6074b7c735dedae0d27f48a6ea5b41ed35e9b9b6 SHA512 84d3e59b381d7bbb4515ae4bc989110adf955603a9dbf0970ad47311a4e0c3dc4f20e52752e1d3a33374e46353149da88507014fc096f5643691485b55db3781
 EBUILD libktorrent-21.04.3.ebuild 1437 BLAKE2B 066e9af041e881c1a4e45c69cff5e671eba2f96933dd1d3054f06895a3b662c18baee17407f77ce9136ff7551d50ada8a77b414046a2a9fc9ecb16141e30a883 SHA512 7c6ff4abd4bf4a2baaf131cf10c353f5a78355dd2930e61867341fd9bc5f48ad20f6122604f46f6df26ac83c595e6319f544135807aad5a1acdf5b350eddea09
-EBUILD libktorrent-21.08.2.ebuild 1447 BLAKE2B 9ad0b9676d4ff070eb845987bb1e7f985c51d7e0ea8a691907bd97d40ca20e9f692e8c5b51e4c17d230080b320600d09908575f4b78d081b0433c79d9277c148 SHA512 1865250f93ffc65f966fa79ed8ea048468b165a6316250a698e9b154f3dfc9f3611b29149be5df44bc84e4f5e93dc51cd283bfd72571b3e29b786be133d4e6ec
+EBUILD libktorrent-21.08.2.ebuild 1454 BLAKE2B 53f3c39d69d59d343190475829e4ef5f83a01d2b3a11ac1cbcfb6039ebff664ac43fffcdd2a24051c18d43d9db538de1a7af1d07e967b88b7057224f745a9918 SHA512 7c28bf7a037cbf669c3cc299066bf4fb7966ce615ac0f1bf99afd5d8ff850ef30414ccf5bfae5fefd2f889e44427c0523598ca5d0ab7db7a027ba1d2cc4851a8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-21.08.2.ebuild b/net-libs/libktorrent/libktorrent-21.08.2.ebuild
index 7c6b14babcfc..29b3a843561b 100644
--- a/net-libs/libktorrent/libktorrent-21.08.2.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.08.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index e92663dcf87d..9c06944f128b 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,6 +1,7 @@
 AUX libnids-1.24-ldflags.patch 422 BLAKE2B 407953c925cb226aa324e22ee5fa7d68022633b751a94844c8bc29ae0e741775f50eeaed10af06c25c493acae58aa881df4e66de359fcfc2b0e9e28ee55a9e69 SHA512 080a982ee45d69419fb45f8fc35eb53febfc098d24f5c52476933dae1333a11ffe3bffafa5dde302af308840ce17a4ed8fa210a87d6c65e16f78993d23492481
 AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c7eaedc23c5a70a34cf592081ba559e2b03ab4684bef7d6f8bf4c3d640374e516e466721a3e75d7ae540f5e28949 SHA512 de76de95ce3f10e36c15cce31c9743a3caf96445a9d38e7d922710d5d482d9f09e73fccefa75285f200086bd0d2476a4f59a1bbcdfca807ed84873d8726554da
+AUX libnids-1.24-no-inline.patch 1259 BLAKE2B 1ac7190a455e71617df1297f64d718ebb099cc6ad113a27de65f59b6eaf65225999a10dcb6adc524365580dc9662758a7cc452b81951f3b1d4942c29eed87254 SHA512 95e632891a4aea8792ab88f78d3bc2cdae203ad23b86033b829b743071a08ef57ee78256eb2958483d2946a2fa40582a7003c8b5471b5500591373ae789a2a14
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
 DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
-EBUILD libnids-1.24-r7.ebuild 1157 BLAKE2B d85ff2648f8dcada0a038b80b0fb6d590fc8986188d9caa83a059a2fa83327872ae2e36b3bb33be6592ea1a5d7a6d752c4153feec6a1c21121d19333ff83491d SHA512 964d2666d84d2e1a1d591a3080f00bac8db51a1201e42dbc8926d311f23a1d1ae515351fd997c0b8e565f213fd6834ce6f028116767b04e37426fd872cbdd999
+EBUILD libnids-1.24-r8.ebuild 1199 BLAKE2B e961b542b65561c290c50b7760a7a08f2393aaae0a9b1e45b2a00550e005a4e404c2b6bf83c611ed1b5a84f2bbef3505c41df51e63e3e809bb22e333e50a1552 SHA512 693b40bfa675398ef8752ea3b2b1827150d1a89661fa9ff390ceac5e23683dd9700ebf283380abd8a098c2d409b974fbef6ccb3d9570fea0df50979622b63159
 MISC metadata.xml 689 BLAKE2B 427b3b74135ded960a4018145565bf5102432068f16272ee77c222a61a2a2b1c71000c2891e73d108036929ebe371c627cbd4704c21b5e16d14690843b6be67a SHA512 886e1ebf913dfb9e71b97effb737545b8e06dff2780ee92fd90ef86061a06b28f7f3f76eb8ead3bfbef8694184988ca91fd9a6a31ade302d84ac2740d53d98f7
diff --git a/net-libs/libnids/files/libnids-1.24-no-inline.patch b/net-libs/libnids/files/libnids-1.24-no-inline.patch
new file mode 100644
index 000000000000..8a57c6354d3c
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-no-inline.patch
@@ -0,0 +1,43 @@
+https://src.fedoraproject.org/rpms/libnids/raw/rawhide/f/libnids-1.24-inline.patch
+https://bugs.gentoo.org/818517
+
+Patch by Robert Scheck <robert@fedoraproject.org> for libnids <= 1.24 which
+avoids making the functions ip_fast_csum, ip_compute_csum, my_tcp_check and
+my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well.
+
+--- a/src/checksum.c
++++ b/src/checksum.c
+@@ -120,7 +120,7 @@
+   By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt
+   Gulbrandsen.
+ */
+-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
++u_short ip_fast_csum(u_char * iph, u_int ihl)
+ {
+   u_int sum;
+   if (dontchksum(((struct ip*)iph)->ip_src.s_addr))
+@@ -191,13 +191,13 @@
+   this routine is used for miscellaneous IP-like checksums, mainly in
+   icmp.c
+ */
+-inline u_short
++u_short
+ ip_compute_csum(u_char * buff, int len)
+ {
+   return (csum_fold(csum_partial(buff, len, 0)));
+ }
+ 
+-inline u_short
++u_short
+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
+@@ -205,7 +205,7 @@
+   return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
+ 			   csum_partial((u_char *)th, len, 0));
+ }
+-inline u_short
++u_short
+ my_udp_check(void *u, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r8.ebuild
index aec872f32866..a993c8d91295 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
@@ -13,20 +14,18 @@ SLOT="1.2"
 KEYWORDS="amd64 ppc x86"
 IUSE="+glib +libnet static-libs"
 
-RDEPEND="
-	!net-libs/libnids:1.1
+RDEPEND="!net-libs/libnids:1.1
 	net-libs/libpcap
 	glib? ( dev-libs/glib:2 )
-	libnet? ( >=net-libs/libnet-1.1.0-r3 )
-"
-DEPEND="
-	${RDEPEND}
-	glib? ( virtual/pkgconfig )
-"
+	libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="glib? ( virtual/pkgconfig )"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-ldflags.patch
 	"${FILESDIR}"/${P}-libdir.patch
 	"${FILESDIR}"/${P}-static-libs.patch
+	"${FILESDIR}"/${P}-no-inline.patch
 )
 
 src_prepare() {
@@ -36,6 +35,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export AR
+
 	append-flags -fno-strict-aliasing
 
 	econf \
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index d511b5fd6b6f..48cb4cb34dbb 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,7 +1,7 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871 SHA512 fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d
-EBUILD libssh2-1.10.0.ebuild 1322 BLAKE2B f36eddacbf1b356878bb5766631a5f0bf73863b4e62602b1ad27048db191d99bd52d3d184ab6bb0d80d47eb3d3b4d320d157a8e07c58a03adf315b130ce80ca1 SHA512 f862ce07a46e453629e21b47772d3759d85b7532121d3bceebfc9bcc3e5ea621b5eb716988b47f143c1e0c179ab3c4bddaf19436c53db6d5f4e29c49c5c661b9
+EBUILD libssh2-1.10.0.ebuild 1314 BLAKE2B e58d79dd103034825ea7a67bcc69c3ae5b4cba9ec180bbfb00c08e11474bdb8e17619806f81745e777c15264577bd0aa39e82db4b7bef9d08178afd0e792bb4a SHA512 0e2842331b687eaa5086a998d6d110e54f464b47886817c793eacabc232800f3c18cd6661f891d7f81338566b78e4b2ae63253f92a9564206258a99186f65aef
 EBUILD libssh2-1.9.0_p20200614-r1.ebuild 1421 BLAKE2B 37519a216486fb45b11fda8d1d1913bcde8d87161d871a91e3bcab8f5b5d35c1e0c118802de8e0a8d1bfa5bb44d3012661139d6e009d033df844dbc327ba33a8 SHA512 b2fbcc7ef09762597fc637e8a0df46df2b5caca586a5e4f7cdfaa3f0508278e89fa67792a90231c767efe45e8fb1a61ccb6717eb8f6fcfa4299e6862c6fc25e1
 EBUILD libssh2-9999.ebuild 1171 BLAKE2B bf50faa5cc98d82483b1bef3f640d9bd112ecc18e8478477b46ef070fc817646227c0a235d2ab0215fd4f2ef2ae2ec95e6a15eb947664f97a74da2f3f0bc20b6 SHA512 3a79004b8e22ae696db0e47754bd011576ff70b06fc15405b8c8968cec96992b7379bfb4c270cc7fa3c8d221e615633f2a4431319a0e2345d837f0c7b41bc8a3
 MISC metadata.xml 533 BLAKE2B e4c675e12d0d2e906d061b66dd698081dff4560e5e055f2a88c9d77f8502460241e995d6ca6572f4404f20d2bdd3afa26d241756f97c9ef7dd6610c30fa3bac5 SHA512 7cdb591fc1ca9db8428a402a0ca8805ef28589c7af015d59debd7700ca46f2cc0bab8c18e3acaa5cbd773ce4bba1c675376eaf5c5f9be07aa75256864533de2a
diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 309a9aac8403..ff53c9234667 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 1896dc784893..75d889111ec9 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,11 +1,7 @@
-DIST mbedtls-2.16.10.tar.gz 2677333 BLAKE2B 5f94003547d5c4ba8daec8270b6e91fea1bbcc94aa7a7417018ec57b8807fbdbd057640fda24cf65171bf7dd872eb091d21e7508df28b57ddfc512736f9c6482 SHA512 13837316b04fab6bebacdd283f437b5f246df0785c866cf3d94019d040ab0edf417e0b409653f5abf98a4944345eb088010658c9de10f9e96a5624d33741898a
 DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
-DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421ad3ab58e3cdf08ec40e0a3da5dcc7a1bcb6eb1ce491ebb544dcd15eb6bc634f04e6ab0f773dc89fa44b6843542ad SHA512 959f6dd0759bfd8dcc497a0527b8b9e9975adb9fee01461e6bcc37475cf9e4eae597687e05e077dfe51d0542c81bc3b90e6d9a692353dca331e020e02d642196
 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
 DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
-EBUILD mbedtls-2.16.10.ebuild 2436 BLAKE2B 0d76524a1be47d488c732ba0a3d4ea76a5eeb915e0f83575ae498fffc5629f2b86e399e3f00ed5418fe14ca2204febcf4a23d2e9a3a5338630b9f67bc027e8cf SHA512 d54f04f7988457506fc2abe03fb8e97b6abb7555c72bc852917e33aa6ece7b291c96cb6dabd5806cd19d5407806279981e660a1ff371b37b94535d7ddfdd99cc
-EBUILD mbedtls-2.16.11.ebuild 2435 BLAKE2B 8389041b06224e6244c8031c8bad2f49cad98026e1105464fd41995afcf267ec6dea95a483b40b1d379fb641399b9cc8bf396f499c7b223e37de6e21e4f3e842 SHA512 1fe3727c58052c3fa007a5e4d1966c6921d2f41e8491b7a0c5f4423e726468bdf5e37067297a4325103e13c45e1d21d855c760134743b1aac66c81b5f92649da
-EBUILD mbedtls-2.26.0.ebuild 2502 BLAKE2B 6f7f727b0466a0d091596f5c187222b095a21fa61d6b70073db7014f17539440781f70e763bf17c5451e832db6795d3289528f1cb9cec53450da120a5b5ffb0b SHA512 ffed411ce59d0476563af7393dd9733d0b44eebc7e232cc6f88b2788af4a98c7511dafb1238874fa941df57ec3de7acede0459353103973ec0ddb03274053c41
-EBUILD mbedtls-2.27.0-r1.ebuild 2503 BLAKE2B ae8f22b9aa45cf427fc35c6c9e8664c8fb661e34a98885ecd7f5388cdeb13b6564c7714df56e6157d56b923cbc8276eeec8030d3cd2c3d50c2ee92d625ad5e96 SHA512 39e9c8221f9cfdb5709a8ad725ae551c73f42ee4e94136e244bf6d1aa0695d4b10859c6f2ca3562b66b821e5af17c69d4f8629389415c1a0a53e423d71b509ba
-EBUILD mbedtls-3.0.0.ebuild 2303 BLAKE2B fc3b11e2295fc79a2368e26c0ef0fa3a05de3e8187be3ee23a8e6ad8375ae0553559d29701bc887130928f057b99fae64bc3b897814636f134d42dbfd87a7b66 SHA512 d54986230f6e43923ef4bbf35d85bc80f65af4542e6f15f7894af0bb505778ed7cacd27a5cda4697868b43473a7572bec69fea9a8f63f73427e2a35641fce3c1
+EBUILD mbedtls-2.16.11.ebuild 2591 BLAKE2B 13fcba2f6e4b3397df3629dd1f302de9730eacaa78f850a527ef4ddd4f6daebfbc01d8b8203b5453da0e820b5b584210197ef89de685e211105f27c04b7e09f6 SHA512 7de94d90b5f9dc757a3570e60cc2971c58f555d1e230ad0767b8c5bc525e6b0723757371756109038078d32114ceae2f7b69eda94c85388a972301e5b2096276
+EBUILD mbedtls-2.27.0-r1.ebuild 2658 BLAKE2B 0f8abad89ee22296b4493419f537ed484065ade24d014061d90c304644286692d1f774149de8c62a7e3634caa4d9060a38d147a808f1a4d0c674d2f5085f513e SHA512 637c754102dc34304984c7c9909089b788fc967a8ea44821e9941de34650e166292c7776964bf2a74e174645389ef87976c111852d0f2346a31c1f5e6a825832
+EBUILD mbedtls-3.0.0.ebuild 2416 BLAKE2B 1f10d91faee5f4d8db8a3dd82da4308e156a280ffd1860764726189212cda26f5d4c8f71abf2de81002c16b5335f39ba5a08605c9eb023668cb25b7b6bb6add1 SHA512 95baf23bb04e80b76c4a394d30712a28dd7575b68aa84730b9293733492dc463b6b3533c620608551828d3c48c39a2b7eccf7832ac4e59afffb06b0b550285fa
 MISC metadata.xml 750 BLAKE2B 9adfb9c0b5ce5ac9b3a56878b7d0d4b0dc883c911b92b00ed772242293b7181b0a43760341ad01d897c2022f507b193145220a8a1c16f0fce8fc64e08486e8a1 SHA512 66092068631e2812b1c3bca713d43ef502ee29a22532a12b204d47f86b3dddc2182c4c41b15200e89ee24f25c976508b602492e9cce02c88dbbb9f35e7aa54a2
diff --git a/net-libs/mbedtls/mbedtls-2.16.10.ebuild b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
deleted file mode 100644
index ce4c7c2ec070..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.10.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
index 3aaf46463bbe..8ddca1907c00 100644
--- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
@@ -63,6 +63,13 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
 		cmake_src_test
 }
diff --git a/net-libs/mbedtls/mbedtls-2.26.0.ebuild b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
deleted file mode 100644
index 6b1ea5194f12..000000000000
--- a/net-libs/mbedtls/mbedtls-2.26.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
index 7681b2953ece..fc18e8b6b047 100644
--- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
@@ -64,6 +64,13 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
 		cmake_src_test
 }
diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-3.0.0.ebuild
index 41a81c85e7d0..54ef48f6e4fa 100644
--- a/net-libs/mbedtls/mbedtls-3.0.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.0.0.ebuild
@@ -60,6 +60,12 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	# psa isn't ready yet, even in 3.0.0.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
 		cmake_src_test
 }
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 76573545919b..193d0e5dfdf8 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,8 @@
-DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc SHA512 eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39
 DIST nghttp2-1.44.0.tar.xz 3972832 BLAKE2B 13afbf6e2e242f5a7a5475c3d0f0380170cc5f50a0fac87951173393e79cb7140ea52e5f4918a8207216cc5826534d8fa550e48c06ee7c61b74a54f2de23727c SHA512 756b78665ef9fe8765332e7f0b249029d845a6b635c00a27f4c3716a1354f98bcc34df4da74179213497f6bfc2647d3773ecff2b192c63427447e37cf6393f6c
-DIST nghttp2-1.45.0.tar.xz 4023840 BLAKE2B 779fb55110bce0a8c0cd955cf33afb7059f548c0eeb3310f726e82b0e62c5c55bc33f48a9f39296bf63a05854494542405695dff6f0fa6448dadc9421fbedcaf SHA512 e97f5ee9c468083582396bb4772f39cf13db415747c6b4118e6961d7e8da0e5302053884ed39386ad48aa4fcd2452f6e23868164b976b127e105762bb4567038
 DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
-EBUILD nghttp2-1.43.0-r3.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
+DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b
 EBUILD nghttp2-1.44.0-r1.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
-EBUILD nghttp2-1.45.0-r1.ebuild 2018 BLAKE2B df4620080f09810ed673e0bb904b1f9f44114274e82c90ab71ec96fc66c39cc4b6ab1f9b8172709d1bf4e1e76b73bbf0bb90c8713e4f85048b4fcd35946d31f1 SHA512 1df9e86a91bb0790d8b721b6303aaf9db113520b4865f11de9d511ee23db60e7a47f821959498ea99f568bfee94ceac6be9986c14bc36576d922c627e2d84e78
-EBUILD nghttp2-1.45.1-r1.ebuild 2018 BLAKE2B df4620080f09810ed673e0bb904b1f9f44114274e82c90ab71ec96fc66c39cc4b6ab1f9b8172709d1bf4e1e76b73bbf0bb90c8713e4f85048b4fcd35946d31f1 SHA512 1df9e86a91bb0790d8b721b6303aaf9db113520b4865f11de9d511ee23db60e7a47f821959498ea99f568bfee94ceac6be9986c14bc36576d922c627e2d84e78
-EBUILD nghttp2-9999.ebuild 1981 BLAKE2B 7ea2358d8340ba890109eb5f0c97005b0c8f14681548f7110c738b68dd234355cd9b40141c1f683382bca17748c97034ebd526e77dc4968722fea8ee215f28e4 SHA512 b614027807d25668bd4d1a1127b7e8bd7c54288d2f618cb1f9ae7dce7cf629c2568ba2702487b0666cd110728e468c8d59cd59d722fb0d558d5d398069606c43
+EBUILD nghttp2-1.45.1-r1.ebuild 2011 BLAKE2B 4ff4e001225911986047a2906febb19c6c80d396d5be6fd00ea3078d5e41af338eda7c445d6650caa02ecd9efe018ad0f54c6713bd0921ee6d6db3ecf0f4d30a SHA512 69aba6818013e13894d3e796a058f43f53658e14619c9873e1fa730b322afca34a26040229d71cf3ecb8a277bacee4a538f0424ed4de3ef03cadb0a64d68893b
+EBUILD nghttp2-1.46.0.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
+EBUILD nghttp2-9999.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
 MISC metadata.xml 493 BLAKE2B daffa7d9a21815507215b560815358be5bdfb984eab2fdc28ae872ce2e7fb4f43339bed4b8426ecd7e09ac8c79a19b33427b8a4de68123bf127e88a3a178a6a2 SHA512 85224aae10478e7a6bb2442d595b0bb750503272f281ef4526d976a620316ef0fb5cc7d1d3ae88fd2da05faab1d67b7d93d1bdbc97195ae5bfdf182bd180cc15
diff --git a/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild
deleted file mode 100644
index f79b1b5a91ea..000000000000
--- a/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5:= )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
index 33f0539ba850..142836527b15 100644
--- a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild b/net-libs/nghttp2/nghttp2-1.46.0.ebuild
index 33f0539ba850..6d92e5272f14 100644
--- a/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.46.0.ebuild
@@ -3,7 +3,7 @@
 
 # TODO: Add python support.
 
-EAPI=7
+EAPI=8
 
 inherit multilib-minimal
 
@@ -71,6 +71,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
+		find "${ED}"/usr -type f -name '*.la' -delete || die
 	fi
 }
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 71186bfd3600..6d92e5272f14 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -3,7 +3,7 @@
 
 # TODO: Add python support.
 
-EAPI=7
+EAPI=8
 
 inherit multilib-minimal
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
@@ -71,6 +71,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
+		find "${ED}"/usr -type f -name '*.la' -delete || die
 	fi
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 6f17cffc886a..a683b49afb3c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,4 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
-DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
-EBUILD webkit-gtk-2.32.3.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
 EBUILD webkit-gtk-2.32.4.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
 MISC metadata.xml 650 BLAKE2B 071251dfaa08b7043a9f689bae707ba831ca1eab0b8fed986507b48dfa14766c450663ffedd25a4fa3ed8570f23cd590b8c3f7ed4a102e3c93ce44ab4a03c247 SHA512 a15c21eb92736520129ddc7be6f39e806ea6bb2361cbad7db95d06fbc64ecc5323a1e8be312575b90ca699670ae4ba95ed062f19cf494473991e0ab2a0a31a8f
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
deleted file mode 100644
index 2dd5eb64206c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-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"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-60.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}