diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
index 95a0e8bc32..d6bb63d7d0 100644
--- a/app-text/OCRmyPDF/Manifest
+++ b/app-text/OCRmyPDF/Manifest
@@ -1,2 +1,3 @@
 DIST OCRmyPDF-11.6.2.tar.gz 7885633 BLAKE2B a4c09a8088abe3f9e984e8c7ce1b58699c5e40c46de8e9f81ac43838772541758467887b22c3a9fe8026fb8cd125466968e5745af69c9760a0f470879e40685b SHA512 1f92022352b63d2642a0fd49ea72d70973c08d2b2cc84d3d92f06bfd883a858f7dba06f83a921245846d20fc90a1afa0570e7d58fe673e1dfad82e5e047e8de3
 DIST OCRmyPDF-11.7.0.tar.gz 7885763 BLAKE2B 9658222f85f32958338823686e4c7d66a07060b4660033c167a8462fec7f9c863f516e877b9dca2979f9471a7bbda1a5c611dfbdcdc7ea75fafdb13bca2cef08 SHA512 d9353bc627a13d5092e79e264287942da757669992a3585f44d97d254d4043f41a6e4646026115bd81bf5bcf0d2810c1a382097a23938e0925cbc1fa46815595
+DIST OCRmyPDF-11.7.1.tar.gz 7886196 BLAKE2B 8da696926824b54061035157f7962f428f8c2bf8d94f9bec119a963e05b1bbade1a0740fa7fea4a5a8b8d442b18a294a9ba8ca3b824e5c40445fa7e50279d49b SHA512 75e8b969ff94e1d6b36ddfacc3d79aae00ada2622ace8ef911de2febb815a2b0a5d7b3e46e5adb74687871d75ff1a08bf9cd3f1529bc412fccade1bad16b5fc6
diff --git a/app-text/OCRmyPDF/OCRmyPDF-11.7.1.ebuild b/app-text/OCRmyPDF/OCRmyPDF-11.7.1.ebuild
new file mode 100644
index 0000000000..ed5786c975
--- /dev/null
+++ b/app-text/OCRmyPDF/OCRmyPDF-11.7.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="OCRmyPDF adds an OCR text layer to scanned PDF files"
+HOMEPAGE="https://github.com/jbarlow83/OCRmyPDF"
+SRC_URI="https://github.com/jbarlow83/OCRmyPDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# This uses *a lot* of RAM, I have 32gb and these tests tried to use it all
+RESTRICT="test"
+IUSE="jbig2enc"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	app-text/tesseract
+	app-text/unpaper
+	dev-python/cffi[${PYTHON_USEDEP}]
+	dev-python/coloredlogs[${PYTHON_USEDEP}]
+	>=dev-python/pdfminer-six-20191110[${PYTHON_USEDEP}]
+	<=dev-python/pdfminer-six-20201018[${PYTHON_USEDEP}]
+	dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	media-gfx/img2pdf[${PYTHON_USEDEP}]
+	media-gfx/pngquant
+	media-libs/leptonica
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	jbig2enc? ( media-libs/jbig2enc )
+"
+DEPEND="
+	test? (
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		~dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs --no-autodoc
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp misc/completion/ocrmypdf.bash "${PN,,}"
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/completion/ocrmypdf.fish
+}
diff --git a/dev-python/jellyfin-apiclient-python/Manifest b/dev-python/jellyfin-apiclient-python/Manifest
index b45b65a703..b91566a4c7 100644
--- a/dev-python/jellyfin-apiclient-python/Manifest
+++ b/dev-python/jellyfin-apiclient-python/Manifest
@@ -1 +1,2 @@
 DIST jellyfin-apiclient-python-1.6.2.tar.gz 17115 BLAKE2B 37889d6359d7a1d4350b99fe5eb4fa0bb2e28248daaee64aa324e07b46d6a254c1e488bf39954680f7f044cbf4c78fc6059c8f91787410bdea629996d0874ac3 SHA512 42be1fe1d0d360127655c9718c3a157028918597c3782ea3df9326b844aa9a542d23480da405f580da340b251ce0d790220d55f891000346b219dacddbd523fc
+DIST jellyfin-apiclient-python-1.7.2.tar.gz 17365 BLAKE2B 0cb3dd380bd15dc7092eac7e2a76963b980383899b69c5eafa9ad8136f2f94a9d4b18cfcc7645ba0d8cab1454b1e0c08028640348724859bcf1683f0473ef9b1 SHA512 70685a65da58588013f304d1185ec7d672872c1891f0a81d1ac9c56b2be54b88f920192d0c9ba047d11f78125d937e9f6c920ccfc9687a3e862beff7190aff8c
diff --git a/dev-python/jellyfin-apiclient-python/jellyfin-apiclient-python-1.7.2.ebuild b/dev-python/jellyfin-apiclient-python/jellyfin-apiclient-python-1.7.2.ebuild
new file mode 100644
index 0000000000..d14ccf5bc0
--- /dev/null
+++ b/dev-python/jellyfin-apiclient-python/jellyfin-apiclient-python-1.7.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API client for Jellyfin"
+HOMEPAGE="https://github.com/jellyfin/jellyfin-apiclient-python"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/media-video/jellyfin-desktop/Manifest b/media-video/jellyfin-desktop/Manifest
new file mode 100644
index 0000000000..8daa4b50de
--- /dev/null
+++ b/media-video/jellyfin-desktop/Manifest
@@ -0,0 +1,3 @@
+DIST jellyfin-desktop-1.10.2.tar.gz 462478 BLAKE2B b8fa8642dda49323ae86f6b2848fbf1e65b4f993448a3dc922416cf16051e9ed1e971932ce0ebfd5c6e9f9682f365c2e3a6eeace28c24b4a304235cb30a0d212 SHA512 32ecbb30e08ade248c9e5233984253b0805185efb53b990800ced0ee119e409549ee2282e551bf13c5403c55761d47541a3d319b74fe672e96d10511a7c89738
+DIST jellyfin-mpv-shim-shader-pack-1.1.0.tar.gz 1326518 BLAKE2B ef1d1c699698cc62163b903e20e4a9cbad14169f2aca1058e58da5102e72be4291504cbad5bb877820fb7d4ed6749b04319bca7d210bfcf103693be9a0cc4e69 SHA512 26cacd859c0d0fef06fbd598007f291a652fd52d617af2df71104f705156ae78665dee2ae963f3e7bdb01e91d3fa41f555824a47f9d621d1627a06b2b5f9ba75
+DIST jellyfin-web-1.7.0.zip 34771390 BLAKE2B cab30609bda5936b5a9d3f9a0a9d59ceec88abf8e80e9ddc3e00b2d3a5f20e5cef28318b13b9c529cd1a175ebc87376348471b19d0de2ef92f4e584ee45c672a SHA512 ab674911f20172b56baf06ea0cccb9b89083266661f1b9aecc2e620735de901d355a7f0f93e1b9e109e00b1e8097bd5aa1b185f3e4670ee9f22e38bbaa84f5d2
diff --git a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild b/media-video/jellyfin-desktop/jellyfin-desktop-1.10.2.ebuild
similarity index 67%
rename from media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild
rename to media-video/jellyfin-desktop/jellyfin-desktop-1.10.2.ebuild
index 6fee5b4154..e4f11b87f6 100644
--- a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild
+++ b/media-video/jellyfin-desktop/jellyfin-desktop-1.10.2.ebuild
@@ -11,14 +11,14 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 SHADER_PV="1.1.0"
-WEB_PV="1.6.2"
+WEB_PV="1.7.0"
 
-DESCRIPTION="MPV-based desktop and cast client for Jellyfin (Unofficial)"
-HOMEPAGE="https://github.com/iwalton3/jellyfin-mpv-shim"
+DESCRIPTION="MPV-based desktop and cast client for Jellyfin"
+HOMEPAGE="https://github.com/jellyfin/jellyfin-desktop"
 SRC_URI="
-	https://github.com/iwalton3/jellyfin-mpv-shim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/jellyfin/jellyfin-desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/iwalton3/default-shader-pack/archive/v${SHADER_PV}.tar.gz -> jellyfin-mpv-shim-shader-pack-${SHADER_PV}.tar.gz
-	https://github.com/iwalton3/jellyfin-web/releases/download/jwc${WEB_PV}-1/dist.zip -> jellyfin-web-${WEB_PV}.zip
+	https://github.com/iwalton3/jellyfin-web/releases/download/v${WEB_PV}-4/dist.zip -> jellyfin-web-${WEB_PV}.zip
 "
 
 LICENSE="LGPL-3+ MIT Unlicense"
@@ -28,7 +28,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="
 	$(python_gen_cond_dep '
 		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/jellyfin-apiclient-python[${PYTHON_USEDEP}]
+		>=dev-python/jellyfin-apiclient-python-1.7.2[${PYTHON_USEDEP}]
 		dev-python/python-mpv-jsonipc[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/pydantic[${PYTHON_USEDEP}]
@@ -50,8 +50,8 @@ BDEPEND="app-arch/unzip"
 
 src_install() {
 	distutils-r1_src_install
-	insinto "$(python_get_sitedir)/${PN//-/_}/webclient_view/webclient" # jellyfin-web dist
+	insinto "$(python_get_sitedir)/jellyfin_mpv_shim/webclient_view/webclient" # jellyfin-web dist
 	doins -r "${WORKDIR}"/dist/*
-	insinto "$(python_get_sitedir)/${PN//-/_}/default_shader_pack" # mpv shaders
+	insinto "$(python_get_sitedir)/jellyfin_mpv_shim/default_shader_pack" # mpv shaders
 	doins -r "${WORKDIR}"/default-shader-pack-${SHADER_PV}/*
 }
diff --git a/media-video/jellyfin-mpv-shim/metadata.xml b/media-video/jellyfin-desktop/metadata.xml
similarity index 100%
rename from media-video/jellyfin-mpv-shim/metadata.xml
rename to media-video/jellyfin-desktop/metadata.xml
diff --git a/media-video/jellyfin-mpv-shim/Manifest b/media-video/jellyfin-mpv-shim/Manifest
deleted file mode 100644
index 574efc84db..0000000000
--- a/media-video/jellyfin-mpv-shim/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST jellyfin-mpv-shim-1.8.0.tar.gz 174078 BLAKE2B 9800bf8302c2da91bc1b40dbf9bb9fa50b185811cec8fbc177e54bde3e24045ee0276e7d352ba2d96ff0d9ce0a5c4db91f7ccb30b3bd12d58ac5514249e10aa1 SHA512 9391bb27dff24ca7abb2266ceb9e5b3c64943c7d573b671b38edbe19d6253220ab7a2dc8b0aca58267057ad3c3754bfba74c6b904c4d7328fd5eb40a27422826
-DIST jellyfin-mpv-shim-1.8.1.tar.gz 199229 BLAKE2B 1f3540bd691e84860f7d4447c94bb032da11384050e94a578b90a66a4916436bd703fe287f7b1889c2ff2463252c43fc04b3d7d75462271a422cb4e3b44ff856 SHA512 dfe48c0a262a4fbe3bdf8680d1b4bf94f76306816610785d4a31be3baef7154a63f0f38cbd9d8be11f22f6cb133090159c7914195994108c0e8738ace44e6804
-DIST jellyfin-mpv-shim-shader-pack-1.1.0.tar.gz 1326518 BLAKE2B ef1d1c699698cc62163b903e20e4a9cbad14169f2aca1058e58da5102e72be4291504cbad5bb877820fb7d4ed6749b04319bca7d210bfcf103693be9a0cc4e69 SHA512 26cacd859c0d0fef06fbd598007f291a652fd52d617af2df71104f705156ae78665dee2ae963f3e7bdb01e91d3fa41f555824a47f9d621d1627a06b2b5f9ba75
-DIST jellyfin-web-1.6.2.zip 36138526 BLAKE2B 29248f99bf40c252a31f0b294f239e80909f7b4471945ef3fd767748af3b1fbf1a240edc80b7332d3371fcb03ef128f5f93b04867d99cf5efd9a361a44b7924e SHA512 f92af66cee0a54a41cd16079839bd785c33565db9d3c8263203b9939a531a017d2cdf049ed9f7c322c90175633face34ee6b607e467cb599884f40c43d99920c
diff --git a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild b/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild
deleted file mode 100644
index 6fee5b4154..0000000000
--- a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="tk"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-SHADER_PV="1.1.0"
-WEB_PV="1.6.2"
-
-DESCRIPTION="MPV-based desktop and cast client for Jellyfin (Unofficial)"
-HOMEPAGE="https://github.com/iwalton3/jellyfin-mpv-shim"
-SRC_URI="
-	https://github.com/iwalton3/jellyfin-mpv-shim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/iwalton3/default-shader-pack/archive/v${SHADER_PV}.tar.gz -> jellyfin-mpv-shim-shader-pack-${SHADER_PV}.tar.gz
-	https://github.com/iwalton3/jellyfin-web/releases/download/jwc${WEB_PV}-1/dist.zip -> jellyfin-web-${WEB_PV}.zip
-"
-
-LICENSE="LGPL-3+ MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/jellyfin-apiclient-python[${PYTHON_USEDEP}]
-		dev-python/python-mpv-jsonipc[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	dev-libs/libappindicator:3=
-	$(python_gen_cond_dep '
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pystray[${PYTHON_USEDEP}]
-		>=dev-python/pywebview-3.3.1[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	distutils-r1_src_install
-	insinto "$(python_get_sitedir)/${PN//-/_}/webclient_view/webclient" # jellyfin-web dist
-	doins -r "${WORKDIR}"/dist/*
-	insinto "$(python_get_sitedir)/${PN//-/_}/default_shader_pack" # mpv shaders
-	doins -r "${WORKDIR}"/default-shader-pack-${SHADER_PV}/*
-}
diff --git a/net-analyzer/munin-contrib/Manifest b/net-analyzer/munin-contrib/Manifest
index 1d89e5d2c6..de5354f6c4 100644
--- a/net-analyzer/munin-contrib/Manifest
+++ b/net-analyzer/munin-contrib/Manifest
@@ -1 +1 @@
-DIST munin-contrib-0_p20210318.tar.gz 6777350 BLAKE2B 5899abd4fa71f248d9da2fb4bafdac55ee054602339119b0ad5ba1098745c99859c1c56d800070538d0f6612bb155eedb24584f41e7c281f88fe2e348da8af30 SHA512 4500f625798a09eff4d8ab41226d166086748fdaf5b77c0826b62b165da299c7d9151a29eefc92ec5f602218c75760ea050bd548f22d3987193d1538f732e17a
+DIST munin-contrib-0_p20210325.tar.gz 6776895 BLAKE2B 15e9bb49b07e42f2e63a73367b162fbb8d87155d9fbfaa9aeda40b98468133ed03dc1e36d1c1a1184a0d1542dbfbd8ed76d3e371fd77987dea56bed08ee2acca SHA512 d972d2e965169a666861328e19744d7ea43b66f4852d86690c7d5d531ff2e3524e53259a09a29a364af91b492d15fa406f77c41fd1e99975c8e623bcbbf47911
diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
deleted file mode 100644
index 1a2ce0affe..0000000000
--- a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-COMMIT="7fd554f04b67a985e99f15aa56aa4546d6006f2f"
-
-SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="user contributed stuff related to munin"
-HOMEPAGE="https://github.com/munin-monitoring/contrib"
-LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+" #TODO: investigate all the licenses
-SLOT="0"
-IUSE="examples +plugins templates tools"
-RDEPEND="net-analyzer/munin"
-
-S="${WORKDIR}/contrib-${COMMIT}"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	insinto "/usr/libexec/munin"
-	use tools && doins -r tools
-	insinto "/usr/libexec/munin/plugins/contrib"
-	use plugins && doins -r plugins/*
-	insinto "/etc/munin/templates"
-	use templates && doins -r templates/munstrap
-	use examples && dodoc -r samples/munin.conf
-	dodoc README.md
-}
diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild b/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild
new file mode 100644
index 0000000000..665f36e504
--- /dev/null
+++ b/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+COMMIT="4af69a6d076a467d7f8faa0030e8da53b1de190f"
+
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+DESCRIPTION="user contributed stuff related to munin"
+HOMEPAGE="https://github.com/munin-monitoring/contrib"
+LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+" #TODO: investigate all the licenses
+SLOT="0"
+IUSE="examples +plugins templates tools"
+RDEPEND="net-analyzer/munin"
+
+S="${WORKDIR}/contrib-${COMMIT}"
+README_PLUGINS=(
+	plugins/README.md
+	plugins/apache/apache_byprojects/README.md
+	plugins/apache/apache_vhosts/README.txt
+	plugins/apt/deb_packages/README.md
+	plugins/kamailio/README.md
+	plugins/network/linux_if/README.md
+	plugins/nfs-freebsd/README.rst
+	plugins/nginx/nginx_byprojects/README.md
+	plugins/prosody/README.rst
+	plugins/rackspace/README
+	plugins/tarsnap/README.md
+	plugins/varnish/README-varnish4.md
+	plugins/varnish/README.rst
+	plugins/znc/README.md
+	plugins/zope/README-zodb
+)
+README_TOOLS=(
+	tools/munin-node-c/README
+	tools/munin-node-from-hell/README.rst
+	tools/munin-plugins-busybox/README
+	tools/pmmn/plugins/README
+	tools/pypmmn/README.rst
+)
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	if use tools ; then
+		for i in "${README_TOOLS[@]}" ; do
+			p="${ED}/usr/share/doc/${PF}/${i%/*}"
+			mkdir -p "${p}" || die
+			mv "${i}" "${p}" || die
+		done
+		insinto "/usr/libexec/munin"
+		doins -r tools
+	fi
+
+	if use plugins; then
+		#install documentation in subfolders
+		for i in plugins/{apt,}/*/example-graphs ; do
+			p="${ED}/usr/share/doc/${PF}/${i}"
+			mkdir -p "${p}" || die
+			mv "${i}" "${p}" || die
+		done
+		for i in "${README_PLUGINS[@]}" ; do
+			p="${ED}/usr/share/doc/${PF}/${i%/*}"
+			mkdir -p "${p}" || die
+			mv "${i}" "${p}" || die
+		done
+
+		#install plugins without getting mad at preserving exec bit
+		mkdir -p "${ED}/usr/libexec/munin/plugins/contrib" || die
+		mv plugins/* "${ED}/usr/libexec/munin/plugins/contrib" || die
+	fi
+
+	insinto "/etc/munin/templates"
+	use templates && doins -r templates/munstrap
+
+	use examples && dodoc -r samples/munin.conf
+
+	dodoc README.md
+}
diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021
index e77d3241c5..365f6fd8b4 100644
--- a/profiles/updates/1Q-2021
+++ b/profiles/updates/1Q-2021
@@ -2,3 +2,4 @@ move dev-python/faker dev-python/Faker
 move sci-geosciences/geographiclib sci-geosciences/GeographicLib
 move x11-libs/kimageannotator media-libs/kimageannotator
 move x11-libs/kcolorpicker media-libs/kcolorpicker
+move media-video/jellyfin-mpv-shim media-video/jellyfin-desktop