sys-fs/btrfs-progs: bump up to 4.14

Had to drop keywords for alpha and ia64 due to new
app-arch/zstd depend.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 77446d15741b5fc957c99ba8f5f36a5ac16a6c27..fe6862053d37d1f51b8cab37e175906e45b7fbfd 100644 (file)
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -10,6 +10,7 @@ DIST btrfs-progs-v4.11.tar.xz 1508580 SHA256 e17a68cc52a27d905b715445e91ddbaa4d4
 DIST btrfs-progs-v4.12.tar.xz 1587604 SHA256 917710c84a9d529c92038390ddf8ace19ad409f61cdcf93c38ccaf2678472ece SHA512 6a9b13241edda68c866249874189aafb121f73515bf71e46f1f574eff858405d9ce22a251a07c6437f0dc21ca6ee55b4b57c15b431ce63faa3c16d1c8112616e WHIRLPOOL c929a5f453af005004b858873b3f5c78c8d51372644b3611cf2fc4900c45fee7a6153cf2f09fdf16336928b2427160c4393697751429dc4f1a405721f9ea70e5
 DIST btrfs-progs-v4.13.2.tar.xz 1673732 SHA256 75c7331f1306495dfffabe542ef6c5539808f0cdaebdf14fa8b7ab09c59448bd SHA512 50db13868ed43433ec9b655825767e6e76036f407edc0caffecd4b371baf7d817575c2f25c77fe3d5e741bb52d57757c6c762de0c00cbefede615358a803d80a WHIRLPOOL c3dd7b8ee7c3e1b62885b2e1ad8f0bc4e72b24fd55090f43c7e95eaa2517c51c71d299c4f2450267721d41f1fa792ed48896b8e17215b65d50e61c6a1583cd98
 DIST btrfs-progs-v4.13.3.tar.xz 1674084 SHA256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 SHA512 6db18197ab48a43da5212ead2fdd4a6d0c9eb035cd5ce40fdb5e6e39a69dd118aa0112246df8cb4a339665c20c39479d630e03ccc1ffea3017646695e1c5f833 WHIRLPOOL e54a739862f26f2648def2fa0e8fc1d49f7a70f2dd498d29e47b0d74fa826db961ade323cb5039728b42d28a383a0949494aea584a4d53f4abfce449bf6f10cd
+DIST btrfs-progs-v4.14.tar.xz 1697584 SHA256 09095cbc3bc2b6aa9d09c93146fb4d7437c51d2572f6918b74fe990fcdcb91af SHA512 11171e6730f4aa102bdb4cd405da2d4c55e2c102fec4cc6d3135df516c78af1c34fede722a1677bd9c638b47e77085e005b29333ae70b98771501e32628890f7 WHIRLPOOL 70584ed3dd537bea34d07fdb5597365326d826799c9ee70d6b64faec536e2eedee3feb32a0bcc487e962d90a8f075443d3adfaecd5410fc7780b7af296a53f5c
 DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa484034d185c704870c484cb0771d921316 SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76 WHIRLPOOL 5051f232bf5d6c2d19bc0fba9f2653546fc09000279863637a7ab44ff5c8bd107e5307aef3d2fbc7113581df3c224965f882045153eb9fa10da5b34cc4318188
 DIST btrfs-progs-v4.3.1.tar.xz 1184416 SHA256 0cb5ff15deed01cdf5a77f3f61b7dc9d2cd6787bcf6b6b7dcef424d16e8afd3a SHA512 661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff WHIRLPOOL 503ab00d8362ab2b4b9b91a8de18cca9eba1d76f2331f54cbecc7e89cc491dce3cfbd761d8e6e37773499cea7ef67a66dc7f544d7590d0c82acbef90ebe0c824
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 SHA256 9964e3ae4fb64692e109ddd733de4554e708348ffa18f0fc16a0cbd4bf40a8fc SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a WHIRLPOOL 188c4dec4f699262b023268e4a582312443aeaf0ea798446105d7288f6375cbad92ea2e8514def0b22cc8991c3ca9aefc5220dd8b6922aa4b506572da973ec33

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
index d869f6e5b51620e3c85ef7700322f8b62a6691b6..75f377d2505f2c5762d0dc441867d183e8a0a233 100644 (file)
--- a/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999 ]]; then
 else
        WANT_LIBTOOL=none
        inherit autotools git-r3
-       EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
+       EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
        EGIT_BRANCH="devel"
 fi
 
@@ -81,9 +81,7 @@ src_configure() {
                --bindir="${EPREFIX}"/sbin
                $(use_enable convert)
                $(use_enable elibc_glibc backtrace)
-               # No whitespace due to 'ext2,reiserfs' being invalid
-               # for configure. TODO: Why it's not valid?
-               --with-convert=ext2$(usex reiserfs 'reiserfs' '')
+               --with-convert=ext2$(usex reiserfs ',reiserfs' '')
        )
        econf "${myeconfargs[@]}"
 }

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.14.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.14.ebuild
new file mode 100644 (file)
index 0000000..8a28c86
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.14.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+       MY_PV=v${PV}
+       KEYWORDS="~amd64 ~arm ~arm64 ~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 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
+               )
+       )
+       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
+       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
+
+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)
+               --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+       )
+       econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+       emake V=1 all $(usev static)
+}
+
+src_install() {
+       local makeargs=(
+               $(usex static-libs '' 'libs_static=')
+               $(usex static install-static '')
+       )
+       emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+       newbashcomp btrfs-completion btrfs
+}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 75f377d2505f2c5762d0dc441867d183e8a0a233..33bf02bef56386474d71a7cb92cf541eb8675ced 100644 (file)
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert reiserfs static static-libs"
+IUSE="+convert reiserfs static static-libs +zstd"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -39,6 +39,7 @@ RDEPEND="
                        >=sys-fs/reiserfsprogs-3.6.27
                )
        )
+       zstd? ( app-arch/zstd:0= )
 "
 DEPEND="${RDEPEND}
        convert? ( sys-apps/acl )
@@ -56,6 +57,7 @@ DEPEND="${RDEPEND}
                                >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
                        )
                )
+               zstd? ( app-arch/zstd:0[static-libs(+)] )
        )
 "
 
@@ -82,6 +84,7 @@ src_configure() {
                $(use_enable convert)
                $(use_enable elibc_glibc backtrace)
                --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+               $(use_enable zstd)
        )
        econf "${myeconfargs[@]}"
 }

diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index 22d92c444581e1466f841df154084733ba6d5972..d131bb2ef536112309aa103d05406a1d28f6d888 100644 (file)
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -17,5 +17,6 @@
     <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag>
     <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag>
     <flag name="static">Build static binaries in addition to the dynamic ones</flag>
+    <flag name="zstd">Enable zstd compression support.</flag>
   </use>
 </pkgmetadata>