From 34274f671301798384c780cb5d1c7beb49094513 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 11 Feb 2023 02:27:50 +0000 Subject: sys-fs/zfs-utils : revision bump, drop pyzfs --- metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1 | 17 ---- metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2 | 16 +++ metadata/pkg_desc_index | 2 +- sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild | 143 --------------------------- sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild | 107 ++++++++++++++++++++ 5 files changed, 124 insertions(+), 161 deletions(-) delete mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1 create mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2 delete mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild create mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1 deleted file mode 100644 index 97e45f2b..00000000 --- a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1 +++ /dev/null @@ -1,17 +0,0 @@ -BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig -DEFINED_PHASES=compile configure install prepare -DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) -DESCRIPTION=Userland utilities for ZFS Linux kernel module -EAPI=7 -HOMEPAGE=https://zfsonlinux.org/ -INHERIT=bash-completion-r1 distutils-r1 flag-o-matic pam toolchain-funcs udev -IUSE=debug nls pam python test-suite python_targets_python3_9 python_targets_python3_10 -KEYWORDS=~amd64 -LICENSE=BSD-2 CDDL MIT -RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) -REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 ) -RESTRICT=test -SLOT=0 -SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz -_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff distutils-r1 dcd5f48510105eb95e550ab968147365 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 38c85b725d0467e51954ea921b6c104b out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pam 01b77091d5b6560b0aeafa7fbb1bd818 python-r1 666be58f658d6b32affe30f80e39a49e python-utils-r1 8d5c1c4ecef47fa1b4576a718c620d1d strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9a610728b9bcca1919234cceb35a1027 udev eec0bbab06977f1cfc5597269c1fa152 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=dca48675693587d950666d1dd83d1401 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2 new file mode 100644 index 00000000..df536ed1 --- /dev/null +++ b/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2 @@ -0,0 +1,16 @@ +BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig +DEFINED_PHASES=configure install prepare +DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) +DESCRIPTION=Userland utilities for ZFS Linux kernel module +EAPI=7 +HOMEPAGE=https://zfsonlinux.org/ +INHERIT=bash-completion-r1 flag-o-matic pam toolchain-funcs udev +IUSE=debug nls pam test-suite +KEYWORDS=~amd64 +LICENSE=BSD-2 CDDL MIT +RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) 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 +SLOT=0 +SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz +_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 pam 01b77091d5b6560b0aeafa7fbb1bd818 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9a610728b9bcca1919234cceb35a1027 udev eec0bbab06977f1cfc5597269c1fa152 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=b566442d77ff0069ed9be3b4b8f67304 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 2ef955e1..7da59613 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -58,7 +58,7 @@ sys-fs/cryptsetup 2.3.4-r10: Tool to setup encrypted devices with dm-crypt sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sys-fs/zfs 2.1.7: ZFS meta-package (Gentoo compatibility ebuild) -sys-fs/zfs-utils 2.1.7-r1: Userland utilities for ZFS Linux kernel module +sys-fs/zfs-utils 2.1.7-r2: Userland utilities for ZFS Linux kernel module sys-kernel/bcmwl-dkms 6.30.223.271-r2: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source sys-kernel/dkms 2.3-r2: Dynamic Kernel Module Support sys-kernel/dracut 056-r10: Generic initramfs generation tool diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild deleted file mode 100644 index bda272ce..00000000 --- a/sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -inherit bash-completion-r1 distutils-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 python test-suite" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - dev-libs/openssl:0= - pam? ( sys-libs/pam ) - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="app-alternatives/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -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 - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/2.1.5-r2-dracut-non-root.patch - "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch - "${FILESDIR}"/2.1.5-dracut-mount.patch - "${FILESDIR}"/2.1.6-fgrep.patch - "${FILESDIR}"/2.1.7-dracut-include-systemd-overrides.patch - "${FILESDIR}"/2.1.7-systemd-zed-restart-always.patch -) - -src_prepare() { - default - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi - - # 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=gentoo - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_enable python pyzfs) - --disable-static - ) - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - python_setup - python_fix_shebang "${ED}/bin" -} diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild new file mode 100644 index 00000000..c9038d0f --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild @@ -0,0 +1,107 @@ +# 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 + "${FILESDIR}"/2.1.5-dracut-mount.patch + "${FILESDIR}"/2.1.6-fgrep.patch + "${FILESDIR}"/2.1.7-dracut-include-systemd-overrides.patch + "${FILESDIR}"/2.1.7-systemd-zed-restart-always.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 + + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs +} -- cgit v1.2.3