| 1 |
commit: 621a8f5570fe4e3c771db4088f199132106c35ed |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 11:57:54 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 12:07:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621a8f55 |
| 7 |
|
| 8 |
sys-fs/btrfs-progs: add 5.16 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/830277 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-fs/btrfs-progs/Manifest | 1 + |
| 14 |
.../{btrfs-progs-9999.ebuild => btrfs-progs-5.16.ebuild} | 14 +++++++++----- |
| 15 |
sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 14 +++++++++----- |
| 16 |
3 files changed, 19 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest |
| 19 |
index a0682cc87be5..a7782b9bf352 100644 |
| 20 |
--- a/sys-fs/btrfs-progs/Manifest |
| 21 |
+++ b/sys-fs/btrfs-progs/Manifest |
| 22 |
@@ -2,3 +2,4 @@ DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e |
| 23 |
DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c |
| 24 |
DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 |
| 25 |
DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90 |
| 26 |
+DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63 |
| 27 |
|
| 28 |
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild |
| 29 |
similarity index 90% |
| 30 |
copy from sys-fs/btrfs-progs/btrfs-progs-9999.ebuild |
| 31 |
copy to sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild |
| 32 |
index ffe30a969ded..d2d506005f21 100644 |
| 33 |
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild |
| 34 |
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild |
| 35 |
@@ -1,4 +1,4 @@ |
| 36 |
-# Copyright 2008-2021 Gentoo Authors |
| 37 |
+# Copyright 2008-2022 Gentoo Authors |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
EAPI=7 |
| 41 |
@@ -29,7 +29,7 @@ LICENSE="GPL-2" |
| 42 |
SLOT="0/${libbtrfs_soname}" |
| 43 |
IUSE="+convert doc python reiserfs static static-libs +zstd" |
| 44 |
|
| 45 |
-RESTRICT=test # tries to mount repared filesystems |
| 46 |
+RESTRICT="test" # tries to mount repaired filesystems |
| 47 |
|
| 48 |
RDEPEND=" |
| 49 |
dev-libs/lzo:2= |
| 50 |
@@ -74,7 +74,7 @@ BDEPEND=" |
| 51 |
" |
| 52 |
|
| 53 |
if [[ ${PV} == 9999 ]]; then |
| 54 |
- DEPEND+=" sys-devel/gnuconfig" |
| 55 |
+ BDEPEND+=" sys-devel/gnuconfig" |
| 56 |
fi |
| 57 |
|
| 58 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 59 |
@@ -91,8 +91,8 @@ src_prepare() { |
| 60 |
local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" |
| 61 |
[[ -e ${automakedir} ]] || die "Could not locate automake directory" |
| 62 |
ln -s "${automakedir}"/install-sh config/install-sh || die |
| 63 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die |
| 64 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die |
| 65 |
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die |
| 66 |
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
@@ -107,6 +107,7 @@ src_configure() { |
| 71 |
$(use_enable zstd) |
| 72 |
--with-convert=ext2$(usex reiserfs ',reiserfs' '') |
| 73 |
) |
| 74 |
+ |
| 75 |
econf "${myeconfargs[@]}" |
| 76 |
} |
| 77 |
|
| 78 |
@@ -119,8 +120,11 @@ src_install() { |
| 79 |
$(usex python install_python '') |
| 80 |
$(usex static install-static '') |
| 81 |
) |
| 82 |
+ |
| 83 |
emake V=1 DESTDIR="${D}" install "${makeargs[@]}" |
| 84 |
+ |
| 85 |
newbashcomp btrfs-completion btrfs |
| 86 |
+ |
| 87 |
use python && python_optimize |
| 88 |
|
| 89 |
# install prebuilt subset of manuals |
| 90 |
|
| 91 |
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild |
| 92 |
index ffe30a969ded..d2d506005f21 100644 |
| 93 |
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild |
| 94 |
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild |
| 95 |
@@ -1,4 +1,4 @@ |
| 96 |
-# Copyright 2008-2021 Gentoo Authors |
| 97 |
+# Copyright 2008-2022 Gentoo Authors |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
|
| 100 |
EAPI=7 |
| 101 |
@@ -29,7 +29,7 @@ LICENSE="GPL-2" |
| 102 |
SLOT="0/${libbtrfs_soname}" |
| 103 |
IUSE="+convert doc python reiserfs static static-libs +zstd" |
| 104 |
|
| 105 |
-RESTRICT=test # tries to mount repared filesystems |
| 106 |
+RESTRICT="test" # tries to mount repaired filesystems |
| 107 |
|
| 108 |
RDEPEND=" |
| 109 |
dev-libs/lzo:2= |
| 110 |
@@ -74,7 +74,7 @@ BDEPEND=" |
| 111 |
" |
| 112 |
|
| 113 |
if [[ ${PV} == 9999 ]]; then |
| 114 |
- DEPEND+=" sys-devel/gnuconfig" |
| 115 |
+ BDEPEND+=" sys-devel/gnuconfig" |
| 116 |
fi |
| 117 |
|
| 118 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 119 |
@@ -91,8 +91,8 @@ src_prepare() { |
| 120 |
local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" |
| 121 |
[[ -e ${automakedir} ]] || die "Could not locate automake directory" |
| 122 |
ln -s "${automakedir}"/install-sh config/install-sh || die |
| 123 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die |
| 124 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die |
| 125 |
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die |
| 126 |
+ ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die |
| 127 |
fi |
| 128 |
} |
| 129 |
|
| 130 |
@@ -107,6 +107,7 @@ src_configure() { |
| 131 |
$(use_enable zstd) |
| 132 |
--with-convert=ext2$(usex reiserfs ',reiserfs' '') |
| 133 |
) |
| 134 |
+ |
| 135 |
econf "${myeconfargs[@]}" |
| 136 |
} |
| 137 |
|
| 138 |
@@ -119,8 +120,11 @@ src_install() { |
| 139 |
$(usex python install_python '') |
| 140 |
$(usex static install-static '') |
| 141 |
) |
| 142 |
+ |
| 143 |
emake V=1 DESTDIR="${D}" install "${makeargs[@]}" |
| 144 |
+ |
| 145 |
newbashcomp btrfs-completion btrfs |
| 146 |
+ |
| 147 |
use python && python_optimize |
| 148 |
|
| 149 |
# install prebuilt subset of manuals |
Archives