gentoo resync : 15.12.2019

6 files changed, 135 insertions, 8 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 12d2fc836704..d0d4ec583be9 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -2,8 +2,10 @@ AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v5.3.1.tar.xz 2077644 BLAKE2B f2943fd2215cfc65095e361824deb862c1934bb734c0f3073d8d0a7cb40c606e9e8054e36ae467f6d67f3ed58120493b9515f6a1d0d1062f864dd44521d1bab1 SHA512 7e7ac18a1ced5a8e5db7c0651ac438a48242fb4ca045b944527ed07ac91e87397dbab62b99d67d782501a632f4178db605e81912dfa48ac831d07177f96876fa
-EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B abdc15e7c275830ef675616ca76117145b21c0105569b8bd9010949f21b5a9b85adf76ca6a0d2652e6ffffa8fd2b706cfe479659b33731d66da21d1bc9fe9d6e SHA512 2a1ff36eb7f79f8eea312821c729af96de045fd5d1032b224713a2fecfe9266e322f92dae27147d3a0a3fc43dd0e6a05759fe0ea9cac565b0f8db9f1537ab970
-EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
-EBUILD btrfs-progs-5.3.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
-EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
+DIST btrfs-progs-v5.4.tar.xz 2103432 BLAKE2B 8ed1321c61d73b66bd27b37a255056e601302dacdcf2dd3122d1b7c41e537ebd1aa5df51100e61458084ec15efd6a1aa478d13f424d45d33d7454d886214a994 SHA512 cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90
+EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B 319a48ec9c610dfd28ccd91dbc11a978e6faf21f764da675d3ab5ed568d1d4beee4aacdea6e51dad68d5c17eddcd0081cbfe23ca862eeff576668c3c71182336 SHA512 3d34478a49484d2bf9cf4309c728886b7dc99f08a5d42f65225bd836f3e12411bec8140f3860e3b48cd7a6695212314fa5a4bdb75d9f5a2419e0a88e933763e1
+EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3aebd699880baa42196d1fc632ef36023401fa142d46f3d919c256a0b49209fee96f96b3a9e858e67c6b35f3298044c556ecdfcbf883532f134e4a3874b6e193 SHA512 af818f7c469477dd83fa3129d4f7065aaec0652fda04498c7f1aeeb03a3c60e4dd502545efdc24e37839d73d22a7fc4f82023a302f77a03c01ce016bd43b4aad
+EBUILD btrfs-progs-5.3.1.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
+EBUILD btrfs-progs-5.4.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
+EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 72c6c1c855bf..895c7e396bd2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
index 5d5fe5103ac9..66404e352aa2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 2008-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
index 4680b387969c..d9472cc887d7 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
new file mode 100644
index 000000000000..d9472cc887d7
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2008-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+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 ~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:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	python? ( 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:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[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-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 4680b387969c..d9472cc887d7 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7