commit:     71e8f9c98140000fa25d08101680b1bccc401d5a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 05:16:26 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 05:16:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e8f9c9

sys-fs/zfs: drop 2.1.1-r5

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

 sys-fs/zfs/Manifest            |   2 -
 sys-fs/zfs/zfs-2.1.1-r5.ebuild | 303 -----------------------------------------
 2 files changed, 305 deletions(-)

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e5cc220e8b89..1d9cb77a48f7 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,7 +1,5 @@
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 
45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2
 SHA512 
626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 
3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd
 SHA512 
52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
 DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 
065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a
 SHA512 
123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
-DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 
09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800
 SHA512 
b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c
-DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B 
d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0
 SHA512 
d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94
 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B 
ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584
 SHA512 
3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102
 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 
8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3
 SHA512 
da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb

diff --git a/sys-fs/zfs/zfs-2.1.1-r5.ebuild b/sys-fs/zfs/zfs-2.1.1-r5.ebuild
deleted file mode 100644
index 139ed6d3a5bb..000000000000
--- a/sys-fs/zfs/zfs-2.1.1-r5.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8,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"
-       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 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="virtual/awk
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-       python? (
-               dev-python/setuptools[${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
-       virtual/awk
-       dist-kernel? ( virtual/dist-kernel:= )
-       rootfs? (
-               app-arch/cpio
-               app-misc/pax-utils
-               !<sys-kernel/genkernel-3.5.1.1
-       )
-       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
-       )
-"
-
-# 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] )"
-
-# temporary block new coreutils
-# https://github.com/openzfs/zfs/issues/11900
-RDEPEND+="
-       <sys-apps/coreutils-9
-"
-
-REQUIRED_USE="
-       !minimal? ( ${PYTHON_REQUIRED_USE} )
-       python? ( !minimal )
-       test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-       "${FILESDIR}/2.0.4-scrub-timers.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_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
-
-       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() {
-       # 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"
-                       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-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() {
-       if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-               remove_moduledb
-       fi
-}

Reply via email to