commit: b2dce3922b4fb9b337391d86bc0cf5366ca4152f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 10:07:33 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> 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 <arthurzam <AT> 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
}
