sys-fs/btrfs-progs: bump up to 4.20.1, bug #675974

Reported-by: Vincent de Phily
Closes: https://bugs.gentoo.org/675974
Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index e6353b781ab64544a6f7ed7c1479cdd71da595a0..0a09941b11db5b5bfd6956b0a84992517828e862 100644 (file)
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -5,6 +5,7 @@ DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae17
 DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
 DIST btrfs-progs-v4.19.1.tar.xz 2007160 BLAKE2B fda89842f5117e77a00794054b1a11a7233d33c2135492b4a382cfdbcbbe58624447178cbeba7c44fabd5a5848fb4d47665dffbd838ff1b88432e1d98deb0666 SHA512 834b0a16216437301637d44561fd265db167b7084de7d43d36802907645627d955421c1f5c46f0eb72d85f8b8d70905e5f6c0d539a34693704aa188085dfeec4
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
+DIST btrfs-progs-v4.20.1.tar.xz 2029056 BLAKE2B 849e85886a292ef6b2d3eb5d47a80b1ece5ba51ee74d202f8e0a8cdf00877f76cbab00e01a7a97374f1b2b6c3b1cb8d6e7ffad383cb2f76e8a87618bece8096e SHA512 66f9abdc65bd97ef4a4c6eb9aac252604b7250216c8d9fcf54e9657aff74a2b2b1af465ac7cc68de71bfe1fd86219259cacd27ec2eb96f044ba0c8af2b72e8a2
 DIST btrfs-progs-v4.20.tar.xz 2028328 BLAKE2B f7038a6b454d44ce3899b6607fa5554150f5801a158e8296750acd1275d3ebffeb6284f2ff609a68b2df55b15479d3039ca94e1ecef0515bbc1b87281f536d2c SHA512 a8339f73079d74d61b8bc17cac57ae560746baa4104e496080bde5329b1bb70712f033cdd306f8c06db6b364f0087b424e7e33511cad5bfeed5c214518e16a27
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.20.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.20.1.ebuild
new file mode 100644 (file)
index 0000000..13b9604
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.20.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,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 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 )
+       >=app-text/asciidoc-8.6.0
+       app-text/docbook-xml-dtd:4.5
+       app-text/xmlto
+       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(+)] )
+       )
+"
+
+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 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
+}