commit: 2247323ce9e28f424b66eca83680f52d55a851b8 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sun Jul 5 01:38:19 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sun Jul 5 01:59:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2247323c
sys-fs/zfs: update live ebuild, fix pam dir removal Closes: https://bugs.gentoo.org/730772 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-fs/zfs/zfs-9999.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index b388cd53e3a..143aae5241d 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -130,7 +130,7 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir=/dev/null # debian configs + --with-pamconfigsdir="${EPREFIX}/unwanted_debian_files" --with-pammoduledir="$(getpam_mod_dir)" --with-python="${EPYTHON}" --with-systemdunitdir="$(systemd_get_systemunitdir)" @@ -158,7 +158,9 @@ src_install() { gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}/usr/share/zfs" + use pam && { rm -rv "${ED}/unwanted_debian_files" || die ; } + + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } if ! use static-libs; then find "${ED}/" -name '*.la' -delete || die
