[gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/

[Ulrich Müller]

commit:     0c6e55a42ccd46d50978a7578da4ccbd067c3672
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 20:39:05 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 18 20:40:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c6e55a4

Revert "Revert "net-libs/libiscsi: Don't build ld_iscsi code""

This reverts commit f4ad028f1127130b0756df902b673eb10648439a.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-libs/libiscsi/Manifest               | 1 +
 net-libs/libiscsi/libiscsi-1.19.0.ebuild | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 81e3d2d600d..62c299d99f6 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/net-libs/libiscsi/libiscsi-1.19.0.ebuild b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
index ac0e12e20dd..bbf7c504a2c 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
@@ -10,14 +10,15 @@ if [[ ${PV} == *9999 ]] ; then
 	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"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
 
 RDEPEND="dev-libs/libgcrypt:0="
 DEPEND="${RDEPEND}"
@@ -26,6 +27,7 @@ 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
+	"${WORKDIR}"/${P}-remove-ld-iscsi.patch
 )
 
 src_prepare() {
@@ -43,5 +45,4 @@ src_configure() {
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
-	rm "${ED}"/usr/bin/ld_iscsi.so || die
 }