gentoo auto-resync : 27:07:2023 - 16:34:32

4 files changed, 8 insertions, 221 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 0094cfb1fe08..52ffe1e66a7c 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,11 +1,8 @@
-AUX btrfs-progs-6.2.1-blake2-simd.patch 1056 BLAKE2B 3a5d967cb5a362cdd5abe993b3f1006b68898b14f0915c567bceb0de6ebf37d76f9fd323461ba9bbf4e61158b8bc1d176b2cf204c31958d420b9e94812b50936 SHA512 257035a4282138a5b32d99f07b50017983052a77c661ef5519b833652362c4c015aff8043062f09f87ebc71f09b616c851b66b905a3aa8c490e1dd5080bf496c
-DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03 SHA512 2a485d8c8b3091af27e91751cabe61306388526de3c1c51543708888ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169
-DIST btrfs-progs-v6.2.2.tar.xz 2437300 BLAKE2B b3d0de668baf771ff08c59d20407525be841b06747b771efc013b0c2d1d24ed03caf472b7c9b03499f60140f6f84e2edbcb690cba503a7eb8037af038de79d52 SHA512 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
 DIST btrfs-progs-v6.3.1.tar.xz 3155540 BLAKE2B 5f8ec51f11d705bb4ada2e000143933484bae2f3a5dedb5c1abac37950de44fa0fa762cc09012ca6702b96591264027b28c17392303db414a5651657cb086c7c SHA512 a567a02f565a44dd06f54b3fd03187d259235eedf8033457368add217c87b2304e8c80ca5e2a35bdffc14e43b6889361183c6dcd5e2f4ad6fe7bfc5eb4127e65
 DIST btrfs-progs-v6.3.2.tar.xz 3160148 BLAKE2B e6815eeb90c1dbf9a6c4a5aa72262c18b2031a9305efc9024b1fe7b770a256e1d4cb3b01646a0a523f0e26af2d499382bf42420385c56593ace515a6c225f54d SHA512 d8580250994b3e399babec4478515686f1e3cc2e4fc01ccbc7b00a51b6131452d209cb7f43dbbac5375286546d182fcdf7884bbc1a8ad6889c3f15d85ba8f8d5
-EBUILD btrfs-progs-6.2.1.ebuild 3580 BLAKE2B e66421da8398d9b6856958d4c13ac3fd8271e9773987e13540dfbe1bc69a99780b2654d0b95842770bf1195792592afc19c949ab07786d4748d9ef06fb5e9d86 SHA512 174ab73eabf5af68987a3fd2f13a09d913d947150407cce8a4c6f9af4e2437bb5fe287acaf074cb19e7ecc8477aafa229b13195ba8a9d6674f1a7858b7d759fb
-EBUILD btrfs-progs-6.2.2.ebuild 3547 BLAKE2B dbc2f3076b4162ca8f14f2226aa775d0e3ded2b5bf35c2e3e1cde8934b03ae6a21aacfcabad01f4178fa7f9df9cccbd8109fe23bfb3920e30d39c20a8307861a SHA512 62e0e184aee370bed2f67bc7c4263bf5f15983978d20862047d0db50fece0aeb69569e4b082e2cb13681454e22c9fbad0cabff4b050219e3d4193c5a1c838898
+DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d4cfb6779985036610651a267fcf92299c140f99f2372278cafcb02f651413c069314195b7bd44d56ddf60eb60e5532d SHA512 e72791fd91cc9a93aaab72bf8c36f9d7e2608315ccb3b0474ca0c1e1893465b2c7145ce523216accb0d02c4dd0fd13597702ce6a8b9c2ac137cd9bce3c5a4347
 EBUILD btrfs-progs-6.3.1.ebuild 3547 BLAKE2B dbc2f3076b4162ca8f14f2226aa775d0e3ded2b5bf35c2e3e1cde8934b03ae6a21aacfcabad01f4178fa7f9df9cccbd8109fe23bfb3920e30d39c20a8307861a SHA512 62e0e184aee370bed2f67bc7c4263bf5f15983978d20862047d0db50fece0aeb69569e4b082e2cb13681454e22c9fbad0cabff4b050219e3d4193c5a1c838898
 EBUILD btrfs-progs-6.3.2.ebuild 3548 BLAKE2B bdfb2571f3adecb4705993b2f0fb144ff75e8711e8369adb20d98666c3be6328f1c144adfb32f9ec21eb7e84f6343b468018a099d94516d4725e396ced29872c SHA512 904ba037a89a919293632720d38499a5b4893b488d8ce68ea2cc2c27b73943b70b3d1a05ddc1d425a517839f95fee52bd0b3fbe5067da065d9ded10d9ca106fa
+EBUILD btrfs-progs-6.3.3.ebuild 3548 BLAKE2B bdfb2571f3adecb4705993b2f0fb144ff75e8711e8369adb20d98666c3be6328f1c144adfb32f9ec21eb7e84f6343b468018a099d94516d4725e396ced29872c SHA512 904ba037a89a919293632720d38499a5b4893b488d8ce68ea2cc2c27b73943b70b3d1a05ddc1d425a517839f95fee52bd0b3fbe5067da065d9ded10d9ca106fa
 EBUILD btrfs-progs-9999.ebuild 3548 BLAKE2B bdfb2571f3adecb4705993b2f0fb144ff75e8711e8369adb20d98666c3be6328f1c144adfb32f9ec21eb7e84f6343b468018a099d94516d4725e396ced29872c SHA512 904ba037a89a919293632720d38499a5b4893b488d8ce68ea2cc2c27b73943b70b3d1a05ddc1d425a517839f95fee52bd0b3fbe5067da065d9ded10d9ca106fa
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
deleted file mode 100644
index bb42954a60bb..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-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 )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="virtual/pkgconfig
-	man? ( dev-python/sphinx )"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.1-blake2-simd.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	default
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild
index e2a1bc6c20a1..3c55b2f472d6 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.3.3.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-
+PYTHON_COMPAT=( python3_{10..11} )
 inherit bash-completion-r1 python-single-r1 udev
 
 libbtrfs_soname=0
@@ -14,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 
 	S="${WORKDIR}"/${PN}-${MY_PV}
@@ -26,7 +25,7 @@ else
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
+HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
@@ -138,14 +137,14 @@ src_test() {
 		cd libbtrfsutil/python || die
 
 		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die
+		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
 	fi
 }
 
 src_install() {
 	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
+		$(usev python install_python)
+		$(usev static install-static)
 	)
 
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch
deleted file mode 100644
index f2531135c5c4..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/kdave/btrfs-progs/issues/589
-https://github.com/kdave/btrfs-progs/pull/591
-
-From c7e7e2568b073b6a501eef515f3a4b6402a71211 Mon Sep 17 00:00:00 2001
-From: Tino Mai <mai.tino@gmail.com>
-Date: Sun, 5 Mar 2023 18:15:52 +0100
-Subject: [PATCH] btrfs-progs: crypto: fix SSE2/SSE4.1 implementation of BLAKE2
-
---- a/crypto/blake2b-round.h
-+++ b/crypto/blake2b-round.h
-@@ -136,12 +136,6 @@
- 
- #endif
- 
--#if defined(HAVE_SSE41)
--#include "blake2b-load-sse41.h"
--#else
--#include "blake2b-load-sse2.h"
--#endif
--
- #define ROUND(r) \
-   LOAD_MSG_ ##r ##_1(b0, b1); \
-   G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
---- a/crypto/blake2b-sse2.c
-+++ b/crypto/blake2b-sse2.c
-@@ -30,6 +30,7 @@
- #include <x86intrin.h>
- #endif
- 
-+#include "blake2b-load-sse2.h"
- #include "blake2b-round.h"
- 
- static const uint64_t blake2b_IV[8] =
---- a/crypto/blake2b-sse41.c
-+++ b/crypto/blake2b-sse41.c
-@@ -34,6 +34,7 @@
- #include <x86intrin.h>
- #endif
- 
-+#include "blake2b-load-sse41.h"
- #include "blake2b-round.h"
- 
- static const uint64_t blake2b_IV[8] =
-