5 files changed, 6 insertions, 62 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 58b9b5e38380..de460395623f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 0d603a0507b7..cc023e6ee6af 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD libssh2-1.10.0.ebuild 1302 BLAKE2B c25f35578ed9e9a2a8eeea886bfdef6f690d1705e41464beb35be47563a41cb3437abaaf14a520a5d0c358bbd2e391f1bdc9aaaf4c6e70f37826a9a980a8e15d SHA512 dd431760bc3e2b51c343f5a5bb1c0c9cc61d856c95ae8b5b8325269df4a6d0175023be714fcdaebd1ccd5ad7ae097e1637361b9410c2cb46065d3e8b7a487fd3
-EBUILD libssh2-9999.ebuild 1152 BLAKE2B c564aa4c04e6a356bb1279f1eb0aef881c8c92f5aa03cb1284bfa949666452dabad16579fc17050b304bd3bb82b19e544c3456923dcc013eae718deda6b4f665 SHA512 6f5285620968d58d047e0d276e8dddce7857b5a1f923294e5fcf7d31a468e911ca7e49b0588fb1a31f51ff9e11da845481b7fc34b90b2373ca93566edb777988
+EBUILD libssh2-9999.ebuild 1150 BLAKE2B 598389dc4f42bbd477f9eeddf17ced69ec81602520a313321836937f4ca3e56455867ee7ad860e2f04a3db52e0be19ea39078d4a6de59f6321033cda054de160 SHA512 ecd4f51a283abc70022b174b765975700f6c3233d0ddd606a068917343d9d2c2da45fba74a0809b34b34dea811af50af129e400bc77b646481f3f4f8e51295f8
 MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 55e28471bb49..7aa0edfae11e 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit git-r3 cmake-multilib
+EAPI=8
+
+inherit cmake-multilib git-r3
 
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org"
@@ -25,9 +26,7 @@ RDEPEND="
 	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 694a56706b8a..eda2d008a075 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,5 +2,4 @@ AUX 1.4.3-always-GNUInstallDirs.patch 885 BLAKE2B 84b6a78b6862d4b2302f087c6215b8
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.4.3.tar.gz 1602671 BLAKE2B ed4ec46cab887461f6dccfc2d695fe78a3782f42f4ef6c3ac5ba6e2ea068a7943eb8079c0a448f35864c575009d556363bcfe7d815d0f47a368001a3df478837 SHA512 5cd15fd0c7b324226ab096c1b6c6f81b4ce5600617e1bd2c38985f18d7d551c9a4a09b1e34c7a705c92ae54bb57c5d736ca7eff6e4992e67666aa167e0da855f
 EBUILD srt-1.4.3.ebuild 1149 BLAKE2B 5aa95e450810b954d4f5dbb36c78abdf974f7a7ed0057dfe300785f4625f7b505415c316034abd5c0052415083ff73a7601b75b598d3b03b9412b433e53de326 SHA512 56708ddf0cd5373620391bffea8069cd7c443e737c3c03dec463fa500706262a51fa105839638a9bf964673263dbc79659e6f40723d7e80068dde6681ff072e7
-EBUILD srt-9999.ebuild 1135 BLAKE2B 359b3a1b01927b2ecac442cb39131005f178838d9b950d0c667a06c4f0d31910263f60e6174cde8a777168cc983a2e99de07046e194b4ccae8ccbed3afe04f70 SHA512 ce1d0d3657a774b1147255565beadc3a90e454201e23b254ef5307283318a46eb2763f273b696cfd7abbb34c1dbee4509b8af29a88f24b6df15942dfdc3e566e
 MISC metadata.xml 430 BLAKE2B cb25cf1d0a35ec35acab5ca8bb8fa3d074531c584a70b93f02765c8636a2908a10484bd8f9268bcaa64a2a2d23a12f87b5829249c484f8357dba3974553c2c20 SHA512 c2b853dc7bcb2883c24f2ec3d14d3589b57f0ac72bc7a5bba1d8ac46747d051aa02e24e9f86f758f5a1855ba4d1e6cdb9750ab7493be4c996d281aa269c1a390
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
deleted file mode 100644
index 60f4c45f9b0a..000000000000
--- a/net-libs/srt/srt-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
-HOMEPAGE="https://github.com/Haivision/srt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="gnutls test"
-
-RDEPEND="
-	gnutls? (
-		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
-	)
-	!gnutls? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC=OFF
-		-DUSE_GNUTLS=$(usex gnutls)
-		-DENABLE_UNITTESTS=$(usex test)
-	)
-	cmake-multilib_src_configure
-}