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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 056D2158089 for ; Tue, 19 Sep 2023 17:48:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA0912BC085; Tue, 19 Sep 2023 17:48:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C396D2BC080 for ; Tue, 19 Sep 2023 17:48:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1785F335D0A for ; Tue, 19 Sep 2023 17:48:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EC4011FA for ; Tue, 19 Sep 2023 17:48:45 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1695145697.b2dce3922b4fb9b337391d86bc0cf5366ca4152f.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild sys-fs/btrfs-progs/btrfs-progs-9999.ebuild X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: b2dce3922b4fb9b337391d86bc0cf5366ca4152f X-VCS-Branch: master Date: Tue, 19 Sep 2023 17:48:45 +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: 0b39ba03-7e10-487a-9129-70ce2e32ebea X-Archives-Hash: 523f29738b4b8c2ae86aacdbbb605457 commit: b2dce3922b4fb9b337391d86bc0cf5366ca4152f Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 15 10:07:33 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Tue Sep 19 17:48:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2dce392 sys-fs/btrfs-progs: fix VariableShadowed Signed-off-by: Arthur Zamarin gentoo.org> sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild | 4 +--- sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild | 4 +--- sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild | 4 +--- sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild | 4 +--- sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild | 4 +--- sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild index e2a1bc6c20a1..17767f4fa617 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild @@ -33,7 +33,7 @@ SLOT="0/${libbtrfs_soname}" IUSE="+convert python +man reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. -REQUIRED_USE="static? ( !udev )" +REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )" # Tries to mount repaired filesystems RESTRICT="test" @@ -83,8 +83,6 @@ if [[ ${PV} == 9999 ]]; then BDEPEND+=" sys-devel/gnuconfig" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild index 3c55b2f472d6..479ade82c97a 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild @@ -32,7 +32,7 @@ SLOT="0/${libbtrfs_soname}" IUSE="+convert python +man reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. -REQUIRED_USE="static? ( !udev )" +REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )" # Tries to mount repaired filesystems RESTRICT="test" @@ -82,8 +82,6 @@ if [[ ${PV} == 9999 ]]; then BDEPEND+=" sys-devel/gnuconfig" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild index a733ba88cc9f..cd3842458c30 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild @@ -32,7 +32,7 @@ SLOT="0/${libbtrfs_soname}" IUSE="+convert python +man reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. -REQUIRED_USE="static? ( !udev )" +REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )" # Tries to mount repaired filesystems RESTRICT="test" @@ -82,8 +82,6 @@ if [[ ${PV} == 9999 ]]; then BDEPEND+=" sys-devel/gnuconfig" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild index 3c55b2f472d6..479ade82c97a 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild @@ -32,7 +32,7 @@ SLOT="0/${libbtrfs_soname}" IUSE="+convert python +man reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. -REQUIRED_USE="static? ( !udev )" +REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )" # Tries to mount repaired filesystems RESTRICT="test" @@ -82,8 +82,6 @@ if [[ ${PV} == 9999 ]]; then BDEPEND+=" sys-devel/gnuconfig" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild index 483d5e5b5feb..d34aeab794b1 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild @@ -32,7 +32,7 @@ SLOT="0/${libbtrfs_soname}" IUSE="+convert python +man reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. -REQUIRED_USE="static? ( !udev )" +REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )" # Tries to mount repaired filesystems RESTRICT="test" @@ -82,8 +82,6 @@ if [[ ${PV} == 9999 ]]; then BDEPEND+=" sys-devel/gnuconfig" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - PATCHES=( "${FILESDIR}"/${PN}-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch ) diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 3c55b2f472d6..479ade82c97a 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -32,7 +32,7 @@ SLOT="0/${libbtrfs_soname}" IUSE="+convert python +man reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. -REQUIRED_USE="static? ( !udev )" +REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )" # Tries to mount repaired filesystems RESTRICT="test" @@ -82,8 +82,6 @@ if [[ ${PV} == 9999 ]]; then BDEPEND+=" sys-devel/gnuconfig" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup }