gentoo auto-resync : 23:09:2022 - 05:29:13

3 files changed, 155 insertions, 2 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index b5169d185a7f..60b477be1d6e 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,7 +1,9 @@
 AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e340f8eb322b95adb4037cac10a7824fa94ad7c8a86e01967d99e1e9ede9cda4f6e55b53c440e9d37b94018e31388b7214c5d4 SHA512 cad4314966c634f44252173ff23f09822d2448ac9346d1e9d5c0a193ada1606ed6c7515a3283b2560d68ffb7a004c4c25549f1cd5c87330a1aa49e1a3d722719
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e
+DIST btrfs-progs-v5.19.1.tar.xz 2315036 BLAKE2B f1ae6901ddc8236f440d46a950923727c3f6168a220ec2c782102355fabcc2217e9617691550db203391279775d53676a2a7ad1920bfde07f39b3744b7f5fff5 SHA512 17fded8583b7392202b1bb408cbb5d42024623ac15415f95e8e56e27b43be79da6d4e6c191d39db4e5a8948390a7c216c0ea520171b0ab95438cc330084c8398
 EBUILD btrfs-progs-5.15.1.ebuild 3162 BLAKE2B 736da23fb9d0dfd8cdcc863eab336f71b036814ae00e7d129e64fe2d36e91b5190b4cb7e5588a44da7b897257fc0b2b56489d4397a4e0aed43030fea218ffd37 SHA512 9c50e1dcffa79ccb08ffa4ed180cd44e6d413c2bb036b4df8b7fdbfed5c150bb1baff5111595e079d0f23a58481da1564062476f23da2c045be11b6511ad1ec6
 EBUILD btrfs-progs-5.18.1-r1.ebuild 3388 BLAKE2B 9abed0b3cf61e0ea8ce61270e53751fd6cefbe2907bd498543237e8653e52f9fc4bee773139c136a14a6b99cda5e46af903169eb547a8637050981281fe74a9d SHA512 8cca2d5536600c1193594fe15447051fc2d8b653bba077c7e0e3b63f08c53ed689f3ecc8fd465020fa5bc13e36e38deab48cdf5b61e47a50818d1a8c62d66664
-EBUILD btrfs-progs-9999.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
+EBUILD btrfs-progs-5.19.1.ebuild 3317 BLAKE2B 97893f51a918c591394da6cb7be941536389e44b7271820385af4f1f101c6348a273c6e3aa30ac4cb8cfb150fab532882f7b941e04a663730cbc0cedca2a5310 SHA512 c0c9494e934c296c3812e4dbdf10dba730a9a8045a0a8dfe764348850813be8fdf9701afb72b9d16ae23e9235bebff10bafa868a19dcbe6f32785e145c42da2f
+EBUILD btrfs-progs-9999.ebuild 3317 BLAKE2B 97893f51a918c591394da6cb7be941536389e44b7271820385af4f1f101c6348a273c6e3aa30ac4cb8cfb150fab532882f7b941e04a663730cbc0cedca2a5310 SHA512 c0c9494e934c296c3812e4dbdf10dba730a9a8045a0a8dfe764348850813be8fdf9701afb72b9d16ae23e9235bebff10bafa868a19dcbe6f32785e145c42da2f
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
new file mode 100644
index 000000000000..6390e1a15a34
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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"
+
+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} )"
+
+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_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() {
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 76f2afe1fe01..6390e1a15a34 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -88,6 +88,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	if [[ ${PV} == 9999 ]]; then
 		AT_M4DIR="m4" eautoreconf