diff options
| -rw-r--r-- | metadata/md5-cache/sys-fs/zfs-utils-2.1.0-r2 (renamed from metadata/md5-cache/sys-fs/zfs-utils-2.1.0-r1) | 10 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | sys-fs/zfs-utils/zfs-utils-2.1.0-r2.ebuild (renamed from sys-fs/zfs-utils/zfs-utils-2.1.0-r1.ebuild) | 19 |
3 files changed, 15 insertions, 16 deletions
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.0-r1 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.0-r2 index 90316b3b..9fb2999a 100644 --- a/metadata/md5-cache/sys-fs/zfs-utils-2.1.0-r1 +++ b/metadata/md5-cache/sys-fs/zfs-utils-2.1.0-r2 @@ -1,16 +1,16 @@ -BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/pkgconfig +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[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) +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/ -IUSE=debug pam python test-suite static-libs python_targets_python3_8 python_targets_python3_9 +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[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] 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 ) +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.0/zfs-2.1.0.tar.gz _eclasses_=bash-completion-r1 d3a60385655d9b402be765a6de333245 distutils-r1 6088739b8548699015d46289639d660c eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 4b66d835ec72e021e359bb81eacfe988 multiprocessing 61c959fc55c15c00bbb1079d6a71370b pam 41ce39f668e11d31ff4734f3b5794f7d python-r1 e574a3642f886323f18f867ecc4d91c4 python-utils-r1 08d890890f70fe0096093016e55438d5 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa udev 0a92682c0f65a60d01453db598fc6490 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=e7cbc64bf85cdc05c92f0c07ca6091a7 +_md5_=175096842f23f059de3f1bf995df90dd diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 79977e24..65847836 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -57,7 +57,7 @@ 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.0: ZFS meta-package (Gentoo compatibility ebuild) -sys-fs/zfs-utils 2.1.0-r1: Userland utilities for ZFS Linux kernel module +sys-fs/zfs-utils 2.1.0-r2: 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 diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.0-r1.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.0-r2.ebuild index fef710b0..690d7aaa 100644 --- a/sys-fs/zfs-utils/zfs-utils-2.1.0-r1.ebuild +++ b/sys-fs/zfs-utils/zfs-utils-2.1.0-r2.ebuild @@ -20,14 +20,14 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2 CDDL MIT" SLOT="0" -IUSE="debug pam python test-suite static-libs" +IUSE="debug nls pam python test-suite" DEPEND=" - net-libs/libtirpc[static-libs?] - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/libudev[static-libs(-)?] - dev-libs/openssl:0=[static-libs?] + 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}] @@ -36,6 +36,7 @@ DEPEND=" BDEPEND="virtual/awk virtual/pkgconfig + nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) @@ -93,8 +94,10 @@ src_configure() { --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[@]}" @@ -118,10 +121,6 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - if ! use static-libs; then - find "${ED}/" -name '*.la' -delete || die - fi - dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool |