diff --git a/app-admin/pdk/Manifest b/app-admin/pdk/Manifest
index a3989a2..795cc3a 100644
--- a/app-admin/pdk/Manifest
+++ b/app-admin/pdk/Manifest
@@ -1,2 +1,4 @@
 DIST pdk_1.8.0.0-1stretch_amd64.deb 128361866 BLAKE2B 1d21de3e011d8f111ca9910193fb2ffd3360ec1bc7d1917b89c24d42dad8c1b521b12f37850cfc88a32cc79aab76000b2801568683e96ef9aedfbe7ab48bf6b3 SHA512 edae3add1d7a0e66361cc60c555f556355a07d80dc05b21cfa8c994b8a66442168d72b602258d984f9c19c15e561c9260d3ebbc82e6bfc22758f4327d78791c2
+DIST pdk_3.0.0.0-1bullseye_amd64.deb 117793618 BLAKE2B aea6e1b6a05492323be55ccab81da3737a0f294dd05ada12dfafa0ef799ed441a05cd0814ad6a5284de50c9ac6506eec302dbdcf4ee61f8803b2b5aa5dfaf818 SHA512 05b33d6a98feca5146ec52fb2b735dd73010f0c908c2cec39ce36e9bf93c085f3651de873bcb2c4b6608e5747c2cf7e0bc24ec26274fe4c6690fc24149c73956
 EBUILD pdk-1.8.0.0.ebuild 1612 BLAKE2B 56d49807d13d85c8b43ec6eefc0fe7cf6df5b6a051b9b5c3ee91020b1b7e1b77b5820a9bf42f15f87d5f90817ff3719a6c680c5eb9111743e47973c82f514c1d SHA512 1bd46ddc1b081ca5571e5fdf40d11826e6724ceda15d3f0e890013336c2dbcad399a015326cde376edf06e201af7094f0c462f3d3012460937ff86171396d588
+EBUILD pdk-3.0.0.0.ebuild 881 BLAKE2B 410ea6014df6ed877d8dec455c75e1391d9a042c74b283faad8122a013ea9c4375a03ad89fe15b218eb8c8ef2499134a69f03c95f0f71017b7c73bd11bc353f7 SHA512 c3256bde6bed9beebd0165c6c6607007316ecaa9b73a64f2772c2a36b6bb909a457b508241a3fff0a98d89adb4cd2c69305a57e1c0b12d8de3df7bd32bc8b7bc
diff --git a/app-admin/pdk/pdk-3.0.0.0.ebuild b/app-admin/pdk/pdk-3.0.0.0.ebuild
new file mode 100644
index 0000000..6b13ce1
--- /dev/null
+++ b/app-admin/pdk/pdk-3.0.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils unpacker
+
+DEB_RELEASE="bullseye"
+
+DESCRIPTION="Puppet SDK - develop and test puppet modules"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/${DEB_RELEASE}/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1${DEB_RELEASE}"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="strip"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/pdk
+	/opt/puppetlabs/pdk/lib/engines/*
+	/opt/puppetlabs/pdk/lib/*
+	/opt/puppetlabs/pdk/bin/*"
+
+src_install() {
+	# Drop the opt folder into place
+	insinto /opt
+	doins -r opt/*
+
+	# Add symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/git/bin/"
+
+	dosym ../../opt/puppetlabs/pdk/bin/pdk /usr/bin/pdk
+}
diff --git a/gui-apps/gammastep/Manifest b/gui-apps/gammastep/Manifest
deleted file mode 100644
index 751ee25..0000000
--- a/gui-apps/gammastep/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gammastep-2.0.9.tar.bz2 540120 BLAKE2B cfc29b157ad2dbd3d6bb0ac4bdb26c958ba07cad3e817931c2ee4c2e4d15c157b7c0b8b891869ddcc2cdfc39c1d52afb8437991ae60501afee84500e1f28c694 SHA512 d8b23e5890d6135cef79057408e1b7c1dbc36444dfbfaf7c80a3f36c46df19eaded1829c2cd52365413779cc752d0911a44669b5abce16d7e266b92b15c035fb
-EBUILD gammastep-2.0.9.ebuild 2001 BLAKE2B b5d2f55237c270bae3f15c2c1f884d36d7c9f76b4ef7b9985d425d7f1cbb0afdb4d8d4f9e4447b9d6572137a211b130981ed5c7d7fa8050590e4075fefca5076 SHA512 53443fb17f7124b88d49bedf226a2056b1072927d7e0efab4f73ef7495ab96c30c7133d3f551764b2486375156fdb0de8867e9e14791a3ca9a1265525a4b20c0
diff --git a/gui-apps/gammastep/gammastep-2.0.9.ebuild b/gui-apps/gammastep/gammastep-2.0.9.ebuild
deleted file mode 100644
index 997cb5a..0000000
--- a/gui-apps/gammastep/gammastep-2.0.9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..11} )
-
-inherit systemd autotools gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="https://gitlab.com/chinstrap/gammastep/"
-SRC_URI="https://gitlab.com/chinstrap/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X appindicator drm geoclue gtk nls wayland"
-
-BDEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	X? (
-		>=x11-libs/libX11-1.4
-		x11-libs/libXxf86vm
-		x11-libs/libxcb
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	drm? ( x11-libs/libdrm )
-	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
-	gtk? ( ${PYTHON_DEPS} )
-	wayland? ( >=dev-libs/wayland-1.15.0 )"
-RDEPEND="${DEPEND}
-	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		dev-python/pyxdg[${PYTHON_USEDEP}] )"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use gtk && python_setup
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable drm) \
-		$(use_enable X randr) \
-		$(use_enable X vidmode) \
-		$(use_enable geoclue geoclue2) \
-		$(use_enable gtk gui) \
-		$(use_enable wayland) \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--enable-apparmor
-}
-
-_impl_specific_src_install() {
-	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
-			-C src/gammastep_indicator install
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
-	if use gtk; then
-		python_foreach_impl _impl_specific_src_install
-		python_replicate_script "${D}"/usr/bin/gammastep-indicator
-
-		python_foreach_impl python_optimize
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
deleted file mode 100644
index af277d3..0000000
--- a/media-sound/spotify/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX spotify-wrapper 1377 BLAKE2B b75890e77c96198d7bd788b5d954fb5c10095d9ca59e2c33a48003d5e559231db7aade027206da7d96f9c7bb6c19482c4d382918262e25c912cf47975a990793 SHA512 553d25d286368b1600bb7dc5c3ab681b380e9c9ff30df335796952c86e77912775ddeee03db348220e9d84a4bc32f4a8d85c7a1551a60e4155ee960b4a6d8799
-DIST spotify-client_1.2.13.661.ga588f749_amd64.deb 121793588 BLAKE2B b9b6b659e823e6713b2db5f3c6f7c6e4ce9cedfc0b4222d96b8baec3d086dcf804f021bb0e530f6c3003df9725ff7705aaa0af457a031124e5f104f4bc434ce1 SHA512 5ccac37274ca587414a9f4c5c427fd5d4b93bbde0b39efb94ccf79a1b5947df4a00a79e00686e59a4ccd097eca0bad88e6f030f2e236d86a82c37d8e011217e9
-EBUILD spotify-1.2.13.ebuild 3741 BLAKE2B b3140aeecc7fe4d33149d55d3e910e1b6974f213aec1cd1be392e875ebb46b69241cd2b128dc45783826e6306cff6f69d49e5641fe5c98b7909895f9ec148bb1 SHA512 1b116133d973df89af946bcf91867f8d49950508a053065454558d04a9e1009d34a2734adc835da672c3c5655ae0be4517ecd2ee67465ba50008cc2779c099c4
-MISC metadata.xml 521 BLAKE2B 6859f340482640ec95ed103b2ca4b1e6c316509d8b87402068e1164a4efeaac9cf8ac5360ea038eb09c3682dd8e8e10a9cc872a3820c1a8341fcccaab34e0a18 SHA512 7527cfdf2d421e1bd7c156b930f980a464fad60f2ba2fafa5b79e4f04baad97a6ce3176987e8a32c8b5bcae20acf2b416812b26de1f7bc76205e0d8bee4e98e8
diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
deleted file mode 100644
index 862fa4c..0000000
--- a/media-sound/spotify/files/spotify-wrapper
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
-
-if command -v spotify-dbus.py > /dev/null; then
-        echo "Launching spotify with Gnome systray integration."
-        spotify-dbus.py "$@"
-elif [ -e "$SPOTIFY_HOME/spotify-tray" ] > /dev/null; then
-        echo "Launching spotify with generic systray integration."
-        minimized=
-        for arg; do
-                if [ "$arg" = --minimized ]; then
-                        minimized=$arg
-                        break
-                fi
-        done
-        GDK_BACKEND="x11" "$SPOTIFY_HOME/spotify-tray" \
-                --client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@"
-else
-    if pgrep -f "Spotify/[0-9].[0-9].[0-9]" > /dev/null; then
-        busline="org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri ${1}"
-        echo "Spotify is already running"
-        echo "Sending ${busline} to dbus"
-        if command -v qdbus &> /dev/null; then
-            qdbus $busline
-            exit
-        fi
-        if command -v dbus-send &> /dev/null; then
-            dbus-send $busline
-            exit
-        fi
-        echo "No bus dispatcher found."
-    else
-        echo "Neither gnome-integration-spotify nor spotify-tray are installed."
-        echo "Launching spotify without systray integration."
-        exec "$SPOTIFY_HOME/spotify" "$@"
-    fi
-fi
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
deleted file mode 100644
index 4c1e9f6..0000000
--- a/media-sound/spotify/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<use>
-		<flag name="local-playback">Allows playing local files with the Spotify client</flag>
-		<flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
-		<flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/spotify/spotify-1.2.13.ebuild b/media-sound/spotify/spotify-1.2.13.ebuild
deleted file mode 100644
index 960cb1c..0000000
--- a/media-sound/spotify/spotify-1.2.13.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/download/linux/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="661.ga588f749"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libnotify local-playback pax-kernel pulseaudio"
-RESTRICT="mirror strip"
-
-BDEPEND="
-	>=dev-util/patchelf-0.10
-	sys-devel/gettext
-"
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/openssl:0=
-	dev-python/dbus-python
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	sys-apps/dbus
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	!gnome-extra/gnome-integration-spotify
-	libnotify? ( x11-libs/libnotify )
-	local-playback? ( media-video/ffmpeg:0/56.58.58 )
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-"
-	#gnome-integration-spotify causes spotify to fail to launch
-	#sys-libs/glibc
-
-S="${WORKDIR}/"
-
-QA_PREBUILT="
-	opt/spotify/spotify-client/spotify
-	opt/spotify/spotify-client/libEGL.so
-	opt/spotify/spotify-client/libGLESv2.so
-	opt/spotify/spotify-client/libcef.so
-	opt/spotify/spotify-client/libvk_swiftshader.so
-	opt/spotify/spotify-client/libvulkan.so.1
-	opt/spotify/spotify-client/swiftshader/libEGL.so
-	opt/spotify/spotify-client/swiftshader/libGLESv2.so
-"
-
-src_prepare() {
-	default
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \
-		envsubst '$SPOTIFY_HOME $LIBDIR' \
-		< "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax-kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-
-	optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray
-}
diff --git a/media-tv/jellyfin-bin/Manifest b/media-tv/jellyfin-bin/Manifest
deleted file mode 100644
index 3ef2dad..0000000
--- a/media-tv/jellyfin-bin/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX jellyfin.conf 449 BLAKE2B 2d5b30d8ecd9e84434cfd61bbc07467dc54d1eab3685bc1c2bcd51d1544ead44ffb544e3cfdbfba2fff4e1b9b386f9b2e6d8f8d0a724a8445e615576800b8fb8 SHA512 04e3ae0474e442fe4ee8ce9a0450bf21eb80b6a597080f0d530ad1ece6c82cbc768cb3efe548a70d05fb00c428abadd770c09f1a9642ba567f0d78666c7e297c
-AUX jellyfin.init 1185 BLAKE2B f587b27bf1cc52849437812ab6cf1095395def8f6c993ab1c95f40107b28309fa2d8b2e99b6f5717d7d6d16da68e1042532ae240dada95b45d22e65802d88005 SHA512 60416cc6aa6d6bb418f383fbaac29b184e48596ecbd216262cc3b51afdea285532879c950decde6cfbed5b7202c94031fc4b77feccbac6af20c425a8f18ef613
-DIST jellyfin_10.7.7_amd64.tar.gz 91553323 BLAKE2B ba3008a4cecfd7fa7841153dce8885a1f6c16e65c53b56699b0ad42c2ee19cd982a35d89821d0ccb0a67eff7d0b573e121a36760ebc054edb01d2372c6223154 SHA512 11adfb5f6d5d7aeebbcf0399d1168879abccc49273390466b4a2ab44e4a0833515896e0474160f8e82dcd491db466505a66c9bf293ba3fc1fb9e3e048550fab7
-DIST jellyfin_10.8.0_amd64.tar.gz 98892257 BLAKE2B 7f43c7cbed893cc08ace42d8d41bb0027d93c862d4547ce84bad30dae138ddc983e12edc97b3d474df70dceccf55ecfcb3abc2cfce14413871a7535842911283 SHA512 66fdba4adcf2a34085235f2a4185f277d5bd0732f77756e8dbd0a988c5d20f8fbcd08f6bc8463dead89cf316250af8f55be11f74a272a3a62c44ac24b98fb5dc
-DIST jellyfin_10.8.1_amd64.tar.gz 99055788 BLAKE2B 1e4be154cfa4982e4f2a9f33b17e23dae3ed888b49c993a0f9dded2267904e41195c0dd0d9b2a47ac8bc10d7d4f45a52141d922e8a1b3348e29cba7e60a9d64c SHA512 ac755137c1859b7b322ff2369d92ebe98757a53c58fa49b9fd178a0b703d829d6c254f4e94a27a7b36b44b92e8b003d86a97cf55e620cd58008f89775f7e4cb4
-EBUILD jellyfin-bin-10.7.7.ebuild 1126 BLAKE2B a8bcb798f52a5a0ce341cf6f709db48540d953c5485c5ddf4ce296a71df3ae9d78c2c641bcff25f63cb45302142621d219d9a9f00c1b15daa2da46f7d6a7d30f SHA512 80e4fafc3ff47eb67698b2b947e60ef810b19d3a986c98eb8e26869723ee84fee54b5e3fd0b341133555fd13bc577ad476f641e19547de9a0605f5c1132c0fe4
-EBUILD jellyfin-bin-10.8.0.ebuild 1126 BLAKE2B a8bcb798f52a5a0ce341cf6f709db48540d953c5485c5ddf4ce296a71df3ae9d78c2c641bcff25f63cb45302142621d219d9a9f00c1b15daa2da46f7d6a7d30f SHA512 80e4fafc3ff47eb67698b2b947e60ef810b19d3a986c98eb8e26869723ee84fee54b5e3fd0b341133555fd13bc577ad476f641e19547de9a0605f5c1132c0fe4
-EBUILD jellyfin-bin-10.8.1.ebuild 1126 BLAKE2B a8bcb798f52a5a0ce341cf6f709db48540d953c5485c5ddf4ce296a71df3ae9d78c2c641bcff25f63cb45302142621d219d9a9f00c1b15daa2da46f7d6a7d30f SHA512 80e4fafc3ff47eb67698b2b947e60ef810b19d3a986c98eb8e26869723ee84fee54b5e3fd0b341133555fd13bc577ad476f641e19547de9a0605f5c1132c0fe4
diff --git a/media-tv/jellyfin-bin/files/jellyfin.conf b/media-tv/jellyfin-bin/files/jellyfin.conf
deleted file mode 100644
index 0515eac..0000000
--- a/media-tv/jellyfin-bin/files/jellyfin.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Parameters for jellyfin
-
-# If you want jellyfin to use a different proxy
-# then the rest of the system, you can specify the
-# environment variables here
-
-#http_proxy="http://myproxy:3218"
-#https_proxy="http://myproxy:3218"
-
-
-# Default paths and user
-# you probably don't want to change this
-
-#jellyfin_user="jellyfin"
-#config_dir="/etc/jellyfin"
-#log_dir="/var/log/jellyfin"
-#data_dir="/var/lib/jellyfin/data"
-#cache_dir="/var/lib/jellyfin/cache"
diff --git a/media-tv/jellyfin-bin/files/jellyfin.init b/media-tv/jellyfin-bin/files/jellyfin.init
deleted file mode 100644
index 1fbef4e..0000000
--- a/media-tv/jellyfin-bin/files/jellyfin.init
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${jellyfin_user:=${RC_SVCNAME}}
-: ${jellyfin_group:=${RC_SVCNAME}}
-: ${config_dir:=/etc/jellyfin}
-: ${log_dir:=/var/log/jellyfin}
-: ${data_dir:=/var/lib/jellyfin}
-: ${cache_dir:=/var/cache/jellyfin}
-
-name="jellyfin"
-description="Jellyfin Daemon"
-pidfile=/run/${RC_SVCNAME}.pid
-command=/opt/jellyfin/jellyfin
-command_background=true
-command_user="${jellyfin_user}:${jellyfin_group}"
-command_args="-c ${config_dir} -l ${log_dir} -d ${data_dir} -C ${cache_dir}"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	if [ -n "${http_proxy}" ]; then
-		export http_proxy="${http_proxy}"
-	fi
-	if [ -n "${https_proxy}" ]; then
-		export https_proxy="${https_proxy}"
-	fi
-	checkpath --directory --owner ${jellyfin_user}:${jellyfin_group} \
-		--mode 0775 ${cache_dir}
-	checkpath --directory --owner ${jellyfin_user}:${jellyfin_group} \
-		--mode 0775 ${data_dir}
-	checkpath --directory --owner ${jellyfin_user}:${jellyfin_group} \
-		--mode 0775 ${log_dir}
-	checkpath --directory --owner ${jellyfin_user}:${jellyfin_group} \
-		--mode 0775 ${config_dir}
-}
-
-restart() {
-	stop
-	sleep 3
-	start
-}
diff --git a/media-tv/jellyfin-bin/jellyfin-bin-10.7.7.ebuild b/media-tv/jellyfin-bin/jellyfin-bin-10.7.7.ebuild
deleted file mode 100644
index 410110b..0000000
--- a/media-tv/jellyfin-bin/jellyfin-bin-10.7.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-*}"		# strip off -bin
-
-DESCRIPTION="Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media."
-HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/"
-SRC_URI="https://repo.jellyfin.org/releases/server/linux/stable/combined/${MY_PN}_${PV}_amd64.tar.gz
-	https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/${MY_PN}_${PV}_amd64.tar.gz"
-RESTRICT="mirror test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/lttng-ust
-	acct-user/jellyfin"
-RDEPEND="${DEPEND}"
-BDEPEND="acct-user/jellyfin"
-
-INST_DIR="/opt/${MY_PN}"
-
-QA_PREBUILT="${INST_DIR}/*.so ${INST_DIR}/jellyfin ${INST_DIR}/createdump"
-
-src_unpack() {
-	unpack ${A}
-	mv ${MY_PN}_${PV} ${P}
-}
-
-src_install() {
-	dodir ${INST_DIR}
-	insinto ${INST_DIR}
-	doins -r ${S}/*
-	chmod 755 ${D}${INST_DIR}/jellyfin
-
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init" "${MY_PN}"
-
-	diropts -o jellyfin -g jellyfin
-	keepdir /etc/jellyfin
-	keepdir /var/log/jellyfin
-}
diff --git a/media-tv/jellyfin-bin/jellyfin-bin-10.8.0.ebuild b/media-tv/jellyfin-bin/jellyfin-bin-10.8.0.ebuild
deleted file mode 100644
index 410110b..0000000
--- a/media-tv/jellyfin-bin/jellyfin-bin-10.8.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-*}"		# strip off -bin
-
-DESCRIPTION="Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media."
-HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/"
-SRC_URI="https://repo.jellyfin.org/releases/server/linux/stable/combined/${MY_PN}_${PV}_amd64.tar.gz
-	https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/${MY_PN}_${PV}_amd64.tar.gz"
-RESTRICT="mirror test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/lttng-ust
-	acct-user/jellyfin"
-RDEPEND="${DEPEND}"
-BDEPEND="acct-user/jellyfin"
-
-INST_DIR="/opt/${MY_PN}"
-
-QA_PREBUILT="${INST_DIR}/*.so ${INST_DIR}/jellyfin ${INST_DIR}/createdump"
-
-src_unpack() {
-	unpack ${A}
-	mv ${MY_PN}_${PV} ${P}
-}
-
-src_install() {
-	dodir ${INST_DIR}
-	insinto ${INST_DIR}
-	doins -r ${S}/*
-	chmod 755 ${D}${INST_DIR}/jellyfin
-
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init" "${MY_PN}"
-
-	diropts -o jellyfin -g jellyfin
-	keepdir /etc/jellyfin
-	keepdir /var/log/jellyfin
-}
diff --git a/media-tv/jellyfin-bin/jellyfin-bin-10.8.1.ebuild b/media-tv/jellyfin-bin/jellyfin-bin-10.8.1.ebuild
deleted file mode 100644
index 410110b..0000000
--- a/media-tv/jellyfin-bin/jellyfin-bin-10.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-*}"		# strip off -bin
-
-DESCRIPTION="Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media."
-HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/"
-SRC_URI="https://repo.jellyfin.org/releases/server/linux/stable/combined/${MY_PN}_${PV}_amd64.tar.gz
-	https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/${MY_PN}_${PV}_amd64.tar.gz"
-RESTRICT="mirror test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/lttng-ust
-	acct-user/jellyfin"
-RDEPEND="${DEPEND}"
-BDEPEND="acct-user/jellyfin"
-
-INST_DIR="/opt/${MY_PN}"
-
-QA_PREBUILT="${INST_DIR}/*.so ${INST_DIR}/jellyfin ${INST_DIR}/createdump"
-
-src_unpack() {
-	unpack ${A}
-	mv ${MY_PN}_${PV} ${P}
-}
-
-src_install() {
-	dodir ${INST_DIR}
-	insinto ${INST_DIR}
-	doins -r ${S}/*
-	chmod 755 ${D}${INST_DIR}/jellyfin
-
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init" "${MY_PN}"
-
-	diropts -o jellyfin -g jellyfin
-	keepdir /etc/jellyfin
-	keepdir /var/log/jellyfin
-}
diff --git a/net-im/wire-desktop-bin/Manifest b/net-im/wire-desktop-bin/Manifest
deleted file mode 100644
index 87323c2..0000000
--- a/net-im/wire-desktop-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Wire-3.26.2941_amd64.deb 57516924 BLAKE2B de16f32b56399c9e7b559f394d4d6c40434c3face658c935cfe86424d5eee568784ab6fb92dcc7ceb42dc68485e8fbffdd8aae72e01daf99fca635fd9580bbbd SHA512 a39abf227bb8f6e9961e54560261ffec5a537f5d128f41c542dabcb4ef494172ab796d0811c3862892041985c5f24dc1f5dbf37b0bb6fffa92f891687e8715e2
-EBUILD wire-desktop-bin-3.26.2941.ebuild 1066 BLAKE2B 48167e48cf2c2f03ec4fe7b6102496d21714861f9f6e880c0b36740f54ea5dbbbe66d1f836d4961026a41f8830189641c6f56a5d58a3b92347fa470853eb2a43 SHA512 778663f51e7210543fa7bcc7c2bac5486b071673adeef67e26bf54d33c4d97bfc75179cb51850a6d94696bb87864b3b5d65813d14c3e6f29e459f83025996165
diff --git a/net-im/wire-desktop-bin/wire-desktop-bin-3.26.2941.ebuild b/net-im/wire-desktop-bin/wire-desktop-bin-3.26.2941.ebuild
deleted file mode 100644
index 6dd5b13..0000000
--- a/net-im/wire-desktop-bin/wire-desktop-bin-3.26.2941.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="Wire desktop client"
-HOMEPAGE="https://wire.com/"
-SRC_URI="https://github.com/wireapp/wire-desktop/releases/download/linux/${PV}/Wire-${PV}_amd64.deb"
-
-LICENSE="GPL-3 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	unpack ./data.tar.xz
-	rm data.tar.xz control.tar.gz debian-binary
-}
-
-src_install() {
-	domenu usr/share/applications/wire-desktop.desktop
-	doicon --size 32 usr/share/icons/hicolor/32x32/apps/wire-desktop.png
-	doicon --size 256 usr/share/icons/hicolor/256x256/apps/wire-desktop.png
-	dodoc -r usr/share/doc/wire-desktop/*
-	insinto /opt
-	doins -r opt/Wire
-	dosym /opt/Wire/wire-desktop /usr/bin/wire-desktop
-
-	docompress -x /usr/share/doc/${P}/changelog.gz
-	fperms 0755 /opt/Wire/wire-desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-apps/fava/Manifest b/www-apps/fava/Manifest
index 3814aed..f5ea8b0 100644
--- a/www-apps/fava/Manifest
+++ b/www-apps/fava/Manifest
@@ -1 +1,2 @@
 EBUILD fava-1.24.ebuild 900 BLAKE2B 118810e58bc09572826466ec4165425b9ee640c78715709af3d47326e7b16d262cf34982f428f9767f0434a9191189d4825df7778e56efe0f72a006fe50868ca SHA512 2bd69c287def364840975317dae0639a79950160267b81e37141a4f223a64bcdf0087aa63cd8da947eef343013b1b7d15b32eba35da375279a6c200b184f76b2
+EBUILD fava-1.25.ebuild 903 BLAKE2B 5b93c66414315d2ef118b572c13f0f049e6590c3f839e854c117696db5881f5d328dcbbf5f9691ae2eaea5811711e956705533d6037e7a138996cc48c2759f2e SHA512 a1bb93a708049855b3cd1a78c41b68ece9a641b9c491c19e02001b79b587fe0b9506d2c5fb9bea061dea468e4723d121021d3a3188ad47aef02239ffb59f8d26
diff --git a/www-apps/fava/fava-1.25.ebuild b/www-apps/fava/fava-1.25.ebuild
new file mode 100644
index 0000000..1863b8b
--- /dev/null
+++ b/www-apps/fava/fava-1.25.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Fava is a web interface for the double-entry bookkeeping software Beancount."
+HOMEPAGE="https://github.com/beancount/fava"
+EGIT_REPO_URI="https://github.com/beancount/fava.git"
+EGIT_COMMIT="v${PV}"
+inherit git-r3
+
+#SRC_URI="https://github.com/beancount/fava/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-python/Babel
+	dev-python/flask-babel
+	dev-python/flask
+	dev-python/jinja
+	dev-python/werkzeug
+	app-office/beancount
+	dev-python/cheroot
+	dev-python/click
+	dev-python/markdown2
+	dev-python/ply
+	dev-python/simplejson"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+# Because I have no idea...
+RESTRICT="test"
+
+src_compile() {
+	cd ${S}
+	emake
+}