From ba1f4d8cbb1eb02bbafacb7000cfadb3e785c85e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Apr 2023 10:55:20 +0100 Subject: sys-fs/zfs : version bump --- sys-fs/zfs-utils/Manifest | 2 +- sys-fs/zfs-utils/zfs-utils-2.1.10.ebuild | 100 +++++++++++++++++++++++++++++++ sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild | 100 ------------------------------- sys-fs/zfs/zfs-2.1.10.ebuild | 17 ++++++ sys-fs/zfs/zfs-2.1.9.ebuild | 17 ------ 5 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.10.ebuild delete mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild create mode 100644 sys-fs/zfs/zfs-2.1.10.ebuild delete mode 100644 sys-fs/zfs/zfs-2.1.9.ebuild (limited to 'sys-fs') diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index 214a2c30..5f1b46f7 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75 +DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271 SHA512 3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba2400005c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2 diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.10.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.10.ebuild new file mode 100644 index 00000000..5919c1b7 --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-2.1.10.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 flag-o-matic pam toolchain-funcs udev + +MY_PN="zfs" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://zfsonlinux.org/" + +SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" +KEYWORDS="~amd64" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD-2 CDDL MIT" +SLOT="0" +IUSE="debug nls pam test-suite" + +DEPEND=" + net-libs/libtirpc:= + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:0= + pam? ( sys-libs/pam ) +" + +BDEPEND="app-alternatives/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +RDEPEND="${DEPEND} + virtual/udev + sys-fs/udev-init-scripts + test-suite? ( + sys-apps/kmod[tools] + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.1.5-r2-dracut-non-root.patch + "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch +) + +src_prepare() { + default + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --disable-systemd + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-vendor=redcore + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + --disable-pyzfs + --disable-static + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + dodir etc/conf.d + insinto etc/conf.d + doins "${S}"/etc/default/zfs + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } +} diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild deleted file mode 100644 index 5919c1b7..00000000 --- a/sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 flag-o-matic pam toolchain-funcs udev - -MY_PN="zfs" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" - -SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" -KEYWORDS="~amd64" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="debug nls pam test-suite" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - dev-libs/openssl:0= - pam? ( sys-libs/pam ) -" - -BDEPEND="app-alternatives/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -RDEPEND="${DEPEND} - virtual/udev - sys-fs/udev-init-scripts - test-suite? ( - sys-apps/kmod[tools] - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/2.1.5-r2-dracut-non-root.patch - "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch -) - -src_prepare() { - default - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --disable-systemd - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-vendor=redcore - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - --disable-pyzfs - --disable-static - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - dodir etc/conf.d - insinto etc/conf.d - doins "${S}"/etc/default/zfs - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } -} diff --git a/sys-fs/zfs/zfs-2.1.10.ebuild b/sys-fs/zfs/zfs-2.1.10.ebuild new file mode 100644 index 00000000..bdcb914c --- /dev/null +++ b/sys-fs/zfs/zfs-2.1.10.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=7 + +DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="~sys-fs/zfs-utils-${PV} + ~sys-kernel/zfs-dkms-${PV}" +RDEPEND="${DEPEND}" diff --git a/sys-fs/zfs/zfs-2.1.9.ebuild b/sys-fs/zfs/zfs-2.1.9.ebuild deleted file mode 100644 index bdcb914c..00000000 --- a/sys-fs/zfs/zfs-2.1.9.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=7 - -DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="~sys-fs/zfs-utils-${PV} - ~sys-kernel/zfs-dkms-${PV}" -RDEPEND="${DEPEND}" -- cgit v1.2.3