commit:     502c8b18d05e3b8b952d732f2a40ae375417b122
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 19:24:22 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 19:33:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502c8b18

sys-fs/zfs: drop 2.1.8

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs/Manifest         |   2 -
 sys-fs/zfs/zfs-2.1.8.ebuild | 326 --------------------------------------------
 2 files changed, 328 deletions(-)

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e2e1f8bbdc71..f7e8d6284543 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -2,7 +2,5 @@ DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 
615fe7a2128af77c6c855ea52b6503a78f0c992ea
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B 
d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3
 SHA512 
a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 
9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
 SHA512 
6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 
648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948
 SHA512 
4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
-DIST zfs-2.1.8.tar.gz 35109766 BLAKE2B 
e725a43e5a62998209d638adcec061858f0caf05abd30bcfbaf8c6f6b9f47209808d9fcd726a830ea800793cd719c4471a498a10dab66119c4d24dbf09b1c481
 SHA512 
9c6c2c30f55b089ce29f8895ccc9032615ab25e47291b2d3384bcbb3d1fdb2e7a6fb67725a6fae04b6e28bfdc6dc97fae3b9b3ed8f802e75866c83eabf79c296
-DIST zfs-2.1.8.tar.gz.asc 836 BLAKE2B 
833457dee5948b255312c30da090c77cf8ec1d82b7498a8e85ccd8e4be12f948e9f00e742e76fc1392550756dd1d9c3b610fa29d25a61c41afe32b1c1a728602
 SHA512 
91f964e33772e77d1c4501e0ad526f2ff5cb45fb571bb25218f3f45f4662d544a92146633ef570d067bb7e6e7f36bd00da878b373143cae41611cae6f6c644cb
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B 
d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
 SHA512 
a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 
1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486
 SHA512 
35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0

diff --git a/sys-fs/zfs/zfs-2.1.8.ebuild b/sys-fs/zfs/zfs-2.1.8.ebuild
deleted file mode 100644
index ff0672a41f5b..000000000000
--- a/sys-fs/zfs/zfs-2.1.8.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 
flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs";
-
-if [[ ${PV} == "9999" ]]; then
-       inherit git-r3 linux-mod
-       EGIT_REPO_URI="https://github.com/openzfs/zfs.git";
-else
-       VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-       inherit verify-sig
-
-       MY_P="${P/_rc/-rc}"
-       
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz";
-       SRC_URI+=" verify-sig? ( 
https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-       S="${WORKDIR}/${P%_rc?}"
-
-       if [[ ${PV} != *_rc* ]]; then
-               KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
-       fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide 
stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python 
+rootfs selinux test-suite"
-
-DEPEND="
-       net-libs/libtirpc:=
-       sys-apps/util-linux
-       sys-libs/zlib
-       virtual/libudev:=
-       dev-libs/openssl:0=
-       !minimal? ( ${PYTHON_DEPS} )
-       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}]
-               || (
-                       dev-python/packaging[${PYTHON_USEDEP}]
-                       dev-python/distlib[${PYTHON_USEDEP}]
-               )
-       )
-"
-
-if [[ ${PV} != "9999" ]] ; then
-       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="${DEPEND}
-       !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
-       !prefix? ( virtual/udev )
-       sys-fs/udev-init-scripts
-       app-alternatives/awk
-       dist-kernel? ( virtual/dist-kernel:= )
-       rootfs? (
-               app-arch/cpio
-               app-misc/pax-utils
-       )
-       selinux? ( sec-policy/selinux-zfs )
-       test-suite? (
-               app-shells/ksh
-               sys-apps/kmod[tools]
-               sys-apps/util-linux
-               sys-devel/bc
-               sys-block/parted
-               sys-fs/lsscsi
-               sys-fs/mdadm
-               sys-process/procps
-       )
-"
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set, without suggesting to 
disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
-
-REQUIRED_USE="
-       !minimal? ( ${PYTHON_REQUIRED_USE} )
-       python? ( !minimal )
-       test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-       # bug #854333
-       "${FILESDIR}"/2.1.5-r2-dracut-non-root.patch
-
-       "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
-)
-
-pkg_pretend() {
-       use rootfs || return 0
-
-       if has_version virtual/dist-kernel && ! use dist-kernel; then
-               ewarn "You have virtual/dist-kernel installed, but"
-               ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-               ewarn "It's recommended to globally enable dist-kernel USE flag"
-               ewarn "to auto-trigger initrd rebuilds with kernel updates"
-       fi
-}
-
-pkg_setup() {
-       if use kernel_linux; then
-               linux-info_pkg_setup
-
-               if ! linux_config_exists; then
-                       ewarn "Cannot check the linux kernel configuration."
-               else
-                       if use test-suite; then
-                               if linux_chkconfig_present BLK_DEV_LOOP; then
-                                       eerror "The ZFS test suite requires 
loop device support enabled."
-                                       eerror "Please enable it:"
-                                       eerror "    CONFIG_BLK_DEV_LOOP=y"
-                                       eerror "in /usr/src/linux/.config or"
-                                       eerror "    Device Drivers --->"
-                                       eerror "        Block devices --->"
-                                       eerror "            [X] Loopback device 
support"
-                               fi
-                       fi
-               fi
-       fi
-}
-
-libsoversion_check() {
-       local bugurl libzfs_sover
-       
bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages";
-
-       libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' 
lib/libzfs/Makefile.am \
-               | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-       libzfs_sover="${libzfs_sover%%:*}"
-
-       if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-               echo
-               eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-               eerror "ebuild subslot does not match libzfs soversion!"
-               eerror "libzfs soversion: ${libzfs_sover}"
-               eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-               eerror "This is a bug in the ebuild, please use the following 
URL to report it"
-               eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-               echo
-               # we want to abort for releases, but just print a warning for 
live ebuild
-               # to keep package installable
-               [[  ${PV} == "9999" ]] || die
-       fi
-}
-
-src_unpack() {
-       if use verify-sig ; then
-               # Needed for downloaded patch (which is unsigned, which is fine)
-               verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-       fi
-
-       default
-}
-
-src_prepare() {
-       default
-       libsoversion_check
-
-       # Run unconditionally (bug #792627)
-       eautoreconf
-
-       if [[ ${PV} != "9999" ]]; then
-               # Set revision number
-               sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die 
"Could not set Gentoo release"
-       fi
-
-       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() {
-       use custom-cflags || strip-flags
-       use minimal || python_setup
-
-       # All the same issue:
-       # Segfaults w/ GCC 12 and 'zfs send'
-       # bug #856373
-       # https://github.com/openzfs/zfs/issues/13620
-       # https://github.com/openzfs/zfs/issues/13605
-       append-flags -fno-tree-vectorize
-
-       local myconf=(
-               --bindir="${EPREFIX}/bin"
-               --enable-shared
-               --enable-sysvinit
-               --localstatedir="${EPREFIX}/var"
-               --sbindir="${EPREFIX}/sbin"
-               --with-config=user
-               --with-dracutdir="${EPREFIX}/usr/lib/dracut"
-               --with-linux="${KV_DIR}"
-               --with-linux-obj="${KV_OUT_DIR}"
-               --with-udevdir="$(get_udevdir)"
-               --with-pamconfigsdir="${EPREFIX}/unwanted_files"
-               --with-pammoduledir="$(getpam_mod_dir)"
-               --with-systemdunitdir="$(systemd_get_systemunitdir)"
-               --with-systemdpresetdir="$(systemd_get_systempresetdir)"
-               --with-vendor=gentoo
-               # Building zfs-mount-generator.c on musl breaks as strndupa
-               # isn't available. But systemd doesn't support musl anyway, so
-               # just disable building it.
-               $(use_enable !elibc_musl systemd)
-               $(use_enable debug)
-               $(use_enable nls)
-               $(use_enable pam)
-               $(use_enable python pyzfs)
-               --disable-static
-               $(usex minimal --without-python --with-python="${EPYTHON}")
-       )
-
-       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/{test-runner,zfs-tests,runfiles,*sh} || die ; }
-
-       find "${ED}" -name '*.la' -delete || 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
-       use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-       udev_reload
-
-       # we always need userspace utils in sync with zfs-kmod
-       # so force initrd update for userspace as well, to avoid
-       # situation when zfs-kmod trigger initrd rebuild before
-       # userspace component is rebuilt
-       # KV_* variables are provided by linux-info.eclass
-       if [[ -z ${ROOT} ]] && use dist-kernel; then
-               dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-       fi
-
-       if use rootfs; then
-               if ! has_version sys-kernel/genkernel && ! has_version 
sys-kernel/dracut; then
-                       elog "Root on zfs requires an initramfs to boot"
-                       elog "The following packages provide one and are tested 
on a regular basis:"
-                       elog "  sys-kernel/dracut ( preferred, module 
maintained by zfs developers )"
-                       elog "  sys-kernel/genkernel"
-               fi
-       fi
-
-       if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-               einfo "Adding ${P} to the module database to ensure that the"
-               einfo "kernel modules and userland utilities stay in sync."
-               update_moduledb
-       fi
-
-       if systemd_is_booted || has_version sys-apps/systemd; then
-               einfo "Please refer to 
${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
-               einfo "for default zfs systemd service configuration"
-       else
-               [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-                       einfo "You should add zfs-import to the boot runlevel."
-               [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
-                       einfo "You should add zfs-load-key to the boot 
runlevel."
-               [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-                       einfo "You should add zfs-mount to the boot runlevel."
-               [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-                       einfo "You should add zfs-share to the default 
runlevel."
-               [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-                       einfo "You should add zfs-zed to the default runlevel."
-       fi
-}
-
-pkg_postrm() {
-       udev_reload
-
-       if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-               remove_moduledb
-       fi
-}

Reply via email to