gentoo auto-resync : 10:05:2023 - 17:43:52

5 files changed, 163 insertions, 18 deletions

diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 5220b6cbe41c..5c39a77a0021 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -2,10 +2,13 @@ AUX libiscsi-1.18.0-fno-common-2.patch 2058 BLAKE2B 00a2d3bd1ae4b08479593f92eaf8
 AUX libiscsi-1.18.0-fno-common-3.patch 1387 BLAKE2B f8bacb84a3c340a528576f56b52026fefc97792b9d5a136150bf348e378cd60b9ea702101b8e9443a320ddafe5a21d646f98a4a3434661adb39f595e2e9dc52e SHA512 b0c359393b70ee6a808e254a8aeb58d7bea25307fc0f957696369e74d82eced2d7b3edcbc18dc0c3be0b45016bdf331183bcf8fdfe853b292861ea28238aad2f
 AUX libiscsi-1.18.0-fno-common.patch 386 BLAKE2B c87a1e2c2b582277b3146a592cf385520a20513cc349a6244cba8e55f4a8f3e7f830cf16160564b07756899cc982993fff45900f512c0cb187340ecbb7bd1e4e SHA512 fc1aae874619ba263f404da0cbb4009fc09b907c2f9a65e29e18874b18daff7f0bc243b9666f19430d5a52e30adf5c784d380162c2bb65f1c79c9084981e2c8e
 AUX libiscsi-1.19.0-fix-rdma-automagic.patch 1049 BLAKE2B ec194008113e2ba1f06666d8e8538fae9dfabb227884fae7f79a1512bcfab55f65c03c4bc10cb997e9aad32e6dfcf605c53e9efbdba5f7faf2fd75c8243113f5 SHA512 80c950ca0925109322fe45ba6296ea7dc4117e06a6e4de18c0dfe1405bc2768d137eeac786be8f6672f17d0e8423e9a922dc6b7e1865ec8cdf7a514013dde047
+AUX libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch 1151 BLAKE2B f3e4c14db9e523251de64fda11e1ae938977a0d60a8c16047da3fc54181f29922133ae054bfc4bc27f4f661870d618461954738f99d18b25a2a55f90712601ed SHA512 b566596be01822149c07c16148584c862b24268399b3606febca1081d0d0359621eba9d0a711f6845183f7691e6f0b485ae2246678a0e86c40cd03b4d7571097
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
 DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
+DIST libiscsi-1.19.0_p20230208.tar.gz 293283 BLAKE2B 8dafcdd87d66c8addea8734af264b1ce70ec7cbb7925becf1946b616821a94a0d22ed9a903f5f24c03d9b647353fc76a708cafed0f6482199a45cb628c143fff SHA512 d6416833b4e1352e91d869ae753fdc01968e303d5ce7de52f27692ce7f8d7ca4f648931d54f0ebfa1323f8b43531bfc81771ea0468af4dc9ad53df02c8bad55f
 EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
-EBUILD libiscsi-1.19.0-r1.ebuild 1189 BLAKE2B 194ad7ea6756fa09f937ca14305efecc354ad9fde09f4f7a75dc57ad371e754c6db54f1f86a3935d7d94b357d66922f05c1526c47a132970c14183db324da06b SHA512 dd1d745621a4cba756caf9d24edb19bcf060761c0db05277227b11c4b4dae3b5c6ac5b5d618770c1917b824db5a898a09c6cccee30d810cf607e1e4cde4cd4f7
-EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
+EBUILD libiscsi-1.19.0-r2.ebuild 1382 BLAKE2B a49a22f4475a06fca6be78cadf73271eb5c1edc3cb59ddb881cbf13b0daf96181a9f2771e954f9d6bbe6365139789a36ea6fabc14a2111eb9ce118d5d3bb70ca SHA512 cbdcbf900be41a74a5dd070b1910231213fafc5d1adedd92b258dfeae766e9424961b863d26067eddf676b0d71e2d42b02cc4f87447268d4e5c98ded22eb3f2f
+EBUILD libiscsi-1.19.0_p20230208.ebuild 1379 BLAKE2B 3703023cbdbf65ff64e4e8b4c6c1917b1a6a90378371c89319fd60fd382f3830b01ca9471e69a23dca28d7b97bbde1a0285e9336ab841a321443108cbd2e730b SHA512 1eac24a0a26232c6b9700e667b7c2465136f9ad4334efae2172b6889ba1db2eb3c9f80cf18279e818f45ea066fc2e329e109962d40e138219a96680db4712a90
+EBUILD libiscsi-9999.ebuild 1379 BLAKE2B 3703023cbdbf65ff64e4e8b4c6c1917b1a6a90378371c89319fd60fd382f3830b01ca9471e69a23dca28d7b97bbde1a0285e9336ab841a321443108cbd2e730b SHA512 1eac24a0a26232c6b9700e667b7c2465136f9ad4334efae2172b6889ba1db2eb3c9f80cf18279e818f45ea066fc2e329e109962d40e138219a96680db4712a90
 MISC metadata.xml 353 BLAKE2B 3c729c58e8fe95f38a6f5ea14eba047ebb50b2b80819d53acfaae83d81f51510b652b618c3a7c59d16fe0d1a4e397246c5ea6b0b6807197d580a61f3784cb79f SHA512 070979945abed956dd34ae0d1cc93ea45d30a9eb555262de9f767107d2f3323260df6377c151b8705de5fffd001febd21b9bb3d8fc278b56e52ddb47a081add9
diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch
new file mode 100644
index 000000000000..89d91c5c5ebf
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -166,6 +166,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then
+     AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support])
+ fi
+ 
++AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support]))
++
+ AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <infiniband/verbs.h>
+@@ -173,10 +175,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <rdma/rdma_verbs.h>]],
+ [[int ibv = IBV_WC_SEND;]])],
+ [libiscsi_cv_HAVE_LINUX_ISER=yes],[libiscsi_cv_HAVE_LINUX_ISER=no])])
+-if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then
++if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then
+     AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support])
+ fi
+-AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes])
++AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"])
+ 
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <rdma/rdma_cma.h>]], [[return RDMA_OPTION_ID_ACK_TIMEOUT;]])],[AC_DEFINE([HAVE_RDMA_ACK_TIMEOUT],[1],[Define to 1 if you have RDMA ack timeout support])],[])
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-1.19.0_p20230208.ebuild b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild
new file mode 100644
index 000000000000..b1a76b05442c
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		# The S path is too long for the test suite otherwise.
+		inherit vcs-snapshot
+
+		MY_COMMIT="22f7b26567760921fa1aad77cca642153123ea8c"
+		SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="rdma test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	test? ( >=sys-block/tgt-1.0.58 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #906063
+	rm tests/test_0600_ipv6.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		$(use_with rdma) \
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild
index 9d1977923e12..b1a76b05442c 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
 
@@ -9,29 +9,62 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 	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"
+	if [[ ${PV} == *_p* ]] ; then
+		# The S path is too long for the test suite otherwise.
+		inherit vcs-snapshot
+
+		MY_COMMIT="22f7b26567760921fa1aad77cca642153123ea8c"
+		SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="iscsi client library and utilities"
 HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="rdma test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	test? ( >=sys-block/tgt-1.0.58 )
+"
 
-RDEPEND="dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch
+)
 
 src_prepare() {
 	default
+
+	# bug #906063
+	rm tests/test_0600_ipv6.sh || die
+
 	eautoreconf
 }
 
 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() {