gentoo resync : 22.12.2021

4 files changed, 83 insertions, 1 deletions

diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 3e10258a92b6..482ab6d52744 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,10 +1,12 @@
 AUX libiscsi-1.18.0-fno-common-2.patch 2058 BLAKE2B 00a2d3bd1ae4b08479593f92eaf8092fd5471ebe8df4bc6ff17786214a3d927b90928c014984ecf90b6c8950f8d2e74b5094ff7f903067ca939fcd14ed7006ee SHA512 e19867d6ca9373176bccf9ecb4b78a312f210bd719947a0bb590e8f18862da58d6254f396bab7b84410ca1bbd3ad1c24adfe3e3994e9e6424a4a27e17c65e420
 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
 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
 EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
+EBUILD libiscsi-1.19.0-r1.ebuild 1175 BLAKE2B 08f99506cf67dfe3c7c026d98b7e9e48906771c3f474bec81a9eacba802cda4a7ebae138d81d34ac8f51c2fc1663a019472d8f45df27cdea40ea2663cbf066dc SHA512 80b29d136343f74816f6eb12d6cbc33b21f40b70be739e47bf66ea3d3c703ccfa69dc951d6ecf2ec0ea0290b47e86dd88a4edb3d884abbc58b8615ee36d87b33
 EBUILD libiscsi-1.19.0.ebuild 1077 BLAKE2B 3c55ef59df3254c562ea0b6bf0d11e611aa2092e25b494e24a6bd522b006d2cd4621a87a94f13f14671861f5769533bb895ac15bdea895478e96f74cb079ccc0 SHA512 fad483abeaab71df65361c86cd51246daa687d455979e87b63bc83713d50bf26d6014e4144e2a03c9098ecf38c428f3d7448f12ffa240e439cdc9f9518f96186
 EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
-MISC metadata.xml 248 BLAKE2B 51d5eef69203392e4f35c46701dd3f52cb5587f3ee7f83f4a704a408865202beaf2d0a0854f478a525f9428fd6564f471c089b63743f7d8ea4a734e5d08fc28f SHA512 dcf5f6fbf0ee9aba971a98c8fb5dd817ef1a54f6545d4b73b8ea0dd2710846e561da6458badfcbc9833563db410a9b897d3c6958169aeff4baf419aab2bcd478
+MISC metadata.xml 352 BLAKE2B 675cfb96cc8e0a8f244a926ffc2e151f648722df008cfd9b50dba836996c264c116838ba51c90c85bc29c7797c0ba1d7971019ff99de86c6f1292beb17299055 SHA512 902862649e210c3de4e27552df8daee7278a0b27785d4669345922c3b4e9c26078157bfd8f2ec9a883c83f24dcd8502e8258c4532af747f42c24bffb690e7552
diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
new file mode 100644
index 000000000000..987544ffca68
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 5fe1deb..9efe153 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,6 +140,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_TRY_COMPILE([
+ #include <infiniband/verbs.h>
+@@ -147,10 +149,10 @@ AC_TRY_COMPILE([
+ #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_CACHE_CHECK([whether libcunit is available],
+                [ac_cv_have_cunit],
diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
new file mode 100644
index 000000000000..b44971289d2f
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 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
+	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+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}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch
+	"${FILESDIR}"/${PN}-1.19.0-fix-rdma-automagic.patch
+	"${WORKDIR}"/${P}-remove-ld-iscsi.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		$(use_with rdma) \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libiscsi/metadata.xml b/net-libs/libiscsi/metadata.xml
index fae5428e41b5..afb733ae6305 100644
--- a/net-libs/libiscsi/metadata.xml
+++ b/net-libs/libiscsi/metadata.xml
@@ -5,4 +5,7 @@
 	<upstream>
 		<remote-id type="github">sahlberg/libiscsi</remote-id>
 	</upstream>
+	<use>
+		<flag name="rdma">Enable infiniband support via <pkg>sys-fabric/librdmacm</pkg></flag>
+	</use>
 </pkgmetadata>