diff options
Diffstat (limited to 'sys-fs/zfs')
| -rw-r--r-- | sys-fs/zfs/Manifest | 8 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-2.0.2.ebuild (renamed from sys-fs/zfs/zfs-2.0.1.ebuild) | 0 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-2.0.3.ebuild (renamed from sys-fs/zfs/zfs-0.8.5.ebuild) | 35 |
3 files changed, 26 insertions, 17 deletions
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index f189fa305add..1a5186faf545 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,9 +1,9 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319 -DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce -DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94 -EBUILD zfs-0.8.5.ebuild 5693 BLAKE2B 77894a238f74e1d208ad9606fe38bc95caa4221a8cb9da8196c8479aa53dc63ac93da7259ae3230a0dfe851c342f243df44f8251ffd74fc364bdea9f2af5e299 SHA512 b5bc4272449ea08e454d25b26f41399fb15b6a74db350d78d034e8e92ff82b0045690fd0c614c71fb6be114a792323f8c66b19644d79ff8a26b6694ad5a45534 +DIST zfs-2.0.2.tar.gz 12980696 BLAKE2B 34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f SHA512 5033645ad8fc2afd73187cc00e775ad79ac89e9a69841e1bda2867c2f05dab082f55fc83eedf2fdff1dab322f0eaac1ba2f8411def94e9cd7c011a03e84d5363 +DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200 EBUILD zfs-0.8.6.ebuild 5695 BLAKE2B 1512678bd01715aaabb552739c4a5fdfc2251af572032b8aa4b4402828b18c2b6543d742f41c975f97b3be4c3019f0354f97ca62613dfcb4e79cd54565d090a6 SHA512 d3cc8513012eca1ef0d121e97a9347223278c3f0b6bbaebdbdd70403ddad53c508ee614f682a2280d781d777a74b953f90a9d777edbd744c0a3c45addd20f882 -EBUILD zfs-2.0.1.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 +EBUILD zfs-2.0.2.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 +EBUILD zfs-2.0.3.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 EBUILD zfs-9999.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 MISC metadata.xml 900 BLAKE2B d51eb3a6b612d11f2687117c3e26960834de7b2a6071117bcefccd034f7c105f1158fda5263823ae90d20ebfb3e850a298333502d47566aefdb4ec0b871d570a SHA512 a746956ce9e80348503bd924bd592c3a4d8e11614732bcdf5f1ea824f2439141694654591fe7f744a2d08f3dfb7ec0c17476079d3490b0ab1838cbbb487dde0a diff --git a/sys-fs/zfs/zfs-2.0.1.ebuild b/sys-fs/zfs/zfs-2.0.2.ebuild index 1d1a3c6ccc7c..1d1a3c6ccc7c 100644 --- a/sys-fs/zfs/zfs-2.0.1.ebuild +++ b/sys-fs/zfs/zfs-2.0.2.ebuild diff --git a/sys-fs/zfs/zfs-0.8.5.ebuild b/sys-fs/zfs/zfs-2.0.3.ebuild index e595b2f8c845..1d1a3c6ccc7c 100644 --- a/sys-fs/zfs/zfs-0.8.5.ebuild +++ b/sys-fs/zfs/zfs-2.0.3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# 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} ) +PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript +inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="https://github.com/openzfs/zfs" @@ -15,13 +15,17 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 linux-mod EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="amd64 arm64 ppc64" + MY_P="${P/_rc/-rc}" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64" + S="${WORKDIR}/${P%_rc?}" fi LICENSE="BSD-2 CDDL MIT" -SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair -IUSE="custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs" +# just libzfs soname major for now. +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. +SLOT="0/4" +IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs" DEPEND=" net-libs/libtirpc[static-libs?] @@ -32,6 +36,7 @@ DEPEND=" libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( ${PYTHON_DEPS} ) + pam? ( sys-libs/pam ) python? ( virtual/python-cffi[${PYTHON_USEDEP}] ) @@ -73,9 +78,7 @@ REQUIRED_USE=" RESTRICT="test" -PATCHES=( - "${FILESDIR}/bash-completion-sudo.patch" -) +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) pkg_setup() { if use kernel_linux && use test-suite; then @@ -136,16 +139,20 @@ src_configure() { --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="${EPREFIX}/lib/systemd/system-preset" + --with-vendor=gentoo $(use_enable debug) $(use_enable nls) + $(use_enable pam) $(use_enable python pyzfs) $(use_enable static-libs static) $(usex minimal --without-python --with-python="${EPYTHON}") ) - CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}" + econf "${myconf[@]}" } src_compile() { @@ -160,9 +167,11 @@ src_compile() { src_install() { default - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - use test-suite || rm -rf "${ED}/usr/share/zfs" + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } if ! use static-libs; then find "${ED}/" -name '*.la' -delete || die |