7 files changed, 65 insertions, 2 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5971d3ce1459..8e5107921762 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 3e078599940f..c87820cfae29 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -2,5 +2,5 @@ AUX dd-rescue-1.99.11-musl-r2.patch 1556 BLAKE2B 6b71ac5e30c988894a5fe260372e004
 DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
 DIST dd_rescue-1.99.12.tar.bz2 181798 BLAKE2B 547910af7ac5dde360179dbd75bed36e6420dda162a41f9bb60a454f5c6629d6a1be9b15240ce3d0e7b80e09c660a87765e826909614b037a506ad775b71041f SHA512 61f4f09e7e8442049634c5a5659f887cf82b16bc8b768c0aa79774e18feac6e91fbc258e5a6c8c3cac0577fadbdd26206261cf6c99b3980f763a1b584fb46001
 EBUILD dd-rescue-1.99.11.ebuild 2379 BLAKE2B c139cf37004c7ecff737db83b41d5bcbe8c12e9b5855d442d1f3cb66992461c599ff6ed8f2e8af8692e28c6165574224f8eb1154e9e117449030738ee5f7afca SHA512 c47eaeb5495311afbca3f24d5682200d91ccbd103830a29964fdc7198160ff8cf2afedb2b4e6ce83afee85db3379195093908ad80dbfd7dff33c62d1cf421621
-EBUILD dd-rescue-1.99.12.ebuild 2317 BLAKE2B 3c19c525b2aaa0b3f8a0441e279811950886b543f9debc7c6999145ef773289880e6ba54c7cb79f7350e16e899513b3da9640e6b5781105985325db758ef87c5 SHA512 38f0439c10eb86b10788194ccecf27a264c44552f239a180703eb91e41dfc7d243e2e90903e0e3bbfd96eedd65259e1420f55e6ac165bc80e8ad9bec8f771eb0
+EBUILD dd-rescue-1.99.12.ebuild 2316 BLAKE2B e484e498c072f93c90b415f260edcd0b8bdad64144a126503ed43002bfa7e56347c6078e2145db084fbbe77d52cb27d015d36037a9a71c292a55447fd024547d SHA512 d1be85c826bd0d301120e64423e839604e51f42c02d3c49c5a28ef8dce9077fc244fefdf73cd7680c21312672d859abc7afca5335e8963d6d0a6cb779aa50597
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild
index 71b861626147..afbbda5929f2 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="lzo? ( dev-libs/lzo )
diff --git a/sys-fs/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest
index 0e3cc2277a00..561e4a874fde 100644
--- a/sys-fs/ncdu-bin/Manifest
+++ b/sys-fs/ncdu-bin/Manifest
@@ -2,5 +2,10 @@ DIST ncdu-2.1.2-linux-aarch64.tar.gz 278374 BLAKE2B 32a8674f3878f404836473f41c35
 DIST ncdu-2.1.2-linux-arm.tar.gz 295485 BLAKE2B 0acc3095880ee012eb19f21e14a302b01a2d9c792dcb7e5779f517a214dc850bb78b7620e62a7a99369742a6d4f766d47de0f32ef30e98f38f31802c29fa1c47 SHA512 459a5f148687c68f58f419e767027e1254c4ff43f4848e83d2744198cd11a3dc98591502ff4339d28aa9ddc9a805d5567647788409e355eb73e31e16b9eb8a6c
 DIST ncdu-2.1.2-linux-i386.tar.gz 306261 BLAKE2B 493854be13382e8d3ba2e5ab5e4377a7ca26a3d932cd5e9894cf30664828714fa5d6a0c48bc5688ffd567d06bb314dc95ce1b372e590548816c0027d1185e1f4 SHA512 b4caebfbfb4ff804b87d5154866279735315c4f58f296064a986d7699414f3f0978d007f912fb2e3a0dd9f1c73688ff61d0c3faa599e70e2fe84be21134113bf
 DIST ncdu-2.1.2-linux-x86_64.tar.gz 299337 BLAKE2B e125be86fb8eb7195012379990b2de8868bfd80013e2206f313ebf32bd35c43d03fbe97b86f66fcfe2ca8fedd52287149618c7b2e3b147811bdee5cb51b25923 SHA512 3981bf773b1345e1075a2fdba43867f5524b7ad0d5100e5a5e37cffcd55a691163583f1316e37c3fa986759e29fdbe22b92992a0ecd4a92dbab4ad9eb2c99dce
+DIST ncdu-2.2-linux-aarch64.tar.gz 305715 BLAKE2B 9d8b0b77b9f52ed9065c1ccbed70e28dc012580778024e121a97a78318d7255b821458441033a317f9a2b69c9ad9ae094e6b0b2a328f7e34aa98c391ed85143a SHA512 4c2d5bf66e7f1871110d60e9eb7dd3ca69c8658c321861c8752bc2972868d912d3132e2f271c3a3bf7ddcbf170dc6a32dfbfe31342fce1dbf96b60c44842a5d4
+DIST ncdu-2.2-linux-arm.tar.gz 283173 BLAKE2B c876ad71797109f43ad7db5222d7114841917f2d62904407c9a45e9abda72a48a6372594bb13ad968ac51aaef59547808b3c48021e2654a8cc249ba79e4db900 SHA512 1a696d1737a481384526bd3d57aa233dd5f4880e3cb9f44964ae5a4771fc4756e2a8018fcc97f37d78b6e175bce97cca8d6a7d877c478199b2cc88a9a25da4e3
+DIST ncdu-2.2-linux-i386.tar.gz 290702 BLAKE2B 65a1d43c1781af3f425a5fc7cd8e71f23415c8ffb229d370ad3ef144aaa11d454bc0d601b4456380cff3918ceeee85923c0992b041c48ae9ee0af48dc4c9397d SHA512 e6d5a07ccf0eade260e8e0e7b4e242e05b13ad3c077f07ca0c327e4fbcb397cd72915b18ae517921f192502b9b248f0430bc2ebf78c96218a8301f83dd5bd058
+DIST ncdu-2.2-linux-x86_64.tar.gz 323041 BLAKE2B 23bd4d18e4250f14f79e47d6ec5a3fb9746bd85dcfaeb6510a7b693383c747e628076cad255f6a076236aa2ec6d5bcf3a55dec3311bc13046bca47aa54ec5fdd SHA512 f56ab20f3be98e4b50a7070f88a759f86bf1d785c5869cde33cc9568934245a047e3cf5de3256a3d587a058468ebebc5f24c68554cb6f0ba9455f62b9fac58e6
 EBUILD ncdu-bin-2.1.2.ebuild 629 BLAKE2B 526d6a9a88e938316fbfc67867ea5c7c76f17db721704539cd6ab3f7835131a0e93cc193fc0bc76af7813f1e6a2a0aab49b29192f1105379f02af4ba4fc5cfb3 SHA512 edf7f1523f552cd7eab98253a0c918366c0ec7072f813b1486fd80104c3b76b5190e0757b9a8d4cc740dfe8d640ee06b52d0cbc6cea1392699085cd76fdc5d28
+EBUILD ncdu-bin-2.2.ebuild 629 BLAKE2B 526d6a9a88e938316fbfc67867ea5c7c76f17db721704539cd6ab3f7835131a0e93cc193fc0bc76af7813f1e6a2a0aab49b29192f1105379f02af4ba4fc5cfb3 SHA512 edf7f1523f552cd7eab98253a0c918366c0ec7072f813b1486fd80104c3b76b5190e0757b9a8d4cc740dfe8d640ee06b52d0cbc6cea1392699085cd76fdc5d28
 MISC metadata.xml 586 BLAKE2B 37590076001edf71b7f6eabdecd8b53fe9bf40401db2dcd6b2710f448dd2f7f0ef4ff7f8af8e15a6cce1c9f13e1861338baf219d477810ef0a85d3cce4fb08e2 SHA512 5d0f342d74634927f240a079e33beabac800db525859a65fda2328e821d1e58ee50a634783d3b1507c3748449ed15a966109373d44f8fc98af6929e75ffa2a67
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.2.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.2.ebuild
new file mode 100644
index 000000000000..290db5ad4cc5
--- /dev/null
+++ b/sys-fs/ncdu-bin/ncdu-bin-2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="NCurses Disk Usage"
+HOMEPAGE="https://dev.yorhel.nl/ncdu/"
+SRC_URI="
+	amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz )
+	arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz )
+	arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz )
+	x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-i386.tar.gz )"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+
+QA_PREBUILT="usr/bin/ncdu-bin"
+
+src_install() {
+	newbin ncdu ncdu-bin
+}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 2a5256838636..bebc0fbf782d 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,7 @@
 DIST ncdu-1.17.tar.gz 157187 BLAKE2B 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f SHA512 aa2366797760f0c0b2bea866f0ae0446b8113e3ff6460192a4a42d4d888d473d7f37bc4acff6220fa86003bd96d71761168a2ae0ded36456072176a69564c775
 DIST ncdu-2.1.2.tar.gz 52702 BLAKE2B fb64058bec2e8f286fa82e16986cddd9126e5c94d513740d48ff1c971e7ee95270fe6c1cfbbe240bb8e99fba4e3fd6d2624f99870422835da44447a2507f0b8b SHA512 ff48f2b9625e1aba29e5598051d16c4b5dc1a634fab897709226dd69d3b48031e6e62527c8514ec4753874d2d96800e538d6ad90b4a5f9851410d10579ccc67c
+DIST ncdu-2.2.tar.gz 55903 BLAKE2B 568760748ec54b193f17e31fa285d95085389a4f8e1abfe8e5fe5e2d67b0ca221cb7ca94cba248206808d6369058384286de690338f67faee7ff18f09832ebd9 SHA512 d491976b5e19726afe856860e07974c9c70b161c96cd17960a9f36dbc6fc1a51fd3d84da2e22e21cd3d384ab004a7d248096212e762d1ad3849e2cf8a036fc19
 EBUILD ncdu-1.17.ebuild 456 BLAKE2B 612a29e7cac217a79439d64a990c4f4085c0e2970667a86749cfb5ecccf05a2c4c01eab6b7009752d4727ad4ad22518f37c7875f0d9f02c520c57e193601a6e6 SHA512 1868a54a9150e5b839826f4fe25031e99ef950de96b40365613cb04d8094952a8fb1220e3b5d9a43e4737206f21041efc4fb1992a91888df33eb189cf06c3014
 EBUILD ncdu-2.1.2-r1.ebuild 692 BLAKE2B fa9d4f3c30e200589a449aab882e7436fb8ae5f0f355e1fd52e5ed684ee5db388c404b6e15570a07cf98fd1177823ef1e8ba87f2d6e017aa070e147be52793fd SHA512 1948f24c65c35e0532145e4e5b63e58ae7121376b232a83b932e25f4527b28a63856fced612e3f5ff3829effd48bf7225f07125e67a899eba34835153d4858fb
+EBUILD ncdu-2.2.ebuild 692 BLAKE2B fa9d4f3c30e200589a449aab882e7436fb8ae5f0f355e1fd52e5ed684ee5db388c404b6e15570a07cf98fd1177823ef1e8ba87f2d6e017aa070e147be52793fd SHA512 1948f24c65c35e0532145e4e5b63e58ae7121376b232a83b932e25f4527b28a63856fced612e3f5ff3829effd48bf7225f07125e67a899eba34835153d4858fb
 MISC metadata.xml 586 BLAKE2B 37590076001edf71b7f6eabdecd8b53fe9bf40401db2dcd6b2710f448dd2f7f0ef4ff7f8af8e15a6cce1c9f13e1861338baf219d477810ef0a85d3cce4fb08e2 SHA512 5d0f342d74634927f240a079e33beabac800db525859a65fda2328e821d1e58ee50a634783d3b1507c3748449ed15a966109373d44f8fc98af6929e75ffa2a67
diff --git a/sys-fs/ncdu/ncdu-2.2.ebuild b/sys-fs/ncdu/ncdu-2.2.ebuild
new file mode 100644
index 000000000000..b1f2a22f2abc
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="NCurses Disk Usage"
+HOMEPAGE="https://dev.yorhel.nl/ncdu/"
+SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	|| ( ~dev-lang/zig-0.9.1 ~dev-lang/zig-bin-0.9.1 )
+	virtual/pkgconfig
+"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/ncdu"
+
+src_test() {
+	zig build test || die "Tests failed"
+}
+
+src_install() {
+	emake PREFIX="${ED}"/usr install
+
+	dodoc README.md ChangeLog
+}