diff --git a/app-backup/grub-btrfs/Manifest b/app-backup/grub-btrfs/Manifest
index 63e8b06f8f..53daf08ddc 100644
--- a/app-backup/grub-btrfs/Manifest
+++ b/app-backup/grub-btrfs/Manifest
@@ -1 +1,2 @@
DIST grub-btrfs-4.10.2.tar.gz 25021 BLAKE2B d7fe9eed9a08b79e25a52f37bd86fcb30755bcaa567fc83707340e8d5163ba0959151b711576ccaf06327d38809034740b62dbd526cf49a14554ca6417ab59ae SHA512 26a565db2bacaf3a186f3d0d0827c8dc75204a0d96aeccda13e78f15f81ed1ec79bef8ce65fb63fa35808427ae700e39ada53349c6829d08f0a57e34d37c6b47
+DIST grub-btrfs-4.11.tar.gz 26016 BLAKE2B f808293e7ea06bf10b4a3fa46c7f70aae5b84fab46eae3f0b964e17c0b0e9cb0d2f60995177d33712e4f24b9d3e45aa6fd7ec514be4acb75f00f76d4c5380c3a SHA512 c72cc6cad73e4dfa5d16345d845b2327ec854eb7c49d72f2c8d332c1854937fb1a102833b80517ee17289715f41e9b6a6342e49d4cea88325d13159dc08dcf42
diff --git a/app-backup/grub-btrfs/files/grub-btrfs-4.11-remove-docs-from-make.patch b/app-backup/grub-btrfs/files/grub-btrfs-4.11-remove-docs-from-make.patch
new file mode 100644
index 0000000000..127501b0b3
--- /dev/null
+++ b/app-backup/grub-btrfs/files/grub-btrfs-4.11-remove-docs-from-make.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+
+36,38c36,38
+< @install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
+< @install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
+< @install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
+---
+> # @install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
+> # @install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
+> # @install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
+86c86
+< @echo
+\ No newline at end of file
+---
+> @echo
diff --git a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
new file mode 100644
index 0000000000..cd3f71ad13
--- /dev/null
+++ b/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Improves Grub by adding btrfs snapshots to the Grub menu."
+HOMEPAGE="https://github.com/Antynea/grub-btrfs"
+SRC_URI="https://github.com/Antynea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
+
+DEPEND="
+ sys-fs/btrfs-progs
+ sys-boot/grub
+ virtual/awk
+ >=app-shells/bash-4
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+ default
+}
+src_compile(){
+ true
+}
+src_install(){
+ default
+ dodoc README.md
+ mv ./initramfs/readme.md initramfs-overlayfs.md
+ dodoc initramfs-overlayfs.md
+}
+
+pkg_postinst() {
+ elog "run 'grub-mkconfig -o /boot/grub/grub.cfg' to update your Grub menu."
+ elog "update your /etc/grub.d/41_snapshots-btrfs script (e.g. with dispatch-conf or etc-update)"
+}
diff --git a/app-containers/netavark/netavark-1.0.2-r1.ebuild b/app-containers/netavark/netavark-1.0.2-r1.ebuild
index 9f4f10f3ee..4377387be3 100644
--- a/app-containers/netavark/netavark-1.0.2-r1.ebuild
+++ b/app-containers/netavark/netavark-1.0.2-r1.ebuild
@@ -182,7 +182,7 @@ QA_FLAGS_IGNORED="usr/libexec/podman/${PN}"
src_compile() {
cargo_src_compile
- go-md2man < docs/${PN}.1.md > ./${PN}.1
+ go-md2man < docs/${PN}.1.md > ./${PN}.1 || die
}
src_install() {
diff --git a/app-misc/ssmtool/Manifest b/app-misc/ssmtool/Manifest
deleted file mode 100644
index d5ad0ba649..0000000000
--- a/app-misc/ssmtool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ssmtool-0.6.4.tar.gz 153138 BLAKE2B 06d66776988d2da7a722f3e210f348868d0219e97457beea5090948df919fa5ec710a6578f57bd01556b1c505662611c406dcfdaee6de43e479443e955a8e514 SHA512 d1cb2c886916cc227a2a8f4feba8987423da97c6147be2eb7c70ef043390c89b1c442a8f315730dfa7a233f3005b49b1228ee58cb4830a08efa9209cc7f8af8c
diff --git a/app-misc/vocabsieve/Manifest b/app-misc/vocabsieve/Manifest
new file mode 100644
index 0000000000..4b4087e5f6
--- /dev/null
+++ b/app-misc/vocabsieve/Manifest
@@ -0,0 +1 @@
+DIST vocabsieve-0.7.0.tar.gz 157190 BLAKE2B 6985d189f24cb526e1b079a741d10cea20bbbe70d84425fbbf8ee2a251c6622ab5979dbc74a26810135b5a63acb987f7ede453f8a139ec941570c691fc2a2fd8 SHA512 3f0db2a77c77f8f78453300d03d2941cbe5c735a3c15877b8288d5f83ef8bfc6edd5b5dff8732f1930b7bd7e5d809269b427f4e9815de4d42985db31c9e13ab7
diff --git a/app-misc/ssmtool/metadata.xml b/app-misc/vocabsieve/metadata.xml
similarity index 70%
rename from app-misc/ssmtool/metadata.xml
rename to app-misc/vocabsieve/metadata.xml
index 6112f8d7f6..ad8776139e 100644
--- a/app-misc/ssmtool/metadata.xml
+++ b/app-misc/vocabsieve/metadata.xml
@@ -6,7 +6,7 @@
Shaoyu Tseng
- ssmtool
- FreeLanguageTools/ssmtool
+ vocabsieve
+ FreeLanguageTools/vocabsieve
diff --git a/app-misc/ssmtool/ssmtool-0.6.4.ebuild b/app-misc/vocabsieve/vocabsieve-0.7.0.ebuild
similarity index 83%
rename from app-misc/ssmtool/ssmtool-0.6.4.ebuild
rename to app-misc/vocabsieve/vocabsieve-0.7.0.ebuild
index 51e57408cc..e72834c508 100644
--- a/app-misc/ssmtool/ssmtool-0.6.4.ebuild
+++ b/app-misc/vocabsieve/vocabsieve-0.7.0.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
-DESCRIPTION="A simple sentence mining tool written in PyQt5"
-HOMEPAGE="https://github.com/FreeLanguageTools/ssmtool/ https://pypi.org/project/ssmtool/"
+DESCRIPTION="A simple, effective tool for language learning"
+HOMEPAGE="https://github.com/FreeLanguageTools/vocabsieve/ https://pypi.org/project/vocabsieve/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
@@ -32,4 +32,5 @@ RDEPEND="
dev-python/sentence-splitter[${PYTHON_USEDEP}]
dev-python/mobi[${PYTHON_USEDEP}]
dev-python/SLPP[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
"
diff --git a/app-misc/watchexec/Manifest b/app-misc/watchexec/Manifest
index 495937117f..ef8dc397f1 100644
--- a/app-misc/watchexec/Manifest
+++ b/app-misc/watchexec/Manifest
@@ -422,6 +422,7 @@ DIST watchexec-1.16.2.tar.gz 170954 BLAKE2B 2fd21cdfe01d7f30c7c7a1b5d32ba94bb2a9
DIST watchexec-1.17.1.tar.gz 177405 BLAKE2B e85769d4a2fa39ec9c96b3f9dd878f1ddb804c61fc31cf0f320e9221f1c5fa8d98689b72cf12ddd3ae8f02a4e398e8671b9f55cb22427db9f773ce6b88405efe SHA512 798b67df62b0597ff1bd5a5bf27fd5f9b84a6b3cad831bcd86327d27e1799033cd8d98d72afceb1917663d8ebd5ed77f5acfa07f5398c673ca54bc53007ccf00
DIST watchexec-1.18.11.tar.gz 244677 BLAKE2B c9955fe61fcab8346ded032081930b9bad8353f2717db78cb508790de753e01c8243df85cf0cd5558cf53acc2a92b783a2daaf751d41448690977c8ae840a25f SHA512 b712d92376d4837c8c4b87097a002b0e2864c555a11ed8790841b397e4ae3074df67064171f0342908b0699e24d8adaf5e8db6265fe24473875541369102d62b
DIST watchexec-1.18.12.tar.gz 245324 BLAKE2B e4279f062471c231dd0995bba2f9e17260e1d504629d707fa612e44cd554ad00597c5af2e2d21a6d4da928ac2cc9c4afe672b03693d97debcaa346ef436a414b SHA512 280bf08d1887dd733ae4984c8e2185675a349bc629fd98c3d25ce7a0580024c9c5eca1ce90737d6be3f2a0e32f09e97411d03d456620a98ef814825a3034b239
+DIST watchexec-1.19.0.tar.gz 246191 BLAKE2B de98c2abbbb2f0b7c95862324d98c581695a35b92a3cea22b6c5b76182682251e763346b8f6e8d462f29c5cf31b6ad20be223cc77a520f3d8d4c6cedb9625d50 SHA512 84184353673a4834d7089ccaca117bf9acfd7382b9fea7ca0cbedefb2ff8980de3f3b2ef233ba850f3a2cd4219dce454a9e66f823af16830c6be8aaf96adb7eb
DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
DIST which-4.2.4.crate 9259 BLAKE2B 0371c0c04843ba3c72b4bae2df5ae4539a4750e0d2da0105e370350b7a8985e7fc7a57815dcfe6b3a48ea7c0161b5ca5db3c03b9bf65bd8252adde77fb8055a5 SHA512 9ca2bbec727040197fc12efdc7cd70bc94bd1b4abd03bf86f6043fd960de73053b84c7d101d897563583b8d6d85377025e1e7213640987ebdfdd54fa629e3b80
diff --git a/app-misc/watchexec/watchexec-1.19.0.ebuild b/app-misc/watchexec/watchexec-1.19.0.ebuild
new file mode 100644
index 0000000000..64e56cf45b
--- /dev/null
+++ b/app-misc/watchexec/watchexec-1.19.0.ebuild
@@ -0,0 +1,339 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.1-dev
+
+EAPI=8
+
+CRATES="
+ addr2line-0.17.0
+ adler-1.0.2
+ aho-corasick-0.7.18
+ ansi_term-0.12.1
+ anyhow-1.0.56
+ arrayref-0.3.6
+ arrayvec-0.5.2
+ assert_cmd-2.0.4
+ async-broadcast-0.3.4
+ async-channel-1.6.1
+ async-executor-1.4.1
+ async-io-1.6.0
+ async-lock-2.5.0
+ async-recursion-0.3.2
+ async-recursion-1.0.0
+ async-stream-0.3.3
+ async-stream-impl-0.3.3
+ async-task-4.2.0
+ async-trait-0.1.52
+ atomic-take-1.0.0
+ atty-0.2.14
+ autocfg-1.1.0
+ backtrace-0.3.64
+ base64-0.13.0
+ bitflags-1.3.2
+ blake2b_simd-0.5.11
+ block-0.1.6
+ bstr-0.2.17
+ byteorder-1.4.3
+ bytes-1.1.0
+ cache-padded-1.2.0
+ cc-1.0.73
+ cfg-if-0.1.10
+ cfg-if-1.0.0
+ chrono-0.4.19
+ clap-2.34.0
+ clearscreen-1.0.9
+ command-group-1.0.8
+ concurrent-queue-1.2.2
+ console-0.15.0
+ console-api-0.1.2
+ console-subscriber-0.1.3
+ constant_time_eq-0.1.5
+ crc32fast-1.3.2
+ crossbeam-channel-0.5.3
+ crossbeam-utils-0.8.8
+ derivative-2.2.0
+ difflib-0.4.0
+ dirs-1.0.5
+ dirs-2.0.2
+ dirs-4.0.0
+ dirs-sys-0.3.7
+ doc-comment-0.3.3
+ dunce-1.0.2
+ easy-parallel-3.2.0
+ either-1.6.1
+ embed-resource-1.7.1
+ encode_unicode-0.3.6
+ enumflags2-0.7.3
+ enumflags2_derive-0.7.3
+ event-listener-2.5.2
+ failure-0.1.8
+ failure_derive-0.1.8
+ fastrand-1.7.0
+ filetime-0.2.15
+ fixedbitset-0.4.1
+ flate2-1.0.22
+ fnv-1.0.7
+ fsevent-sys-4.1.0
+ futures-0.3.21
+ futures-channel-0.3.21
+ futures-core-0.3.21
+ futures-executor-0.3.21
+ futures-io-0.3.21
+ futures-lite-1.12.0
+ futures-macro-0.3.21
+ futures-sink-0.3.21
+ futures-task-0.3.21
+ futures-util-0.3.21
+ getrandom-0.1.16
+ getrandom-0.2.5
+ gimli-0.26.1
+ git-config-0.2.0
+ git-features-0.20.0
+ git-hash-0.9.3
+ globset-0.4.8
+ h2-0.3.12
+ hashbrown-0.11.2
+ hdrhistogram-7.5.0
+ heck-0.3.3
+ hermit-abi-0.1.19
+ hex-0.4.3
+ http-0.2.6
+ http-body-0.4.4
+ httparse-1.6.0
+ httpdate-1.0.2
+ humantime-2.1.0
+ hyper-0.14.17
+ hyper-timeout-0.4.1
+ ignore-0.4.18
+ indexmap-1.8.0
+ inotify-0.9.6
+ inotify-sys-0.1.5
+ insta-1.13.0
+ instant-0.1.12
+ is_ci-1.1.1
+ itertools-0.10.3
+ itoa-1.0.1
+ kqueue-1.0.4
+ kqueue-sys-1.0.3
+ lazy_static-1.4.0
+ libc-0.2.120
+ libmimalloc-sys-0.1.24
+ linked-hash-map-0.5.4
+ lock_api-0.4.6
+ log-0.4.14
+ mac-notification-sys-0.3.0
+ malloc_buf-0.0.6
+ matchers-0.1.0
+ memchr-2.4.1
+ memoffset-0.6.5
+ miette-3.3.0
+ miette-derive-3.3.0
+ mimalloc-0.1.28
+ minimal-lexical-0.2.1
+ miniz_oxide-0.4.4
+ mio-0.8.2
+ miow-0.3.7
+ multimap-0.8.3
+ nix-0.22.3
+ nix-0.23.1
+ nom-5.1.2
+ nom-7.1.1
+ notify-5.0.0-pre.14
+ notify-rust-4.5.6
+ ntapi-0.3.7
+ num-integer-0.1.44
+ num-traits-0.2.14
+ num_cpus-1.13.1
+ objc-0.2.7
+ objc-foundation-0.1.1
+ objc_id-0.1.1
+ object-0.27.1
+ once_cell-1.10.0
+ ordered-stream-0.0.1
+ owo-colors-3.2.0
+ parking-2.0.0
+ parking_lot-0.12.0
+ parking_lot_core-0.9.1
+ percent-encoding-2.1.0
+ petgraph-0.6.0
+ phf-0.8.0
+ phf_codegen-0.8.0
+ phf_generator-0.8.0
+ phf_shared-0.8.0
+ pin-project-1.0.10
+ pin-project-internal-1.0.10
+ pin-project-lite-0.2.8
+ pin-utils-0.1.0
+ polling-2.2.0
+ ppv-lite86-0.2.16
+ predicates-2.1.1
+ predicates-core-1.0.3
+ predicates-tree-1.0.5
+ proc-macro-crate-1.1.3
+ proc-macro2-1.0.36
+ prost-0.9.0
+ prost-build-0.9.0
+ prost-derive-0.9.0
+ prost-types-0.9.0
+ pwd-1.3.1
+ quick-error-2.0.1
+ quote-1.0.16
+ rand-0.7.3
+ rand-0.8.5
+ rand_chacha-0.2.2
+ rand_chacha-0.3.1
+ rand_core-0.5.1
+ rand_core-0.6.3
+ rand_hc-0.2.0
+ rand_pcg-0.2.1
+ redox_syscall-0.1.57
+ redox_syscall-0.2.11
+ redox_users-0.3.5
+ redox_users-0.4.2
+ regex-1.5.5
+ regex-automata-0.1.10
+ regex-syntax-0.6.25
+ remove_dir_all-0.5.3
+ rust-argon2-0.8.3
+ rustc-demangle-0.1.21
+ rustc_version-0.4.0
+ ryu-1.0.9
+ same-file-1.0.6
+ scopeguard-1.1.0
+ semver-1.0.6
+ serde-1.0.136
+ serde_derive-1.0.136
+ serde_json-1.0.79
+ serde_repr-0.1.7
+ serde_yaml-0.8.23
+ sha1-0.6.1
+ sha1_smol-1.0.0
+ sharded-slab-0.1.4
+ signal-hook-registry-1.4.0
+ similar-2.1.0
+ siphasher-0.3.10
+ slab-0.4.5
+ smallvec-1.8.0
+ smawk-0.3.1
+ socket2-0.4.4
+ static_assertions-1.1.0
+ strum-0.22.0
+ strum_macros-0.22.0
+ supports-color-1.3.0
+ supports-hyperlinks-1.2.0
+ supports-unicode-1.0.2
+ syn-1.0.89
+ synstructure-0.12.6
+ tempfile-3.3.0
+ term_size-0.3.2
+ terminal_size-0.1.17
+ terminfo-0.7.3
+ termtree-0.2.4
+ textwrap-0.11.0
+ textwrap-0.14.2
+ thiserror-1.0.30
+ thiserror-impl-1.0.30
+ thread_local-1.1.4
+ time-0.1.43
+ tokio-1.17.0
+ tokio-io-timeout-1.2.0
+ tokio-macros-1.7.0
+ tokio-stream-0.1.8
+ tokio-util-0.6.9
+ tokio-util-0.7.0
+ toml-0.5.8
+ tonic-0.6.2
+ tonic-build-0.6.2
+ tower-0.4.12
+ tower-layer-0.3.1
+ tower-service-0.3.1
+ tracing-0.1.32
+ tracing-attributes-0.1.20
+ tracing-core-0.1.23
+ tracing-futures-0.2.5
+ tracing-log-0.1.2
+ tracing-subscriber-0.3.9
+ try-lock-0.2.3
+ unicase-2.6.0
+ unicode-bom-1.1.4
+ unicode-linebreak-0.1.2
+ unicode-segmentation-1.9.0
+ unicode-width-0.1.9
+ unicode-xid-0.2.2
+ valuable-0.1.0
+ version_check-0.9.4
+ vswhom-0.1.0
+ vswhom-sys-0.1.1
+ wait-timeout-0.2.0
+ waker-fn-1.1.0
+ walkdir-2.3.2
+ want-0.3.0
+ wasi-0.9.0+wasi-snapshot-preview1
+ wasi-0.10.2+wasi-snapshot-preview1
+ wasi-0.11.0+wasi-snapshot-preview1
+ wepoll-ffi-0.1.2
+ which-4.2.4
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ windows-0.24.0
+ windows-sys-0.32.0
+ windows_aarch64_msvc-0.32.0
+ windows_i686_gnu-0.24.0
+ windows_i686_gnu-0.32.0
+ windows_i686_msvc-0.24.0
+ windows_i686_msvc-0.32.0
+ windows_x86_64_gnu-0.24.0
+ windows_x86_64_gnu-0.32.0
+ windows_x86_64_msvc-0.24.0
+ windows_x86_64_msvc-0.32.0
+ winreg-0.10.1
+ winrt-notification-0.5.1
+ xml-rs-0.8.4
+ yaml-rust-0.4.5
+ zbus-2.1.1
+ zbus_macros-2.1.1
+ zbus_names-2.1.0
+ zvariant-3.1.2
+ zvariant_derive-3.1.2
+"
+
+inherit cargo
+
+DESCRIPTION="Executes commands in response to file modifications"
+HOMEPAGE="https://github.com/watchexec/watchexec"
+SRC_URI="https://github.com/watchexec/${PN}/archive/refs/tags/cli-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-PD ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+RESTRICT="mirror"
+
+S="${WORKDIR}/${PN}-cli-v${PV}"
+DOCS=( README.md )
+HTML_DOCS=( doc/watchexec.1.html )
+
+QA_FLAGS_IGNORED="usr/bin/watchexec"
+
+src_compile() {
+ cargo_src_compile --manifest-path=cli/Cargo.toml
+}
+
+src_test() {
+ cargo_src_test --manifest-path lib/Cargo.toml --lib
+ cargo_src_test --manifest-path cli/Cargo.toml
+}
+
+src_install() {
+ cargo_src_install --path cli
+
+ einstalldocs
+ doman doc/watchexec.1
+
+ insinto /usr/share/zsh/site-functions
+ newins completions/zsh _watchexec
+}
diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
index 64d566c87a..ed2ff157e0 100644
--- a/app-office/sc-im/metadata.xml
+++ b/app-office/sc-im/metadata.xml
@@ -7,7 +7,7 @@