Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
Date: Sun, 23 Jun 2019 08:00:44
Message-Id: 1561276828.bd323e211512fffbc5d5c0fe868d55e6567dea7e.gyakovlev@gentoo
1 commit: bd323e211512fffbc5d5c0fe868d55e6567dea7e
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 23 07:56:24 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 23 08:00:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd323e21
7
8 sys-fs/zfs: drop 0.8.0
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.15
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-fs/zfs/Manifest | 1 -
14 sys-fs/zfs/zfs-0.8.0.ebuild | 250 --------------------------------------------
15 2 files changed, 251 deletions(-)
16
17 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
18 index 90cf193e838..29e419297f2 100644
19 --- a/sys-fs/zfs/Manifest
20 +++ b/sys-fs/zfs/Manifest
21 @@ -1,4 +1,3 @@
22 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
23 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
24 -DIST zfs-0.8.0.tar.gz 9084737 BLAKE2B c3095ca07b7c36fa204274be1166fd244894de70b97a11da32606b08e9bb150bc1326ac8424d5c001eb33d2d94e214d3944ddfce885844885c55291a82f11a2f SHA512 ba29f1644ec6807f4cad574e4950e56026316c3d405c9fc40a63ab34c2400d508521b09f656ac97898e5feaca5e0b259d9d4d85f75a4b1782a9db13d3b14cdc6
25 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
26
27 diff --git a/sys-fs/zfs/zfs-0.8.0.ebuild b/sys-fs/zfs/zfs-0.8.0.ebuild
28 deleted file mode 100644
29 index 129f3484544..00000000000
30 --- a/sys-fs/zfs/zfs-0.8.0.ebuild
31 +++ /dev/null
32 @@ -1,250 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -DISTUTILS_OPTIONAL=1
39 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
40 -
41 -inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev
42 -
43 -DESCRIPTION="Userland utilities for ZFS Linux kernel module"
44 -HOMEPAGE="https://zfsonlinux.org/"
45 -
46 -if [[ ${PV} == "9999" ]] ; then
47 - inherit autotools git-r3
48 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
49 -else
50 - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
51 - KEYWORDS="~amd64"
52 -fi
53 -
54 -LICENSE="BSD-2 CDDL MIT"
55 -SLOT="0"
56 -IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs"
57 -
58 -COMMON_DEPEND="
59 - ${PYTHON_DEPS}
60 - net-libs/libtirpc
61 - sys-apps/util-linux[static-libs?]
62 - sys-libs/zlib[static-libs(+)?]
63 - virtual/awk
64 - python? (
65 - virtual/python-cffi[${PYTHON_USEDEP}]
66 - )
67 -"
68 -
69 -BDEPEND="${COMMON_DEPEND}
70 - virtual/pkgconfig
71 - python? (
72 - dev-python/setuptools[${PYTHON_USEDEP}]
73 - )
74 -"
75 -
76 -RDEPEND="${COMMON_DEPEND}
77 - !=sys-apps/grep-2.13*
78 - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
79 - !sys-fs/zfs-fuse
80 - !prefix? ( virtual/udev )
81 - sys-fs/udev-init-scripts
82 - rootfs? (
83 - app-arch/cpio
84 - app-misc/pax-utils
85 - !<sys-boot/grub-2.00-r2:2
86 - !<sys-kernel/genkernel-3.5.1.1
87 - !<sys-kernel/genkernel-next-67
88 - !<sys-kernel/bliss-initramfs-7.1.0
89 - !<sys-kernel/dracut-044-r1
90 - )
91 - test-suite? (
92 - sys-apps/util-linux
93 - sys-devel/bc
94 - sys-block/parted
95 - sys-fs/lsscsi
96 - sys-fs/mdadm
97 - sys-process/procps
98 - virtual/modutils
99 - )
100 -"
101 -
102 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
103 -
104 -RESTRICT="test"
105 -
106 -PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
107 -
108 -pkg_setup() {
109 - if use kernel_linux && use test-suite; then
110 - linux-info_pkg_setup
111 -
112 - if ! linux_config_exists; then
113 - ewarn "Cannot check the linux kernel configuration."
114 - else
115 - if use test-suite; then
116 - if linux_chkconfig_present BLK_DEV_LOOP; then
117 - eerror "The ZFS test suite requires loop device support enabled."
118 - eerror "Please enable it:"
119 - eerror " CONFIG_BLK_DEV_LOOP=y"
120 - eerror "in /usr/src/linux/.config or"
121 - eerror " Device Drivers --->"
122 - eerror " Block devices --->"
123 - eerror " [X] Loopback device support"
124 - fi
125 - fi
126 - fi
127 - fi
128 -}
129 -
130 -src_prepare() {
131 - default
132 -
133 - if [[ ${PV} == "9999" ]]; then
134 - eautoreconf
135 - else
136 - # Set revision number
137 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
138 - fi
139 -
140 - # Update paths
141 - sed -e "s|/sbin/lsmod|/bin/lsmod|" \
142 - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
143 - -e "s|/sbin/parted|/usr/sbin/parted|" \
144 - -i scripts/common.sh.in || die
145 -
146 - if use python; then
147 - pushd contrib/pyzfs >/dev/null || die
148 - distutils-r1_src_prepare
149 - popd >/dev/null || die
150 - fi
151 -}
152 -
153 -src_configure() {
154 - use custom-cflags || strip-flags
155 -
156 - local myconf=(
157 - --bindir="${EPREFIX}/bin"
158 - --enable-systemd
159 - --enable-sysvinit
160 - --localstatedir="${EPREFIX}/var"
161 - --sbindir="${EPREFIX}/sbin"
162 - --with-config=user
163 - --with-dracutdir="${EPREFIX}/usr/lib/dracut"
164 - --with-linux="${KV_DIR}"
165 - --with-linux-obj="${KV_OUT_DIR}"
166 - --with-udevdir="$(get_udevdir)"
167 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
168 - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
169 - $(use_enable debug)
170 - $(use_enable python pyzfs)
171 - )
172 -
173 - econf "${myconf[@]}"
174 -}
175 -
176 -src_compile() {
177 - default
178 - if use python; then
179 - pushd contrib/pyzfs >/dev/null || die
180 - distutils-r1_src_compile
181 - popd >/dev/null || die
182 - fi
183 -}
184 -
185 -src_install() {
186 - default
187 -
188 - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
189 -
190 - use test-suite || rm -rf "${ED}/usr/share/zfs"
191 -
192 - dobashcomp contrib/bash_completion.d/zfs
193 - bashcomp_alias zfs zpool
194 -
195 - # strip executable bit from conf.d file
196 - fperms 0644 /etc/conf.d/zfs
197 -
198 - if use python; then
199 - pushd contrib/pyzfs >/dev/null || die
200 - distutils-r1_src_install
201 - popd >/dev/null || die
202 - fi
203 -
204 - # enforce best available python implementation
205 - python_setup
206 - python_fix_shebang "${ED}/bin"
207 -}
208 -
209 -pkg_postinst() {
210 - if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
211 - einfo "genkernel version 3.5.3.3 and earlier does NOT support"
212 - einfo " unlocking pools with native zfs encryption enabled at boot"
213 - einfo " use dracut or genkernel-9999 if you requre this functionality"
214 - fi
215 -
216 - if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
217 - einfo "Adding ${P} to the module database to ensure that the"
218 - einfo "kernel modules and userland utilities stay in sync."
219 - update_moduledb
220 - fi
221 -
222 - if [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then
223 - einfo 'The zfs boot script has been split into the zfs-import,'
224 - einfo 'zfs-mount and zfs-share scripts.'
225 - einfo
226 - einfo 'You had the zfs script in your boot runlevel. For your'
227 - einfo 'convenience, it has been automatically removed and the three'
228 - einfo 'scripts that replace it have been configured to start.'
229 - einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
230 - einfo 'runlevel while the zfs-share script is in the default runlevel.'
231 -
232 - rm "${EROOT}/etc/runlevels/boot/zfs"
233 - ln -snf "${EROOT}/etc/init.d/zfs-import" \
234 - "${EROOT}/etc/runlevels/boot/zfs-import"
235 - ln -snf "${EROOT}/etc/init.d/zfs-mount" \
236 - "${EROOT}/etc/runlevels/boot/zfs-mount"
237 - ln -snf "${EROOT}/etc/init.d/zfs-share" \
238 - "${EROOT}/etc/runlevels/default/zfs-share"
239 - else
240 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
241 - einfo "You should add zfs-import to the boot runlevel."
242 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
243 - einfo "You should add zfs-mount to the boot runlevel."
244 - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
245 - einfo "You should add zfs-share to the default runlevel."
246 - fi
247 -
248 - if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then
249 - einfo 'The downstream OpenRC zed script has replaced by the upstream'
250 - einfo 'OpenRC zfs-zed script.'
251 - einfo
252 - einfo 'You had the zed script in your default runlevel. For your'
253 - einfo 'convenience, it has been automatically removed and the zfs-zed'
254 - einfo 'script that replaced it has been configured to start.'
255 -
256 - rm "${EROOT}/etc/runlevels/boot/zed"
257 - ln -snf "${EROOT}/etc/init.d/zfs-zed" \
258 - "${EROOT}/etc/runlevels/default/zfs-zed"
259 - else
260 - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
261 - einfo "You should add zfs-zed to the default runlevel."
262 - fi
263 -
264 - if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then
265 - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
266 - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
267 - fi
268 -
269 - systemd_reenable zfs-zed.service
270 - systemd_reenable zfs-import-cache.service
271 - systemd_reenable zfs-import-scan.service
272 - systemd_reenable zfs-mount.service
273 - systemd_reenable zfs-share.service
274 - systemd_reenable zfs-import.target
275 - systemd_reenable zfs.target
276 -}
277 -
278 -pkg_postrm() {
279 - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
280 - remove_moduledb
281 - fi
282 -}