net-libs/libiscsi: EAPI 8, wire up (restricted) tests

test_9000_compareandwrite.sh fails for now, needs investigation, but this
package needs some other love too.

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 42 insertions, 16 deletions

diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild
index 851b26691c45..f0879dde5e86 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,11 +19,18 @@ HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-IUSE="rdma"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	rdma? ( sys-cluster/rdma-core )"
-DEPEND="${RDEPEND}"
+IUSE="rdma test"
+# test_9000_compareandwrite.sh failure needs investigation
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
@@ -42,7 +49,12 @@ src_configure() {
 	econf \
 		--enable-manpages \
 		$(use_with rdma) \
-		--disable-werror
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
 }
 
 src_install() {
diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild
index 9d1977923e12..6d289d4b8eb3 100644
--- a/net-libs/libiscsi/libiscsi-9999.ebuild
+++ b/net-libs/libiscsi/libiscsi-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -10,17 +10,26 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="iscsi client library and utilities"
 HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-
-RDEPEND="dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
+SLOT="0"
+IUSE="rdma test"
+# test_9000_compareandwrite.sh failure needs investigation
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
 
 src_prepare() {
 	default
@@ -30,8 +39,13 @@ src_prepare() {
 src_configure() {
 	econf \
 		--enable-manpages \
-		--disable-static \
-		--disable-werror
+		$(use_with rdma) \
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
 }
 
 src_install() {