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