gentoo resync : 20.10.2021

3 files changed, 2 insertions, 132 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 83916a48fec4..060767a998ce 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,10 +1,8 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
-DIST btrfs-progs-v5.13.1.tar.xz 2237108 BLAKE2B 6de5d70d1b3611dc7c502530c08f9b58da798b33a97a415a787c5ed55b3369432f362c4d61636b6c85d952bf4482125a2d59397214ac543cf7160de28fe20a0b SHA512 4ef8256da59614d17316db9c19909a2aa4f0557504201e421332c63a4935dbd6578791484b9f3f2dbeaaa28f6f4b4fd59c5a7adf6853fd76546ac213a0f09823
 DIST btrfs-progs-v5.14.1.tar.xz 2247384 BLAKE2B 70eb5f1f3f4b7acc2d4f662c0484984903a09c03bd4d3bd6e15ac712318c3ee9a3621e682f1d33a8b2b25280a63801e1a71d574c55dbd28e205e7fb4b549af47 SHA512 d706322b3c82825ab0eedc952a5e68642483539af5f3bf84d751ffed09d5e997f188370734145c7eb8b109be5bf6d77a2e3731521b3e34d46e1a454eef6bfb56
-DIST btrfs-progs-v5.14.tar.xz 2246876 BLAKE2B 0b0b9a8b131c7a80951695bd8e606e07f89834b60e5af1478b9a02474b9c4e77cd7d628e8cb1be32051d25bd8539e15c48f8b15b3500f6490daca87cd36555b6 SHA512 153dc24e24cb68e2522bad94873de4e24b106fe160fbea924e132728a908219f22baacbdd224a4d1f93179ebcb265bfef6ae7e92e486f538cd40ecdc46b98efd
+DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c
 EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7
-EBUILD btrfs-progs-5.13.1-r1.ebuild 3015 BLAKE2B 4d1c0c35fe2e0d159db0a286805258ec4db568b39ea0bab81b3459bd87538c0d9b2ce5b4966d7cb64548d25e86ab0a42d6a96818439ed26dfbd6a904fc52ea1d SHA512 8109626768b1622658657eeb054decb92e1f2474623c3b4eae249d94712f61831d7f4a8207f824eae08bd6a4ad776e411c39c9896a359467ec53d07c5b5df03b
-EBUILD btrfs-progs-5.14-r1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 EBUILD btrfs-progs-5.14.1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
+EBUILD btrfs-progs-5.14.2.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 EBUILD btrfs-progs-9999.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild
deleted file mode 100644
index 7180e0d1cd55..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-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:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" 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 "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--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
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.14-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild
index 36548f98db8a..36548f98db8a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.14-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild