diff --git a/app-misc/watchexec/watchexec-1.20.6.ebuild b/app-misc/watchexec/watchexec-1.20.6.ebuild
index 2092cd38b7..1ea633072e 100644
--- a/app-misc/watchexec/watchexec-1.20.6.ebuild
+++ b/app-misc/watchexec/watchexec-1.20.6.ebuild
@@ -305,7 +305,7 @@ 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 CC0-1.0 ISC MIT Unicode-DFS-2016 WTFPL"
+LICENSE="Apache-2.0 BSD CC0-1.0 ISC MIT Unicode-DFS-2016 WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
diff --git a/dev-python/desktop-notifier/Manifest b/dev-python/desktop-notifier/Manifest
index 5502aa2d54..d26761973f 100644
--- a/dev-python/desktop-notifier/Manifest
+++ b/dev-python/desktop-notifier/Manifest
@@ -1,2 +1,2 @@
 DIST desktop-notifier-3.3.2.tar.gz 4595234 BLAKE2B c53383b8f15c36acb21a77695b8a76e782f912078ba7c5946fe55c2e8c3c950ece7581a81a69dbee12553be7155364c9165336d7f2b814ccb0e3076dc082cf85 SHA512 d93825ea4880428e9eb41f0adff27e963ebeae23aa5cdc8c77e4a60aecee69aa1448f9aca8b12520597b52df531580e29e3458c2ea7b4f2e60eda68de5dfbe9f
-DIST desktop-notifier-3.4.0.tar.gz 4598031 BLAKE2B b8b6e0df59f2fc656ab6d3d8ee0e2e6ba58b9714c1efd103d866ccc4acd14bb1d05ebc9db88488de6643e7b42b8af960f75b79d0f82d877e33c6c35025e29ecc SHA512 4b98201466dac7da2555e11c624534f09855cd2183ff7ffaa682f22dac840dfaf402f97335b2892f4cae35739f5cb76e5d0458cb2ecccf7e33f939f41b7e38ef
+DIST desktop-notifier-3.4.0.gh.tar.gz 4598031 BLAKE2B b8b6e0df59f2fc656ab6d3d8ee0e2e6ba58b9714c1efd103d866ccc4acd14bb1d05ebc9db88488de6643e7b42b8af960f75b79d0f82d877e33c6c35025e29ecc SHA512 4b98201466dac7da2555e11c624534f09855cd2183ff7ffaa682f22dac840dfaf402f97335b2892f4cae35739f5cb76e5d0458cb2ecccf7e33f939f41b7e38ef
diff --git a/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild b/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild
index 830de8f38e..ff4deb3ebe 100644
--- a/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild
+++ b/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://pypi.org/project/desktop-notifier/
 	https://github.com/samschott/desktop-notifier
 "
-SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild b/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild
index 06b7d698af..60328568f6 100644
--- a/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild
+++ b/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/python-dbus-next/Manifest b/dev-python/python-dbus-next/Manifest
index 2c73f9a9e7..9b3346732f 100644
--- a/dev-python/python-dbus-next/Manifest
+++ b/dev-python/python-dbus-next/Manifest
@@ -1 +1 @@
-DIST python-dbus-next-0.2.3.tar.gz 81711 BLAKE2B 6acc38a05511b3de7e13893d82dd1ecd55f9a6124b4d859574294602b921ff012776c12ddb02e1be437b258c7bd5120a3a9625fc5b06bbbe02915dcc4c14897b SHA512 7836d855c755c8ac6cbbb251ca0cbd2f4df9b573f31b1ea1cab480e47896d36b4cb0d479b2469b0bf0b5c700068361a18874b4a087f73020cdcb4e04a2d7dbe7
+DIST python-dbus-next-0.2.3.gh.tar.gz 81711 BLAKE2B 6acc38a05511b3de7e13893d82dd1ecd55f9a6124b4d859574294602b921ff012776c12ddb02e1be437b258c7bd5120a3a9625fc5b06bbbe02915dcc4c14897b SHA512 7836d855c755c8ac6cbbb251ca0cbd2f4df9b573f31b1ea1cab480e47896d36b4cb0d479b2469b0bf0b5c700068361a18874b4a087f73020cdcb4e04a2d7dbe7
diff --git a/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild b/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
index 7d7d00ea3a..af2574febc 100644
--- a/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
+++ b/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/altdesktop/python-dbus-next
 	https://pypi.org/project/dbus-next/
 "
-SRC_URI="https://github.com/altdesktop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/altdesktop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 72673d54e1..b2758b520d 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1 +1 @@
-DIST bb4242-sdnotify-0.3.2.tar.gz 3302 BLAKE2B add938bb947d8834abc9cbfaae28dfd85d9e9580d130f6dac0660a1f06f291723b909eac61eb39023d999566568985f93ab07587ab235bdfe79fe09efca28874 SHA512 08fbbd2865ac075f0faa4ee3c1a9e5afb824318a4863cc603bc544ebb173d9f1caf4941df19470c0c506b4f518cc1f30ec1d8be70b03a46afadf490765af2e55
+DIST bb4242-sdnotify-0.3.2.gh.tar.gz 3302 BLAKE2B add938bb947d8834abc9cbfaae28dfd85d9e9580d130f6dac0660a1f06f291723b909eac61eb39023d999566568985f93ab07587ab235bdfe79fe09efca28874 SHA512 08fbbd2865ac075f0faa4ee3c1a9e5afb824318a4863cc603bc544ebb173d9f1caf4941df19470c0c506b4f518cc1f30ec1d8be70b03a46afadf490765af2e55
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index 205e496c9a..8db5658f51 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/bb4242/sdnotify
 	https://pypi.org/project/sdnotify/
 "
-SRC_URI="https://github.com/bb4242/${PN}/archive/refs/tags/v${PV}.tar.gz -> bb4242-${P}.tar.gz"
+SRC_URI="https://github.com/bb4242/${PN}/archive/refs/tags/v${PV}.tar.gz -> bb4242-${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-fulltoc/Manifest b/dev-python/sphinxcontrib-fulltoc/Manifest
index 0af2795447..c052bc08e4 100644
--- a/dev-python/sphinxcontrib-fulltoc/Manifest
+++ b/dev-python/sphinxcontrib-fulltoc/Manifest
@@ -1 +1 @@
-DIST sphinxcontrib-fulltoc-1.2.tar.gz 12366 BLAKE2B 229fed6e70f6908152b88ad192fcc19df862905d5c99580f0bd9be8dc44f2a6355c14d6121e69f6e9beec3111d2328d05158052712cc0e5f287f1872ed792e9b SHA512 ea622e1918711390d58061e3608ea8e4d72ccc104c7f80577060c0cc8d608d78b5bdbf097302cf3f96153643266b4edc1a70d039b3f2e1ec555a230cd06671c9
+DIST sphinxcontrib-fulltoc-1.2.gh.tar.gz 12366 BLAKE2B 229fed6e70f6908152b88ad192fcc19df862905d5c99580f0bd9be8dc44f2a6355c14d6121e69f6e9beec3111d2328d05158052712cc0e5f287f1872ed792e9b SHA512 ea622e1918711390d58061e3608ea8e4d72ccc104c7f80577060c0cc8d608d78b5bdbf097302cf3f96153643266b4edc1a70d039b3f2e1ec555a230cd06671c9
diff --git a/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild b/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild
index ee44722ea1..0f876d09fc 100644
--- a/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild
+++ b/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="python-dbus-next is a Python library for DBus"
@@ -13,7 +12,7 @@ HOMEPAGE="
 	https://pypi.org/project/sphinxcontrib-fulltoc/
 	https://sphinxcontrib-fulltoc.readthedocs.io
 "
-SRC_URI="https://github.com/sphinx-contrib/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/sphinx-contrib/fulltoc/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest
index 602ad2b98f..e16a287dce 100644
--- a/dev-python/survey/Manifest
+++ b/dev-python/survey/Manifest
@@ -1 +1 @@
-DIST survey-3.4.3.tar.gz 13533965 BLAKE2B 4b2e881bdddb3c606cc356ab1883545ea98b433e8568fc421ae0601c75e9828f1facfaa0b988da19962f93ded7b16ecd4d495c02022b5d1f99a00ba4c6996362 SHA512 a4033a54a9eef5e9082d9903a0b9cc158897d9f58696905c5fb551c64d55fe13d9a687ca161555b280002df3d0f9405dfcbf16830f691004fec614dd980b3e32
+DIST survey-3.4.3.gh.tar.gz 13533965 BLAKE2B 4b2e881bdddb3c606cc356ab1883545ea98b433e8568fc421ae0601c75e9828f1facfaa0b988da19962f93ded7b16ecd4d495c02022b5d1f99a00ba4c6996362 SHA512 a4033a54a9eef5e9082d9903a0b9cc158897d9f58696905c5fb551c64d55fe13d9a687ca161555b280002df3d0f9405dfcbf16830f691004fec614dd980b3e32
diff --git a/dev-python/survey/survey-3.4.3.ebuild b/dev-python/survey/survey-3.4.3.ebuild
index b2c41aad58..be6a6c4256 100644
--- a/dev-python/survey/survey-3.4.3.ebuild
+++ b/dev-python/survey/survey-3.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/Exahilosys/survey
 	https://pypi.org/project/survey/
 "
-SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/wrapio/Manifest b/dev-python/wrapio/Manifest
index e0b2bf0233..d7b8acac45 100644
--- a/dev-python/wrapio/Manifest
+++ b/dev-python/wrapio/Manifest
@@ -1 +1 @@
-DIST wrapio-2.0.0.tar.gz 7239 BLAKE2B 228d1a0367bdcb1c69e9035de2bd780d9a47b3a6b5ccb9080fc7f9974dafdfec3ccca8888e9f4ff7368d4d5c06424cecc5832a38db60410954cde561a0c2e272 SHA512 09056de108f6f5fc6af83534a9e8a9c80c70ead6d1d492f3dfd573b38a5dd909c837934309f9f7611394768573848afa737484b3f64ff682bcf6c7a091e15a46
+DIST wrapio-2.0.0.gh.tar.gz 7239 BLAKE2B 228d1a0367bdcb1c69e9035de2bd780d9a47b3a6b5ccb9080fc7f9974dafdfec3ccca8888e9f4ff7368d4d5c06424cecc5832a38db60410954cde561a0c2e272 SHA512 09056de108f6f5fc6af83534a9e8a9c80c70ead6d1d492f3dfd573b38a5dd909c837934309f9f7611394768573848afa737484b3f64ff682bcf6c7a091e15a46
diff --git a/dev-python/wrapio/wrapio-2.0.0.ebuild b/dev-python/wrapio/wrapio-2.0.0.ebuild
index b0ab5e932c..7cd11bb990 100644
--- a/dev-python/wrapio/wrapio-2.0.0.ebuild
+++ b/dev-python/wrapio/wrapio-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/Exahilosys/wrapio
 	https://pypi.org/project/wrapio/
 	"
-SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/gui-apps/somebar/Manifest b/gui-apps/somebar/Manifest
new file mode 100644
index 0000000000..44052eb3fe
--- /dev/null
+++ b/gui-apps/somebar/Manifest
@@ -0,0 +1 @@
+DIST somebar-1.0.0.tar.gz 31294 BLAKE2B 1006fa9fcf6a081ea0dbbeb98fd2f45ade0e7a3e8e51b76b070f9ad5fa1d352735ceca4000eea8722326dfc19fcd8a317c143316b755bb9e88e9a0cce6dd6099 SHA512 a2f1a4f05ff8297ef6675e0feaaed71308c0ab512f2bd0f961c2e28de8c716b3ea2150dfd1c4dbbfb29e5de410a03a38359f2f173e396bb5059a46d4db4b4515
diff --git a/gui-apps/somebar/somebar-1.0.0.ebuild b/gui-apps/somebar/somebar-1.0.0.ebuild
new file mode 100644
index 0000000000..8231cb396a
--- /dev/null
+++ b/gui-apps/somebar/somebar-1.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig meson
+
+DESCRIPTION="dwm-like bar for dwl"
+HOMEPAGE="https://git.sr.ht/~raphi/somebar"
+SRC_URI="https://git.sr.ht/~raphi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/pango
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+"
+
+src_prepare() {
+	default
+	use savedconfig && restore_config src/config.hpp
+	[[ -f src/config.hpp ]] || cp src/config.def.hpp src/config.hpp
+}
+
+src_install() {
+	meson_src_install
+	save_config src/config.hpp
+}
diff --git a/gui-apps/someblocks/Manifest b/gui-apps/someblocks/Manifest
new file mode 100644
index 0000000000..156df4984d
--- /dev/null
+++ b/gui-apps/someblocks/Manifest
@@ -0,0 +1 @@
+DIST someblocks-1.0.0.tar.gz 3967 BLAKE2B ab9c9ac97074c77dc17440fb3b628707ed51256a7d812b0ab8411a20029ebb48ae0092421f096e6c21f3e072c472e9863eec99ebbc6e809cb26de1638ef27520 SHA512 c7e0d77df2094d4bfe7ab616e848073d7bae06d9b3788574bc1b942469a618f4cb4cffebff7d5aabc014068d2350c08c3f83e41f9de0c0cc5ae1f3bf1ef10e8a
diff --git a/gui-apps/someblocks/someblocks-1.0.0.ebuild b/gui-apps/someblocks/someblocks-1.0.0.ebuild
new file mode 100644
index 0000000000..47a5927029
--- /dev/null
+++ b/gui-apps/someblocks/someblocks-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig
+
+DESCRIPTION="Modular status bar for somebar written in c."
+HOMEPAGE="https://git.sr.ht/~raphi/someblocks"
+SRC_URI="https://git.sr.ht/~raphi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	default
+
+	restore_config blocks.h
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+
+	einstalldocs
+
+	save_config blocks.h
+}
diff --git a/licenses/Unicode-DFS-2016 b/licenses/Unicode-DFS-2016
deleted file mode 100644
index 85d0d580d2..0000000000
--- a/licenses/Unicode-DFS-2016
+++ /dev/null
@@ -1,46 +0,0 @@
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-See Terms of Use <https://www.unicode.org/copyright.html>
-for definitions of Unicode Inc.’s Data Files and Software.
-
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
diff --git a/licenses/VESTA b/licenses/VESTA
new file mode 100644
index 0000000000..05a2717921
--- /dev/null
+++ b/licenses/VESTA
@@ -0,0 +1,28 @@
+
+                             VESTA LICENSE
+                                Version 3
+
+        Copyright (C) 2006-2021, Koichi Momma and Fujio Izumi
+
+VESTA is currently copyrighted with its source code not open to the 
+public; we wish to control the development and future of VESTA by 
+ourselves. This software is distributed free of charge for academic, 
+scientific, educational, and non-commercial users. Users belonging to
+commercial enterprises may also use this software at no cost until a 
+license for business users is established.
+
+Permission to use this software is hereby granted under the following
+conditions:
+
+1) Drawings produced by VESTA may be used in any publications provided 
+that its use is explicitly acknowledged. A suitable reference for 
+VESTA is:
+
+K. Momma and F. Izumi, "VESTA 3 for three-dimensional visualization of crystal, volumetric and morphology data," J. Appl. Crystallogr., 44, 1272-1276 (2011).
+
+2) You should not redistribute any copy of the distributed files
+including MADEL and STRUCTURE TIDY unless you have a written
+permission from us.
+
+Part of these terms may be changed without any prior announcement.
+This software is provided "as is" without any expressed or implied warranty.
diff --git a/media-fonts/source-han-mono/Manifest b/media-fonts/source-han-mono/Manifest
new file mode 100644
index 0000000000..2480d675b3
--- /dev/null
+++ b/media-fonts/source-han-mono/Manifest
@@ -0,0 +1 @@
+DIST source-han-mono-1.002.ttc 122117628 BLAKE2B bf7f6e96b9f8b9c9d752263523f075d46d62f2eff9ed1d174008b66ef413c7cb2a5422b0e5352fb119c94850de055661acc18e928ff747fd37f933ba9868581e SHA512 315eae53d2417e78d9d92844614a5f4a4684f6c6160342779c738331c3e627c9f2e550f9d6d515d9023b597a2adbbb4672cd0b1efbb091bf0674ce057474c39c
diff --git a/media-fonts/source-han-mono/metadata.xml b/media-fonts/source-han-mono/metadata.xml
new file mode 100644
index 0000000000..bf01756f35
--- /dev/null
+++ b/media-fonts/source-han-mono/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<stabilize-allarches />
+	<upstream>
+		<remote-id type="github">adobe-fonts/source-han-mono</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-fonts/source-han-mono/source-han-mono-1.002.ebuild b/media-fonts/source-han-mono/source-han-mono-1.002.ebuild
new file mode 100644
index 0000000000..513b54344f
--- /dev/null
+++ b/media-fonts/source-han-mono/source-han-mono-1.002.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Pan-CJK OpenType/CFF mono font family"
+HOMEPAGE="https://github.com/adobe-fonts/source-han-serif/"
+SRC_URI="https://github.com/adobe-fonts/${PN}/releases/download/${PV}/SourceHanMono.ttc -> ${P}.ttc"
+S=${WORKDIR}
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+FONT_SUFFIX="ttc"
+RESTRICT="binchecks strip"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	cp "${DISTDIR}"/${P}.ttc . || die
+	default
+}
diff --git a/media-fonts/source-han-serif/Manifest b/media-fonts/source-han-serif/Manifest
index ae7820f2a3..bbacee960f 100644
--- a/media-fonts/source-han-serif/Manifest
+++ b/media-fonts/source-han-serif/Manifest
@@ -1,4 +1,8 @@
 DIST source-han-serif-ja-1.001.zip 36733628 BLAKE2B 0c171c414b350ecb65ade49d80bfed127c8f339a34fc43f9c0ee2fb853521165d81f6a3bd65be01c6d404c679d26930494fa077df0aec4b5c3783341c624cddc SHA512 5e6005e904619b671b1ffd089a0f44e0502e3a6af1dca749ddcf0fe0fe6d67cbb0d2e19099f5e0da173a31e67bcbeb6f884e41eb998141346be69122452a0ae4
+DIST source-han-serif-ja-2.001.zip 36789229 BLAKE2B b17cdb9ade2bdde67ccf142fe6c8b2637b520916ee72028bf0f4226e733fd5fea244344c288ad5217b2b28b312e92f0787b54dba60e3031b8203760590311981 SHA512 f436321985c5a2c3a8b3483c94d7d0bcde059832c3068ee1a74b6468a46ce19d571fc782ee395b6b5ef9bd26279c3661dd6adffed24845c6e92670784fe03831
 DIST source-han-serif-ko-1.001.zip 38346428 BLAKE2B 423d09b686d4c953e14689e92769bc1bd93168d64f930f121d30f8b04610fe9f47c3eca7dd1adbff30325d599c7336159dddf795612a0a40d238c5831f622297 SHA512 0562aaab11926a70672c0aba6dc0e212492067d02bea71c2508ff199c84a7b02e5e2dc87aaa8b2a966cdeb5ef30ecc8e8ebe0c2eea8e881b788adfaa00aa2e7c
+DIST source-han-serif-ko-2.001.zip 39231528 BLAKE2B 5b3a4a71b119a0a329363db45c511b195972c5ea36b391ce69277e2495c7904e938b9add8a042b92fcd79f0f1cdcca7bd55d785b8e667fd4693b2d64164b45b4 SHA512 e7f6468140a937d006155db746dbf4b8455a75ca2dd0ec6916c2e084f6136a79b0db080a2521b7ba665013ba7a257a763f9087d2270d531f4a1455e440329f1b
 DIST source-han-serif-zh_CN-1.001.zip 66778823 BLAKE2B 8878b8dfbbf5b15067a31fe0a1055f8e3de7afe280072dd23226fe06bba403e3e69b50b5ecac28e7b53f916f3e5c821696aa399a9893089b59fa78c020e19063 SHA512 e8bd7776caff6a70945c23ec02ece2310fbe905768ae784698bf937ed6e376e2065f535f2498909d962b3942c524f8621c1fd4bc41e3c2d3d033806cab4a0ffc
+DIST source-han-serif-zh_CN-2.001.zip 68857778 BLAKE2B 13810a87500a69295468005374d1119e032a8f3e9d8672022c0e927c5941868e87ed9fe6f87b5f21a59ec6b326ec6db80c7ca3a4c32c0e22c174d8155ba98902 SHA512 f75844e260e8bb49a50a4276e431f5fb39704d60ffac3d0ba8326e8758bb7d2cff5dfb0cd4fab590c12c14e65384cdf624fef830731fdd3df8dab088ebadac6c
 DIST source-han-serif-zh_TW-1.001.zip 34610053 BLAKE2B 9f7ff54a1ae1f3b87ce0c4854d77860e96d8973c9edec5d8442e50a8055fe440f7a8663b341555af9094c2c07ebac022f5b1e8ce097e117087fb1a4a6cb91918 SHA512 29f88f7f7b280187fc46e7e14a3bf869c1e543b1f6be0667e1fdae06a934471124207b7d45ae505bf3bf2f4c0541ed1ffb8612992342d81d85a6587e85545aa4
+DIST source-han-serif-zh_TW-2.001.zip 47266838 BLAKE2B e3974e21270df8f55a84081526bcfd2002b5b71a75b4184c9f02d32373e40248bacae019c2c1b9e4748c1f24aee995e6735ef45e44220e99e0c3887961da8989 SHA512 e15a9cf79ab89c1f3d9ca72658fc561aa5ed3c1fb7d0f9ee21ed7c6dc430231f10d5ce85cd0d41f20f8116dcd6aa71a7d2b697e66190d13c9a0e69aa71a318dd
diff --git a/media-fonts/source-han-serif/source-han-serif-2.001.ebuild b/media-fonts/source-han-serif/source-han-serif-2.001.ebuild
new file mode 100644
index 0000000000..db54557115
--- /dev/null
+++ b/media-fonts/source-han-serif/source-han-serif-2.001.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+# NOTE: There is a zh_HK version, but to use that zh_HK has to be added to
+#       profiles/desc/l10n.desc in ::gentoo, as far as i'm aware.
+
+DESCRIPTION="Pan-CJK OpenType/CFF font family"
+HOMEPAGE="https://github.com/adobe-fonts/source-han-serif/"
+SRC_URI="
+	l10n_ja? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/12_SourceHanSerifJP.zip -> ${PN}-ja-${PV}.zip )
+	l10n_ko? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/13_SourceHanSerifKR.zip -> ${PN}-ko-${PV}.zip )
+	l10n_zh-CN? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/14_SourceHanSerifCN.zip -> ${PN}-zh_CN-${PV}.zip )
+	l10n_zh-TW? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/15_SourceHanSerifTW.zip -> ${PN}-zh_TW-${PV}.zip )
+"
+S=${WORKDIR}
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
+REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
+
+FONT_SUFFIX="otf"
+RESTRICT="binchecks strip"
+
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	use l10n_ja && FONT_S="${S}/SubsetOTF/JP" font_src_install
+	use l10n_ko && FONT_S="${S}/SubsetOTF/KR" font_src_install
+	use l10n_zh-CN && FONT_S="${S}/SubsetOTF/CN" font_src_install
+	use l10n_zh-TW && FONT_S="${S}/SubsetOTF/TW" font_src_install
+}
diff --git a/mpv-plugin/mpv-mpris/Manifest b/mpv-plugin/mpv-mpris/Manifest
index c6d93f7756..dbc3019030 100644
--- a/mpv-plugin/mpv-mpris/Manifest
+++ b/mpv-plugin/mpv-mpris/Manifest
@@ -1,3 +1,2 @@
-DIST mpv-mpris-0.7.1.tar.gz 13432 BLAKE2B 884204c2186bc3b52378113dde87e58578b3811ec1a40576eb30e779fe3a3575ad9db802a51434e9fc3d22785db6036f898c76acab61780fac4b35276a17524f SHA512 7e928bbbf85b5c8e1e92ce51e65986ef7a7fe27a1e382b0148cdd70e22e5320be37a573c6206b3a1ab05119d9d24b861fd45081a008111f1da37673aa3896f23
 DIST mpv-mpris-0.8.1.tar.gz 13469 BLAKE2B a284a9ffb7f0c36254bcec6d5cc102e19bca551b02657c1802cc0790e7ce61866b8928fa42e0de483463a05e2e513d90f53477b3fd5ca2cf29c1ce0fe8efc766 SHA512 a7ed2c7d5d0b7eb323026ae7b21c8a55e02a90b9fe761d7162ed7162200cf00793842f04a7a2ac841f7de3196657cfb17029ce7285ea977cd35284879db0184d
-DIST mpv-mpris-0.8.tar.gz 13477 BLAKE2B 57ac9e0604bfcb979595f42a9bede20cb4e27c07e768cade3a996bbcb7226cf01704cfc52448a5eb363e1aba1e0b48e90edfcc858a7913649c740c0fa82c5ed1 SHA512 97387caa98296bbcb71c847ada45f8baac8cfb9536554d38accd706800d9b867ac0012d330e9b548926184fff9e4952ff90b22a3e7d42c68ac74fbd6d61c3006
+DIST mpv-mpris-0.9.tar.gz 13746 BLAKE2B bcfb6efd51265409545e007980774b1ee7b7415fd89788c909be95d0fa12175c8ef9529d18c608345e88b6cba2b11f98a7bcb6cc1977a8b791b7025b6197c269 SHA512 82845320fe8d1ce903e8c9027070339d0281ace3887743728df0c0b4abb12de59bd7e86927d86b2669c54f80fee03d5f65e2c086ddafd5bcf55039db51bf64fc
diff --git a/mpv-plugin/mpv-mpris/mpv-mpris-0.8.ebuild b/mpv-plugin/mpv-mpris/mpv-mpris-0.8.ebuild
deleted file mode 100644
index ba02bf7f62..0000000000
--- a/mpv-plugin/mpv-mpris/mpv-mpris-0.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MPV_REQ_USE="cplugins,libmpv"
-inherit mpv-plugin toolchain-funcs
-
-DESCRIPTION="MPRIS plugin for mpv"
-HOMEPAGE="https://github.com/hoyon/mpv-mpris"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hoyon/${PN}.git"
-else
-	SRC_URI="https://github.com/hoyon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		app-misc/jq
-		app-shells/bash
-		app-text/jo
-		media-sound/playerctl
-		net-misc/socat
-		sys-apps/dbus
-		virtual/awk
-		x11-apps/xauth
-		x11-misc/xvfb-run
-		x11-themes/sound-theme-freedesktop
-	)
-"
-
-MPV_PLUGIN_FILES=( mpris.so )
-
-RESTRICT="!test? ( test )"
-
-src_compile() {
-	tc-export CC
-	emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_test() {
-	emake test
-}
diff --git a/mpv-plugin/mpv-mpris/mpv-mpris-0.7.1-r1.ebuild b/mpv-plugin/mpv-mpris/mpv-mpris-0.9.ebuild
similarity index 100%
rename from mpv-plugin/mpv-mpris/mpv-mpris-0.7.1-r1.ebuild
rename to mpv-plugin/mpv-mpris/mpv-mpris-0.9.ebuild
diff --git a/sci-chemistry/vesta-bin/Manifest b/sci-chemistry/vesta-bin/Manifest
new file mode 100644
index 0000000000..eddda12fca
--- /dev/null
+++ b/sci-chemistry/vesta-bin/Manifest
@@ -0,0 +1 @@
+DIST VESTA-gtk3.tar.bz2 24963082 BLAKE2B e3f32358c841ba3dadcb95df68385ef7bd3d004abdd4aad67ad170b04c252318bf49c8bf52eed505277342df22d59d80a1e68440d248c52d08fb12c870c519a2 SHA512 d6ec6ed11a173b899b8d29da0b727f454272e5b3127544c1992a0a8a5a9d4318b0e021230beddd0b43b92cdd5a077a1394dc987dd9dae1b40f00e8ebddef9843
diff --git a/sci-chemistry/vesta-bin/files/VESTA.desktop b/sci-chemistry/vesta-bin/files/VESTA.desktop
new file mode 100644
index 0000000000..8741428db0
--- /dev/null
+++ b/sci-chemistry/vesta-bin/files/VESTA.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=VESTA
+Type=Application
+Comment=For the visualisation of molecular and crystal structures.
+Exec=/opt/VESTA/VESTA
+TryExec=/opt/VESTA/VESTA
+Icon=/usr/share/icons/hicolor/128x128/apps/VESTA.png
+Categories=Science;
diff --git a/sci-chemistry/vesta-bin/metadata.xml b/sci-chemistry/vesta-bin/metadata.xml
new file mode 100644
index 0000000000..50dcf2837c
--- /dev/null
+++ b/sci-chemistry/vesta-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick.joseph.taylor@gmail.com</email>
+		<name>Patrick J Taylor</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
new file mode 100644
index 0000000000..65ce1ce481
--- /dev/null
+++ b/sci-chemistry/vesta-bin/vesta-bin-3.5.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Visualisation for Electronic and STructural Analysis."
+
+HOMEPAGE="https://jp-minerals.org/vesta/en/"
+
+SRC_URI="https://jp-minerals.org/vesta/archives/${PV}/VESTA-gtk3.tar.bz2"
+
+S="${WORKDIR}/VESTA-gtk3"
+
+LICENSE="VESTA"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# As of 3.5.6, wayland support required for gtk even when running on xorg.
+RDEPEND=">=x11-libs/gtk+-3.24.34[wayland]
+	>=virtual/glu-9.0-r2
+	>=virtual/jdk-17"
+
+RESTRICT="strip"
+
+src_install() {
+	insinto /opt/VESTA
+	doins -r "${S}"/*
+	fperms +x /opt/VESTA/VESTA
+	fperms +x /opt/VESTA/VESTA-gui
+
+	domenu "${FILESDIR}"/VESTA.desktop
+	newicon -s 128x128 "${D}"/opt/VESTA/img/logo.png VESTA.png
+
+	dosym -r /opt/VESTA/libVESTA.so /usr/lib64/libVESTA.so
+}
diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl-lib.patch
similarity index 100%
rename from sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch
rename to sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl-lib.patch
diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
deleted file mode 100644
index ef231827e2..0000000000
--- a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Adds -fcommon to CFLAGS to allow compilation on more recent GCC.
-diff --git a/system/Make.sys-shared b/system/Make.sys-shared
-index 51891e7..f89f876 100644
---- a/system/Make.sys-shared
-+++ b/system/Make.sys-shared
-@@ -19,7 +19,7 @@ MAKE = make
- # C-preprocessor flags
- CPPFLAGS ?=
- # C-compiler flags
--CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall
-+CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall -fcommon
- 
- CC     = gcc 
- #LDLIB  = -ldl
diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper-paths.patch
similarity index 100%
rename from sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch
rename to sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper-paths.patch
diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index c6ecb73d0d..b76f8a0a15 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop xdg
+inherit desktop flag-o-matic xdg
 
 DESCRIPTION="For the visualisation of molecular and crystal structures."
 
@@ -17,20 +17,21 @@ SLOT="0"
 
 KEYWORDS="~amd64"
 
-RDEPEND=">=dev-lang/tcl-8.6.12
+RDEPEND=">=x11-base/xorg-server-21.1.4
+	>=virtual/glu-9.0-r2
+	>=dev-lang/tcl-8.6.12
 	>=dev-lang/tk-8.6.12
 	>=dev-tcltk/togl-2.0-r3
 	>=dev-tcltk/bwidget-1.9.14
 	>=media-libs/mesa-22.1.3
 	>=sci-libs/fftw-3.3.10"
 
-BDEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ext-bwidget.patch"
-	"${FILESDIR}/${P}-gcc_flags.patch"
-	"${FILESDIR}/${P}-Togl_lib.patch"
-	"${FILESDIR}/${P}-wrapper_paths.patch"
+	"${FILESDIR}/${P}-Togl-lib.patch"
+	"${FILESDIR}/${P}-wrapper-paths.patch"
 )
 
 src_prepare() {
@@ -39,6 +40,7 @@ src_prepare() {
 }
 
 src_compile() {
+	append-cflags "-fcommon"
 	emake xcrysden
 }
 
diff --git a/www-apps/mycorrhiza/Manifest b/www-apps/mycorrhiza/Manifest
index 1bc7380f1f..5e7e68a006 100644
--- a/www-apps/mycorrhiza/Manifest
+++ b/www-apps/mycorrhiza/Manifest
@@ -1,2 +1,2 @@
-DIST mycorrhiza-1.11.0-deps.tar.bz2 21778870 BLAKE2B 33f7d048280b36fa67d41ecc5b78ddf21442af07f83e6751b556832a859cc21ab4613aa5d02df7d4a8a7c73795f8f546b692ca59fbe2fee38492532b7660c60a SHA512 99d4657506fe74d8736242ac36e1986783fe4d01dfdb61cabe55646f9b566fe72daeba2efc0dedbce21ab99b33553a8e449030959b4f11f475672f58ae9777c5
-DIST mycorrhiza-1.11.0.tar.gz 135211 BLAKE2B 58d59c8ac8e56a84711736c5c98e2524840fc54184bd3f250d883aa407066ffa4b5162d754c1162b5e53e1248ea634831e15be33db6adff268c93d7d478d48fe SHA512 be1a403b73d31462b41dcd3c3eb781312170ee9ac7bef7db4e01041197f2097f258f97fe3210e0e17079f5d579b8b8384e081659f9b77011804246336187a9d0
+DIST mycorrhiza-1.12.1-deps.tar.bz2 21760292 BLAKE2B 42f64ea142ac37d13265656a3efdab2f4be02db4d60cda2b2e4776bfa0905ce9280d08e8f6f8042ba69692ffb41f34ce3df0de8ceab69365feef08648d6f6f02 SHA512 db38fcc2efddd37f50ff9da56bf9f4ae68e9f91ae1bfdbab77135724fd90a30443765f411deecb374744583a5c7b03b136982a3a1d585e676a7a42e9e01298f4
+DIST mycorrhiza-1.12.1.tar.gz 136377 BLAKE2B bd1112143262d7db6aa5f2dbe3a0abe96c56c6fbfa897110579799264943abdbaf976cc5603620eb0e8d541e8ba731bde5e1aacb9fd2c9ac02e1e73cfd19ed04 SHA512 2eee4ce46ad6cd05a1afa3aa4b1ee8b1f769c52eb4ddb9cacbf77e65704121cff5f2f8aded634d87cf3330182351be52739ea04a51730678bdd9c4b04fd8d376
diff --git a/www-apps/mycorrhiza/mycorrhiza-1.11.0.ebuild b/www-apps/mycorrhiza/mycorrhiza-1.12.1.ebuild
similarity index 90%
rename from www-apps/mycorrhiza/mycorrhiza-1.11.0.ebuild
rename to www-apps/mycorrhiza/mycorrhiza-1.12.1.ebuild
index b3734d7dd5..8295bd38f5 100644
--- a/www-apps/mycorrhiza/mycorrhiza-1.11.0.ebuild
+++ b/www-apps/mycorrhiza/mycorrhiza-1.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 "
 KEYWORDS="~amd64 ~x86"
 
-LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2"
+LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2 CC-BY-4.0"
 SLOT="0"
 
 BDEPEND=">=dev-lang/go-1.18.0"
@@ -31,7 +31,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Quick start: /usr/bin/mycorrhiza /your/wiki/directory"
+	elog "Quick start: mycorrhiza /your/wiki/directory"
 	elog
 	elog "It will initialize a Git repository, set useful default settings"
 	elog "And run a server on http://localhost:1737"
diff --git a/www-apps/mycorrhiza/mycorrhiza-9999.ebuild b/www-apps/mycorrhiza/mycorrhiza-9999.ebuild
index c55fba6a4f..fa001ef26c 100644
--- a/www-apps/mycorrhiza/mycorrhiza-9999.ebuild
+++ b/www-apps/mycorrhiza/mycorrhiza-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://mycorrhiza.wiki"
 
 EGIT_REPO_URI="https://github.com/bouncepaw/mycorrhiza"
 
-LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2"
+LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2 CC-BY-4.0"
 SLOT="0"
 
 BDEPEND=">=dev-lang/go-1.18.0"
@@ -32,7 +32,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Quick start: /usr/bin/mycorrhiza /your/wiki/directory"
+	elog "Quick start: mycorrhiza /your/wiki/directory"
 	elog
 	elog "It will initialize a Git repository, set useful default settings"
 	elog "And run a server on http://localhost:1737"
diff --git a/www-client/vimb/vimb-3.6.0.ebuild b/www-client/vimb/vimb-3.6.0.ebuild
index b822ec942e..177a0dd036 100644
--- a/www-client/vimb/vimb-3.6.0.ebuild
+++ b/www-client/vimb/vimb-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit savedconfig
+inherit savedconfig optfeature
 
 DESCRIPTION="a fast, lightweight, vim-like browser based on webkit"
 HOMEPAGE="https://fanglingsu.github.io/vimb/"
@@ -41,7 +41,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "For media decoding to work properly, you need to install:"
-	elog "media-plugins/gst-plugins-libav"
-	elog "media-libs/gst-plugins-good"
+	optfeature "media decoding support"  media-plugins/gst-plugins-libav media-libs/gst-plugins-good
 }