Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/
Date: Tue, 18 May 2021 17:16:27
Message-Id: 1621358170.af0376423c11be3dc9180d8236770af911243565.sam@gentoo
1 commit: af0376423c11be3dc9180d8236770af911243565
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sat May 15 15:02:11 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 18 17:16:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af037642
7
8 net-libs/libiscsi: Don't build ld_iscsi code
9
10 Upstream commit e6bcdf5fdbf39729399c4f0914661ca1055107a1
11
12 Closes: https://bugs.gentoo.org/778905
13 Signed-off-by: orbea <orbea <AT> riseup.net>
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 net-libs/libiscsi/Manifest | 1 +
17 net-libs/libiscsi/libiscsi-1.19.0.ebuild | 5 +++--
18 2 files changed, 4 insertions(+), 2 deletions(-)
19
20 diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
21 index 81e3d2d600d..62c299d99f6 100644
22 --- a/net-libs/libiscsi/Manifest
23 +++ b/net-libs/libiscsi/Manifest
24 @@ -1,2 +1,3 @@
25 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
26 +DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
27 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
28
29 diff --git a/net-libs/libiscsi/libiscsi-1.19.0.ebuild b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
30 index ac0e12e20dd..bbf7c504a2c 100644
31 --- a/net-libs/libiscsi/libiscsi-1.19.0.ebuild
32 +++ b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
33 @@ -10,14 +10,15 @@ if [[ ${PV} == *9999 ]] ; then
34 inherit git-r3
35 else
36 SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
37 + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"
38 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
39 fi
40
41 DESCRIPTION="iscsi client library and utilities"
42 HOMEPAGE="https://github.com/sahlberg/libiscsi"
43
44 -SLOT="0"
45 LICENSE="GPL-2 LGPL-2"
46 +SLOT="0"
47
48 RDEPEND="dev-libs/libgcrypt:0="
49 DEPEND="${RDEPEND}"
50 @@ -26,6 +27,7 @@ PATCHES=(
51 "${FILESDIR}"/${PN}-1.18.0-fno-common.patch
52 "${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch
53 "${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch
54 + "${WORKDIR}"/${P}-remove-ld-iscsi.patch
55 )
56
57 src_prepare() {
58 @@ -43,5 +45,4 @@ src_configure() {
59 src_install() {
60 default
61 find "${ED}" -name '*.la' -delete || die
62 - rm "${ED}"/usr/bin/ld_iscsi.so || die
63 }