Gentoo Archives: gentoo-commits

From: Jonathan Vasquez <fearedbliss@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/, sys-fs/zfs-kmod/, sys-kernel/spl/
Date: Mon, 26 Mar 2018 00:37:04
Message-Id: 1522024599.298ad534e5ce392f7245fb790daec33f2799beec.fearedbliss@gentoo
1 commit: 298ad534e5ce392f7245fb790daec33f2799beec
2 Author: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 26 00:08:15 2018 +0000
4 Commit: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 26 00:36:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=298ad534
7
8 sys-fs/zfs: removing version 0.7.5 and co.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sys-fs/zfs-kmod/Manifest | 1 -
13 sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild | 146 -----------------------
14 sys-fs/zfs/Manifest | 1 -
15 sys-fs/zfs/zfs-0.7.5-r2.ebuild | 212 ----------------------------------
16 sys-kernel/spl/Manifest | 1 -
17 sys-kernel/spl/spl-0.7.5.ebuild | 112 ------------------
18 6 files changed, 473 deletions(-)
19
20 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
21 index 783d0d03db0..502148aaee0 100644
22 --- a/sys-fs/zfs-kmod/Manifest
23 +++ b/sys-fs/zfs-kmod/Manifest
24 @@ -1,5 +1,4 @@
25 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
26 DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 BLAKE2B e9db3c1bde3a2636b35a4204c484bc4cec0968278519762707849ba138eeb9128130de70c2f40bb28dc9102347465d724a60cebd45ddb12d4217739ecbed7714 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f
27 DIST zfs-0.6.5.4.tar.gz 2506470 BLAKE2B 10a2242081891b94a7863f11b4c3b9e443d3b75b5eb03e8fc88e30484a94555203dec8964075cf23f694777dd699e20acb1a52b5d04cba410b6df84512436e08 SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01
28 -DIST zfs-0.7.5.tar.gz 6403102 BLAKE2B 5159b2ab811b2f7bcbbc708814e07e68b0b38d7b5fca4a82205c7bb4332155121f1385f2cd3a6b7acb6bd64d13b9ad2af85d42b90623efb0f33a2f542fb90803 SHA512 3512aaa6225f74323f2d14e029a113593e0cf44be2ab18cc42dcb82d237b88843ccd7e48ed73a4c6f6da574151c1af461e0528725e11bcb42280467e37f63df2
29 DIST zfs-0.7.6.tar.gz 6409035 BLAKE2B 498d02172f0eaaa658e2aad2dd74d37f0ce5d41fda817976cc370ad42ad320f09124e6dc4a609b5eeda7819f538247cf64823871d00902e80a9bc92a374d0d51 SHA512 d9d45696b81080234068a4731276f888382e6680a6ca30d302110dbd1fa00d38ef17bd59de4b787b1ce91c3184ccb403c5db6b064a611f6f8572fa077a989cdb
30
31 diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild
32 deleted file mode 100644
33 index df70ae1c9a0..00000000000
34 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild
35 +++ /dev/null
36 @@ -1,146 +0,0 @@
37 -# Copyright 1999-2018 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI="5"
41 -
42 -if [ ${PV} == "9999" ]; then
43 - AUTOTOOLS_AUTORECONF="1"
44 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
45 - inherit git-r3
46 -else
47 - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
48 - S="${WORKDIR}/zfs-${PV}"
49 - KEYWORDS="~amd64"
50 -fi
51 -
52 -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
53 -
54 -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
55 -HOMEPAGE="http://zfsonlinux.org/"
56 -
57 -LICENSE="CDDL debug? ( GPL-2+ )"
58 -SLOT="0"
59 -IUSE="custom-cflags debug +rootfs"
60 -RESTRICT="debug? ( strip ) test"
61 -
62 -DEPEND="
63 - =sys-kernel/spl-${PV}*
64 - dev-lang/perl
65 - virtual/awk
66 -"
67 -
68 -RDEPEND="${DEPEND}
69 - !sys-fs/zfs-fuse
70 -"
71 -
72 -AT_M4DIR="config"
73 -AUTOTOOLS_IN_SOURCE_BUILD="1"
74 -
75 -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
76 -
77 -pkg_setup() {
78 - linux-info_pkg_setup
79 - CONFIG_CHECK="
80 - !DEBUG_LOCK_ALLOC
81 - !CONFIG_REISER4_FS
82 - EFI_PARTITION
83 - IOSCHED_NOOP
84 - MODULES
85 - !PAX_KERNEXEC_PLUGIN_METHOD_OR
86 - ZLIB_DEFLATE
87 - ZLIB_INFLATE
88 - "
89 -
90 - use debug && CONFIG_CHECK="${CONFIG_CHECK}
91 - FRAME_POINTER
92 - DEBUG_INFO
93 - !DEBUG_INFO_REDUCED
94 - "
95 -
96 - use rootfs && \
97 - CONFIG_CHECK="${CONFIG_CHECK}
98 - BLK_DEV_INITRD
99 - DEVTMPFS
100 - "
101 -
102 - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
103 -
104 - [ ${PV} != "9999" ] && \
105 - { kernel_is le 4 14 || die "Linux 4.14 is the latest supported version."; }
106 -
107 - check_extra_config
108 -}
109 -
110 -src_prepare() {
111 - # Remove GPLv2-licensed ZPIOS unless we are debugging
112 - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
113 -
114 - # Set module revision number
115 - [ ${PV} != "9999" ] && \
116 - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
117 -
118 - autotools-utils_src_prepare
119 -}
120 -
121 -src_configure() {
122 - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
123 - use custom-cflags || strip-flags
124 - filter-ldflags -Wl,*
125 -
126 - set_arch_to_kernel
127 - local myeconfargs=(${myeconfargs}
128 - --bindir="${EPREFIX}/bin"
129 - --sbindir="${EPREFIX}/sbin"
130 - --with-config=kernel
131 - --with-linux="${KV_DIR}"
132 - --with-linux-obj="${KV_OUT_DIR}"
133 - --with-spl="${EROOT}usr/src/${SPL_PATH}"
134 - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
135 - $(use_enable debug)
136 - )
137 -
138 - autotools-utils_src_configure
139 -}
140 -
141 -src_install() {
142 - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
143 -}
144 -
145 -pkg_postinst() {
146 - linux-mod_pkg_postinst
147 -
148 - # Remove old modules
149 - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
150 - then
151 - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
152 - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
153 - ewarn "Automatically removing old modules to avoid problems."
154 - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
155 - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
156 - fi
157 -
158 - if use x86 || use arm
159 - then
160 - ewarn "32-bit kernels will likely require increasing vmalloc to"
161 - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
162 - fi
163 -
164 - ewarn "This version of ZFSOnLinux includes support for new feature flags"
165 - ewarn "that are incompatible with previous versions. GRUB2 support for"
166 - ewarn "/boot with the new feature flags is not yet available."
167 - ewarn "Do *NOT* upgrade root pools to use the new feature flags."
168 - ewarn "Any new pools will be created with the new feature flags by default"
169 - ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
170 - ewarn "create a newpool that is backward compatible wih GRUB2, use "
171 - ewarn
172 - ewarn "zpool create -d -o feature@async_destroy=enabled "
173 - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
174 - ewarn " -o feature@spacemap_histogram=enabled"
175 - ewarn " -o feature@enabled_txg=enabled "
176 - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
177 - ewarn " ..."
178 - ewarn
179 - ewarn "GRUB2 support will be updated as soon as either the GRUB2"
180 - ewarn "developers do a tag or the Gentoo developers find time to backport"
181 - ewarn "support from GRUB2 HEAD."
182 -}
183
184 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
185 index 10800c862f4..4e2e735e291 100644
186 --- a/sys-fs/zfs/Manifest
187 +++ b/sys-fs/zfs/Manifest
188 @@ -1,5 +1,4 @@
189 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
190 DIST zfs-0.6.5.4-patches-p2.tar.xz 63912 BLAKE2B f8bd5d0cd2b6170b45cf40a78b484d9a73017b20a77c603f4bcec63b6c77347b07df74c9d53288b5b2b984135d651d3d3ef830395ff2625576b13d8ce433fbcb SHA512 9f598c2a750b92dadddb677a6a9dda4573fa91421a82270d8104d718da4b945a4d5412bab92037a033cec1ec177f2a0eb52207babd023847918e3754054ec5e9
191 DIST zfs-0.6.5.4.tar.gz 2506470 BLAKE2B 10a2242081891b94a7863f11b4c3b9e443d3b75b5eb03e8fc88e30484a94555203dec8964075cf23f694777dd699e20acb1a52b5d04cba410b6df84512436e08 SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01
192 -DIST zfs-0.7.5.tar.gz 6403102 BLAKE2B 5159b2ab811b2f7bcbbc708814e07e68b0b38d7b5fca4a82205c7bb4332155121f1385f2cd3a6b7acb6bd64d13b9ad2af85d42b90623efb0f33a2f542fb90803 SHA512 3512aaa6225f74323f2d14e029a113593e0cf44be2ab18cc42dcb82d237b88843ccd7e48ed73a4c6f6da574151c1af461e0528725e11bcb42280467e37f63df2
193 DIST zfs-0.7.6.tar.gz 6409035 BLAKE2B 498d02172f0eaaa658e2aad2dd74d37f0ce5d41fda817976cc370ad42ad320f09124e6dc4a609b5eeda7819f538247cf64823871d00902e80a9bc92a374d0d51 SHA512 d9d45696b81080234068a4731276f888382e6680a6ca30d302110dbd1fa00d38ef17bd59de4b787b1ce91c3184ccb403c5db6b064a611f6f8572fa077a989cdb
194
195 diff --git a/sys-fs/zfs/zfs-0.7.5-r2.ebuild b/sys-fs/zfs/zfs-0.7.5-r2.ebuild
196 deleted file mode 100644
197 index b625fe321e0..00000000000
198 --- a/sys-fs/zfs/zfs-0.7.5-r2.ebuild
199 +++ /dev/null
200 @@ -1,212 +0,0 @@
201 -# Copyright 1999-2018 Gentoo Foundation
202 -# Distributed under the terms of the GNU General Public License v2
203 -
204 -EAPI="5"
205 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
206 -
207 -if [ ${PV} == "9999" ] ; then
208 - inherit git-r3 linux-mod
209 - AUTOTOOLS_AUTORECONF="1"
210 - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
211 -else
212 - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
213 - KEYWORDS="~amd64"
214 -fi
215 -
216 -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
217 -
218 -DESCRIPTION="Userland utilities for ZFS Linux kernel module"
219 -HOMEPAGE="http://zfsonlinux.org/"
220 -
221 -LICENSE="BSD-2 CDDL MIT"
222 -SLOT="0"
223 -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
224 -RESTRICT="test"
225 -
226 -COMMON_DEPEND="
227 - net-libs/libtirpc
228 - sys-apps/util-linux[static-libs?]
229 - sys-libs/zlib[static-libs(+)?]
230 - virtual/awk
231 -"
232 -DEPEND="${COMMON_DEPEND}
233 - virtual/pkgconfig
234 -"
235 -
236 -RDEPEND="${COMMON_DEPEND}
237 - !=sys-apps/grep-2.13*
238 - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
239 - !sys-fs/zfs-fuse
240 - !prefix? ( virtual/udev )
241 - test-suite? (
242 - sys-apps/util-linux
243 - sys-devel/bc
244 - sys-block/parted
245 - sys-fs/lsscsi
246 - sys-fs/mdadm
247 - sys-process/procps
248 - virtual/modutils
249 - )
250 - rootfs? (
251 - app-arch/cpio
252 - app-misc/pax-utils
253 - !<sys-boot/grub-2.00-r2:2
254 - !<sys-kernel/genkernel-3.5.1.1
255 - !<sys-kernel/genkernel-next-67
256 - !<sys-kernel/bliss-initramfs-7.1.0
257 - !<sys-kernel/dracut-044-r1
258 - )
259 - sys-fs/udev-init-scripts
260 -"
261 -
262 -AT_M4DIR="config"
263 -AUTOTOOLS_IN_SOURCE_BUILD="1"
264 -
265 -pkg_setup() {
266 - if use kernel_linux && use test-suite; then
267 - linux-info_pkg_setup
268 - if ! linux_config_exists; then
269 - ewarn "Cannot check the linux kernel configuration."
270 - else
271 - # recheck that we don't have usblp to collide with libusb
272 - if use test-suite; then
273 - if linux_chkconfig_present BLK_DEV_LOOP; then
274 - eerror "The ZFS test suite requires loop device support enabled."
275 - eerror "Please enable it:"
276 - eerror " CONFIG_BLK_DEV_LOOP=y"
277 - eerror "in /usr/src/linux/.config or"
278 - eerror " Device Drivers --->"
279 - eerror " Block devices --->"
280 - eerror " [ ] Loopback device support"
281 - fi
282 - fi
283 - fi
284 - fi
285 -
286 -}
287 -
288 -src_prepare() {
289 - # Update paths
290 - sed -e "s|/sbin/lsmod|/bin/lsmod|" \
291 - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
292 - -e "s|/sbin/parted|/usr/sbin/parted|" \
293 - -i scripts/common.sh.in
294 -
295 - autotools-utils_src_prepare
296 -}
297 -
298 -src_configure() {
299 - use custom-cflags || strip-flags
300 - local myeconfargs=(
301 - --bindir="${EPREFIX}/bin"
302 - --sbindir="${EPREFIX}/sbin"
303 - --with-config=user
304 - --with-dracutdir="${EPREFIX}/usr/lib/dracut"
305 - --with-linux="${KV_DIR}"
306 - --with-linux-obj="${KV_OUT_DIR}"
307 - --with-udevdir="$(get_udevdir)"
308 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
309 - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
310 - $(use_enable debug)
311 - )
312 - autotools-utils_src_configure
313 -
314 - # prepare systemd unit and helper script
315 - cat "${FILESDIR}/zfs.service.in" | \
316 - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
317 - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
318 - > "${T}/zfs.service" || die
319 - cat "${FILESDIR}/zfs-init.sh.in" | \
320 - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
321 - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
322 - > "${T}/zfs-init.sh" || die
323 -}
324 -
325 -src_install() {
326 - autotools-utils_src_install
327 - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
328 - use test-suite || rm -rf "${ED}usr/share/zfs"
329 -
330 - newbashcomp "${FILESDIR}/bash-completion-r1" zfs
331 - bashcomp_alias zfs zpool
332 -
333 - exeinto /usr/libexec
334 - doexe "${T}/zfs-init.sh"
335 - systemd_dounit "${T}/zfs.service"
336 -}
337 -
338 -pkg_postinst() {
339 - if ! use kernel-builtin && [ ${PV} = "9999" ]
340 - then
341 - einfo "Adding ${P} to the module database to ensure that the"
342 - einfo "kernel modules and userland utilities stay in sync."
343 - update_moduledb
344 - fi
345 -
346 - if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
347 - then
348 - einfo 'The zfs boot script has been split into the zfs-import,'
349 - einfo 'zfs-mount and zfs-share scripts.'
350 - einfo
351 - einfo 'You had the zfs script in your boot runlevel. For your'
352 - einfo 'convenience, it has been automatically removed and the three'
353 - einfo 'scripts that replace it have been configured to start.'
354 - einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
355 - einfo 'runlevel while the zfs-share script is in the default runlevel.'
356 -
357 - rm "${EROOT}etc/runlevels/boot/zfs"
358 - ln -snf "${EROOT}etc/init.d/zfs-import" \
359 - "${EROOT}etc/runlevels/boot/zfs-import"
360 - ln -snf "${EROOT}etc/init.d/zfs-mount" \
361 - "${EROOT}etc/runlevels/boot/zfs-mount"
362 - ln -snf "${EROOT}etc/init.d/zfs-share" \
363 - "${EROOT}etc/runlevels/default/zfs-share"
364 - else
365 - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
366 - einfo "You should add zfs-import to the boot runlevel."
367 - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
368 - einfo "You should add zfs-mount to the boot runlevel."
369 - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
370 - einfo "You should add zfs-share to the default runlevel."
371 - fi
372 -
373 - if [ -e "${EROOT}etc/runlevels/default/zed" ]
374 - then
375 - einfo 'The downstream OpenRC zed script has replaced by the upstream'
376 - einfo 'OpenRC zfs-zed script.'
377 - einfo
378 - einfo 'You had the zed script in your default runlevel. For your'
379 - einfo 'convenience, it has been automatically removed and the zfs-zed'
380 - einfo 'script that replaced it has been configured to start.'
381 -
382 - rm "${EROOT}etc/runlevels/boot/zed"
383 - ln -snf "${EROOT}etc/init.d/zfs-sed" \
384 - "${EROOT}etc/runlevels/default/zfs-zed"
385 - else
386 - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
387 - einfo "You should add zfs-zed to the default runlevel."
388 - fi
389 -
390 - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
391 - then
392 - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
393 - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
394 - fi
395 -
396 - systemd_reenable zfs-zed.service
397 - systemd_reenable zfs-import-cache.service
398 - systemd_reenable zfs-import-scan.service
399 - systemd_reenable zfs-mount.service
400 - systemd_reenable zfs-share.service
401 - systemd_reenable zfs-import.target
402 - systemd_reenable zfs.target
403 - systemd_reenable zfs.service
404 -
405 -}
406 -
407 -pkg_postrm() {
408 - if ! use kernel-builtin && [ ${PV} = "9999" ]
409 - then
410 - remove_moduledb
411 - fi
412 -}
413
414 diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
415 index 6c331dd99a0..6a0addbcb33 100644
416 --- a/sys-kernel/spl/Manifest
417 +++ b/sys-kernel/spl/Manifest
418 @@ -1,5 +1,4 @@
419 DIST spl-0.6.5.11.tar.gz 531710 BLAKE2B e89cb5a023d3f4b3949a385100b56e01c5fd0ff4448bc175f8463a84b74d1d8f1fcf669c2e4b73f2ec3326653594106ebfa3e66987e49a9cd029355bbb317990 SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722
420 DIST spl-0.6.5.4-patches-p1.tar.xz 2020 BLAKE2B 82b836df5c18f68ebd967d5d33e65232167ff1c4b1da3998dadf49c1fd0ffad4a86fa418a30ba0ba106ee4baa190fc51dedabec68083af80e5eb5aa1b225dcc5 SHA512 2650f06bf23045bd2805ef58baa2561534373862e1fbbaf189cf93283aa8e18cbee989b4e81751b37da3058aeba357cf8e46db97331379e1b5eafde7faa33851
421 DIST spl-0.6.5.4.tar.gz 556298 BLAKE2B 142d92ece51f544ed53f8d15390a97469b322c0e8f16c6510eb72f69493a3489f98ead9fa4138765b364c22777ee0cb49a76c4d9b1c4ac4e5ce8c0e5dbfe9952 SHA512 a50d804008237820d6a8e7d938f6699df2966836ebedf0b6a4421f55bd6c24ae69e8f80eaf3aa2b7f6ed308983ab4ca11abfb32f98c8d070e4957b4802e00cac
422 -DIST spl-0.7.5.tar.gz 549272 BLAKE2B b645c68fa53e3e10a80788684efbeeafecb04753a1b515de32555943f372fa61c1c24cd7afac1cc646de572daa32f88c5b95662797a085c756519e03fdf3e46f SHA512 a797ddab6841cbe9c7eacc4f276537ecb5905a694604185044e98ed017b325367a1fdd1ea6830d29d4a21ed11a8d1ff0505bda7bbd2112418db319df128141a3
423 DIST spl-0.7.6.tar.gz 550089 BLAKE2B c0b1cc87a9b7997f6346a106eb8f23493938357fce9d6209e159016f2df5655678fce5ddc64dc4a63a4f93b715c44d5ff7fd30097c63ab62a1daabb3dcc28908 SHA512 b8e74e4ad8c16df1a4742639f00c4c4162607d136145bae58489f9a34539dcc5569da18639a67ac5d9d52b5feac93e052323ebf6efce6a92ba9a2b965f940fdd
424
425 diff --git a/sys-kernel/spl/spl-0.7.5.ebuild b/sys-kernel/spl/spl-0.7.5.ebuild
426 deleted file mode 100644
427 index 351b1b4c31c..00000000000
428 --- a/sys-kernel/spl/spl-0.7.5.ebuild
429 +++ /dev/null
430 @@ -1,112 +0,0 @@
431 -# Copyright 1999-2018 Gentoo Foundation
432 -# Distributed under the terms of the GNU General Public License v2
433 -
434 -EAPI="5"
435 -
436 -if [[ ${PV} == "9999" ]] ; then
437 - AUTOTOOLS_AUTORECONF="1"
438 - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
439 - inherit git-r3
440 -else
441 - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
442 - KEYWORDS="~amd64"
443 -fi
444 -
445 -inherit flag-o-matic linux-info linux-mod autotools-utils
446 -
447 -DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
448 -HOMEPAGE="http://zfsonlinux.org/"
449 -
450 -LICENSE="GPL-2"
451 -SLOT="0"
452 -IUSE="custom-cflags debug"
453 -RESTRICT="debug? ( strip ) test"
454 -
455 -COMMON_DEPEND="
456 - dev-lang/perl
457 - virtual/awk"
458 -
459 -DEPEND="${COMMON_DEPEND}"
460 -
461 -RDEPEND="${COMMON_DEPEND}
462 - !sys-devel/spl"
463 -
464 -AT_M4DIR="config"
465 -AUTOTOOLS_IN_SOURCE_BUILD="1"
466 -DOCS=( AUTHORS DISCLAIMER )
467 -
468 -pkg_setup() {
469 - linux-info_pkg_setup
470 - CONFIG_CHECK="
471 - !DEBUG_LOCK_ALLOC
472 - !CONFIG_REISER4_FS
473 - MODULES
474 - KALLSYMS
475 - !PAX_KERNEXEC_PLUGIN_METHOD_OR
476 - !PAX_SIZE_OVERFLOW
477 - ZLIB_DEFLATE
478 - ZLIB_INFLATE
479 - "
480 -
481 - use debug && CONFIG_CHECK="${CONFIG_CHECK}
482 - FRAME_POINTER
483 - DEBUG_INFO
484 - !DEBUG_INFO_REDUCED
485 - "
486 -
487 - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
488 -
489 - [ ${PV} != "9999" ] && \
490 - { kernel_is le 4 14 || die "Linux 4.14 is the latest supported version."; }
491 -
492 - check_extra_config
493 -}
494 -
495 -src_prepare() {
496 - # Workaround for hard coded path
497 - sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
498 - die "Cannot patch check.sh"
499 -
500 - # splat is unnecessary unless we are debugging
501 - use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
502 -
503 - # Set module revision number
504 - [ ${PV} != "9999" ] && \
505 - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
506 -
507 - autotools-utils_src_prepare
508 -}
509 -
510 -src_configure() {
511 - use custom-cflags || strip-flags
512 - filter-ldflags -Wl,*
513 -
514 - set_arch_to_kernel
515 - local myeconfargs=(
516 - --bindir="${EPREFIX}/bin"
517 - --sbindir="${EPREFIX}/sbin"
518 - --with-config=all
519 - --with-linux="${KV_DIR}"
520 - --with-linux-obj="${KV_OUT_DIR}"
521 - $(use_enable debug)
522 - )
523 - autotools-utils_src_configure
524 -}
525 -
526 -src_install() {
527 - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
528 -}
529 -
530 -pkg_postinst() {
531 - linux-mod_pkg_postinst
532 -
533 - # Remove old modules
534 - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
535 - then
536 - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
537 - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
538 - ewarn "Automatically removing old modules to avoid problems."
539 - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
540 - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
541 - fi
542 -}