From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Dec 2020 23:06:25 +0000 Subject: gentoo christmass resync : 25.12.2020 --- sys-fs/Manifest.gz | Bin 21242 -> 21263 bytes sys-fs/atari-fdisk/Manifest | 2 +- sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild | 2 +- sys-fs/duperemove/Manifest | 4 +- sys-fs/duperemove/duperemove-0.11.1.ebuild | 30 -------- sys-fs/duperemove/duperemove-0.11.2.ebuild | 2 +- sys-fs/fuse-common/Manifest | 2 + sys-fs/fuse-common/fuse-common-3.10.1.ebuild | 34 +++++++++ sys-fs/fuse/Manifest | 2 + sys-fs/fuse/fuse-3.10.1.ebuild | 79 +++++++++++++++++++++ sys-fs/inotify-tools/Manifest | 2 +- sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild | 2 +- sys-fs/ncdu/Manifest | 2 +- sys-fs/ncdu/ncdu-1.15.1.ebuild | 2 +- sys-fs/ntfs3g/Manifest | 2 +- sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild | 79 +++++++++++++++++++++ sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild | 77 -------------------- sys-fs/squashfs-tools/Manifest | 8 +-- .../files/squashfs-tools-4.4-fno-common.patch | 11 --- sys-fs/squashfs-tools/metadata.xml | 6 -- sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild | 55 -------------- sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild | 67 ----------------- sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild | 2 +- sys-fs/xfsprogs/Manifest | 2 +- sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild | 6 +- sys-fs/zerofree/Manifest | 2 +- sys-fs/zerofree/zerofree-1.1.1.ebuild | 2 +- sys-fs/zfs-kmod/Manifest | 3 +- sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch | 27 +++++++ sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild | 7 +- 30 files changed, 246 insertions(+), 275 deletions(-) delete mode 100644 sys-fs/duperemove/duperemove-0.11.1.ebuild create mode 100644 sys-fs/fuse-common/fuse-common-3.10.1.ebuild create mode 100644 sys-fs/fuse/fuse-3.10.1.ebuild create mode 100644 sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild delete mode 100644 sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild delete mode 100644 sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch delete mode 100644 sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild delete mode 100644 sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild create mode 100644 sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 5b516d149440..f850b90a2600 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/atari-fdisk/Manifest b/sys-fs/atari-fdisk/Manifest index 95d5b8fd6fd0..eac46993896d 100644 --- a/sys-fs/atari-fdisk/Manifest +++ b/sys-fs/atari-fdisk/Manifest @@ -1,5 +1,5 @@ AUX atari-fdisk-0.7.1.5.4-gcc-5-inline.patch 722 BLAKE2B 8c1e0697b77c34aeb90d6d0c1f3cb0fe7f9e22f73bbaa194c158d0cf5f6add1f0932be4808879a0150ea6e25084693813cd93c652638615c1cd6dff969f94b45 SHA512 aeda384a27e6ed408e82ede3e7821976daece0b577b2aa26250b183697387ea39a01ffc1bbe8aa09c570f0897ecf6022477e7a4126c6e90181a5c0a88cbe11c1 AUX atari-fdisk-0.7.1.5.4-prompt-logic.patch 495 BLAKE2B 4c4224850c10cefaa0d85f14f6f12d048808ad75314cff755785bec07d12e123b2f4520533c61c60d5c06d52137309c4e08ae9ccfff2fe9cd0e546611b2aba6b SHA512 7be32b061f2aaea03579282e9df5b78d207b823551ffeb91a20a96bd28fc57969e21b7e54da2af15bd0c74ea346ef904dee798405b61a593bd9149064b9bbec5 DIST atari-fdisk_0.7.1-5.4.tar.gz 47576 BLAKE2B 42154c48399a47aafbbddfe6bacfdb9997b2b6d93f7548c60e8b614fbc3abbef448ea514a168b39590c1c907a5b7d881ce58fa8c25fa41d24680d1786ca4bc15 SHA512 014be9a92b19f81901f814308b0f380df77de712f1e3f69438cf7ae7c57c53111cfc39f60899facd04af8b5457e980fdc689bfbfe2a91e5c2a0de8446a724961 -EBUILD atari-fdisk-0.7.1.5.4.ebuild 1248 BLAKE2B e4f7bf46eab67efcafb8faed1ade0aa8a6b5da0ba0b17fdf1ab661be77ce43c12f33e325e5ca817af781dadf2e5ee64d3180f17e60c7d8863de739c6d77ca62e SHA512 72effe45c55488184860ad45de4136d3f337df106c896156db87adbd67412f89a50735f4adfd2d8cded89b3e4276872d5e3821ec872fb05b47b3c5968889051b +EBUILD atari-fdisk-0.7.1.5.4.ebuild 1245 BLAKE2B 4627cc32833fedc819659b9f2f0796023e42e6d0b165488fb72aff6f345876a149cc5a016c88ad5b98ad29ae3b3ce64d2d7cf00d85def2fd0a0452ae54c978f4 SHA512 c8a29bbdb5c17c4877511f5b6131001d11f48eb2fd1cafad4ac2e5d55937fd2307c36714bb06b7a48befaa18ae30ec629ecc90f668d420f356ad6b8496c505f8 MISC metadata.xml 213 BLAKE2B 9cfb840971c5a4f3188b32fef19b55e8cc693fa5b17f0a1231a26287f666f27ccaac578946b240f1c93dd7c26e4f2ca8e5a5831547bec8a6caf6153ebfca06d2 SHA512 66584639f70df67edf15360939d73d26f6097167cc24df4713171d34527fc373a3685b6ad531b9cd629a76e861d13b231284c633d863482b59347580e04037c2 diff --git a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild index 6e783ebbc07c..f5c41bab0e90 100644 --- a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild +++ b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest index b926daab925a..62bb9873ce0c 100644 --- a/sys-fs/duperemove/Manifest +++ b/sys-fs/duperemove/Manifest @@ -1,5 +1,3 @@ -DIST duperemove-0.11.1.tar.gz 115740 BLAKE2B 7804f1c98cdeb349ae12425636575c9b2468613dfe908d8c9f1d9fb74aefb412142002a0fc899b8448ed1b255257569555264b9d9c172899f856a919d02dd1a8 SHA512 3c344b00b8fb58a259840aea977ba2e5123b651bb58ec84177bdfd8337a377361984b85c6325271b7d3e4ea216017fa6fda793136c83e9837a13ec041df326b9 DIST duperemove-0.11.2.tar.gz 158001 BLAKE2B 743f59319424f7fcd400bc24de056fb79fddcb2600a707446c2f1c13c26cdae2ae24e1a91d9edadef55aaafb01b7ca217defc4c939053981bddaca12fcc230e9 SHA512 d2b24c912a3ae4a5b9730ba1369b6174cc6fe252710dc7dae2971816e931558ea68d664bf4c9497630dd9002a71fccc26848ad848831fa45d7a7715ba65378e5 -EBUILD duperemove-0.11.1.ebuild 621 BLAKE2B 71c3b85e3b46c60a90475364ec149b1e736ffa9216ae12228c57dc1f109109fccc3d3d26c6d7d11266daddf3f99e00e2ec61a7c5b3be81a9e6fcfa8ee8bdfe4f SHA512 e1e67d3fe8e6d0f7e9da7e8e90cf7958d72b23c3149c6b1e395de3873a810dc2c68f712082f75264b4d1e3dbc5392428ab8d5f6d93d0958b4f2c16e167e5fd51 -EBUILD duperemove-0.11.2.ebuild 702 BLAKE2B c6dd8efb70f2e108bb7fb1107e2813a4565ee27a2eb43c68056e454dd353e06684743ae8ae4552bf2cbdc41072b172861a34b118404238023a6110d39853239d SHA512 c615860087ae3a00bf38dae467b1d87333817308fecf33d9cd9060d5a6d87988dff3c7809207f81923dfcd0ba4d6d025a4aa5b112640aeff65412dbade8e4f70 +EBUILD duperemove-0.11.2.ebuild 701 BLAKE2B ed3758942b72ff9eab25d5244f2fa6f2c476f921e1e89da8c2274b2b460e7d88928592d21e27f9d9000647865d4eb1d31156a880542b72422dd5f0da2a64acb9 SHA512 26300436e69b9a46bc0e52bb70fd29cd178a5a7d83b0f86a07a36bfcc40a01995461e2eafce0060c038297793ea92f25e8d0eee1b0a609d722347ac0935be3e9 MISC metadata.xml 333 BLAKE2B 0fee725be9a70cd4044f405f29806359d9e310aaf38915806ba1486424d7b55af23e052cb42d4e2583d5d11bf1be86b59a74e9c556bff985dad4e6c5ee5843f0 SHA512 686d9f84253b594161fecbe0693e1a88735ee928eb7683317e46317e746cd787790e27691b77f6df4da864aec5fb7ac76436de0dd3805f9707c2536daa3eb122 diff --git a/sys-fs/duperemove/duperemove-0.11.1.ebuild b/sys-fs/duperemove/duperemove-0.11.1.ebuild deleted file mode 100644 index 2491a42a58ac..000000000000 --- a/sys-fs/duperemove/duperemove-0.11.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Btrfs and xfs deduplication utility" -HOMEPAGE="https://github.com/markfasheh/duperemove" -SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/glib:2" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${P/_/.} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install -} diff --git a/sys-fs/duperemove/duperemove-0.11.2.ebuild b/sys-fs/duperemove/duperemove-0.11.2.ebuild index 3e266368e293..62cb077c58ad 100644 --- a/sys-fs/duperemove/duperemove-0.11.2.ebuild +++ b/sys-fs/duperemove/duperemove-0.11.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> $ LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest index d3579b0854ab..cfb6843e6674 100644 --- a/sys-fs/fuse-common/Manifest +++ b/sys-fs/fuse-common/Manifest @@ -1,8 +1,10 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 +DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329 DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26 +EBUILD fuse-common-3.10.1.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f EBUILD fuse-common-3.9.1.ebuild 878 BLAKE2B 2b36fcad7d4b870240f6d8c25639825bc51c8ceca28488a46708317f72d7e58978fa6c8bbdcc12be211016c256e36408723ce9f042d935fb679f433cf2046956 SHA512 36f14cb465000d7d48ebe0367e2a84af714567cfc28ba4583e9e9b6d8a92808e1acf001a2742d0996bb0ad9875badde088e380e66ccce6eaca851bc3c85fe4e8 EBUILD fuse-common-3.9.2.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f EBUILD fuse-common-3.9.3.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f diff --git a/sys-fs/fuse-common/fuse-common-3.10.1.ebuild b/sys-fs/fuse-common/fuse-common-3.10.1.ebuild new file mode 100644 index 000000000000..1562ff02eb90 --- /dev/null +++ b/sys-fs/fuse-common/fuse-common-3.10.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit udev + +DESCRIPTION="Common files for multiple slots of sys-fs/fuse" +HOMEPAGE="https://github.com/libfuse/libfuse" +SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +BDEPEND="virtual/pkgconfig" +RDEPEND="!mgorny@gentoo.org Michał Górny - - - Enable support for XZ ("LZMA2") compression using - app-arch/xz-utils - - squashfs diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild deleted file mode 100644 index f330af3c97ac..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="tools to create and extract Squashfs filesystems" -HOMEPAGE="https://github.com/plougher/squashfs-tools" -SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="debug lz4 lzma lzo xattr zstd" - -RDEPEND=" - sys-libs/zlib - lz4? ( app-arch/lz4 ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr ) - zstd? ( app-arch/zstd ) -" -DEPEND=${RDEPEND} - -PATCHES=( - "${FILESDIR}"/${PN}-4.4-fno-common.patch -) - -use10() { usex "${1}" 1 0; } - -src_configure() { - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 lzma) - ZSTD_SUPPORT=$(use10 zstd) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE -} - -src_compile() { - emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools -} - -src_install() { - dobin squashfs-tools/{mksquashfs,unsquashfs} - dodoc ACKNOWLEDGEMENTS CHANGES README* - dodoc -r RELEASE-READMEs -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild deleted file mode 100644 index 26923c4c78e9..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="tools to create and extract Squashfs filesystems" -HOMEPAGE="https://github.com/plougher/squashfs-tools" -SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -IUSE="debug lz4 lzma lzo static xattr +xz zstd" - -LIB_DEPEND=" - sys-libs/zlib[static-libs(+)] - !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) - lz4? ( app-arch/lz4[static-libs(+)] ) - lzma? ( app-arch/xz-utils[static-libs(+)] ) - lzo? ( dev-libs/lzo[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] ) - xz? ( app-arch/xz-utils[static-libs(+)] ) - zstd? ( app-arch/zstd[static-libs(+)] ) -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-4.4-fno-common.patch -) - -use10() { usex $1 1 0 ; } - -src_configure() { - # restore GNU89 inline semantics to - # emit function symbols, bug 595290 - append-cflags -std=gnu89 - - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 xz) - ZSTD_SUPPORT=$(use10 zstd) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE - use static && append-ldflags -static -} - -src_compile() { - emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN} -} - -src_install() { - dobin ${PN}/{mksquashfs,unsquashfs} - dodoc ACKNOWLEDGEMENTS CHANGES README* - dodoc -r RELEASE-READMEs -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild index ff8ad03a5649..9faef4b6fd90 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild @@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" IUSE="debug lz4 lzma lzo xattr zstd" RDEPEND=" diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index e5b32c78ca24..22cecaec9940 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -6,7 +6,7 @@ DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e01287 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231 DIST xfsprogs-5.8.0.tar.xz 1260580 BLAKE2B d4efb81123d46fd7907dd81605922ba283642ead92f6270a3b0d93a0c7321963d5b8b0068a2b6b4cdb236da0653a6432b74056feff77354d2557e899b01f1a62 SHA512 11f2810402ecb83db204346c45ff9f7d643ff2390767794e311a06a10eb97118095e4c377d2b065be50611ec5fc82ac5cbc0a8c7122ee7e9820a2db4e9f177c1 DIST xfsprogs-5.9.0.tar.xz 1263364 BLAKE2B 0504e06a9b2b664289fec3dbb083508438b4950c623e309f326954b81f2e9ca0e65d9eb0c9fa029c49f6708e7995db2e9cab0bc7f42aa048e7f9feb80fc7ec77 SHA512 76f7da8c57e859326b33bff4ceae9f73af485357252b2b1c09808ebb309af5abbafdceb874b9739a1aa87b8f130e42c5ee143fff117edde20844182e7babd0ce -EBUILD xfsprogs-5.10.0.ebuild 2257 BLAKE2B d2f631604dad9f4434c062c33735bf652d8e809cd82620cef7c078b4bacd6963bfa543e737a4003f39c2e52c306dbd86071d086525868217f2a41d32c712f20a SHA512 ecbb03877e2fc85678777f0966b170877c6a3e8c8267925c73285b178a9481f67dd11883435e678899f64aee6d8b9a12f045fecf08cdee50ed4065225a5bd169 +EBUILD xfsprogs-5.10.0.ebuild 2318 BLAKE2B fdf4057fe3d3bbe283c8f3873ec85cce69dc55b20ad71f687df67ae980927dcfc1580de437cfacc53b986e906d37fa4e5da96c03f5728334dc1bd600e58f9ab8 SHA512 6d708a25a5f2c61edf2f0381eee32cfa495479018e09bfe6338a3c786d2b17f912e3354366a1c56545365233267eb04673df5cf3d5adab8b9dbb7f0b5012bbe9 EBUILD xfsprogs-5.4.0-r1.ebuild 2847 BLAKE2B b81f15ddd470b549433942259ce7c7edb4f102a7903d361fd2ddc151b4d3ba1abcda491425d64d2cb5b50d1c034f4301e4350856a2e7df80f2690f065bc93c0d SHA512 962334a565a0b3686f28ec9c9091e1260df3f842da3f64ffdc3d524e6baed77663c8ee2100964471b44935661d60331e7b4c9688d151bcd2c16ef7208d1b9a54 EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild index 1661c39dc4e8..de634d27bdb3 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="icu libedit nls" LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] @@ -88,8 +88,8 @@ src_compile() { } src_install() { - emake DIST_ROOT="${ED}" install - emake DIST_ROOT="${ED}" install-dev + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev gen_usr_ldscript -a handle } diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest index 666899a7a4be..2ceece85892f 100644 --- a/sys-fs/zerofree/Manifest +++ b/sys-fs/zerofree/Manifest @@ -1,4 +1,4 @@ AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c -EBUILD zerofree-1.1.1.ebuild 954 BLAKE2B 6201d8c315c1a47d6661165bf0e486306fcc9993fb9604fe34aecfcb3f986273e579b4d07844aee2abca50bfa9e776e72de322901e4f6215cbbac49ab86e407c SHA512 83f746c7ea899b3d07a5a5e9fb56bad5b13911ac1c257e9dc87e481997bb8d02a2a14fb24f245bfe3d34dcd7650096d1ce104043c68b52b29da7575d87b9bd53 +EBUILD zerofree-1.1.1.ebuild 950 BLAKE2B e2346293c8f9d1a4b32eb649fd73b34b70024993b188e1d777ee79d70a5290e381326d158cc8d9961f4a8eafab39157130aa8e91b327243c296b27c52cc33762 SHA512 c9ba7479c84b4971c78dea878c40dc820b8537419526d7be57785529088e0a4f64af30715fe3b7b2e6a1fe4c196c9674fdbe2fec7e9828c8cf2e7a937d971390 MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8 diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild index ffa8a9947d42..de639dd5c0d8 100644 --- a/sys-fs/zerofree/zerofree-1.1.1.ebuild +++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/uml/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" +KEYWORDS="amd64 arm arm64 ~mips x86" IUSE="" DEPEND="sys-libs/e2fsprogs-libs" diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 46f5a1ac2c8c..6105784e505e 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,8 +1,9 @@ +AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322 -EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 7eb6f17543425e7216461bb5813a0933bb672dd5479af661cca233968e8543aa72c5b80c8282e3c0a53374abe1900b5f5530e94823cf6fb8a70c4d91bfc863e8 SHA512 4c591a4b524f140a15eddfb75371dfb03040e1d95c4c25f1d1e6f48115b605ea153348252d2a10849f2c4372c694a6c1252f624e5ab8d8346ecc529f482c2bcb +EBUILD zfs-kmod-0.8.6.ebuild 4636 BLAKE2B b3fb6e9f08bdae9c641e350076c3ca9281428510c696932014a72216b7622176471055a32d629c38941f87b92fffb3f895718f87dba1fe36513542aa68beb551 SHA512 3f7b55b7d9c93222997f5ce4f2d45dba5840799ecdb86e99ec35cff4a5f855230355c79ff3c9b6b7fb47aee2355c73ae38f806a1e5c6c6a49f7df1fdd1e11c51 EBUILD zfs-kmod-2.0.0.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89 EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch new file mode 100644 index 000000000000..2b1ef8582546 --- /dev/null +++ b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch @@ -0,0 +1,27 @@ +From 0ce99b43b339226d62362f624d37f80a921eb197 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Fri, 18 Dec 2020 11:35:07 -0800 +Subject: [PATCH] copy-builtin: handle missing .gitignore + +acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in +release tarballs, because those do not contain .gitignore file. +Adding -f to rm call will make it return 0 even if file does not exist. + +Signed-off-by: Georgy Yakovlev +--- + copy-builtin | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/copy-builtin b/copy-builtin +index 84f469fef02..6a6eb1f3695 100755 +--- a/copy-builtin ++++ b/copy-builtin +@@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs" + cp --recursive include "$KERNEL_DIR/include/zfs" + cp --recursive module "$KERNEL_DIR/fs/zfs" + cp zfs_config.h "$KERNEL_DIR/include/zfs/" +-rm "$KERNEL_DIR/include/zfs/.gitignore" ++rm -f "$KERNEL_DIR/include/zfs/.gitignore" + + for MODULE in "${MODULES[@]}" + do diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild index cc5f18c90673..9067f3662366 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild @@ -37,6 +37,9 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +# https://github.com/openzfs/zfs/pull/11371 +PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" ) + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC @@ -94,10 +97,6 @@ src_prepare() { # Set module revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi - - # undo https://github.com/openzfs/zfs/commit/acfc4944d0d6db114db9f2bb5401251c5bd767b6 - # we use release tarballs with no gitignore files already - sed -i 's:rm "$KERNEL_DIR/include/zfs/.gitignore"::' copy-builtin || die } src_configure() { -- cgit v1.2.3