[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/

[Sergei Trofimovich]

commit:     3d469d0e30a3a6764f4c208a94e179ff85bc9a81
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 19:03:53 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 19:03:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d469d0e

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

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sys-fs/btrfs-progs/Manifest                                         | 1 +
 .../{btrfs-progs-9999.ebuild => btrfs-progs-4.17.1.ebuild}          | 6 +++++-
 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild                          | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index b753237fef4..7fc33bb6d1e 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -6,6 +6,7 @@ DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 
35575946c1de9cb81f1aed2a5be24331
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 
00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64
 SHA512 
6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
 DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 
85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421
 SHA512 
9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
 DIST btrfs-progs-v4.16.tar.xz 1980420 BLAKE2B 
979dffe990ea92f44582fa29f634ba4fa8e75917c9907ae4d4c5a72f6623450b29b6b0f3c40423711bc11856bc7d7775fb134fc5210e092d2c61ebe2165352cc
 SHA512 
3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e
+DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B 
cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433
 SHA512 
90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
 DIST btrfs-progs-v4.17.tar.xz 2002792 BLAKE2B 
beb63b0dcbd7f84b9ec95338d50c13e410fd967dcee56449328eb40d0ed89def4136675ffc86fc693d961175e74f11bf89f725e101e5cf35e7cbf2e228887d77
 SHA512 
1d238ea6c75f2493f0c5f3995bcfd592e945e20e407a71d962a8ce534fe829f5aa139c0e2d2cb497435de6ddf5c29f0e9dfb900419cc0c9d91cac3ae8154ee75
 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-9999.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
similarity index 96%
copy from sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
copy to sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
index 0936ade7591..5f71a58e642 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
@@ -72,6 +72,10 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+       "${FILESDIR}"/btrfs-progs-man-no-gz.patch
+)
+
 pkg_setup() {
        use python && python-single-r1_pkg_setup
 }
@@ -95,6 +99,7 @@ src_configure() {
                $(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' '')
        )
@@ -108,7 +113,6 @@ src_compile() {
 src_install() {
        local makeargs=(
                $(usex python install_python '')
-               $(usex static-libs '' 'libs_static=')
                $(usex static install-static '')
        )
        emake V=1 DESTDIR="${D}" install "${makeargs[@]}"

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 0936ade7591..9051b02693b 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -95,6 +95,7 @@ src_configure() {
                $(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' '')
        )
@@ -108,7 +109,6 @@ src_compile() {
 src_install() {
        local makeargs=(
                $(usex python install_python '')
-               $(usex static-libs '' 'libs_static=')
                $(usex static install-static '')
        )
        emake V=1 DESTDIR="${D}" install "${makeargs[@]}"