[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

["Golubev Alexander" <fatzer2@gmail.com>]

commit:     97f47c39bfa2f995da9557c696ce80a5df88aef1
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Wed Nov 13 22:53:29 2024 +0000
Commit:     Golubev Alexander <fatzer2 <AT> gmail <DOT> com>
CommitDate: Wed Nov 13 22:56:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=97f47c39

net-libs/usockets: update EAPI 7 -> 8

Also:
- avoid downloading submodules for live (boringssl is quite bulky)
- fix test

Closes: https://bugs.gentoo.org/820296
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>

 net-libs/usockets/usockets-0.8.8.ebuild | 32 +++++++++++++++++++++++---------
 net-libs/usockets/usockets-9999.ebuild  | 32 +++++++++++++++++++++++---------
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/net-libs/usockets/usockets-0.8.8.ebuild b/net-libs/usockets/usockets-0.8.8.ebuild
index 328d32ea9..93f82656b 100644
--- a/net-libs/usockets/usockets-0.8.8.ebuild
+++ b/net-libs/usockets/usockets-0.8.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/uNetworking/uSockets"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+	EGIT_SUBMODULES=( '-*' ) # We don't use any of bundled libraries from submodules
 else
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,9 +20,10 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="asio libuv +ssl test"
-REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
-RESTRICT="!test? ( test )"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"
+# Our only half-assed test requires ssl
+RESTRICT="!ssl? ( test )"
 
 DEPEND="
 	asio? ( dev-cpp/asio:= )
@@ -40,13 +42,25 @@ PATCHES=(
 src_configure() {
 	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
-	       LIB="$(get_libdir)" \
-	       WITH_OPENSSL="$(usex ssl 1 0)" \
-	       WITH_LIBUV="$(usex libuv 1 0)" \
-	       WITH_ASIO="$(usex asio 1 0)"
+		LIB="$(get_libdir)" \
+		WITH_OPENSSL="$(usex ssl 1 0)" \
+		WITH_LIBUV="$(usex libuv 1 0)" \
+		WITH_ASIO="$(usex asio 1 0)"
 	default
 }
 
+src_test() {
+	local saved_ulimit=$(ulimit -n)
+	# see https://bugs.gentoo.org/820296
+	if ! ulimit -n 10240; then
+		ewarn "Failed to set ulimit; ${PN} require ulimit -n 10240 to reliably pass tests"
+		ulimit -n 2048 || die "${PN} requires ulimit -n set to at least 2048 for tests"
+	fi
+
+	emake test
+	ulimit -n "${saved_ulimit}" || die "Failed restore ulimit to its original value"
+}
+
 src_install() {
 	default
 	einstalldocs

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 328d32ea9..93f82656b 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/uNetworking/uSockets"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+	EGIT_SUBMODULES=( '-*' ) # We don't use any of bundled libraries from submodules
 else
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,9 +20,10 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="asio libuv +ssl test"
-REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
-RESTRICT="!test? ( test )"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"
+# Our only half-assed test requires ssl
+RESTRICT="!ssl? ( test )"
 
 DEPEND="
 	asio? ( dev-cpp/asio:= )
@@ -40,13 +42,25 @@ PATCHES=(
 src_configure() {
 	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
-	       LIB="$(get_libdir)" \
-	       WITH_OPENSSL="$(usex ssl 1 0)" \
-	       WITH_LIBUV="$(usex libuv 1 0)" \
-	       WITH_ASIO="$(usex asio 1 0)"
+		LIB="$(get_libdir)" \
+		WITH_OPENSSL="$(usex ssl 1 0)" \
+		WITH_LIBUV="$(usex libuv 1 0)" \
+		WITH_ASIO="$(usex asio 1 0)"
 	default
 }
 
+src_test() {
+	local saved_ulimit=$(ulimit -n)
+	# see https://bugs.gentoo.org/820296
+	if ! ulimit -n 10240; then
+		ewarn "Failed to set ulimit; ${PN} require ulimit -n 10240 to reliably pass tests"
+		ulimit -n 2048 || die "${PN} requires ulimit -n set to at least 2048 for tests"
+	fi
+
+	emake test
+	ulimit -n "${saved_ulimit}" || die "Failed restore ulimit to its original value"
+}
+
 src_install() {
 	default
 	einstalldocs