From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 331C013835A for ; Thu, 27 Aug 2020 08:24:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D371E0C89; Thu, 27 Aug 2020 08:24:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 022BFE0C89 for ; Thu, 27 Aug 2020 08:24:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B17334067D for ; Thu, 27 Aug 2020 08:24:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F010B335 for ; Thu, 27 Aug 2020 08:24:06 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1598515707.2b8df15c030224073db4b37f5e74e4c9bce8fa66.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-0.8.4-r2.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 2b8df15c030224073db4b37f5e74e4c9bce8fa66 X-VCS-Branch: master Date: Thu, 27 Aug 2020 08:24:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6e723f80-7add-4a79-9d5d-1bd0fdc7d2af X-Archives-Hash: b5150c028aeda89de49fa1d77d595fd0 commit: 2b8df15c030224073db4b37f5e74e4c9bce8fa66 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Aug 27 08:07:54 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Aug 27 08:08:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8df15c sys-fs/zfs: backport minimal useflag to 0.8.4 Closes: https://bugs.gentoo.org/701522 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs/zfs-0.8.4-r2.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys-fs/zfs/zfs-0.8.4-r2.ebuild b/sys-fs/zfs/zfs-0.8.4-r2.ebuild index 50fa48c210c..6b30ef219ee 100644 --- a/sys-fs/zfs/zfs-0.8.4-r2.ebuild +++ b/sys-fs/zfs/zfs-0.8.4-r2.ebuild @@ -21,10 +21,9 @@ fi LICENSE="BSD-2 CDDL MIT" SLOT="0" -IUSE="custom-cflags debug kernel-builtin libressl nls python +rootfs test-suite static-libs" +IUSE="custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs" DEPEND=" - ${PYTHON_DEPS} net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] @@ -32,6 +31,7 @@ DEPEND=" virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) + !minimal? ( ${PYTHON_DEPS} ) python? ( virtual/python-cffi[${PYTHON_USEDEP}] ) @@ -65,7 +65,11 @@ RDEPEND="${DEPEND} ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" RESTRICT="test" @@ -119,7 +123,7 @@ src_prepare() { src_configure() { use custom-cflags || strip-flags - python_setup + use minimal || python_setup local myconf=( --bindir="${EPREFIX}/bin" @@ -133,13 +137,13 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" - --with-python="${EPYTHON}" --with-systemdunitdir="$(systemd_get_systemunitdir)" --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) $(use_enable nls) $(use_enable python pyzfs) $(use_enable static-libs static) + $(usex minimal --without-python --with-python="${EPYTHON}") ) econf "${myconf[@]}" @@ -178,7 +182,7 @@ src_install() { fi # enforce best available python implementation - python_fix_shebang "${ED}/bin" + use minimal || python_fix_shebang "${ED}/bin" } pkg_postinst() {