diff --git a/.github/workflows/emails.yml b/.github/workflows/emails.yml
index e7791f5585..966000a143 100644
--- a/.github/workflows/emails.yml
+++ b/.github/workflows/emails.yml
@@ -1,6 +1,10 @@
 name: emails
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
 
 jobs:
   bugzilla:
diff --git a/app-misc/lf/Manifest b/app-misc/lf/Manifest
index 43126ae94a..2e6f994dbc 100644
--- a/app-misc/lf/Manifest
+++ b/app-misc/lf/Manifest
@@ -1,30 +1,2 @@
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
-DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.0.mod 253 BLAKE2B 972ed39f4848b39eac6662d8f0f3dfc1ff4ec14f5da35fb8c41ada758932df35d4bdc1cf1fd91e54626ae74fc1cdfbbaf93261d793ce828f6a08d0120b5168ed SHA512 8d9fcc68e635c163c1f3f29367988ed5af2d3a2a9acd0c142cc95571bb920618d09e828aa0bf26718c330e5e199d66f2c6c618cab20618ca00be284b013dd833
-DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.0.zip 219838 BLAKE2B e6d587643ad89f8428931a5aa9dd085a028bf5de1ae01ee5cb9e54b93cb760b81be79f54d2f555afeffe5846915f11f58037be20948e782e3089e0f2937ee3bf SHA512 6992b07bfe24152dd8b867bef52be9fdd17da27d0007ed4fc1c3701d3060bbc71854709ce74456a8d280949abd5b3224f1daf92f18c4a36b89bb78ccbbb16aac
-DIST github.com%2Fgokcehan%2Ftcell%2Fv2%2F@v%2Fv2.2.1-0.20210329222449-4dd2d52e83ef.mod 308 BLAKE2B f53f87ed7d2310c09408d55be26ed053edd625203a7d860da4136849e5d44c6cb9cdd025b8b5d5d58b8649a3dadde10ed8861df75aa9e36989bf45549375c8ed SHA512 933a68f338fab6b8676db5abef19e3d521b546051dc8459cf11cca1bcedbdff94ee93bb0cde94e84c72f75ab1a2ee724ae3d0a2b116f9ec827862cd9a882d21c
-DIST github.com%2Fgokcehan%2Ftcell%2Fv2%2F@v%2Fv2.2.1-0.20210329222449-4dd2d52e83ef.zip 227557 BLAKE2B 6d3a65a1d8a4e3944cb8bf562c52e52f933afe03bc508236126a20cd14e59c3439b5fea5814602a987abaa263a2d326f393ece6bd7fbc29b870f7e7228884d1a SHA512 4721e4fb265bcac520c5ef82eff0853671740915a31cb431136bb31c946a0bf6070680aaeb3d53c87f0b524545752069e8627c92425607101f1770cdada6906d
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip 20348 BLAKE2B 74a4be12412897c2b8a361023107469ba1ed86109b0c216d010621bfe5700fbaaf4622ad5ab4b2fc13fc0c6ce9c2e2f9d47cdcad2c3efa95c47baa879bf3f816 SHA512 4cad5f43527cfdac732d5a71f083ded5080cbb01cb16245616408bcd41c99dd89002813a83a69d2c2e8a3aa46434495b855d592046108713739b3e29ee0ca8fd
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
-DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
-DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip 45664 BLAKE2B 300a1f32c514f6857be8cffe884b9fc29091a709746c83567f82413b0e64d7f42ff3aa6bc34846745489f98e10045736e3571797e715fad87cec937df28d0fc9 SHA512 f9a98001ee97894e319b82f4c190f93ce7a60e109b991691f3a90cd51818596b1baefcc1c24793aa3c8c9d4505f809fbc689037b1a929e21e17fcf134134118b
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550 BLAKE2B e0bcc6235d88e1728797c178d10261e851b18814ecad679674349596f5fc0aa2784b0b4fee440488ffe8188b47dbf8474e5a5078b1220188ac6c25b0c371068d SHA512 98442115bb11ccc8061eb7c39e2e7efcc809d45ed6051456d6ec5439e20823b4b4d2ce16f4ba02530b58f74e9c1b9f3bf0d3dd0b4327b1b8158f395022ab2d80
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip 1529034 BLAKE2B a30815639bc723fe9c7078c1fc5214e43aa946520c8d2d1efdc2cfb88b53c1faf50054f693d4f3b92461a64c07c8dbb845901c87a8deb86650cfcfc0482aae08 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip 23402 BLAKE2B 03ef6b566c4f9539fe7310adff76e37bac4e3aaf32559f1a228690195207530ff68ad1179b22594cb7a62f9dcceb41631452052eb8bdab852848ffa1e19c0fbb SHA512 3aaf366b00d38d9dfe1ab23a0c6df05e2fb586f44470ec9b7cc59fc113cc68567a4102352b4a416da137df619b44c61e28042124cebcc525e3c6ebf10f8fbff2
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST gopkg.in%2Fdjherbis%2Ftimes.v1%2F@v%2Fv1.2.0.mod 34 BLAKE2B 994760ba91670807a6a9daa1781637b17e67721dc15124e262cfff7eb23a9bb7191d15925a7cf824a51ba6560816995ec24b3c175960e98669b41febbd69db5c SHA512 2983ea900dc8faee385d721e0d5062317f8d475c690d93d64b5863e7a0c8256077ed884b7dca284431af6696b0088a2a61bbf03aa19d14397f1a04b15f420bcc
-DIST gopkg.in%2Fdjherbis%2Ftimes.v1%2F@v%2Fv1.2.0.zip 16389 BLAKE2B 1b10d96f25305726184fe72c5f77a8d740a5e5d211fbc4cd78c89f8c5dac863ea24a940d3491c173879cd45e893f92565568a0f5c168fc2aad20e35141a6a12c SHA512 aca66545aa32b274864b4e84b6ef7284b5c63218f346230bf97587c69aaab6b9d5beb11ca3da9c1e9952b68ebc2fda974859757b91a66ede42d64339848ee069
-DIST lf-22.tar.gz 102883 BLAKE2B 6e1357ba2038c383ddb6369bdf1f36c673964a34614423e6defeed8aa6094a7167436549bfd65d20ecd04b83ea618e3da7498ce0848ab98af778eb5628ff64ac SHA512 efdca3639d9042ad1ef84529b0b9be21cd8924ac094985b3d978046edb5e11303591a8bebc41df7b2837a3add196f94a8cc482a001a508c4fbc79ba1d2f8c54c
 DIST lf-27-deps.tar.xz 12602056 BLAKE2B fec475a83988080468c8daabd4076a16f58eec610d71ad46ad7e5adf146c70d2e2ec78ede22c62b3353e668fd24f102c82a4b27f768153b4d003854734f92428 SHA512 74e3cbc98746669bc7f57bcf0b9a2d196795f0c8b011b33f1cf8afed7b7f3ef971c002df3f83985ca68b7980b4beec71569357123dbc31219542a04ff63295cd
 DIST lf-27.tar.gz 112266 BLAKE2B e03cd38042661d35dd7d110894fe7ca4866e491c810e76d6cfe1d34efedbda5f2b4b6e626ab72c72450252dca8f82c3e1804a686e7437d6f7475f3b9fa0ca796 SHA512 1a9cd0a3206f01f75a9ea0dbef4fcd3a2e28e9d283b19c74e821c5e90229b9ff64524e9d151dec44d9b2c06b3f8b424c4053034b58bcc7fa38345ce7c662f013
-DIST lf-r20.tar.gz 101838 BLAKE2B 085b7331d65f3e93bf8c0767b08f528bb7f28f4432a25fd7b83eed270e17df4744433fe4e0d736eedfae04edb60dc6bf3663dcd403c0503c6ec4985009ad39b7 SHA512 7706950d11847638eaed3afa2c277945a18364781339d530d4c8829f0e4ec382f133aac43519237646b852a6899b28eb7279dc72f26833b50fdf2c4641ecc109
diff --git a/app-misc/lf/lf-20.ebuild b/app-misc/lf/lf-20.ebuild
deleted file mode 100644
index 36aa78f36b..0000000000
--- a/app-misc/lf/lf-20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-"github.com/gdamore/encoding v1.0.0"
-"github.com/gdamore/encoding v1.0.0/go.mod"
-"github.com/gdamore/tcell/v2 v2.0.0"
-"github.com/gdamore/tcell/v2 v2.0.0/go.mod"
-"github.com/lucasb-eyer/go-colorful v1.0.3"
-"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-"github.com/mattn/go-runewidth v0.0.7/go.mod"
-"github.com/mattn/go-runewidth v0.0.9"
-"github.com/mattn/go-runewidth v0.0.9/go.mod"
-"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
-"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
-"golang.org/x/text v0.3.0"
-"golang.org/x/text v0.3.0/go.mod"
-"gopkg.in/djherbis/times.v1 v1.2.0"
-"gopkg.in/djherbis/times.v1 v1.2.0/go.mod"
-	)
-
-go-module_set_globals
-
-DESCRIPTION="Terminal file manager"
-HOMEPAGE="https://github.com/gokcehan/lf"
-SRC_URI="https://github.com/gokcehan/lf/archive/r20.tar.gz -> ${PN}-r${PV}.tar.gz
-		${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/lf-r${PV}"
-
-EGO_PN=github.com/gokcehan/lf
-
-src_compile() {
-	go build -x || die
-}
-
-src_install() {
-	dobin "lf"
-	einstalldocs
-	doman "lf.1"
-}
diff --git a/app-misc/lf/lf-22.ebuild b/app-misc/lf/lf-22.ebuild
deleted file mode 100644
index 97a74e42ed..0000000000
--- a/app-misc/lf/lf-22.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"github.com/gdamore/encoding v1.0.0"
-	"github.com/gdamore/encoding v1.0.0/go.mod"
-	"github.com/gokcehan/tcell/v2 v2.2.1-0.20210329222449-4dd2d52e83ef"
-	"github.com/gokcehan/tcell/v2 v2.2.1-0.20210329222449-4dd2d52e83ef/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/mattn/go-runewidth v0.0.10"
-	"github.com/mattn/go-runewidth v0.0.10/go.mod"
-	"github.com/rivo/uniseg v0.1.0"
-	"github.com/rivo/uniseg v0.1.0/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
-	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
-	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"gopkg.in/djherbis/times.v1 v1.2.0"
-	"gopkg.in/djherbis/times.v1 v1.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Terminal file manager"
-HOMEPAGE="https://github.com/gokcehan/lf"
-SRC_URI="https://github.com/gokcehan/${PN}/archive/r${PV}.tar.gz -> ${P}.tar.gz
-		${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-src_compile() {
-	go build -x || die
-}
-
-src_install() {
-	dobin "lf"
-	einstalldocs
-	doman "lf.1"
-}
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index eed3d720a6..49753c8bbd 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -15,7 +15,6 @@ IUSE="X plots xls lua ods tmux"
 PATCHES=(
 	"${FILESDIR}/${P}-prefix.patch"
 	"${FILESDIR}/${P}-tmux.patch"
-
 )
 
 DEPEND="
@@ -42,6 +41,6 @@ S="${WORKDIR}/${P}/src"
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-prefix.patch"
-	use tmux && "${FILESDIR}/${P}-tmux.patch"
+	use tmux && eapply "${FILESDIR}/${P}-tmux.patch"
 	eapply_user
 }
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild
index b57c9d7171..6e292b3c65 100644
--- a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild
@@ -21,10 +21,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	cmake_src_prepare
-}
-
 src_configure() {
 	DOUBLEFUNCTION=OFF
 	for x in $(plocale_get_locales); do
diff --git a/eclass/mpv-plugin.eclass b/eclass/mpv-plugin.eclass
new file mode 100644
index 0000000000..01212adec0
--- /dev/null
+++ b/eclass/mpv-plugin.eclass
@@ -0,0 +1,128 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: mpv-plugin.eclass
+# @MAINTAINER:
+# Nicola Smaniotto <smaniotto.nicola@gmail.com>
+# @AUTHOR:
+# Nicola Smaniotto <smaniotto.nicola@gmail.com>
+# @SUPPORTED_EAPIS: 8
+# @BLURB: install mpv plugins
+# @DESCRIPTION:
+# This eclass simplifies the installation of mpv plugins into system-wide
+# directories.  Also handles the mpv dependency and provides an USE flag
+# for automatic loading of the plugin.
+
+case ${EAPI:-0} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} unsupported."
+esac
+
+EXPORT_FUNCTIONS src_install pkg_postinst
+
+# @ECLASS_VARIABLE: USE_MPV
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Controls adding media-video/mpv dependency.  The allowed values are:
+#
+# - rdepend -- add it to RDEPEND
+#
+# - depend -- add it to DEPEND+RDEPEND with the binding slot operator (the
+# default)
+
+# @ECLASS_VARIABLE: MPV_REQ_USE
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @DESCRIPTION:
+# The list of USE flags required to be enabled on mpv, formed as a
+# USE-dependency string.
+#
+# Example:
+# @CODE@
+# MPV_REQ_USE="lua"
+# @CODE@
+
+if [[ ! ${_MPV_PLUGIN_ECLASS} ]]; then
+
+# @FUNCTION: _mpv-plugin_set_globals
+# @INTERNAL
+# @USAGE:
+# @DESCRIPTION:
+# Sets all the global output variables provided by this eclass.
+# This function must be called once, in global scope.
+_mpv-plugin_set_globals() {
+	local MPV_PKG_DEP
+
+	SLOT="0"
+	IUSE="+autoload"
+
+	MPV_PKG_DEP="media-video/mpv"
+	case ${USE_MPV:-depend} in
+		 rdepend)
+			  ;;
+		 depend)
+			  MPV_PKG_DEP+=":="
+			  ;;
+		 *)
+			  die "Invalid USE_MPV=${USE_MPV}"
+			  ;;
+	esac
+	if [ ${MPV_REQ_USE} ]; then
+		 MPV_PKG_DEP+="[${MPV_REQ_USE}]"
+	fi
+
+	RDEPEND="${MPV_PKG_DEP}"
+	if [[ ${USE_MPV} == depend ]]; then
+		 DEPEND="${MPV_PKG_DEP}"
+	fi
+}
+_mpv-plugin_set_globals
+
+# @ECLASS_VARIABLE: MPV_PLUGIN_FILES
+# @DEFAULT_UNSET
+# @REQUIRED
+# @DESCRIPTION:
+# Array containing the list of files to be installed.
+
+# @FUNCTION: mpv-plugin_src_install
+# @USAGE:
+# @DESCRIPTION:
+# Install the specified files in ${D} and symlink them if the autoload flag is
+# set.
+# The ebuild must specify the file list in the MPV_PLUGIN_FILES array.
+mpv-plugin_src_install() {
+	if [[ ! ${MPV_PLUGIN_FILES} ]]; then
+		 die "${ECLASS}: no files specified in MPV_PLUGIN_FILES, cannot install"
+	fi
+
+	insinto /usr/$(get_libdir)/mpv
+	for f in "${MPV_PLUGIN_FILES[@]}"; do
+		 doins "${f}"
+		 use autoload && dosym -r "/usr/$(get_libdir)/mpv/${f}" "/etc/mpv/scripts/${f}"
+	done
+
+	einstalldocs
+}
+
+# @FUNCTION: mpv-plugin_pkg_postinst
+# @USAGE:
+# @DESCRIPTION:
+# Warns the user of the existence of the autoload use flag.
+mpv-plugin_pkg_postinst() {
+	if ! use autoload; then
+		 elog
+		 elog "The plugin has not been installed to /etc/mpv/scripts for autoloading."
+		 elog "You have to activate it manually by passing"
+		 for f in "${MPV_PLUGIN_FILES[@]}"; do
+			  elog "  \"${EPREFIX}/usr/$(get_libdir)/mpv/${f}\""
+		 done
+		 elog "as script option to mpv or symlinking the library to \"scripts/\" in your mpv"
+		 elog "config directory."
+		 elog "Alternatively, activate the autoload use flag."
+		 elog
+	fi
+}
+
+_MPV_PLUGIN_ECLASS=1
+fi
diff --git a/gui-apps/somebar/somebar-9999.ebuild b/gui-apps/somebar/somebar-9999.ebuild
index 1ec94a368e..9ddcc25da6 100644
--- a/gui-apps/somebar/somebar-9999.ebuild
+++ b/gui-apps/somebar/somebar-9999.ebuild
@@ -22,8 +22,6 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-libs/wayland-protocols
 	dev-util/wayland-scanner
-	dev-util/meson
-	dev-util/ninja
 "
 
 src_prepare() {
@@ -33,6 +31,6 @@ src_prepare() {
 }
 
 src_install() {
-	meson_install
+	meson_src_install
 	save_config src/config.hpp
 }
diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
index 77bdfc71a1..6da9d682fb 100644
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,3 +1 @@
-DIST dwl-0.2.1.tar.gz 49275 BLAKE2B e99acc86e937e288fbaf4532fc446d7b6820fec5316b8417824369a142481c67f3a2567733e2836b3dfeb88658f42c8df9db6d3283a3d23082451e868d4f8150 SHA512 caac92082c97d36a8f1ff3b3cf9762ee16e43595223acedb752646de9c78240718a4d118513e8314b0089f7073d6cea5d6a8313fd0d2eeeeb8f9d3b06b0d78af
 DIST dwl-0.3.1.tar.gz 51347 BLAKE2B 754dcf17de405f4a3f69478444fe46199f4e67fd7a7801e02131676e23e7324b49d6f31da629a6ab977262a210b95adcb8407c37b81031aac3ee6d2427f27a10 SHA512 c6bcaf26d6f67f7712f907331c947afc84a5c5b990f5ec6d568d65f624a2cafd1617055ed514cd7e8a331abcd4c37ed574672dcbeeb890607d8eb38e7a304215
-DIST dwl-0.3.tar.gz 48523 BLAKE2B 4064d01641f833a12a9b4cde304efded878a1037f19f477d765366cf41f16358576ddc6e210fb13d91f2acd4874395685aa680a150e034e5fe79ea8202ee3ab3 SHA512 2575c782df55e70f27db5b9ff50f8b47979354f4e9c1a6b37638221db13573790344996cc884e317f3738d848a4209257ae6abe5c173a556b8d2690391e04691
diff --git a/gui-wm/dwl/dwl-0.2.1.ebuild b/gui-wm/dwl/dwl-0.2.1.ebuild
deleted file mode 100644
index 285f36ac7f..0000000000
--- a/gui-wm/dwl/dwl-0.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl"
-SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 GPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/libinput
-	dev-libs/wayland
-	gui-libs/wlroots[X(-)?]
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/wayland-protocols
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	restore_config config.h
-}
-
-src_configure() {
-	use X && append-cppflags -DXWAYLAND
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-
-	insinto /usr/share/wayland-sessions
-	doins "${FILESDIR}"/dwl.desktop
-
-	einstalldocs
-
-	save_config config.h
-}
diff --git a/gui-wm/dwl/dwl-0.3.ebuild b/gui-wm/dwl/dwl-0.3.ebuild
deleted file mode 100644
index 79989a7d88..0000000000
--- a/gui-wm/dwl/dwl-0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic savedconfig toolchain-funcs desktop
-
-DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl"
-SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 GPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/libinput
-	dev-libs/wayland
-	>=gui-libs/wlroots-0.15.1[X(-)?]
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/wayland-protocols
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	restore_config config.h
-}
-
-src_configure() {
-	use X && append-cppflags -DXWAYLAND
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-
-	domenu "${FILESDIR}"/dwl.desktop
-
-	einstalldocs
-
-	save_config config.h
-}
diff --git a/kde-misc/skanpage/Manifest b/kde-misc/skanpage/Manifest
index b0d647be0b..38581b2e64 100644
--- a/kde-misc/skanpage/Manifest
+++ b/kde-misc/skanpage/Manifest
@@ -1 +1 @@
-DIST skanpage-0_p20210402.tar.gz 33068 BLAKE2B f4eff6d12031dd0e9b92a3ed6061f2cda07933d46ab9377761d4a5bf1b23c6675c64056c7dc4e6114b2a7639bdd783349e5f85e656ff4e8e5d412fed461bfa52 SHA512 c971bf05907019f75c63ce2747a52fa9472a77a24bd4e80e6d0b2a4c99820bcd3994d37b59074c0d1b2754ae34dfe64ee7962115513518999d8b456218980aa3
+DIST skanpage-22.03.80-6edb4961.tar.gz 386413 BLAKE2B 07e6a7df3846cd5b7707c25891719220b4cead9a7307424a9e36cd9229b171c3d2b1fa9df48249876a5f7e6e3f1290e35fd09ca9f6d4f187d0473a3f22c2136d SHA512 d6d86e2964893ea5084511159afebc9eceb327c990a63ac9e6ed3f9f3b4d79cab57a834b4c49d9a1c99b7e734d61bd0e41d531eab9adcef6a1853961a79d3cfb
diff --git a/kde-misc/skanpage/skanpage-0_p20210402.ebuild b/kde-misc/skanpage/skanpage-22.03.80.ebuild
similarity index 59%
rename from kde-misc/skanpage/skanpage-0_p20210402.ebuild
rename to kde-misc/skanpage/skanpage-22.03.80.ebuild
index 71135a604d..6b3fe4d85a 100644
--- a/kde-misc/skanpage/skanpage-0_p20210402.ebuild
+++ b/kde-misc/skanpage/skanpage-22.03.80.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_DEBUG="false"
-KFMIN=5.80
+KDE_ORG_CATEGORY="utilities"
+if [[ ${PV} != 9999 ]]; then
+	KDE_ORG_COMMIT="6edb4961b5f0f3fc417580c55e3fcbbadcba4543"
+	KEYWORDS="~amd64"
+fi
+KFMIN=5.91
 QTMIN=5.15.2
-inherit ecm
+inherit ecm kde.org
 
-COMMIT="1c144786d44ec266839ff3ffbe911f2cc61644d1"
-
-DESCRIPTION="Simple pdf scanning application based on libksane and KDE Frameworks"
+DESCRIPTION="Multi-page scanning application supporting image and pdf files"
 HOMEPAGE="https://invent.kde.org/utilities/skanpage"
-SRC_URI="https://invent.kde.org/utilities/skanpage/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="|| ( GPL-2 GPL-3 )"
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="5"
-KEYWORDS="~amd64"
 
 DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-apps/libksane-19.04.0:5
+	>=kde-apps/libksane-21.12.3:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -32,5 +32,3 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/kde-misc/skanpage/skanpage-9999.ebuild b/kde-misc/skanpage/skanpage-9999.ebuild
new file mode 100644
index 0000000000..6b3fe4d85a
--- /dev/null
+++ b/kde-misc/skanpage/skanpage-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+if [[ ${PV} != 9999 ]]; then
+	KDE_ORG_COMMIT="6edb4961b5f0f3fc417580c55e3fcbbadcba4543"
+	KEYWORDS="~amd64"
+fi
+KFMIN=5.91
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Multi-page scanning application supporting image and pdf files"
+HOMEPAGE="https://invent.kde.org/utilities/skanpage"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
+SLOT="5"
+
+DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-apps/libksane-21.12.3:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/media-video/mpv-mpris/mpv-mpris-0.7.1-r1.ebuild b/media-video/mpv-mpris/mpv-mpris-0.7.1-r1.ebuild
new file mode 100644
index 0000000000..ba02bf7f62
--- /dev/null
+++ b/media-video/mpv-mpris/mpv-mpris-0.7.1-r1.ebuild
@@ -0,0 +1,53 @@
+# 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/media-video/mpv_thumbnail_script/Manifest b/media-video/mpv_thumbnail_script/Manifest
new file mode 100644
index 0000000000..4570f96b59
--- /dev/null
+++ b/media-video/mpv_thumbnail_script/Manifest
@@ -0,0 +1 @@
+DIST mpv_thumbnail_script-0.4.8.tar.gz 2583047 BLAKE2B dabcc477b49ceac3b15ffcde0c6ff072797a42109a2a8a0b4bcb2a029964fe8b3095f45691b6a03924ad960c1643354f09bc370caa63aa64a3bfa2aadc94a326 SHA512 b28b8dc2b268725d15aa1f0ca2a8dd512d6eb5f9a520786a0d59beae79a1608b6e7a783c92cb75950f36c85893834acf85c75f457995248116c54fc1832792bd
diff --git a/media-video/mpv_thumbnail_script/mpv_thumbnail_script-0.4.8.ebuild b/media-video/mpv_thumbnail_script/mpv_thumbnail_script-0.4.8.ebuild
new file mode 100644
index 0000000000..21d82b623e
--- /dev/null
+++ b/media-video/mpv_thumbnail_script/mpv_thumbnail_script-0.4.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MPV_REQ_USE="lua"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit mpv-plugin python-any-r1
+
+DESCRIPTION="A Lua script to show preview thumbnails in mpv's OSC seekbar"
+HOMEPAGE="https://github.com/marzzzello/mpv_thumbnail_script"
+
+SRC_URI="https://github.com/marzzzello/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+MPV_PLUGIN_FILES=(
+	${PN}_client_osc.lua
+	${PN}_server.lua
+)
+
+src_compile() {
+	${EPYTHON} concat_files.py -r "cat_osc.json" || die
+	${EPYTHON} concat_files.py -r "cat_server.json" || die
+}
diff --git a/net-mail/dovecot-fts-xapian/metadata.xml b/net-mail/dovecot-fts-xapian/metadata.xml
index 62b6af6a4c..3c0f021270 100644
--- a/net-mail/dovecot-fts-xapian/metadata.xml
+++ b/net-mail/dovecot-fts-xapian/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>gentoo_bugs_peep@parallaxshift.com</email>
-		<name>Philippe 'Peep' Chaintreuil</name>
+		<name>Philippe Chaintreuil</name>
 	</maintainer>
 	<upstream>
 		<maintainer>
diff --git a/profiles/package.mask b/profiles/package.mask
index d65dbd4747..8cc1d3aefa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -22,3 +22,7 @@ gnome-extra/extension-manager
 # Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in> (2022-01-09)
 # Depends on masked libhandy 1.5.0
 >=app-text/komikku-0.36.0
+
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-04-14)
+# Depends on unavailable dev-python/regex-2022.3.15
+dev-python/dateparser