diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild (renamed from sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild) | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild index bda272ce..c9038d0f 100644 --- a/sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild +++ b/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild @@ -3,10 +3,7 @@ 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 +inherit bash-completion-r1 flag-o-matic pam toolchain-funcs udev MY_PN="zfs" MY_P="${MY_PN}-${PV}" @@ -20,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2 CDDL MIT" SLOT="0" -IUSE="debug nls pam python test-suite" +IUSE="debug nls pam test-suite" DEPEND=" net-libs/libtirpc:= @@ -29,17 +26,11 @@ DEPEND=" virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) " BDEPEND="app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) " RDEPEND="${DEPEND} @@ -56,8 +47,6 @@ RDEPEND="${DEPEND} ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - RESTRICT="test" PATCHES=( @@ -72,12 +61,6 @@ PATCHES=( 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 @@ -96,26 +79,17 @@ src_configure() { --with-udevdir="$(get_udevdir)" --with-pamconfigsdir="${EPREFIX}/unwanted_files" --with-pammoduledir="$(getpam_mod_dir)" - --with-vendor=gentoo + --with-vendor=redcore $(use_enable debug) $(use_enable nls) $(use_enable pam) - $(use_enable python pyzfs) + --disable-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 @@ -130,14 +104,4 @@ src_install() { # 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" } |