From 6698f40ed6cf83146d45a8776231ad5d31f0e2ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Apr 2022 02:51:09 +0100 Subject: sys-fs/zfs{,-utils} && sys-kernel/zfs-dkms : version bump --- metadata/md5-cache/sys-fs/zfs-2.1.1 | 9 -- metadata/md5-cache/sys-fs/zfs-2.1.4 | 9 ++ metadata/md5-cache/sys-fs/zfs-utils-2.1.1 | 17 ---- metadata/md5-cache/sys-fs/zfs-utils-2.1.4 | 17 ++++ metadata/md5-cache/sys-kernel/zfs-dkms-2.1.1 | 13 --- metadata/md5-cache/sys-kernel/zfs-dkms-2.1.4 | 13 +++ metadata/pkg_desc_index | 6 +- sys-fs/zfs-utils/Manifest | 2 +- sys-fs/zfs-utils/zfs-utils-2.1.1.ebuild | 134 --------------------------- sys-fs/zfs-utils/zfs-utils-2.1.4.ebuild | 134 +++++++++++++++++++++++++++ sys-fs/zfs/zfs-2.1.1.ebuild | 17 ---- sys-fs/zfs/zfs-2.1.4.ebuild | 17 ++++ sys-kernel/zfs-dkms/Manifest | 2 +- sys-kernel/zfs-dkms/files/dkms.conf | 2 +- sys-kernel/zfs-dkms/zfs-dkms-2.1.1.ebuild | 51 ---------- sys-kernel/zfs-dkms/zfs-dkms-2.1.4.ebuild | 51 ++++++++++ 16 files changed, 247 insertions(+), 247 deletions(-) delete mode 100644 metadata/md5-cache/sys-fs/zfs-2.1.1 create mode 100644 metadata/md5-cache/sys-fs/zfs-2.1.4 delete mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.1.1 create mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.1.4 delete mode 100644 metadata/md5-cache/sys-kernel/zfs-dkms-2.1.1 create mode 100644 metadata/md5-cache/sys-kernel/zfs-dkms-2.1.4 delete mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.1.ebuild create mode 100644 sys-fs/zfs-utils/zfs-utils-2.1.4.ebuild delete mode 100644 sys-fs/zfs/zfs-2.1.1.ebuild create mode 100644 sys-fs/zfs/zfs-2.1.4.ebuild delete mode 100644 sys-kernel/zfs-dkms/zfs-dkms-2.1.1.ebuild create mode 100644 sys-kernel/zfs-dkms/zfs-dkms-2.1.4.ebuild diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.1 b/metadata/md5-cache/sys-fs/zfs-2.1.1 deleted file mode 100644 index 9e733c43..00000000 --- a/metadata/md5-cache/sys-fs/zfs-2.1.1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=- -DEPEND=~sys-fs/zfs-utils-2.1.1 ~sys-kernel/zfs-dkms-2.1.1 -DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild) -EAPI=5 -KEYWORDS=amd64 -LICENSE=GPL-2 -RDEPEND=~sys-fs/zfs-utils-2.1.1 ~sys-kernel/zfs-dkms-2.1.1 -SLOT=0 -_md5_=fd9a7a332ff735b0d15efacf4e8ceb45 diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.4 b/metadata/md5-cache/sys-fs/zfs-2.1.4 new file mode 100644 index 00000000..32087095 --- /dev/null +++ b/metadata/md5-cache/sys-fs/zfs-2.1.4 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DEPEND=~sys-fs/zfs-utils-2.1.4 ~sys-kernel/zfs-dkms-2.1.4 +DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild) +EAPI=5 +KEYWORDS=amd64 +LICENSE=GPL-2 +RDEPEND=~sys-fs/zfs-utils-2.1.4 ~sys-kernel/zfs-dkms-2.1.4 +SLOT=0 +_md5_=fd9a7a332ff735b0d15efacf4e8ceb45 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.1 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.1 deleted file mode 100644 index fd56dc21..00000000 --- a/metadata/md5-cache/sys-fs/zfs-utils-2.1.1 +++ /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(-)?] ) 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(-)?] ) -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 -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(-)?] ) !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 ) -RESTRICT=test -SLOT=0 -SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz -_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff distutils-r1 779bc733c68a72273cfce64602bada1d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pam e44a1dd98f13e1ad76de01e919bde1f1 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 59dddabd6a41ab69723654916142f63b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 udev 2d229ad4bfa09058e0184b1ca900db32 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=6f45ccec7b5025c8939951fea63280d6 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.4 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.4 new file mode 100644 index 00000000..1be75d11 --- /dev/null +++ b/metadata/md5-cache/sys-fs/zfs-utils-2.1.4 @@ -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.4/zfs-2.1.4.tar.gz +_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff distutils-r1 779bc733c68a72273cfce64602bada1d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pam e44a1dd98f13e1ad76de01e919bde1f1 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 59dddabd6a41ab69723654916142f63b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 udev 2d229ad4bfa09058e0184b1ca900db32 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=315e5e3a1cc5bfc471a63e7302091882 diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.1 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.1 deleted file mode 100644 index ede69661..00000000 --- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.1 +++ /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.1/zfs-2.1.1.tar.gz -_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=c99b139394da5f09fe55671b0f12322c diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.4 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.4 new file mode 100644 index 00000000..87a5609b --- /dev/null +++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.4 @@ -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.4/zfs-2.1.4.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=c99b139394da5f09fe55671b0f12322c diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index c9553ec7..3dc3d105 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -56,8 +56,8 @@ sys-devel/libtool 2.4.6-r10: 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 20190831-r2: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite -sys-fs/zfs 2.1.1: ZFS meta-package (Gentoo compatibility ebuild) -sys-fs/zfs-utils 2.1.1: Userland utilities for ZFS Linux kernel module +sys-fs/zfs 2.1.4: ZFS meta-package (Gentoo compatibility ebuild) +sys-fs/zfs-utils 2.1.4: Userland utilities for ZFS Linux kernel module sys-kernel/bbswitch-dkms 0.8-r1: BBswitch sources for linux sys-kernel/broadcom-sta-dkms 6.30.223.271-r5: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source sys-kernel/dkms 2.3-r1: Dynamic Kernel Module Support @@ -74,7 +74,7 @@ sys-kernel/nvidia-drivers-legacy-dkms 390.147: NVIDIA driver sources for linux sys-kernel/rtl8821cu-dkms 5.8.1: Realtek RTL8811CU/RTL8821CU USB Wi-Fi adapter driver for Linux sys-kernel/vhba-dkms 20190831: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources sys-kernel/virtualbox-modules-dkms 6.1.18-r1: Kernel Modules source for Virtualbox -sys-kernel/zfs-dkms 2.1.1: ZFS sources for linux +sys-kernel/zfs-dkms 2.1.4: ZFS sources for linux sys-libs/binutils-libs 2.37_p1-r10: Core binutils libraries (libbfd, libopcodes, libiberty) for external packages sys-libs/glibc 2.33-r10: 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 e11bc403..3d251cb1 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c +DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.1.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.1.ebuild deleted file mode 100644 index 368a1963..00000000 --- a/sys-fs/zfs-utils/zfs-utils-2.1.1.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} ) - -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.4.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.4.ebuild new file mode 100644 index 00000000..32f1e13c --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-2.1.4.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.1.ebuild b/sys-fs/zfs/zfs-2.1.1.ebuild deleted file mode 100644 index c91d103c..00000000 --- a/sys-fs/zfs/zfs-2.1.1.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=5 - -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.4.ebuild b/sys-fs/zfs/zfs-2.1.4.ebuild new file mode 100644 index 00000000..c91d103c --- /dev/null +++ b/sys-fs/zfs/zfs-2.1.4.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +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 e11bc403..3d251cb1 100644 --- a/sys-kernel/zfs-dkms/Manifest +++ b/sys-kernel/zfs-dkms/Manifest @@ -1 +1 @@ -DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c +DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf index 5b55f58f..c1e0d500 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.1" +PACKAGE_VERSION="2.1.4" PACKAGE_CONFIG="/etc/sysconfig/zfs" NO_WEAK_MODULES="yes" PRE_BUILD="configure diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.1.1.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.1.1.ebuild deleted file mode 100644 index cec96ca3..00000000 --- a/sys-kernel/zfs-dkms/zfs-dkms-2.1.1.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.4.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.1.4.ebuild new file mode 100644 index 00000000..cec96ca3 --- /dev/null +++ b/sys-kernel/zfs-dkms/zfs-dkms-2.1.4.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