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 B0ABD158043 for ; Tue, 7 Sep 2021 17:37:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B11EE090E; Tue, 7 Sep 2021 17:37:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 1E048E090E for ; Tue, 7 Sep 2021 17:37:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9CD42340B25 for ; Tue, 7 Sep 2021 17:37:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08224C0 for ; Tue, 7 Sep 2021 17:37:44 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1631036182.6768e8ac2eed1314fb802d86fcd71831bb7ea2c9.floppym@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.6-r1.ebuild sys-fs/zfs/zfs-0.8.6.ebuild sys-fs/zfs/zfs-2.0.5-r1.ebuild sys-fs/zfs/zfs-2.0.5.ebuild sys-fs/zfs/zfs-2.1.0-r1.ebuild sys-fs/zfs/zfs-2.1.0.ebuild sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 6768e8ac2eed1314fb802d86fcd71831bb7ea2c9 X-VCS-Branch: master Date: Tue, 7 Sep 2021 17:37:44 +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: 15c80647-d04d-41e3-952b-089adb87b91f X-Archives-Hash: 7da5f207639a4984a34ff848b35dec25 commit: 6768e8ac2eed1314fb802d86fcd71831bb7ea2c9 Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 5 01:03:33 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Sep 7 17:36:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6768e8ac sys-fs/zfs: drop static libs Signed-off-by: Mike Gilbert gentoo.org> sys-fs/zfs/{zfs-0.8.6.ebuild => zfs-0.8.6-r1.ebuild} | 18 ++++++++---------- sys-fs/zfs/{zfs-2.0.5.ebuild => zfs-2.0.5-r1.ebuild} | 18 ++++++++---------- sys-fs/zfs/{zfs-2.1.0.ebuild => zfs-2.1.0-r1.ebuild} | 18 ++++++++---------- sys-fs/zfs/zfs-9999.ebuild | 18 ++++++++---------- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild similarity index 94% rename from sys-fs/zfs/zfs-0.8.6.ebuild rename to sys-fs/zfs/zfs-0.8.6-r1.ebuild index b3237b14330..ac6c6017eaa 100644 --- a/sys-fs/zfs/zfs-0.8.6.ebuild +++ b/sys-fs/zfs/zfs-0.8.6-r1.ebuild @@ -22,15 +22,15 @@ fi LICENSE="BSD-2 CDDL MIT" SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc[static-libs?] - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] + net-libs/libtirpc + sys-apps/util-linux + sys-libs/zlib virtual/awk - virtual/libudev[static-libs(-)?] - dev-libs/openssl:0=[static-libs?] + virtual/libudev:= + dev-libs/openssl:0= !minimal? ( ${PYTHON_DEPS} ) python? ( virtual/python-cffi[${PYTHON_USEDEP}] @@ -154,7 +154,7 @@ src_configure() { $(use_enable debug) $(use_enable nls) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -177,9 +177,7 @@ src_install() { use test-suite || rm -rf "${ED}/usr/share/zfs" - if ! use static-libs; then - find "${ED}/" -name '*.la' -delete || die - fi + find "${ED}/" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5-r1.ebuild similarity index 96% rename from sys-fs/zfs/zfs-2.0.5.ebuild rename to sys-fs/zfs/zfs-2.0.5-r1.ebuild index 67d297759f1..6b91c6f5b81 100644 --- a/sys-fs/zfs/zfs-2.0.5.ebuild +++ b/sys-fs/zfs/zfs-2.0.5-r1.ebuild @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/4" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs 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= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -202,7 +202,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -227,9 +227,7 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool diff --git a/sys-fs/zfs/zfs-2.1.0.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild similarity index 96% rename from sys-fs/zfs/zfs-2.1.0.ebuild rename to sys-fs/zfs/zfs-2.1.0-r1.ebuild index 81159a7d8e2..9f8ac5af220 100644 --- a/sys-fs/zfs/zfs-2.1.0.ebuild +++ b/sys-fs/zfs/zfs-2.1.0-r1.ebuild @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs 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= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -199,7 +199,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -224,9 +224,7 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 22e4286a865..c089c475f30 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs 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= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -201,7 +201,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) - $(use_enable static-libs static) + --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) @@ -226,9 +226,7 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool