Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/
Date: Fri, 28 Dec 2018 11:58:56
Message-Id: 1545998315.9a792c1bc8045ad0a832926ead6f9a094d895067.zlogene@gentoo
1 commit: 9a792c1bc8045ad0a832926ead6f9a094d895067
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 28 11:58:35 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 28 11:58:35 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a792c1b
7
8 sys-block/open-iscsi: Drop old
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sys-block/open-iscsi/Manifest | 1 -
14 sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild | 104 -------------------
15 sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild | 112 --------------------
16 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 93 -----------------
17 sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild | 121 ----------------------
18 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild | 108 -------------------
19 6 files changed, 539 deletions(-)
20
21 diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
22 index 069168c6adc..cc864142805 100644
23 --- a/sys-block/open-iscsi/Manifest
24 +++ b/sys-block/open-iscsi/Manifest
25 @@ -1,4 +1,3 @@
26 -DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
27 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
28 DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
29 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
30
31 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
32 deleted file mode 100644
33 index e56b51bec42..00000000000
34 --- a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
35 +++ /dev/null
36 @@ -1,104 +0,0 @@
37 -# Copyright 1999-2017 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=2
41 -inherit versionator linux-info eutils flag-o-matic toolchain-funcs
42 -
43 -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
44 -HOMEPAGE="http://www.open-iscsi.com/"
45 -MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
46 -SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
47 -LICENSE="GPL-2"
48 -SLOT="0"
49 -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
50 -IUSE="debug slp"
51 -DEPEND="slp? ( net-libs/openslp )"
52 -RDEPEND="${DEPEND}
53 - sys-apps/util-linux"
54 -
55 -S="${WORKDIR}/${MY_PV}"
56 -
57 -pkg_setup() {
58 - linux-info_pkg_setup
59 -
60 - if kernel_is -lt 2 6 16; then
61 - die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
62 - fi
63 -
64 - # Needs to be done, as iscsid currently only starts, when having the iSCSI
65 - # support loaded as module. Kernel builtion options don't work. See this for
66 - # more information:
67 - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
68 - # If there's a new release, check whether this is still valid!
69 - CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
70 - if linux_config_exists; then
71 - for module in ${CONFIG_CHECK_MODULES}; do
72 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
73 - done
74 - fi
75 -}
76 -
77 -src_prepare() {
78 - export EPATCH_OPTS="-d${S}"
79 - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
80 - epatch "${FILESDIR}"/${P}-glibc212.patch
81 - epatch "${FILESDIR}"/${P}-dont-call-configure.patch
82 - epatch "${FILESDIR}"/${P}-ldflags.patch
83 - epatch "${FILESDIR}"/${P}-isns-slp.patch
84 - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
85 -}
86 -
87 -src_configure() {
88 - cd utils/open-isns || die
89 - econf $(use_with slp)
90 -}
91 -
92 -src_compile() {
93 - use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
94 -
95 - einfo "Building userspace"
96 - local SLP_LIBS
97 - use slp && SLP_LIBS="-lslp"
98 - cd "${S}" && \
99 - KSRC="${KV_DIR}" CFLAGS="" \
100 - emake \
101 - OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
102 - AR="$(tc-getAR)" CC="$(tc-getCC)" \
103 - user \
104 - || die "emake failed"
105 -}
106 -
107 -src_install() {
108 - einfo "Installing userspace"
109 - dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
110 -
111 - einfo "Installing utilities"
112 - dosbin utils/iscsi-iname utils/iscsi_discovery || die
113 -
114 - einfo "Installing docs"
115 - doman doc/*[1-8] || die
116 - dodoc README THANKS || die
117 - docinto test || die
118 - dodoc test/* || die
119 -
120 - einfo "Installing configuration"
121 - insinto /etc/iscsi
122 - doins etc/iscsid.conf || die
123 - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
124 - insinto /etc/iscsi/ifaces
125 - doins etc/iface.example || die
126 -
127 - newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
128 - newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die
129 -
130 - keepdir /var/db/iscsi
131 - fperms 700 /var/db/iscsi || die
132 - fperms 600 /etc/iscsi/iscsid.conf || die
133 -}
134 -
135 -pkg_postinst() {
136 - in='/etc/iscsi/initiatorname.iscsi'
137 - if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
138 - cp -f "${ROOT}${in}.example" "${ROOT}${in}"
139 - fi
140 -}
141
142 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
143 deleted file mode 100644
144 index 4e5854c5f89..00000000000
145 --- a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
146 +++ /dev/null
147 @@ -1,112 +0,0 @@
148 -# Copyright 1999-2017 Gentoo Foundation
149 -# Distributed under the terms of the GNU General Public License v2
150 -
151 -EAPI=2
152 -inherit versionator linux-info eutils flag-o-matic toolchain-funcs
153 -
154 -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
155 -HOMEPAGE="http://www.open-iscsi.com/"
156 -MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
157 -SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
158 -LICENSE="GPL-2"
159 -SLOT="0"
160 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
161 -IUSE="debug slp"
162 -DEPEND="slp? ( net-libs/openslp )"
163 -RDEPEND="${DEPEND}
164 - virtual/udev
165 - sys-fs/lsscsi
166 - sys-apps/util-linux"
167 -
168 -S="${WORKDIR}/${MY_PV}"
169 -
170 -pkg_setup() {
171 - linux-info_pkg_setup
172 -
173 - if kernel_is -lt 2 6 16; then
174 - die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
175 - fi
176 -
177 - # Needs to be done, as iscsid currently only starts, when having the iSCSI
178 - # support loaded as module. Kernel builtion options don't work. See this for
179 - # more information:
180 - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
181 - # If there's a new release, check whether this is still valid!
182 - CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
183 - if linux_config_exists; then
184 - for module in ${CONFIG_CHECK_MODULES}; do
185 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
186 - done
187 - fi
188 -}
189 -
190 -src_prepare() {
191 - export EPATCH_OPTS="-d${S}"
192 - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
193 - epatch "${FILESDIR}"/${P}-glibc212.patch
194 - epatch "${FILESDIR}"/${P}-dont-call-configure.patch
195 - epatch "${FILESDIR}"/${P}-ldflags.patch
196 - epatch "${FILESDIR}"/${P}-isns-slp.patch
197 - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
198 -}
199 -
200 -src_configure() {
201 - cd utils/open-isns || die
202 - econf $(use_with slp)
203 -}
204 -
205 -src_compile() {
206 - use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
207 -
208 - einfo "Building userspace"
209 - local SLP_LIBS
210 - use slp && SLP_LIBS="-lslp"
211 - cd "${S}" && \
212 - KSRC="${KV_DIR}" CFLAGS="" \
213 - emake \
214 - OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
215 - AR="$(tc-getAR)" CC="$(tc-getCC)" \
216 - user \
217 - || die "emake failed"
218 -}
219 -
220 -src_install() {
221 - einfo "Installing userspace"
222 - dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
223 -
224 - einfo "Installing utilities"
225 - dosbin utils/iscsi-iname utils/iscsi_discovery || die
226 -
227 - einfo "Installing docs"
228 - doman doc/*[1-8] || die
229 - dodoc README THANKS || die
230 - docinto test || die
231 - dodoc test/* || die
232 -
233 - einfo "Installing configuration"
234 - insinto /etc/iscsi
235 - doins etc/iscsid.conf || die
236 - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
237 - insinto /etc/iscsi/ifaces
238 - doins etc/iface.example || die
239 -
240 - newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
241 - newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die
242 -
243 - # udev pieces
244 - insinto /etc/udev/scripts
245 - doins "${FILESDIR}"/iscsidev.sh
246 - insinto /lib/udev/rules.d
247 - doins "${FILESDIR}"/99-iscsi.rules
248 -
249 - keepdir /var/db/iscsi
250 - fperms 700 /var/db/iscsi || die
251 - fperms 600 /etc/iscsi/iscsid.conf || die
252 -}
253 -
254 -pkg_postinst() {
255 - in='/etc/iscsi/initiatorname.iscsi'
256 - if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
257 - cp -f "${ROOT}${in}.example" "${ROOT}${in}"
258 - fi
259 -}
260
261 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
262 deleted file mode 100644
263 index 9e1610b7395..00000000000
264 --- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
265 +++ /dev/null
266 @@ -1,93 +0,0 @@
267 -# Copyright 1999-2017 Gentoo Foundation
268 -# Distributed under the terms of the GNU General Public License v2
269 -
270 -EAPI=5
271 -
272 -inherit versionator linux-info eutils flag-o-matic toolchain-funcs
273 -
274 -MY_P="${PN}-$(replace_version_separator 2 "-")"
275 -
276 -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
277 -HOMEPAGE="http://www.open-iscsi.com/"
278 -SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
279 -
280 -LICENSE="GPL-2"
281 -SLOT="0"
282 -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
283 -IUSE="debug slp"
284 -
285 -DEPEND="slp? ( net-libs/openslp )"
286 -RDEPEND="${DEPEND}
287 - sys-fs/lsscsi
288 - sys-apps/util-linux"
289 -
290 -S="${WORKDIR}/${MY_P}"
291 -
292 -pkg_setup() {
293 - linux-info_pkg_setup
294 -
295 - if kernel_is -lt 2 6 16; then
296 - die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
297 - fi
298 -
299 - # Needs to be done, as iscsid currently only starts, when having the iSCSI
300 - # support loaded as module. Kernel builtion options don't work. See this for
301 - # more information:
302 - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
303 - # If there's a new release, check whether this is still valid!
304 - CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
305 - if linux_config_exists; then
306 - for module in ${CONFIG_CHECK_MODULES}; do
307 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
308 - done
309 - fi
310 -}
311 -
312 -src_prepare() {
313 - epatch "${FILESDIR}"/${P}-Makefiles.patch
314 -
315 - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
316 -}
317 -
318 -src_configure() {
319 - cd utils/open-isns || die
320 -
321 - # SSL (--with-security) is broken
322 - econf $(use_with slp) \
323 - --without-security
324 -}
325 -
326 -src_compile() {
327 - use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
328 -
329 - KSRC="${KV_DIR}" CFLAGS="" \
330 - emake \
331 - OPTFLAGS="${CFLAGS}" \
332 - AR="$(tc-getAR)" CC="$(tc-getCC)" \
333 - user
334 -}
335 -
336 -src_install() {
337 - emake DESTDIR="${ED}" sbindir="/usr/sbin" install
338 -
339 - dodoc README THANKS
340 -
341 - docinto test/
342 - dodoc test/*
343 -
344 - insinto /etc/iscsi
345 - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
346 -
347 - # udev pieces
348 - insinto /lib/udev/rules.d
349 - doins "${FILESDIR}"/99-iscsi.rules
350 - exeinto /etc/udev/scripts
351 - doexe "${FILESDIR}"/iscsidev.sh
352 -
353 - newconfd "${FILESDIR}"/iscsid-conf.d iscsid
354 - newinitd "${FILESDIR}"/iscsid-init.d iscsid
355 -
356 - keepdir /var/db/iscsi
357 - fperms 700 /var/db/iscsi
358 - fperms 600 /etc/iscsi/iscsid.conf
359 -}
360
361 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
362 deleted file mode 100644
363 index 4f623960f7b..00000000000
364 --- a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
365 +++ /dev/null
366 @@ -1,121 +0,0 @@
367 -# Copyright 1999-2017 Gentoo Foundation
368 -# Distributed under the terms of the GNU General Public License v2
369 -
370 -EAPI=6
371 -
372 -inherit versionator linux-info flag-o-matic toolchain-funcs udev
373 -
374 -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
375 -HOMEPAGE="http://www.open-iscsi.com/"
376 -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
377 -
378 -LICENSE="GPL-2"
379 -SLOT="0"
380 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
381 -IUSE="debug infiniband slp +tcp rdma"
382 -
383 -DEPEND="sys-block/open-isns:=
384 - slp? ( net-libs/openslp )
385 - infiniband? ( sys-fabric/ofed )"
386 -RDEPEND="${DEPEND}
387 - sys-fs/lsscsi
388 - sys-apps/util-linux"
389 -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
390 -
391 -PATCHES=(
392 - "${FILESDIR}/${P}-Makefiles.patch"
393 - "${FILESDIR}/${P}-musl-fixes.patch"
394 - "${FILESDIR}/${P}-musl-ethtool-compat.patch"
395 -)
396 -
397 -pkg_setup() {
398 - linux-info_pkg_setup
399 -
400 - if kernel_is -lt 2 6 16; then
401 - die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
402 - fi
403 -
404 - # Needs to be done, as iscsid currently only starts, when having the iSCSI
405 - # support loaded as module. Kernel builtin options don't work. See this for
406 - # more information:
407 - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
408 - # If there's a new release, check whether this is still valid!
409 - TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
410 - RDMA_MODULES="INFINIBAND_ISER"
411 - INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
412 - CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
413 - if linux_config_exists; then
414 - if use tcp; then
415 - for module in ${TCP_MODULES}; do
416 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
417 - done
418 - fi
419 - if use infiniband; then
420 - for module in ${INFINIBAND_MODULES}; do
421 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
422 - done
423 - fi
424 - if use rdma; then
425 - for module in ${RDMA_MODULES}; do
426 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
427 - done
428 - fi
429 - fi
430 -}
431 -
432 -src_prepare() {
433 - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
434 - default
435 -}
436 -
437 -src_configure() {
438 - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
439 - append-lfs-flags
440 -}
441 -
442 -src_compile() {
443 - # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
444 - # is messed up already here, so it's not making it that much worse.
445 - KSRC="${KV_DIR}" CFLAGS="" \
446 - emake \
447 - OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
448 - AR="$(tc-getAR)" CC="$(tc-getCC)" \
449 - user
450 -}
451 -
452 -src_install() {
453 - emake DESTDIR="${ED}" sbindir="/usr/sbin" install
454 - # Upstream make is not deterministic, per bug #601514
455 - rm -f "${ED}"/etc/initiatorname.iscsi
456 -
457 - dodoc README THANKS
458 -
459 - docinto test/
460 - dodoc test/*
461 -
462 - insinto /etc/iscsi
463 - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
464 -
465 - # udev pieces
466 - udev_dorules "${FILESDIR}"/99-iscsi.rules
467 - exeinto /etc/udev/scripts
468 - doexe "${FILESDIR}"/iscsidev.sh
469 -
470 - newconfd "${FILESDIR}"/iscsid-conf.d iscsid
471 - newinitd "${FILESDIR}"/iscsid-init.d iscsid
472 -
473 - keepdir /var/db/iscsi
474 - fperms 700 /var/db/iscsi
475 - fperms 600 /etc/iscsi/iscsid.conf
476 -}
477 -
478 -pkg_postinst() {
479 - in='/etc/iscsi/initiatorname.iscsi'
480 - if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
481 - {
482 - cat "${EROOT}${in}.example"
483 - echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
484 - echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
485 - } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
486 - fi
487 -}
488
489 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
490 deleted file mode 100644
491 index 400251eb5d0..00000000000
492 --- a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
493 +++ /dev/null
494 @@ -1,108 +0,0 @@
495 -# Copyright 1999-2017 Gentoo Foundation
496 -# Distributed under the terms of the GNU General Public License v2
497 -
498 -EAPI=6
499 -
500 -inherit versionator linux-info flag-o-matic toolchain-funcs udev
501 -
502 -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
503 -HOMEPAGE="http://www.open-iscsi.com/"
504 -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
505 -
506 -LICENSE="GPL-2"
507 -SLOT="0"
508 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
509 -IUSE="debug infiniband slp +tcp rdma"
510 -
511 -DEPEND="sys-block/open-isns:=
512 - slp? ( net-libs/openslp )
513 - infiniband? ( sys-fabric/ofed )"
514 -RDEPEND="${DEPEND}
515 - sys-fs/lsscsi
516 - sys-apps/util-linux"
517 -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
518 -
519 -PATCHES=(
520 - "${FILESDIR}/${P}-Makefiles.patch"
521 - "${FILESDIR}/${P}-musl-fixes.patch"
522 - "${FILESDIR}/${P}-musl-ethtool-compat.patch"
523 -)
524 -
525 -pkg_setup() {
526 - linux-info_pkg_setup
527 -
528 - if kernel_is -lt 2 6 16; then
529 - die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
530 - fi
531 -
532 - # Needs to be done, as iscsid currently only starts, when having the iSCSI
533 - # support loaded as module. Kernel builtin options don't work. See this for
534 - # more information:
535 - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
536 - # If there's a new release, check whether this is still valid!
537 - TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
538 - RDMA_MODULES="INFINIBAND_ISER"
539 - INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
540 - CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
541 - if linux_config_exists; then
542 - if use tcp; then
543 - for module in ${TCP_MODULES}; do
544 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
545 - done
546 - fi
547 - if use infiniband; then
548 - for module in ${INFINIBAND_MODULES}; do
549 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
550 - done
551 - fi
552 - if use rdma; then
553 - for module in ${RDMA_MODULES}; do
554 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
555 - done
556 - fi
557 - fi
558 -}
559 -
560 -src_prepare() {
561 - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
562 - default
563 -}
564 -
565 -src_configure() {
566 - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
567 - append-lfs-flags
568 -}
569 -
570 -src_compile() {
571 - # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
572 - # is messed up already here, so it's not making it that much worse.
573 - KSRC="${KV_DIR}" CFLAGS="" \
574 - emake \
575 - OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
576 - AR="$(tc-getAR)" CC="$(tc-getCC)" \
577 - user
578 -}
579 -
580 -src_install() {
581 - emake DESTDIR="${ED}" sbindir="/usr/sbin" install
582 -
583 - dodoc README THANKS
584 -
585 - docinto test/
586 - dodoc test/*
587 -
588 - insinto /etc/iscsi
589 - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
590 -
591 - # udev pieces
592 - udev_dorules "${FILESDIR}"/99-iscsi.rules
593 - exeinto /etc/udev/scripts
594 - doexe "${FILESDIR}"/iscsidev.sh
595 -
596 - newconfd "${FILESDIR}"/iscsid-conf.d iscsid
597 - newinitd "${FILESDIR}"/iscsid-init.d iscsid
598 -
599 - keepdir /var/db/iscsi
600 - fperms 700 /var/db/iscsi
601 - fperms 600 /etc/iscsi/iscsid.conf
602 -}