summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/Manifest.gzbin21589 -> 21588 bytes
-rw-r--r--sys-fs/cachefilesd/Manifest2
-rw-r--r--sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild2
-rw-r--r--sys-fs/duperemove/Manifest4
-rw-r--r--sys-fs/duperemove/duperemove-0.11.2.ebuild35
-rw-r--r--sys-fs/duperemove/duperemove-0.11.3.ebuild2
-rw-r--r--sys-fs/e2fsprogs/Manifest2
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild2
-rw-r--r--sys-fs/exfatprogs/Manifest2
-rw-r--r--sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild2
-rw-r--r--sys-fs/f2fs-tools/Manifest2
-rw-r--r--sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild4
-rw-r--r--sys-fs/fatsort/Manifest2
-rw-r--r--sys-fs/fatsort/fatsort-1.6.4.625.ebuild34
-rw-r--r--sys-fs/inotify-tools/Manifest6
-rw-r--r--sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild2
-rw-r--r--sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild (renamed from sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild)2
-rw-r--r--sys-fs/loop-aes/Manifest4
-rw-r--r--sys-fs/loop-aes/loop-aes-3.7v.ebuild (renamed from sys-fs/loop-aes/loop-aes-3.7s.ebuild)8
-rw-r--r--sys-fs/mtd-utils/Manifest4
-rw-r--r--sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild43
-rw-r--r--sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild2
-rw-r--r--sys-fs/mtpfs/Manifest3
-rw-r--r--sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch24
-rw-r--r--sys-fs/mtpfs/mtpfs-1.1-r6.ebuild3
-rw-r--r--sys-fs/ntfs3g/Manifest2
-rw-r--r--sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild2
-rw-r--r--sys-fs/udftools/Manifest2
-rw-r--r--sys-fs/udftools/udftools-2.3.ebuild2
-rw-r--r--sys-fs/udisks/Manifest6
-rw-r--r--sys-fs/udisks/udisks-2.9.1-r2.ebuild132
-rw-r--r--sys-fs/udisks/udisks-2.9.4.ebuild (renamed from sys-fs/udisks/udisks-2.9.2-r2.ebuild)2
-rw-r--r--sys-fs/zfs-kmod/Manifest8
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild208
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild2
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild194
-rw-r--r--sys-fs/zfs/Manifest12
-rw-r--r--sys-fs/zfs/zfs-2.0.6-r1.ebuild (renamed from sys-fs/zfs/zfs-2.0.5-r1.ebuild)6
-rw-r--r--sys-fs/zfs/zfs-2.0.6.ebuild292
-rw-r--r--sys-fs/zfs/zfs-2.1.0-r1.ebuild293
-rw-r--r--sys-fs/zfs/zfs-2.1.1-r2.ebuild (renamed from sys-fs/zfs/zfs-2.1.1-r1.ebuild)6
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild6
42 files changed, 116 insertions, 1255 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 79d967a0a4d1..580634af0b56 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
Binary files differ
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index 18137fc3c6dc..ada32c77aa4e 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -4,6 +4,6 @@ AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219
AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.10-r1.ebuild 1584 BLAKE2B 071ba66543118ba53e2893a9226bf6716d12250f226759c38697e43eb6818ebc5904389de3a9b839e20f912a211021cf7a2cd60594ffbfa3a0a34a01a7b23f9a SHA512 c158d7c153336ccbeceb63a1ba2c26dc3779fad2ee92ae3032e4a8e5275ef7d3814a2dc692a20d0f983587f396081794f43ccfe9993f077c82658af299e6b4a3
+EBUILD cachefilesd-0.10.10-r1.ebuild 1591 BLAKE2B a3d6ebd05893d4c76c6950ba663c0bb56032ea7afa588918a521cfb6fba2071336cfb06a892cfc4129a81e19ceea3199a9b5fe9a0c2dac8cb83b6d66943103e6 SHA512 131abc35e1a4ad7085d7510e0f0fe94ed1045ccb85c4c0bf902b630932d479d3c799f2967db63d94aa887c25340fb68e5cade54e8e4acf8c8c7dc6e301cae05e
EBUILD cachefilesd-0.10.9.ebuild 1501 BLAKE2B 40541a5c37516de1694a7bf485debe1ea56cae9a091e2456b34947c5d1b169083289150809c2777447c1ddb949650751d5a1e37b1f3ad0ac3896c7b5fab723f3 SHA512 80a5038fe9cbf257e981f1d54ebeed81c49b7a69adb7cf55092478a474732ad0c9dab4667b50913873ae39c8cb3cae6556f55668d2d47c76cc39ff9aebe23e94
MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
index 48fbad06a93a..7b7c61767c29 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="doc selinux"
RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index 3753ca43846c..71fe504cc25c 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,5 +1,3 @@
-DIST duperemove-0.11.2.tar.gz 158001 BLAKE2B 743f59319424f7fcd400bc24de056fb79fddcb2600a707446c2f1c13c26cdae2ae24e1a91d9edadef55aaafb01b7ca217defc4c939053981bddaca12fcc230e9 SHA512 d2b24c912a3ae4a5b9730ba1369b6174cc6fe252710dc7dae2971816e931558ea68d664bf4c9497630dd9002a71fccc26848ad848831fa45d7a7715ba65378e5
DIST duperemove-0.11.3.tar.gz 158445 BLAKE2B dff7fdcf8468933c21753a8253067dddc400d2baec4052cd70cd3d94e92ad6e612bb24ffc12ad4a79e356747dcf4ceba15aa3bf6b3fca4a7a0b829f7c2783391 SHA512 0669cbb8a08082b9c2b62aff26759951e3e2c1b2236676ac6d79b9639027f775e4e5a218d1c7930b33ad7cca39726764cce5ac3063dc7d2049eb65fc4431af89
-EBUILD duperemove-0.11.2.ebuild 701 BLAKE2B ed3758942b72ff9eab25d5244f2fa6f2c476f921e1e89da8c2274b2b460e7d88928592d21e27f9d9000647865d4eb1d31156a880542b72422dd5f0da2a64acb9 SHA512 26300436e69b9a46bc0e52bb70fd29cd178a5a7d83b0f86a07a36bfcc40a01995461e2eafce0060c038297793ea92f25e8d0eee1b0a609d722347ac0935be3e9
-EBUILD duperemove-0.11.3.ebuild 703 BLAKE2B fd83f57c2e03341d436ff6fa65beb9b49a774d8c362dd5d207e87a6649cfec66230fe7e76bb63a54c1e7fb01068863462509f3119478b0e0c5143fa6b0fbe900 SHA512 e7f8f0177dddc8c94d73d093e363635da90da24f1c8beb2ddd240e122aaa0188a53328788febf5e803ca954301d2cc5c7d781b176329f25871e719b17d62c852
+EBUILD duperemove-0.11.3.ebuild 701 BLAKE2B e97ff112928f733e72f6bdaf1687fe4aa4ea8a8ec3c39a7a8a5393095bb78c841ee3047118ef6bb80b39a30847d433d554b34b6077730e9788021332e6ae4a1d SHA512 6144301b1501f93716df4b59a339658526eb9a0993ce91fba393fe5841e3db7f8ca3641d51d2f0720aba10130c2b921b0c80e61a6871dc733da9ffbd5d6aa6d6
MISC metadata.xml 334 BLAKE2B 375ee51b86214e9cc0d3b68727d83314d2694fa25f36758f7af1e691bcbc620896576c4f957809429d527ab0d9e6c6464af4850d13991b7174f8118901fd9985 SHA512 6ff5e136e085723546f070d388e9da22a902461629c799985fb2563c3eb3ca7b05794b4bcc96bedee97dd5a65551b2c74aeadbb3e2880a3ffa6426a9fea05bac
diff --git a/sys-fs/duperemove/duperemove-0.11.2.ebuild b/sys-fs/duperemove/duperemove-0.11.2.ebuild
deleted file mode 100644
index 62cb077c58ad..000000000000
--- a/sys-fs/duperemove/duperemove-0.11.2.ebuild
+++ /dev/null
@@ -1,35 +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_prepare() {
- sed -i -e "/VER/s:0.12.dev:${PV}:" Makefile || die
- default
-}
-
-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.3.ebuild b/sys-fs/duperemove/duperemove-0.11.3.ebuild
index 116961235a22..e26abe5c4f9d 100644
--- a/sys-fs/duperemove/duperemove-0.11.3.ebuild
+++ b/sys-fs/duperemove/duperemove-0.11.3.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/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ed700e6e8e15..903f85136dba 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -11,5 +11,5 @@ DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc19
EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
EBUILD e2fsprogs-1.46.2.ebuild 4015 BLAKE2B 6aabd166fce82e441e6214fcc911033c3b58ac114870b221c29e4d55978adf8819d8dfa09d0b8549ca6fbd5e964fa2bb3de5afe8a1006e31c92fa4785949ace0 SHA512 6faff94db1cff5d1ae4c726afb9c8e5a31cb2f435f009af4b66668d65ffc88375d98ed4a187c744abb368d1804db6c193bceef7a76057d94df94cb4ad9bb61b5
EBUILD e2fsprogs-1.46.3.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
-EBUILD e2fsprogs-1.46.4.ebuild 4014 BLAKE2B ac2a45cb2877a952fbe58fbc0d15d3110ff250a65a103933a0d952d371ca0917bc9e481b141da0963522d312ab72fddc59200bf178c6f64627963d3be5b17bda SHA512 81971cf3e057093ca600fa5041b01449ee321bd8293f07d62283b62fb755bace5791b9eb173d080a668d39131cc64146092ff579ecdb7792e93e95f53f805b29
+EBUILD e2fsprogs-1.46.4.ebuild 4012 BLAKE2B 5e466745b9bd6535ecd6df07130084f0d78f0077ae6d021fbcd7f480693a3a26bab4f7f5b8727a1240a7ca7d5abf1ee8f58252da5aa45ed2fb2aa98da35bc45a SHA512 a2dbd3e5c3a9afcef08180fbe3729bb6c383f19d305325d9656179841d65456c2c74e62a4957beaffe69adac21721e53fe9120cbc03aa4573d3e28dbf1f7b857
MISC metadata.xml 704 BLAKE2B a3986eb376f5e2416b1588bba5de134c62c45f0f0d952973f8a6adafbdfac19e81111f0b558592c914c71b072d1e51a6d98dd89f2488f9abbd5b81ebdf3906db SHA512 3059a0e8fd73db411e44749af435e061eda76fe908cbde14ce6e1ed3cc316f5f3e895632e92f789ced0b96766124eecf61885444755615ced25e137b32e9f7e7
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 2449fbcf989c..31c0a571616d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index 64e2fc33c855..3efc32a07f2e 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,4 +1,4 @@
DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e
-EBUILD exfatprogs-1.1.2.ebuild 610 BLAKE2B 1b5155d52daf7ea081cf27d271fd177a8faa04df22e2e386276083e60dffa23b13a6d82645fc61b7b7f1c0bd9703aec2e971d0896e980a47239646a966b04cda SHA512 1f9e98d10ec4bd64db27f7b78859e22866d51e6c49b4727e4c7cc0ab6a3db95998c50a5656b139070a8eabc051dcc89e72b9bc1988dc4ac2a4f067aae3d57247
+EBUILD exfatprogs-1.1.2.ebuild 617 BLAKE2B a1a86d9e39e1fd4dafb16f7a2c0ba0aa368d36ee343e10d39f0001de8cd2c5b8067835ea9da556b30ed8b9a414ef093d034f59e0b423910200bc1ae353308183 SHA512 a55c4bd6113876be8ab39330bd3e50736a69165728b941359b984853b1ae06f49ba93b0b872a2a6dde16a5997f0abf747154d4f41b2c0e9e53a95745f8e07ec5
EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d
diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
index 51882e697520..2746d008abdc 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
else
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~ppc ppc64 x86"
+ KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index caf061d2e16e..5c95ac13f228 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,3 +1,3 @@
DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
-EBUILD f2fs-tools-1.14.0.ebuild 823 BLAKE2B 6ddd43860f467c53c5abbcf0b0755b9a0980eeb0848d66cd4d559b89040e03c48b5ffc1db6db8048110217338e6084ad25678038a17f34d1bc6fdada25676b30 SHA512 29c40a964b8a0273d1708a270a3d8f39323ff5e996d5487ba7c0d51e3c0613f7d79f75a305a04096a57070ff09e4d0bcb9a483d918b867410f637cdaff714c11
+EBUILD f2fs-tools-1.14.0.ebuild 830 BLAKE2B 0a28f29ca8c4e1ceae7d119bc892413387c22772f52f0b5bfa7b53489e690970e5e186a4ebbf09b23c030c4a2fedf33c6ec15ba2534a69d4cf7ded95dade5d12 SHA512 610cdcab1942c5c8b116c7772bce50e933509035cad24b6a3c6bc9421e6113d5e6c09c78b94ef06a9fe496ba59bc34238a59706cdb856851d10fe19916ed73ee
MISC metadata.xml 439 BLAKE2B c7c467cc754472343e7e4473b79e8a70ed5f2f34c94292db772c93ce8018373dd8fa2ffadb26c93febece4c5b5faa1e7eb1338dbd7f516c208f1e2e17bfea82f SHA512 8045798ff0308394ee5cdc172e13776291089d63769007d2b5c13a4d50f27fa1a1fec3eda3642cadd068d91780788d0d504faa6a17e754521d3f7e02934eb41b
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
index 91ca217cb65c..abdb5ccaff97 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0/8"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
IUSE="selinux"
RDEPEND="
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index b0f189357c68..19fef16b1344 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,3 +1,5 @@
DIST fatsort-1.6.3.622.tar.xz 123644 BLAKE2B 1db530753bdaee4ebda9ab36a47f6794584bc590de4cbf8d144a5baa770c080c9d27a1ecadd5a22de72538887c4e10f161f3c4fb3afb3e63bd18834897ebe905 SHA512 309c7424e53fb74f57d0c4272a1a4b3df57fa1130d7e7adae0ac73ac1c8b1900504e49efd0cc4dafea3efa2fbc9191f343b10bb97b647dd6124197356cd01c53
+DIST fatsort-1.6.4.625.tar.xz 123964 BLAKE2B 4d958886af48e9f6d6a39b128b5ff96b809e67667026483a5abfb3db6f16d8a5ebb257433f2a7fbba6c7e4d81614477cc4cec437bcfba868a2c2fb6b13b15c42 SHA512 1d67c3cb515295d0a47054803e5b2a625875e71f41b2fad17f9d495b6aa4a291776696692545800bb4d5b826e9d622ea34077c81f7f08f41b8dfd70491e439ef
EBUILD fatsort-1.6.3.622.ebuild 709 BLAKE2B c55f68dad837981f511e25ac7d2dc5071a5efb025022fc8a9ccb54c231fc91db94e1ce3f8a438d44293071a7f0f52d207f7950d0e43ca57fb6ffd43c4cdadca0 SHA512 4eb71498be5f0667a82f8b0be259c6a7c599b9e34c13c26b408165a38b41e31aa3e6eb8e657e8b0ae27cb1eb2b4d792cd0a781c922ca3199cd46d3065078ccf6
+EBUILD fatsort-1.6.4.625.ebuild 711 BLAKE2B 98a7271583e4808a605fea798490cd528a5a294736c7b53e219eed05250145b5e528be8d8dc8b4805c7b97eaf96ceff7a98ef1adcee79afd4501b4ce6ebf35bd SHA512 4f2149fdc9eae0503a0451f4a749fdd664bffd97f318ed1ab94bf67c36ba94c862719cec8adb889f4239bb0618432f6098839b09d1a466153fb7bace3f159bf0
MISC metadata.xml 739 BLAKE2B e9c57a69520793f24cfafb131edfb6b94cd1d0cccbe74494835cbbd597ea6ae0c5d6eacb54bb82bb21acbf2db0ed0b27988cd5e228bfc092c847aceeacac10da SHA512 1983abae2f5d444b6a20039e50606dbf9a9894dae4a0f95b2337f60e451e61f0b7f556c8906d4bb5611ed1bf5201412a677e3dacf6344a4903bf44be13d507aa
diff --git a/sys-fs/fatsort/fatsort-1.6.4.625.ebuild b/sys-fs/fatsort/fatsort-1.6.4.625.ebuild
new file mode 100644
index 000000000000..85bf5c3f3520
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.6.4.625.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ default
+
+ sed -i -e 's|/usr/local|/usr|g' \
+ $(find ./ -name Makefile || die) || die
+}
+
+src_compile() {
+ emake \
+ CC=$(tc-getCC) LD=$(tc-getCC) \
+ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ man
+}
+
+src_test() {
+ # Tests require root permissions and mounting filesystems which does
+ # not work inside the ebuild environment
+ true
+}
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 0c1fcc61a68e..329247a5153f 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,9 +1,9 @@
DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672
DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
-DIST inotify-tools-3.21.9.1.tar.gz 91378 BLAKE2B a7d5d7ed2f63e186ed68d42ec443c43ae75e575d553221a11cd6991421d5d5b8c5447144a2e5cbc7dbad1d603e3cc120429ef5c91ac67994a82ea530c54142c0 SHA512 2a4d9f2e98b1f0263745c533fc06cd9f23bf9c793e9a8a3a944c7312f8d2b8e223caafbdd17b81e6dc0e29d85dd1730aef9341ed282992b4333d6d79cbfb3f99
DIST inotify-tools-3.21.9.5.tar.gz 91711 BLAKE2B cf6575cdd445a823c8272a9f8394ed241af1cc729784ec363c9dac6cd3c5cf37856076e88d389669d9da768b899e7ecb64c997e25b42cd5fccc2ebbbf145b273 SHA512 d0ae070f4fa3ea261913bba4ed6edf865aa8ddb9235cf5e967d11f54168a78d92739a5110a1afbdedbe3e6f0cbaf395883e2d47a182c9e6847986da184a52a97
+DIST inotify-tools-3.21.9.6.tar.gz 91668 BLAKE2B cfb279d69e650b275af03052f4f76522670b7a563aa4e81bd5883b3ff825ecb70382cd4a5d48a9eb50b59930685a60b59a17376958d111d129c61fbced47a6bb SHA512 206eeebfd948499d81e6666b153cd7d9b05df618291fd3ada6479251b0773ce629c19f73117442a9093f028e294c5ba2dfa0aa4cf711510284ab7cad657da21c
EBUILD inotify-tools-3.20.11.0.ebuild 930 BLAKE2B d80311a5642e7af833733c6f75258d857762582b7ff9663d623aad2d32a788d708571f6942faeaf2d124f76d9209748ba1973bf1ca04d08de2e0935d5e619c43 SHA512 61ee8874dbdc03f3749285a7fe072cca38353151d2ae8db10674ac38e850c6f6be872924ee5e2f6f953e7bb2f1d13dd1498d0bde95d62a78a58344ddc0e286e7
EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57
-EBUILD inotify-tools-3.21.9.1.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f
-EBUILD inotify-tools-3.21.9.5.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f
+EBUILD inotify-tools-3.21.9.5.ebuild 945 BLAKE2B e351e97ad2996da6331e8621ae58dfc31928601c8682d4a7c26331e2b5b574074e5411d69e65a66d69e914f677f6b47346adc46ad6a67923f90c62528806bbd0 SHA512 7e4bcb5e609b2bd20af4ada32e9c8d7bd969f80973c09ef572427e2178a0504e3541e600ac913efd29548cd481793cea5a8e6961c5f761df16b6160f38c6e40c
+EBUILD inotify-tools-3.21.9.6.ebuild 945 BLAKE2B e351e97ad2996da6331e8621ae58dfc31928601c8682d4a7c26331e2b5b574074e5411d69e65a66d69e914f677f6b47346adc46ad6a67923f90c62528806bbd0 SHA512 7e4bcb5e609b2bd20af4ada32e9c8d7bd969f80973c09ef572427e2178a0504e3541e600ac913efd29548cd481793cea5a8e6961c5f761df16b6160f38c6e40c
MISC metadata.xml 650 BLAKE2B c9ba61d027e41cbf654b86cd305377637833d117431ce3b88ffd300627ea3b040b42ba69a8e1cd11a6cc83457009a2529f5e498bde3809dc6c098c86cd9439d7 SHA512 cfd57d3d0ada7f845cc8dbdfd19024fafd9603b5532ce3aa03b78f0910b9fd4de59e43d3f5bb0ead8d0ae61fa37f62f9b4320caa6f0be4776a2ad775b5efb833
diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
index 1cc912c8d9cc..f9459bef6394 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
IUSE="doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
index 1cc912c8d9cc..f9459bef6394 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
IUSE="doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index a0f68a97304e..ead90bd8c3a7 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,5 +1,5 @@
-DIST loop-AES-v3.7s.tar.bz2 376972 BLAKE2B 0a4dcc6aeadfad5c33b01b48c53d6df55925be2cc0f85c2e96b61b15a60d42d7868fa9c32ad5ef3a13caa5e1ab4407792aad32cd60a57b094348b355cd688b22 SHA512 25f7d9218ae83c4c1fb5294bc405267c3a4e20954fbd7a45effb70ebef4014625b8cc93c7d69be220da4a04f4cd4b429763273cdb6cda497a6a31888d47ca1d1
DIST loop-AES-v3.7t.tar.bz2 377808 BLAKE2B 77a6baa31be9efc84504e6eaccca87193180b26ec6f6dc824480453e78905f8763c08fd72a63c18950796ad0b70ad8be2ed26e107cded6dcaddd96433dfa7f56 SHA512 cb0dcbfa7639f8d2c1990465a44cbcd6d4bf065b1df9178f4dd524a8b8ddd05ebb860e6a9d9425b4a22b9c74342bf3ff232ff777be9b5458bdabe54f4097ecef
-EBUILD loop-aes-3.7s.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
+DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275 SHA512 62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
EBUILD loop-aes-3.7t.ebuild 1751 BLAKE2B 318ecaf349eb7ef78e506352c9a20c3ac5d77b7d8e95dbd14c5ea8e8d6000018fdc16ba10ad7806d51539167a5a42978465ca4693c8b9b0796139bee05aae57a SHA512 f0dbca7131097f5c9e58623991085a60bfaea2d6f70072da714485ede0f1b89b27dad78f322a8bd4e77d8b081ca95f347d7d8098a3c3735814f47aadf4aca94b
+EBUILD loop-aes-3.7v.ebuild 1528 BLAKE2B 9774785e6db9f11ad9191e3b4b761b05507b6f613de6d347a3a756aa5abc4d63b7db56826b6345bf836ca837fcb8bc4f81fde6555c027772d2434931e32672c0 SHA512 8edae2efb1686106bc3f4a625f9a7e0e5da5034e80019b37be5ea568eefcc289916aa81c919e7d64223efcec5e21172994aa9db557f3b3d2b675102ff443c58a
MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/loop-aes-3.7s.ebuild b/sys-fs/loop-aes/loop-aes-3.7v.ebuild
index 6879462d4158..3061d50ad0a8 100644
--- a/sys-fs/loop-aes/loop-aes-3.7s.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.7v.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,6 +49,7 @@ src_install() {
linux-mod_src_install
dodoc README
+ dodoc ChangeLog
dobin loop-aes-keygen
doman loop-aes-keygen.1
@@ -63,9 +64,4 @@ pkg_postinst() {
einfo "For more instructions take a look at examples in README at:"
einfo "'${EPREFIX}/usr/share/doc/${PF}'"
einfo
- einfo "If you have a newer Intel processor (i5, i7), and you use AES"
- einfo "you may want to consider using the aes-ni use flag. It will"
- einfo "use your processors native AES instructions giving quite a speed"
- einfo "increase."
- einfo
}
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 470cbc9260ea..bfbbab0a40b7 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,5 +1,3 @@
-DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921
DIST mtd-utils-2.1.3.tar.gz 383897 BLAKE2B 75aa73440101bb4bfc753b7e0b8371c141ea6b648aa3928c5c121f4976e01c37770d09da3683376891a9899d46c6ccbb7685b32c70f925e63916c552ae720037 SHA512 68efffda2077e14560b9c0b0e40ce8567aee21096c2a3e19bfb6febc3bc11d56c4ac5682728f08b6d215754e7cb39f956a3ced1f6bde3142f0d6ea8492b9bfda
-EBUILD mtd-utils-2.1.2.ebuild 933 BLAKE2B 245fd61df8a47518240c74599b7a1685df48f57cf6fc3f4a77768d95dc5a7199486260be4d92ce3573a500456a4b9a898ed23c3cc0280c93b80809b23bbb00ac SHA512 fafb5d790b20eefd5948a479e1926b768be4e148080530043d2c0fd3619f864101c7db8b4c20c0add9d47d237a9b33d15ef463587c5c717b4e9c9fdee384731d
-EBUILD mtd-utils-2.1.3.ebuild 940 BLAKE2B 6c008f89ca77212d9355948e4ab9cc1fe295f1a6d5298a2b7faf3912a69779e391200af47f994908cd001d822d994775e5c957892a3bd7a33e6a8ea9fbceff65 SHA512 80fbc3648d2de7dbdf342c291da1ed2cc5017ea176c7739a9172a39d361968c6153700b419a4e20ba313bd324dce9a9096ace83a3baa6146b5d94f26508ef500
+EBUILD mtd-utils-2.1.3.ebuild 936 BLAKE2B 83f6ad80a8fb59eeadca556df36f5f46b86d48409cdc29a26cdc7787b31ede27f6a371833d53943e143190cd8aa4e668a88299794b0d2503c1acabd56302e4ac SHA512 64e9e1a4485e4fdbd586aa0fae77a817318f37f8f92f91b0113c74a7babf97bbede2f26b1799d36d0b6bf215d341bb908e7e2e69012823d004c61e57593ae99a
MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
deleted file mode 100644
index 88222eda3de7..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+lzo xattr +zstd"
-
-DEPEND="!sys-fs/mtd
- >=sys-apps/util-linux-2.16
- sys-libs/zlib
- lzo? ( dev-libs/lzo )
- xattr? ( sys-apps/acl )
- zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/libtool"
-
-DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
-
-src_prepare() {
- default
- ./autogen.sh || die
-}
-
-src_configure() {
- econf \
- $(use_with lzo) \
- $(use_with xattr) \
- $(use_with zstd)
-}
-
-src_install() {
- default
- doman \
- jffsX-utils/mkfs.jffs2.1 \
- ubi-utils/ubinize.8
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
index 0f873521e8eb..0cfd35235d4f 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="+lzo xattr +zstd"
DEPEND="
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index ebbd4969922d..b08e838004a2 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -1,3 +1,4 @@
+AUX mtpfs-1.1-deprecated_lock_init.patch 803 BLAKE2B 1e7e1cd45cc14ffd5300583f386bc2ff1199e9086efa148813f6b03fdd4254cff4b8136d5537dfbd9d8262cc1f17fdb9a0ec2811951a346d59444715b138f3a4 SHA512 d93a2fc04b4d09de89b4227a05d88f4a1d139098cd50bbd6970c746c090b44600572682721b48c5a59ac62f9584592aad0e6c17dfd6740f98e372346457620c7
AUX mtpfs-1.1-fix-mutex-crash.patch 2115 BLAKE2B 13e74f735cf415d3b8a1139244d4c8f90a4d7d4482cda4de732ba6141e5988b5bd04faf29c8855897469f7e221414dd042be7042ff6c0a1349eec63c76df417c SHA512 800e1dd3d2b76503ee7ba03bbdce8cd43c6a64b4444d3f2f9b49e155b86b005c98ff2019043cbc440762ed8c4dc675a4666fe0fa4bfbc3c89971a2aeb16538e1
AUX mtpfs-1.1-g_printf.patch 166 BLAKE2B 73c28b822a2ec2cc016bcf4adb037ec4b7b24dc49ecd7c5ad118edc09e970524c7976a95c04de4c5adeae575930912fb7eaf65c175226cff4f5665d2801606b1 SHA512 97ba9291dbcad22c149f5edb89fd67a92b678843caa7b1fa397c9d2c6205bfc591c31696f108732eef9b20bfe767df8e33d5a356d8e975c02eb0a28f773f2006
AUX mtpfs-1.1-unitialized-variable.patch 346 BLAKE2B a0d2c486ecb01a11af0f4ef486a28d8dd7d09fd5516372fb37e8adf5010a00e4fe6972bfc5f0ee4baa5e801276df5a54d55c1c9942f0790477384ecd015b1d1a SHA512 a61beb4a5c5cfb2d6682e3962a63697c7c9bfd2692780c2a9cb0d0c5cf3f8e2ef545a1c3cb4c91329e9991ee27db37322b030c8fdcfb0eb40a81b1293d48f884
@@ -9,5 +10,5 @@ AUX mtpfs-1.1-wking-patches/0005-Use-O_ACCMODE-to-pull-out-the-access-portion-of
AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAKE2B c6cff901a12db5254517776abef8ec58b756bcb2a10b26bcf6fefe7340bb7003a6e2d043f1c87fa586025ab71d0c692e910b3e545858c560b7e9d21193892b70 SHA512 c43ab62c8d63d6e9c2b42de74a4a25fbb6edf87d0f46128796c7e4e61704a5ee7753fafffbcfbbbc116e180cc1a8d8a3aa8a9b4cb9d3a031ffd8d3d67e201da3
AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
-EBUILD mtpfs-1.1-r6.ebuild 1252 BLAKE2B 286cd29e1a7d613d10f03faf234056f48eb8f2c4659cf7734503dea215533a4d4e07bd2de048c365b4d949f59ce494ecb55fe6ebe35f99228997800805d14e39 SHA512 bca08bc35807b316c4b0701df9fc0c413686c7bf5886a9a86204500751e7b92e59e2f1b8cf25b5d9d25fad1a6d803d47aec0ff573187c433a315c62c7e238c6d
+EBUILD mtpfs-1.1-r6.ebuild 1299 BLAKE2B 0b570be9013efdea2c897cbbb7854e01191523f6caefd9fbcb86aa0194726fba8571edc2d0a721630238687e7cfe919bc1b629e6ce9049dbac652052553bf9ef SHA512 a591ca2d241b26ed7294815c35c4f44e4dbef35098d87f45263f80e98794ebf1c5258cf4517a7e910d9c7c21946a35c4066bde92a483531aaf56a6ed2b55a911
MISC metadata.xml 572 BLAKE2B 7a7e36f2ae5612b21850553cfbe139d1890625ab35c6af5e6ac7743283b60418fab05fdda51bca45131b033cd6f66d38ff8341414b753630c0e2dd3d15287b06 SHA512 0b400a93a50484a42d5cb9be206d4c233947de16692dedbd4163b692e5175ddc51d429ea0d3bf88c8f60502308fe29cc3ea94df7efdc58d17834be1a96a3c863
diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch b/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch
new file mode 100644
index 000000000000..d369ebfe1f2a
--- /dev/null
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch
@@ -0,0 +1,24 @@
+diff -Naur mtpfs-1.1.orig/mtpfs.c mtpfs-1.1/mtpfs.c
+--- mtpfs-1.1.orig/mtpfs.c 2021-10-01 00:15:15.763423589 +0200
++++ mtpfs-1.1/mtpfs.c 2021-10-01 00:16:07.626486888 +0200
+@@ -1371,6 +1371,8 @@
+ extern int optind;
+ extern char *optarg;
+
++ g_mutex_init(&device_lock);
++
+ //while ((opt = getopt(argc, argv, "d")) != -1 ) {
+ //switch (opt) {
+ //case 'd':
+diff -Naur mtpfs-1.1.orig/mtpfs.h mtpfs-1.1/mtpfs.h
+--- mtpfs-1.1.orig/mtpfs.h 2021-10-01 00:15:15.779423609 +0200
++++ mtpfs-1.1/mtpfs.h 2021-10-01 00:16:20.322502337 +0200
+@@ -77,7 +77,7 @@
+ static GSList *myfiles = NULL;
+ static LIBMTP_playlist_t *playlists = NULL;
+ static gboolean playlists_changed = FALSE;
+-static GMutex device_lock = G_STATIC_MUTEX_INIT;
++static GMutex device_lock;
+
+
+ #endif /* _MTPFS_H_ */
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
index 3bc2351e26c1..04dd5b86b903 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
@@ -27,7 +27,8 @@ DOCS=(AUTHORS NEWS README)
PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
"${FILESDIR}"/${P}-unitialized-variable.patch
"${FILESDIR}"/${P}-wking-patches/
- "${FILESDIR}"/${P}-g_printf.patch )
+ "${FILESDIR}"/${P}-g_printf.patch
+ "${FILESDIR}"/${P}-deprecated_lock_init.patch )
src_prepare() {
default
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 9d902b6218b6..2b8d7f2f0380 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,5 +1,5 @@
DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2063 BLAKE2B d70e46fe59628db9440f4d6516781fad6d9d10873f98b06364acd4c8afbc6b609f78fca688fbb1c4486ae6cd7a0089a6c3674b8555fec8af4360b6c7e4ac54b1 SHA512 fbf424b708a4e15fabdffb1046dd49854ed21335bf953fe39eb8993541178cfd3ffe482121d29c56b5dd5802c373d8aaaa70e0ae9dc6526f091baa886950bf36
-EBUILD ntfs3g-2021.8.22.ebuild 2094 BLAKE2B 27766b0410ed323c997bbcfdd5d1e302aefdfa985b2d38a1ec60a1b34ba90da4c0fbe5ea657bcf3c7461cdc5b10637b7d83eef3644c39523d0cf7401974b5346 SHA512 93848999d1b2a48950b2178c56dccbefbb384a63f936871fc2877052f738f50403655f8e3b909b32ece9b1b988930fde0554d35fbcf9d6314e7bafec2e300c66
+EBUILD ntfs3g-2021.8.22.ebuild 2101 BLAKE2B 5f4b74c7f0f149215ed69d120dc2b0bd556fde2646b4ff641a4a081826b7eb00198b999a2846cf8165cfba64e8ad28f40015938e2041b95a49a0b6a903d24306 SHA512 055b4a7aabe659361a52a6c469e195b4ef50bbfb784918e5629b270fd03e2d5f515e8a834d66e7d1c2248b9002dd5a6faaa2ad05651c70bcf3d1a32a3e9f2dba
MISC metadata.xml 1072 BLAKE2B cbfb93f83a25bb707c6584f035d742513da2e423ec1f52fcebf25b6b34829bc429f7fbc38e2e3e76dd5ad2eca5f28d91072a0000ef83277bf84553aa6ff1e6b5 SHA512 2afcc34189ca0708f6d1cd15e9e249dc3ac0a150f4094c97a0d5745ca0b21f426676c3090df031cc8f234da38b2d13abb8ddf1583b9049d52ce2737833ee9314
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
index ab40a1ab9931..7e4c2ed5669d 100644
--- a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
LICENSE="GPL-2"
# The subslot matches the SONAME major #.
SLOT="0/89"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
RDEPEND="
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index fc9a33579111..6f5e110bab31 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,3 +1,3 @@
DIST udftools-2.3.tar.gz 581756 BLAKE2B 48b3681509c755249cfabd29fae9a622bcf104aead15e03196acaaa64ad8cab77b928fec7c08be7b9f5753594e1de1c21c9a9c3e863bcf5388d6e2090d04e9a9 SHA512 17304264388ae53e348d6aa870f0d23c29477344fee848236b46886c086221941872073974f804c0735eafd0cf9f7acdac7988132f03c0a87dba37467b5bda95
-EBUILD udftools-2.3.ebuild 553 BLAKE2B 82cceec792b3c32d351b79ed093bee70bd99adce8ad8ed072cbcd28a39e0c142c729783796aadc759839fcd6d74f0b35db7e98e6dc07b9dab8c19d3c306a284b SHA512 cd3fd750cf88ef890d491ceb87b37f1516faa2641cbae8ff13b4e23354c84de0b96362713cb436e2408c4b4f7e4165c6d346948d8fc4a15b4b2510ff34c2f436
+EBUILD udftools-2.3.ebuild 560 BLAKE2B 3da42d397004b68021c51a6fdaddc1ede14b2f669024ddfbdd20e1ca217cf960ed663c34c6c616fc63c800793b240583fffc8cdaa415d7e5d79c552652a7d245 SHA512 9e56b3cc0f15fd2e50acd993d132165f3fa3e1d65984d4b0f46303258b1756a0ea9c24efbee4c73e11612527a18e56a95f877d26fb099d89bc7d18cdb560c159
MISC metadata.xml 390 BLAKE2B f13ee3ecfadfa4d89abd4afd55cd6c61cab21bb05094ef8f6ce70e81d116c3974f860e9839b5b1bc39bc31d439b6a5ca267fa7475040247718f51ba0f7d942f1 SHA512 37d975607cfb79777c4a77c73c1c8b9b1dbbc0cb6568e94bec8b6ad65ce24a2e951939151f26bb9afe80e3ea09399712a4f0d270e1287f6947caa64e447cfd94
diff --git a/sys-fs/udftools/udftools-2.3.ebuild b/sys-fs/udftools/udftools-2.3.ebuild
index 8bd6a21db085..e3ffa7b9458f 100644
--- a/sys-fs/udftools/udftools-2.3.ebuild
+++ b/sys-fs/udftools/udftools-2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="sys-libs/readline:0="
DEPEND="${RDEPEND}"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index b6e483499baf..cd0b8420bbcb 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,7 +1,5 @@
-DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
-DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42
-EBUILD udisks-2.9.1-r2.ebuild 3529 BLAKE2B 45aa4d904dd309b528754dd7077a1c0c23b94c6f6f2aa3413af4ff793536aafc46947c360274ed38999538838e63accbb34d01d2e846040268df8f24853c0193 SHA512 2d20c606cd8e05f50da1e0020b58f8790f9ae25fbd98de2e4280a1dc55826ae44e15a2d8ceef3c2d6c4fea5da4622c8d29ba71eb86245fcc8583f70728d8dd36
-EBUILD udisks-2.9.2-r2.ebuild 3652 BLAKE2B b7e3809e57ab006d4652152287941e08c902d1cdc950a9dbbd187fb62be7f7dcdfd01bd840157aa62b6612d56bdf11f24dbc048dc01073010c33ac005c39e52c SHA512 83b736c253aedda99a8376e3bcd341a73430d18ccbd056314573af5d7fe29fa7b51fd593c0a260ae22e4fcd7dff04aad35cd4cfffa58e111bd6118f5e6e4a753
+DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a
+EBUILD udisks-2.9.4.ebuild 3652 BLAKE2B 255dff40822adf438c750c3b53da385d9adaa55e8cb2e75910b185ebe2f8471a33142f26697f5369dd8088910e0ec4d2b234016d7d04bd31b1e23183809f3831 SHA512 549a74771ddb6a89b3794ac3e51e6a0b6e5ef2635a9aa22759deb662f1e0e5865bda28813fd94600f0a7a37fb145d4b0a371054addd655361303e8cd57c75115
MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671
diff --git a/sys-fs/udisks/udisks-2.9.1-r2.ebuild b/sys-fs/udisks/udisks-2.9.1-r2.ebuild
deleted file mode 100644
index 57047f60efec..000000000000
--- a/sys-fs/udisks/udisks-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
-
-REQUIRED_USE="
- ?? ( elogind systemd )
- elogind? ( daemon )
- systemd? ( daemon )
- zram? ( systemd )
-"
-
-COMMON_DEPEND="
- >=sys-auth/polkit-0.110
- >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
- virtual/udev
- acl? ( virtual/acl )
- daemon? (
- >=dev-libs/glib-2.50:2
- >=dev-libs/libatasmart-0.19
- >=dev-libs/libgudev-165:=
- )
- elogind? ( >=sys-auth/elogind-219 )
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- lvm? ( sys-fs/lvm2 )
- systemd? ( >=sys-apps/systemd-209 )
- zram? ( >=sys-libs/libblockdev-2.24[kbd] )
-"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
- >=sys-block/parted-3
- >=sys-apps/util-linux-2.30
- selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.1
-"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- >=dev-util/gdbus-codegen-2.32
- >=dev-util/gtk-doc-am-1.3
- virtual/pkgconfig
- nls? ( >=sys-devel/gettext-0.19.8 )
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# dev-libs/gobject-introspection-common
-# sys-devel/autoconf-archive
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-pkg_setup() {
- # Listing only major arch's here to avoid tracking kernel's defconfig
- if use amd64 || use arm || use ppc || use ppc64 || use x86; then
- CONFIG_CHECK="~!IDE" #319829
- CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
- CONFIG_CHECK+=" ~NLS_UTF8" #425562
- kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- xdg_environment_reset
- default
-
- if ! use systemd ; then
- sed -i -e 's:libsystemd-login:&disable:' configure || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-btrfs
- --disable-gtk-doc
- --disable-static
- --localstatedir="${EPREFIX}"/var
- --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
- --with-modprobedir="${EPREFIX}"/lib/modprobe.d
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
- --with-udevdir="$(get_udevdir)"
- $(use_enable acl)
- $(use_enable daemon)
- $(use_enable debug)
- $(use_enable introspection)
- $(use_enable lvm lvm2)
- $(use_enable lvm lvmcache)
- $(use_enable nls)
- $(use_enable vdo)
- $(use_enable zram)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
- keepdir /var/lib/udisks2 #383091
-
- rm -rf "${ED}"/usr/share/bash-completion
- dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
- # Remove gtk-doc symlink, #597628
- if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
- rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
- fi
-}
-
-pkg_postinst() {
- # TODO: obsolete with tmpfiles_process?
- #mkdir -p "${EROOT}"/run #415987
-
- tmpfiles_process udisks2.conf
-
- # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
- if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
-}
diff --git a/sys-fs/udisks/udisks-2.9.2-r2.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild
index 480609ab96ff..b15fdab52bd3 100644
--- a/sys-fs/udisks/udisks-2.9.2-r2.ebuild
+++ b/sys-fs/udisks/udisks-2.9.4.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
BLOCKDEV_MIN_VER="2.25"
COMMON_DEPEND="
- >=sys-auth/polkit-0.110
+ >=sys-auth/polkit-0.114
>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo?]
virtual/udev
acl? ( virtual/acl )
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index fa8802067160..1a36f1a56379 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,17 +1,11 @@
AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23
DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba
-DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa
DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
-DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
-DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c
DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94
EBUILD zfs-kmod-0.8.6.ebuild 5481 BLAKE2B a367b1cec0374f6c9266bf599944ef5493eae21a91704572f806ec2486707a6d3cae876f52f97d527744c66596204b2dcdb435b2beb7cd182ca524cb991f8915 SHA512 014332fa562aae19d65c3f31ba1179e0c623dc3293e45e51323bb2b279641ee6926ac9d8cca3aba8407b44a2787be19abbaa3945f48e6e40f9aa27b1458e647a
-EBUILD zfs-kmod-2.0.5.ebuild 5524 BLAKE2B 09188fec56c553b2a5f1cf8f0047b155745ac023cf3656b9f2d6550cd3e208a08807f2eb31fad1c6412ea161a46d26fa82e981fdd29b843cc47ba647fc88952f SHA512 54ef09279cb6a1ae2610c3f78a3384da40af545a368e73701c1e3377972949000337bff9dc9daedc76734dcf2b641457a6a8ba4fae60ab8cec4626fcf64aa135
-EBUILD zfs-kmod-2.0.6.ebuild 5527 BLAKE2B 6f420e4b7ecfe938f73b14f4d735e91291d53608bbd784dcf60f74cc84454fc9a56a0e5f87397f1ce942888a1db46a62fe37aec60b03d915058c5539da69f22c SHA512 b3c13a5411ba13da36a729e5c258724ad3945a0b820953333d465b51fb601c640c4315977c3ae3abf28c5a39168c59c62b9b4e0eb0401fcff24761ebbf3ceec8
-EBUILD zfs-kmod-2.1.0.ebuild 4733 BLAKE2B aaa6a4be69435f30069a329854e0f33e963401c70e5b95ff1c418562d0556180659cb52f867475112c889a9d0596f2919fa5e9519c9ec41247f8128da394e447 SHA512 1f2829c7c1c317198e83594066c3e2aaa5931639cfa87920b1a1e1aff827da12c18cbc0ef340d1bda388efae6d59f4135f0ab85fb9f3923e2d8e6e7328deff41
+EBUILD zfs-kmod-2.0.6.ebuild 5524 BLAKE2B 92a1d66c9d994129b54957858eb2235f018df88e4a564a7dcfbe0a7d0d558dbbb81661a48fa0d6bc8a745cfff08b2d5f01a1263d2ef7a6b509d4ea4439d06e39 SHA512 37ca8be74fa3dbca773c76ddd60dcb9ce790e92174d400c4abb0837e6bce6dee24a3cdfa0366fa5e6bb196691ac9a17c976ee272516b2a918b872741f7c9fd23
EBUILD zfs-kmod-2.1.1.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04
EBUILD zfs-kmod-9999.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04
MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
deleted file mode 100644
index 74e838c5764e..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
- inherit verify-sig
-
- MY_PV="${PV/_rc/-rc}"
- SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
- SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
- S="${WORKDIR}/zfs-${PV%_rc?}"
- ZFS_KERNEL_COMPAT="5.13"
-
- if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="amd64 arm64 ppc64"
- fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}
- !sys-kernel/spl
-"
-
-BDEPEND="
- dev-lang/perl
- virtual/awk
-"
-
-if [[ ${PV} != "9999" ]] ; then
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_pretend() {
- use rootfs || return 0
-
- if has_version virtual/dist-kernel && ! use dist-kernel; then
- ewarn "You have virtual/dist-kernel installed, but"
- ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
- ewarn "It's recommended to globally enable dist-kernel USE flag"
- ewarn "to auto-trigger initrd rebuilds with kernel updates"
- fi
-}
-
-pkg_setup() {
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- EFI_PARTITION
- MODULES
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- !TRIM_UNUSED_KSYMS
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use debug && CONFIG_CHECK="${CONFIG_CHECK}
- FRAME_POINTER
- DEBUG_INFO
- !DEBUG_INFO_REDUCED
- "
-
- use rootfs && \
- CONFIG_CHECK="${CONFIG_CHECK}
- BLK_DEV_INITRD
- DEVTMPFS
- "
-
- kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
- if [[ ${PV} != "9999" ]]; then
- local kv_major_max kv_minor_max zcompat
- zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
- kv_major_max="${zcompat%%.*}"
- zcompat="${zcompat#*.}"
- kv_minor_max="${zcompat%%.*}"
- kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
- "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
- fi
-
- kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Run unconditionally (bug #792627)
- eautoreconf
-
- if [[ ${PV} != "9999" ]]; then
- # Set module revision number
- sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
- fi
-}
-
-src_configure() {
- set_arch_to_kernel
-
- use custom-cflags || strip-flags
-
- filter-ldflags -Wl,*
-
- # Set CROSS_COMPILE in the environment.
- # This allows the user to override it via make.conf or via a local Makefile.
- # https://bugs.gentoo.org/811600
- export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
- local myconf=(
- HOSTCC="$(tc-getBUILD_CC)"
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=kernel
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- )
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- set_arch_to_kernel
-
- myemakeargs=(
- HOSTCC="$(tc-getBUILD_CC)"
- V=1
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- set_arch_to_kernel
-
- myemakeargs+=(
- DEPMOD=:
- DESTDIR="${D}"
- INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
- )
-
- emake "${myemakeargs[@]}" install
-
- einstalldocs
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # Remove old modules
- if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
- ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
- ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
- ewarn "Automatically removing old modules to avoid problems."
- rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
- rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
- fi
-
- if [[ -z ${ROOT} ]] && use dist-kernel; then
- set_arch_to_portage
- dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
- fi
-
- if use x86 || use arm; then
- ewarn "32-bit kernels will likely require increasing vmalloc to"
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
- fi
-
- ewarn "This version of OpenZFS includes support for new feature flags"
- ewarn "that are incompatible with previous versions. GRUB2 support for"
- ewarn "/boot with the new feature flags is not yet available."
- ewarn "Do *NOT* upgrade root pools to use the new feature flags."
- ewarn "Any new pools will be created with the new feature flags by default"
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
- ewarn "create a newpool that is backward compatible wih GRUB2, use "
- ewarn
- ewarn "zpool create -d -o feature@async_destroy=enabled "
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
- ewarn " -o feature@spacemap_histogram=enabled"
- ewarn " -o feature@enabled_txg=enabled "
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
- ewarn " ..."
- ewarn
- ewarn "GRUB2 support will be updated as soon as either the GRUB2"
- ewarn "developers do a tag or the Gentoo developers find time to backport"
- ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
index e7c85c6b3e47..5c445cce099f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
@@ -22,7 +22,7 @@ else
ZFS_KERNEL_COMPAT="5.14"
if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm64 ~ppc64"
+ KEYWORDS="amd64 arm64 ppc64"
fi
fi
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
deleted file mode 100644
index 3aa1db85dc33..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
- inherit verify-sig
-
- MY_PV="${PV/_rc/-rc}"
- SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
- SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
- S="${WORKDIR}/zfs-${PV%_rc?}"
- ZFS_KERNEL_COMPAT="5.13"
-
- if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm64 ~ppc64"
- fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}
- !sys-kernel/spl
-"
-
-BDEPEND="
- dev-lang/perl
- virtual/awk
-"
-
-if [[ ${PV} != "9999" ]] ; then
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_pretend() {
- use rootfs || return 0
-
- if has_version virtual/dist-kernel && ! use dist-kernel; then
- ewarn "You have virtual/dist-kernel installed, but"
- ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
- ewarn "It's recommended to globally enable dist-kernel USE flag"
- ewarn "to auto-trigger initrd rebuilds with kernel updates"
- fi
-}
-
-pkg_setup() {
- CONFIG_CHECK="
- !DEBUG_LOCK_ALLOC
- EFI_PARTITION
- MODULES
- !PAX_KERNEXEC_PLUGIN_METHOD_OR
- !TRIM_UNUSED_KSYMS
- ZLIB_DEFLATE
- ZLIB_INFLATE
- "
-
- use debug && CONFIG_CHECK="${CONFIG_CHECK}
- FRAME_POINTER
- DEBUG_INFO
- !DEBUG_INFO_REDUCED
- "
-
- use rootfs && \
- CONFIG_CHECK="${CONFIG_CHECK}
- BLK_DEV_INITRD
- DEVTMPFS
- "
-
- kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
- if [[ ${PV} != "9999" ]]; then
- local kv_major_max kv_minor_max zcompat
- zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
- kv_major_max="${zcompat%%.*}"
- zcompat="${zcompat#*.}"
- kv_minor_max="${zcompat%%.*}"
- kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
- "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
- fi
-
- kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Run unconditionally (bug #792627)
- eautoreconf
-
- if [[ ${PV} != "9999" ]]; then
- # Set module revision number
- sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
- fi
-}
-
-src_configure() {
- set_arch_to_kernel
-
- use custom-cflags || strip-flags
-
- filter-ldflags -Wl,*
-
- # Set CROSS_COMPILE in the environment.
- # This allows the user to override it via make.conf or via a local Makefile.
- # https://bugs.gentoo.org/811600
- export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
- local myconf=(
- HOSTCC="$(tc-getBUILD_CC)"
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=kernel
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- $(use_enable debug)
- )
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- set_arch_to_kernel
-
- myemakeargs=(
- HOSTCC="$(tc-getBUILD_CC)"
- V=1
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- set_arch_to_kernel
-
- myemakeargs+=(
- DEPMOD=:
- DESTDIR="${D}"
- INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
- )
-
- emake "${myemakeargs[@]}" install
-
- einstalldocs
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- if [[ -z ${ROOT} ]] && use dist-kernel; then
- set_arch_to_portage
- dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
- fi
-
- if use x86 || use arm; then
- ewarn "32-bit kernels will likely require increasing vmalloc to"
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
- fi
-
- if has_version sys-boot/grub; then
- ewarn "This version of OpenZFS includes support for new feature flags"
- ewarn "that are incompatible with previous versions. GRUB2 support for"
- ewarn "/boot with the new feature flags is not yet available."
- ewarn "Do *NOT* upgrade root pools to use the new feature flags."
- ewarn "Any new pools will be created with the new feature flags by default"
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
- ewarn "create a newpool that is backward compatible wih GRUB2, use "
- ewarn
- ewarn "zpool create -o compatibility=grub2 ..."
- ewarn
- ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features."
- fi
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c2cc068a46f1..c91e5b826deb 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,18 +1,12 @@
AUX 2.0.4-scrub-timers.patch 2873 BLAKE2B 40986e258ddc3c5b4dfdebc8c2126fbb2c0ff9ac947700fa30c547795612fb98b2778f364ee10ec47c05a6837c4d4129918a6efe7cf3ab5854910e1892a3e348 SHA512 0e557974fe8992a7b0e6c15e46fac55d265e469aa13f85e85b0abe449b5fe2e8c51cf56510863fa2e33c060f2b38c0c43a910a740172ef1d4c42c0aa85e04ab9
AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba
-DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa
DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
-DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
-DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c
DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94
EBUILD zfs-0.8.6-r1.ebuild 6315 BLAKE2B 063ec7b7374c26035f05614ce2cab7e9d73993571edd22fbaa6eeff51b26ebdeba98fe7fae398f4201a12774a672fe444c1f0f56cfae8da7acd1ec35d92cd5c4 SHA512 5ee8f85b288eca30d3540b1fa8de11616f9095385190139478aa59942e0df7e5f089522e145c35ce900c288b1a4f1d13dda66c569a206da73050630b2f3e787b
-EBUILD zfs-2.0.5-r1.ebuild 8035 BLAKE2B 757cfe559c0f3f97f8feb4dae98938cfef68336947057a4520857842e3ff037ef26a78a7cd191183a439b3aab123a4b4b98bb544c5ea31b144beba6241a820b5 SHA512 4a918715cff7d63c00a4d6bcd7b72ecc0f9f76a27180552a98bbec59161ca920b53b077127163f81944a0d3afda7000bcc2dc5aecb7cc3a0d1bf12c347ab0b2e
-EBUILD zfs-2.0.6.ebuild 8038 BLAKE2B f7c2ee5b3a66001d1904aac338fa1c02252d283d7fbe85a39d1585eb2baf87f3bc40468f68051cb953129fe15090b5462999e1f13a52ba9a77c7a28a34518691 SHA512 00ace24909653a236cd742c688e1da57bad38cfa3d5c0261d0f2900326c85719dec9c4d6a554aa45ec170bdd9bc46002921b70830f18ea71505770143a5f0f0d
-EBUILD zfs-2.1.0-r1.ebuild 8088 BLAKE2B 02df4f77ce32bad5454b3a772447da4f87faae5a0fd247113236bc3001f37fd6a667ff6ae64916d2c98e767e14b8fe5ac682dda928aab80e6b09398c48906e43 SHA512 982e62c15298bef0ce0cd4f35835ee415c5f32082bbfcea30919f120c2390e8707c68d9e01e1509b801549e5293a731d5a75da5a7a27a6681470f9d89dafb33a
-EBUILD zfs-2.1.1-r1.ebuild 8213 BLAKE2B 599e9a41f8c47bf5d120bd0509f8bd1a5c0833ec1ab1981602148cf9f33012db3363d3e4b9f5fc1ce56b00d1732e56dc2e24561f3f2b0c6492290aa095f43c50 SHA512 3dc47e1c9ced2ac9c9c4f7f8532835da63f26d85e0b6713ec73b909ae3f4153c4bddf98224517da910441fad22b1b9a38d5c3f7ccb86a046d8b108ab663892d0
-EBUILD zfs-9999.ebuild 8254 BLAKE2B 85816fe265223812d55b688dfce5ca23de5be4f095cfa64aeed54a6cee481a22c749ca461e34fb774a02f96d91899bdaf103474a2f9a54c72dea01f61fafe66d SHA512 6677231a44923f7903f7da2d5631e1acb8915af272a0bb7c61afca1e3204dd26041be873cf79b99be404c2afc9afabe6dab06584318888833458d484b6bd37f8
+EBUILD zfs-2.0.6-r1.ebuild 8150 BLAKE2B 97f5d5db28d6202b7585be544b7fc4f70d19c04b85356525cea2a12a14840f4f5b09119fc51fd5ff7f7b83eee042fedab89f24ca0cc204b2f8e35be21cde38c5 SHA512 2eb2544cdfbfcd24fd9da53afa15c24afcd12eea817df3553022161f250f1d65ed0bac4600d0dc3c34c152df4577248aae3bc56d0a3b8193da9c83f6d2f5ef96
+EBUILD zfs-2.1.1-r2.ebuild 8328 BLAKE2B 4ced1d769042006a93d2a77fdcb89097179cee184704a2eb7ca6a0a1e651c598d17781ac2974221e68dc9bf10107be2a5e0c569f0e0c8efa9c84697f99538b59 SHA512 bcbf86059b5f49f52d408e26cc7fc49eb888b07114b3e0d9675931a5c88d70f4fa8e4daef0bbc87912ee4cb2e84aa507d402bb96163e7ff47f08e2789d929572
+EBUILD zfs-9999.ebuild 8369 BLAKE2B af151107e258c8d391616a9860b12f4394b81e0ef05eea989ee23d9f649f78c126a73a8067873145574c2e3798044363ca5ba5f79fcdec9a4dead46df63103ae SHA512 515a0f26d5c12caeedaf6f8b4c3a1b7c3c735e045980b2c600857ed9412e3b167cf1c02d921efad68c4ee97063a9db71dfff78ce7639357644e70db7d90cbe56
MISC metadata.xml 1001 BLAKE2B 8e94a0d8e1afff064b3f8e4a7e3e6d34ad12d5fa550df2f3371b1593b0938b3ea0dbfdcd2e40023f4e91bbe12cf1f3633d92977e4f5b4ee10b56d5040f065f90 SHA512 fc7ba310676715f5daa59b30107560f9ba61cc7dc79eb74ff866e4c8f36bd6a414474a216f5c833dc46c6426e4c80a6672b488fab4178a0c00a47b0de1caf6eb
diff --git a/sys-fs/zfs/zfs-2.0.5-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
index 6b91c6f5b816..e12aebe76f0a 100644
--- a/sys-fs/zfs/zfs-2.0.5-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
@@ -84,6 +84,12 @@ RDEPEND="${DEPEND}
)
"
+# temporary block new coreutils
+# https://github.com/openzfs/zfs/issues/11900
+RDEPEND+="
+ <sys-apps/coreutils-9
+"
+
REQUIRED_USE="
!minimal? ( ${PYTHON_REQUIRED_USE} )
python? ( !minimal )
diff --git a/sys-fs/zfs/zfs-2.0.6.ebuild b/sys-fs/zfs/zfs-2.0.6.ebuild
deleted file mode 100644
index 4b474020cd77..000000000000
--- a/sys-fs/zfs/zfs-2.0.6.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3 linux-mod
- EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
- inherit verify-sig
-
- MY_P="${P/_rc/-rc}"
- SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
- S="${WORKDIR}/${P%_rc?}"
-
- if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm64 ~ppc64"
- fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/4"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
-
-DEPEND="
- net-libs/libtirpc
- sys-apps/util-linux
- sys-libs/zlib
- virtual/libudev:=
- dev-libs/openssl:0=
- !minimal? ( ${PYTHON_DEPS} )
- pam? ( sys-libs/pam )
- python? (
- virtual/python-cffi[${PYTHON_USEDEP}]
- )
-"
-
-BDEPEND="virtual/awk
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- python? (
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
-"
-
-if [[ ${PV} != "9999" ]] ; then
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="${DEPEND}
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
- !prefix? ( virtual/udev )
- sys-fs/udev-init-scripts
- virtual/awk
- dist-kernel? ( virtual/dist-kernel:= )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-kernel/genkernel-3.5.1.1
- )
- test-suite? (
- sys-apps/kmod[tools]
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- )
-"
-
-REQUIRED_USE="
- !minimal? ( ${PYTHON_REQUIRED_USE} )
- python? ( !minimal )
- test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/bash-completion-sudo.patch"
- "${FILESDIR}/2.0.4-scrub-timers.patch"
-)
-
-pkg_pretend() {
- use rootfs || return 0
-
- if has_version virtual/dist-kernel && ! use dist-kernel; then
- ewarn "You have virtual/dist-kernel installed, but"
- ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
- ewarn "It's recommended to globally enable dist-kernel USE flag"
- ewarn "to auto-trigger initrd rebuilds with kernel updates"
- fi
-}
-
-pkg_setup() {
- if use kernel_linux; then
- linux-info_pkg_setup
-
- if ! linux_config_exists; then
- ewarn "Cannot check the linux kernel configuration."
- else
- if use test-suite; then
- if linux_chkconfig_present BLK_DEV_LOOP; then
- eerror "The ZFS test suite requires loop device support enabled."
- eerror "Please enable it:"
- eerror " CONFIG_BLK_DEV_LOOP=y"
- eerror "in /usr/src/linux/.config or"
- eerror " Device Drivers --->"
- eerror " Block devices --->"
- eerror " [X] Loopback device support"
- fi
- fi
- fi
- fi
-}
-
-libsoversion_check() {
-
- local bugurl libzfs_sover
- bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
- libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
- | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
- libzfs_sover="${libzfs_sover%%:*}"
-
- if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
- echo
- eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
- eerror "ebuild subslot does not match libzfs soversion!"
- eerror "libzfs soversion: ${libzfs_sover}"
- eerror "ebuild value: $(ver_cut 2 ${SLOT})"
- eerror "This is a bug in the ebuild, please use the following URL to report it"
- eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
- echo
- # we want to abort for releases, but just print a warning for live ebuild
- # to keep package installable
- [[ ${PV} == "9999" ]] || die
- fi
-}
-
-src_prepare() {
- default
- libsoversion_check
-
- # Run unconditionally (bug #792627)
- eautoreconf
-
- if [[ ${PV} != "9999" ]]; then
- # Set revision number
- sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
- fi
-
- if use python; then
- pushd contrib/pyzfs >/dev/null || die
- distutils-r1_src_prepare
- popd >/dev/null || die
- fi
-
- # prevent errors showing up on zfs-mount stop, #647688
- # openrc will unmount all filesystems anyway.
- sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- use minimal || python_setup
-
- local myconf=(
- --bindir="${EPREFIX}/bin"
- --enable-shared
- --enable-systemd
- --enable-sysvinit
- --localstatedir="${EPREFIX}/var"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-dracutdir="${EPREFIX}/usr/lib/dracut"
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-pamconfigsdir="${EPREFIX}/unwanted_files"
- --with-pammoduledir="$(getpam_mod_dir)"
- --with-systemdunitdir="$(systemd_get_systemunitdir)"
- --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
- --with-vendor=gentoo
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable pam)
- $(use_enable python pyzfs)
- --disable-static
- $(usex minimal --without-python --with-python="${EPYTHON}")
- )
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
- if use python; then
- pushd contrib/pyzfs >/dev/null || die
- distutils-r1_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- default
-
- gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
- use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
- use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
- find "${ED}" -name '*.la' -delete || die
-
- dobashcomp contrib/bash_completion.d/zfs
- bashcomp_alias zfs zpool
-
- # strip executable bit from conf.d file
- fperms 0644 /etc/conf.d/zfs
-
- if use python; then
- pushd contrib/pyzfs >/dev/null || die
- distutils-r1_src_install
- popd >/dev/null || die
- fi
-
- # enforce best available python implementation
- use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
- # we always need userspace utils in sync with zfs-kmod
- # so force initrd update for userspace as well, to avoid
- # situation when zfs-kmod trigger initrd rebuild before
- # userspace component is rebuilt
- # KV_* variables are provided by linux-info.eclass
- if [[ -z ${ROOT} ]] && use dist-kernel; then
- dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
- fi
-
- if use rootfs; then
- if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
- elog "Root on zfs requires an initramfs to boot"
- elog "The following packages provide one and are tested on a regular basis:"
- elog " sys-kernel/dracut"
- elog " sys-kernel/genkernel"
- fi
- fi
-
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- if systemd_is_booted || has_version sys-apps/systemd; then
- einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
- einfo "for default zfs systemd service configuration"
- else
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
- einfo "You should add zfs-import to the boot runlevel."
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
- einfo "You should add zfs-mount to the boot runlevel."
- [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
- einfo "You should add zfs-share to the default runlevel."
- [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
- einfo "You should add zfs-zed to the default runlevel."
- fi
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-2.1.0-r1.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
deleted file mode 100644
index 2ab356846cf3..000000000000
--- a/sys-fs/zfs/zfs-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3 linux-mod
- EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
- inherit verify-sig
-
- MY_P="${P/_rc/-rc}"
- SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
- S="${WORKDIR}/${P%_rc?}"
-
- if [[ ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm64 ~ppc64"
- fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
-
-DEPEND="
- net-libs/libtirpc
- sys-apps/util-linux
- sys-libs/zlib
- virtual/libudev:=
- dev-libs/openssl:0=
- !minimal? ( ${PYTHON_DEPS} )
- pam? ( sys-libs/pam )
- python? (
- virtual/python-cffi[${PYTHON_USEDEP}]
- )
-"
-
-BDEPEND="virtual/awk
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- python? (
- dev-python/setuptools[${PYTHON_USEDEP}]
- || (
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/distlib[${PYTHON_USEDEP}]
- )
- )
-"
-
-if [[ ${PV} != "9999" ]] ; then
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="${DEPEND}
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
- !prefix? ( virtual/udev )
- sys-fs/udev-init-scripts
- virtual/awk
- dist-kernel? ( virtual/dist-kernel:= )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- !<sys-kernel/genkernel-3.5.1.1
- )
- test-suite? (
- sys-apps/kmod[tools]
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- )
-"
-
-REQUIRED_USE="
- !minimal? ( ${PYTHON_REQUIRED_USE} )
- python? ( !minimal )
- test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/2.0.4-scrub-timers.patch" )
-
-pkg_pretend() {
- use rootfs || return 0
-
- if has_version virtual/dist-kernel && ! use dist-kernel; then
- ewarn "You have virtual/dist-kernel installed, but"
- ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
- ewarn "It's recommended to globally enable dist-kernel USE flag"
- ewarn "to auto-trigger initrd rebuilds with kernel updates"
- fi
-}
-
-pkg_setup() {
- if use kernel_linux; then
- linux-info_pkg_setup
-
- if ! linux_config_exists; then
- ewarn "Cannot check the linux kernel configuration."
- else
- if use test-suite; then
- if linux_chkconfig_present BLK_DEV_LOOP; then
- eerror "The ZFS test suite requires loop device support enabled."
- eerror "Please enable it:"
- eerror " CONFIG_BLK_DEV_LOOP=y"
- eerror "in /usr/src/linux/.config or"
- eerror " Device Drivers --->"
- eerror " Block devices --->"
- eerror " [X] Loopback device support"
- fi
- fi
- fi
- fi
-}
-
-libsoversion_check() {
-
- local bugurl libzfs_sover
- bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
- libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
- | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
- libzfs_sover="${libzfs_sover%%:*}"
-
- if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
- echo
- eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
- eerror "ebuild subslot does not match libzfs soversion!"
- eerror "libzfs soversion: ${libzfs_sover}"
- eerror "ebuild value: $(ver_cut 2 ${SLOT})"
- eerror "This is a bug in the ebuild, please use the following URL to report it"
- eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
- echo
- # we want to abort for releases, but just print a warning for live ebuild
- # to keep package installable
- [[ ${PV} == "9999" ]] || die
- fi
-}
-
-src_prepare() {
- default
- libsoversion_check
-
- # Run unconditionally (bug #792627)
- eautoreconf
-
- if [[ ${PV} != "9999" ]]; then
- # Set revision number
- sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
- fi
-
- if use python; then
- pushd contrib/pyzfs >/dev/null || die
- distutils-r1_src_prepare
- popd >/dev/null || die
- fi
-
- # prevent errors showing up on zfs-mount stop, #647688
- # openrc will unmount all filesystems anyway.
- sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- use minimal || python_setup
-
- local myconf=(
- --bindir="${EPREFIX}/bin"
- --enable-shared
- --enable-systemd
- --enable-sysvinit
- --localstatedir="${EPREFIX}/var"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-dracutdir="${EPREFIX}/usr/lib/dracut"
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="$(get_udevdir)"
- --with-pamconfigsdir="${EPREFIX}/unwanted_files"
- --with-pammoduledir="$(getpam_mod_dir)"
- --with-systemdunitdir="$(systemd_get_systemunitdir)"
- --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
- --with-vendor=gentoo
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable pam)
- $(use_enable python pyzfs)
- --disable-static
- $(usex minimal --without-python --with-python="${EPYTHON}")
- )
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
- if use python; then
- pushd contrib/pyzfs >/dev/null || die
- distutils-r1_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- default
-
- gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
- use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
- use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
- find "${ED}" -name '*.la' -delete || die
-
- dobashcomp contrib/bash_completion.d/zfs
- bashcomp_alias zfs zpool
-
- # strip executable bit from conf.d file
- fperms 0644 /etc/conf.d/zfs
-
- if use python; then
- pushd contrib/pyzfs >/dev/null || die
- distutils-r1_src_install
- popd >/dev/null || die
- fi
-
- # enforce best available python implementation
- use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
- # we always need userspace utils in sync with zfs-kmod
- # so force initrd update for userspace as well, to avoid
- # situation when zfs-kmod trigger initrd rebuild before
- # userspace component is rebuilt
- # KV_* variables are provided by linux-info.eclass
- if [[ -z ${ROOT} ]] && use dist-kernel; then
- dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
- fi
-
- if use rootfs; then
- if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
- elog "Root on zfs requires an initramfs to boot"
- elog "The following packages provide one and are tested on a regular basis:"
- elog " sys-kernel/dracut"
- elog " sys-kernel/genkernel"
- fi
- fi
-
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
- einfo "Adding ${P} to the module database to ensure that the"
- einfo "kernel modules and userland utilities stay in sync."
- update_moduledb
- fi
-
- if systemd_is_booted || has_version sys-apps/systemd; then
- einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
- einfo "for default zfs systemd service configuration"
- else
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
- einfo "You should add zfs-import to the boot runlevel."
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
- einfo "You should add zfs-mount to the boot runlevel."
- [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
- einfo "You should add zfs-share to the default runlevel."
- [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
- einfo "You should add zfs-zed to the default runlevel."
- fi
-}
-
-pkg_postrm() {
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
- remove_moduledb
- fi
-}
diff --git a/sys-fs/zfs/zfs-2.1.1-r1.ebuild b/sys-fs/zfs/zfs-2.1.1-r2.ebuild
index b18fbb260614..36d16c857de2 100644
--- a/sys-fs/zfs/zfs-2.1.1-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.1.1-r2.ebuild
@@ -84,6 +84,12 @@ RDEPEND="${DEPEND}
)
"
+# temporary block new coreutils
+# https://github.com/openzfs/zfs/issues/11900
+RDEPEND+="
+ <sys-apps/coreutils-9
+"
+
REQUIRED_USE="
!minimal? ( ${PYTHON_REQUIRED_USE} )
python? ( !minimal )
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 43755044ed6b..6cf9307c40d0 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -88,6 +88,12 @@ RDEPEND="${DEPEND}
)
"
+# temporary block new coreutils
+# https://github.com/openzfs/zfs/issues/11900
+RDEPEND+="
+ <sys-apps/coreutils-9
+"
+
REQUIRED_USE="
!minimal? ( ${PYTHON_REQUIRED_USE} )
python? ( !minimal )