From 296bf827e8e9d472b33ebf1d027d6c208485cf3e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Oct 2022 20:34:55 +0100 Subject: sys-fs/zfs & co : version bump --- metadata/md5-cache/sys-fs/zfs-2.1.5 | 9 -- metadata/md5-cache/sys-fs/zfs-2.1.6 | 9 ++ metadata/md5-cache/sys-fs/zfs-utils-2.1.5 | 17 ---- metadata/md5-cache/sys-fs/zfs-utils-2.1.6 | 17 ++++ metadata/md5-cache/sys-kernel/zfs-dkms-2.1.5 | 13 --- metadata/md5-cache/sys-kernel/zfs-dkms-2.1.6 | 13 +++ metadata/pkg_desc_index | 6 +- sys-fs/zfs-utils/Manifest | 2 +- sys-fs/zfs-utils/zfs-utils-2.1.5.ebuild | 134 --------------------------- sys-fs/zfs-utils/zfs-utils-2.1.6.ebuild | 134 +++++++++++++++++++++++++++ sys-fs/zfs/zfs-2.1.5.ebuild | 17 ---- sys-fs/zfs/zfs-2.1.6.ebuild | 17 ++++ sys-kernel/zfs-dkms/Manifest | 2 +- sys-kernel/zfs-dkms/files/dkms.conf | 2 +- sys-kernel/zfs-dkms/zfs-dkms-2.1.5.ebuild | 51 ---------- sys-kernel/zfs-dkms/zfs-dkms-2.1.6.ebuild | 51 ++++++++++ 16 files changed, 247 insertions(+), 247 deletions(-) delete mode 100644 metadata/md5-cache/sys-fs/zfs-2.1.5 create mode 100644 metadata/md5-cache/sys-fs/zfs-2.1.6 delete mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.1.5 create mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.1.6 delete mode 100644 metadata/md5-cache/sys-kernel/zfs-dkms-2.1.5 create mode 100644 metadata/md5-cache/sys-kernel/zfs-dkms-2.1.6 delete mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.5.ebuild create mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.6.ebuild delete mode 100644 sys-fs/zfs/zfs-2.1.5.ebuild create mode 100644 sys-fs/zfs/zfs-2.1.6.ebuild delete mode 100644 sys-kernel/zfs-dkms/zfs-dkms-2.1.5.ebuild create mode 100644 sys-kernel/zfs-dkms/zfs-dkms-2.1.6.ebuild diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.5 b/metadata/md5-cache/sys-fs/zfs-2.1.5 deleted file mode 100644 index d4002881..00000000 --- a/metadata/md5-cache/sys-fs/zfs-2.1.5 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=- -DEPEND=~sys-fs/zfs-utils-2.1.5 ~sys-kernel/zfs-dkms-2.1.5 -DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild) -EAPI=7 -KEYWORDS=amd64 -LICENSE=GPL-2 -RDEPEND=~sys-fs/zfs-utils-2.1.5 ~sys-kernel/zfs-dkms-2.1.5 -SLOT=0 -_md5_=e55b835fd30a4e79085053c624251ca7 diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.6 b/metadata/md5-cache/sys-fs/zfs-2.1.6 new file mode 100644 index 00000000..9cdfeb1a --- /dev/null +++ b/metadata/md5-cache/sys-fs/zfs-2.1.6 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DEPEND=~sys-fs/zfs-utils-2.1.6 ~sys-kernel/zfs-dkms-2.1.6 +DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild) +EAPI=7 +KEYWORDS=amd64 +LICENSE=GPL-2 +RDEPEND=~sys-fs/zfs-utils-2.1.6 ~sys-kernel/zfs-dkms-2.1.6 +SLOT=0 +_md5_=e55b835fd30a4e79085053c624251ca7 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.5 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.5 deleted file mode 100644 index 647d3edf..00000000 --- a/metadata/md5-cache/sys-fs/zfs-utils-2.1.5 +++ /dev/null @@ -1,17 +0,0 @@ -BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,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_8(-)?,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_8 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !prefix? ( 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_8 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.5/zfs-2.1.5.tar.gz -_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff distutils-r1 8c1ceb6b71a65547b0ea7bc901d906cb eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 29a755b1291d64133634d80b0328f153 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pam e44a1dd98f13e1ad76de01e919bde1f1 python-r1 2d51fd03931e743811ce30d198e4dcfd python-utils-r1 b9fc5e97e886514e5132f50465185401 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 udev eec0bbab06977f1cfc5597269c1fa152 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=315e5e3a1cc5bfc471a63e7302091882 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.6 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.6 new file mode 100644 index 00000000..d132ffaa --- /dev/null +++ b/metadata/md5-cache/sys-fs/zfs-utils-2.1.6 @@ -0,0 +1,17 @@ +BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,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_8(-)?,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_8 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !prefix? ( 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_8 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.6/zfs-2.1.6.tar.gz +_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff distutils-r1 8c1ceb6b71a65547b0ea7bc901d906cb eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 29a755b1291d64133634d80b0328f153 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pam e44a1dd98f13e1ad76de01e919bde1f1 python-r1 2d51fd03931e743811ce30d198e4dcfd python-utils-r1 b9fc5e97e886514e5132f50465185401 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 udev eec0bbab06977f1cfc5597269c1fa152 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=315e5e3a1cc5bfc471a63e7302091882 diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.5 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.5 deleted file mode 100644 index 2677dda4..00000000 --- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.5 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prerm -DEPEND=sys-kernel/dkms -DESCRIPTION=ZFS sources for linux -EAPI=7 -HOMEPAGE=http://zfsonlinux.org/ -INHERIT=eutils -KEYWORDS=amd64 -LICENSE=GPL-2 -RDEPEND=sys-kernel/dkms -SLOT=0 -SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz -_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=c99b139394da5f09fe55671b0f12322c diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.6 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.6 new file mode 100644 index 00000000..53ada2d1 --- /dev/null +++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.6 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prerm +DEPEND=sys-kernel/dkms +DESCRIPTION=ZFS sources for linux +EAPI=7 +HOMEPAGE=http://zfsonlinux.org/ +INHERIT=eutils +KEYWORDS=amd64 +LICENSE=GPL-2 +RDEPEND=sys-kernel/dkms +SLOT=0 +SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=c99b139394da5f09fe55671b0f12322c diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index bb458f3e..94de9f84 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -53,8 +53,8 @@ sys-devel/libtool 2.4.7: A shared library tool for developers 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.5: ZFS meta-package (Gentoo compatibility ebuild) -sys-fs/zfs-utils 2.1.5: Userland utilities for ZFS Linux kernel module +sys-fs/zfs 2.1.6: ZFS meta-package (Gentoo compatibility ebuild) +sys-fs/zfs-utils 2.1.6: Userland utilities for ZFS Linux kernel module sys-kernel/bcmwl-dkms 6.30.223.271-r1: 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 @@ -69,7 +69,7 @@ sys-kernel/nvidia-drivers-dkms 470.141.03-r1: NVIDIA driver sources for linux sys-kernel/nvidia-drivers-legacy-dkms 390.154: NVIDIA driver sources for linux sys-kernel/vhba-dkms 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources sys-kernel/virtualbox-modules-dkms 6.1.18-r2: Kernel Modules source for Virtualbox -sys-kernel/zfs-dkms 2.1.5: ZFS sources for linux +sys-kernel/zfs-dkms 2.1.6: ZFS sources for linux sys-libs/binutils-libs 2.39-r1: Core binutils libraries (libbfd, libopcodes, libiberty) for external packages sys-libs/glibc 2.35-r8: GNU libc C library sys-power/radeon-profile 20200824-r10: Read current clocks of ATi/AMD Radeon cards diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index f54864e3..60420386 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 SHA512 d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03 +DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46 SHA512 75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6 diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.5.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.5.ebuild deleted file mode 100644 index 32f1e13c..00000000 --- a/sys-fs/zfs-utils/zfs-utils-2.1.5.ebuild +++ /dev/null @@ -1,134 +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="virtual/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -RDEPEND="${DEPEND} - !prefix? ( 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" - -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.6.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.6.ebuild new file mode 100644 index 00000000..32f1e13c --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-2.1.6.ebuild @@ -0,0 +1,134 @@ +# 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="virtual/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" + +RDEPEND="${DEPEND} + !prefix? ( 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" + +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/zfs-2.1.5.ebuild b/sys-fs/zfs/zfs-2.1.5.ebuild deleted file mode 100644 index bdcb914c..00000000 --- a/sys-fs/zfs/zfs-2.1.5.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}" diff --git a/sys-fs/zfs/zfs-2.1.6.ebuild b/sys-fs/zfs/zfs-2.1.6.ebuild new file mode 100644 index 00000000..bdcb914c --- /dev/null +++ b/sys-fs/zfs/zfs-2.1.6.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-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest index f54864e3..60420386 100644 --- a/sys-kernel/zfs-dkms/Manifest +++ b/sys-kernel/zfs-dkms/Manifest @@ -1 +1 @@ -DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 SHA512 d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03 +DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46 SHA512 75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6 diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf index e12dae25..b48f1894 100644 --- a/sys-kernel/zfs-dkms/files/dkms.conf +++ b/sys-kernel/zfs-dkms/files/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="zfs-dkms" -PACKAGE_VERSION="2.1.5" +PACKAGE_VERSION="2.1.6" PACKAGE_CONFIG="/etc/sysconfig/zfs" NO_WEAK_MODULES="yes" PRE_BUILD="configure diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.1.5.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.1.5.ebuild deleted file mode 100644 index cec96ca3..00000000 --- a/sys-kernel/zfs-dkms/zfs-dkms-2.1.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=7 - -inherit eutils - -MY_PN="zfs" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="ZFS sources for linux" -HOMEPAGE="http://zfsonlinux.org/" -SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64" -IUSE="" -DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - cp "${FILESDIR}/dkms.conf" "${S}" || die - dodir /usr/src/${P} - insinto /usr/src/${P} - doins -r ${S}/* - fperms 0755 /usr/src/${P}/configure - fperms 0755 /usr/src/${P}/scripts/dkms.mkconf - fperms 0755 /usr/src/${P}/scripts/dkms.postbuild - fperms 0755 /usr/src/${P}/scripts/enum-extract.pl - fperms 0755 /usr/src/${P}/scripts/make_gitrev.sh -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.1.6.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.1.6.ebuild new file mode 100644 index 00000000..cec96ca3 --- /dev/null +++ b/sys-kernel/zfs-dkms/zfs-dkms-2.1.6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=7 + +inherit eutils + +MY_PN="zfs" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="ZFS sources for linux" +HOMEPAGE="http://zfsonlinux.org/" +SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64" +IUSE="" +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + : +} + +src_compile() { + : +} + +src_install() { + cp "${FILESDIR}/dkms.conf" "${S}" || die + dodir /usr/src/${P} + insinto /usr/src/${P} + doins -r ${S}/* + fperms 0755 /usr/src/${P}/configure + fperms 0755 /usr/src/${P}/scripts/dkms.mkconf + fperms 0755 /usr/src/${P}/scripts/dkms.postbuild + fperms 0755 /usr/src/${P}/scripts/enum-extract.pl + fperms 0755 /usr/src/${P}/scripts/make_gitrev.sh +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} -- cgit v1.2.3