diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
deleted file mode 100644
index 0b665e5..0000000
--- a/dev-util/gdbus-codegen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glib-2.67.6.tar.xz 4935624 BLAKE2B f0a27f0e1124fb922f1d04c6caae136001d4c7b4b4ed1477ac1a09e63ea65a8f34d2c5bfec9446e1f3fa76c5c80dfcad571ad3087b7cb1d331444e55b034f130 SHA512 df575e2ed1d18a44559ddb51db543fb58ba1f2b6ecee299317fb89ad8d6d96c7eed2c4493ce5a0a25c20d24d7cd1ffac264e429e1ba1e1457afb0d2d62662321
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
deleted file mode 100644
index 216fb78..0000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9eaaa76e2e36e46a43dbd419724696fd7ff8ea64 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sat, 14 Apr 2018 09:55:22 +0200
-Subject: [PATCH 1/2] gdbus-codegen-2.54.3-sitedir.patch
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 28 --------------------------
- 1 file changed, 28 deletions(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 67d367543..190afa28f 100755
---- a/gdbus-codegen.in
-+++ b/gdbus-codegen.in
-@@ -20,36 +20,8 @@
- # Author: David Zeuthen <davidz@redhat.com>
- 
- 
--import os
- import sys
- 
--srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
--filedir = os.path.dirname(__file__)
--
--if srcdir is not None:
--    path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.path.basename(filedir) == 'bin':
--    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
--    # adding /some/prefix/bin/../share/glib-2.0 to the python path
--    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
--else:
--    # Assume that the modules we need are in the current directory and add the
--    # parent directory to the python path.
--    path = os.path.join(filedir, '..')
--
--# Canonicalize, then do further testing
--path = os.path.abspath(path)
--
--# If the above path detection failed, use the hard-coded datadir. This can
--# happen when, for instance, bindir and datadir are not in the same prefix or
--# on Windows where we cannot make any guarantees about the directory structure.
--#
--# In these cases our installation cannot be relocatable, but at least we should
--# be able to find the codegen module.
--if not os.path.isfile(os.path.join(path, 'codegen', 'codegen_main.py')):
--    path = os.path.join('@DATADIR@', 'glib-2.0')
--
--sys.path.insert(0, path)
--from codegen import codegen_main
-+from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())
--- 
-2.17.0
diff --git a/dev-util/gdbus-codegen/files/setup.py-2.32.4 b/dev-util/gdbus-codegen/files/setup.py-2.32.4
deleted file mode 100644
index c5318e3..0000000
--- a/dev-util/gdbus-codegen/files/setup.py-2.32.4
+++ /dev/null
@@ -1,6 +0,0 @@
-from distutils.core import setup
-setup(name="gdbus_codegen",
-      version="@PV@",
-      packages=["gdbus_codegen"],
-      package_dir={"gdbus_codegen" : ""},
-      scripts=["gdbus-codegen"])
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.67.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.67.6.ebuild
deleted file mode 100644
index 360ef3b..0000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.67.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
deleted file mode 100644
index 54abf69..0000000
--- a/media-libs/gst-plugins-bad/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild
deleted file mode 100644
index c7d3b25..0000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="X bzip2 +introspection +orc vnc wayland"
-
-# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
-	wayland? (
-		>=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.15
-	)
-
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
-	gstreamer_multilib_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable orc) \
-		$(use_enable vnc librfb) \
-		$(use_enable wayland) \
-		--disable-examples \
-		--disable-debug \
-		--without-player-tests \
-		--enable-shm \
-		--enable-ipcpipeline \
-		--disable-gl # eclass probably does this too, but be explicit as it used to be handled in ebuild here; all parts now in gst-plugins-base instead
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Tests are slower than upstream expects
-	virtx emake check CK_DEFAULT_TIMEOUT=300
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
deleted file mode 100644
index af1ef7f..0000000
--- a/media-libs/gstreamer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gstreamer-1.18.4.tar.xz 2703948 BLAKE2B b11be1309e7a6ad0aff24aa99b10b1c16df4b1720b821421a72ec9d9b20087488901bb4667e797d32ef616f909c3aefd301fac6be9c4c4120ec9e4af3acc7b48 SHA512 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a
diff --git a/media-libs/gstreamer/gstreamer-1.18.4.ebuild b/media-libs/gstreamer/gstreamer-1.18.4.ebuild
deleted file mode 100644
index a2493d6..0000000
--- a/media-libs/gstreamer/gstreamer-1.18.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 multilib-minimal pax-utils
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+caps +introspection nls +orc test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? (
-		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
-		dev-libs/elfutils[${MULTILIB_USEDEP}]
-	)
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local completiondir=$(get_bashcompdir)
-	# Set 'libexecdir' to ABI-specific location for the library spawns
-	# helpers from there.
-	# Disable static archives and examples to speed up build time
-	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-benchmarks
-		--disable-debug
-		--disable-examples
-		--disable-static
-		--disable-valgrind
-		--enable-check
-		$(use_with unwind)
-		$(use_with unwind dw)
-		$(multilib_native_use_enable introspection)
-		$(use_enable nls)
-		$(use_enable test tests)
-		--with-bash-completion-dir="${completiondir%/*}"
-		--with-package-name="GStreamer ebuild for Gentoo"
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-	)
-
-	if use caps ; then
-		myconf+=( --with-ptp-helper-permissions=capabilities )
-	else
-		myconf+=(
-			--with-ptp-helper-permissions=setuid-root
-			--with-ptp-helper-setuid-user=nobody
-			--with-ptp-helper-setuid-group=nobody
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in gst libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install() {
-	# can't do "default", we want to install docs in multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
deleted file mode 100644
index a47aef2..0000000
--- a/net-libs/libqmi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libqmi-1.28.2.tar.xz 1165204 BLAKE2B 17f7462d84b74099a5ef4fa6f28e777a4587be0a7652b38c4ab5c0f50bbbbd0b8b293df22d7a8c470444df23fd405e3b176e8c449019787c5305fef13d0b27b2 SHA512 10d11b780aa381e93669aad2540c609bcd3f789302ed76d80b9845a24f84d8741b8c39287a2007ec80d8e0e517686023d08a7a677426c77f3b12ec172edc05e7
diff --git a/net-libs/libqmi/libqmi-1.28.2.ebuild b/net-libs/libqmi/libqmi-1.28.2.ebuild
deleted file mode 100644
index 51ac033..0000000
--- a/net-libs/libqmi/libqmi-1.28.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
-
-LICENSE="LGPL-2"
-SLOT="0/5.7"	# soname of libqmi-glib.so
-IUSE="doc +mbim"
-
-RDEPEND=">=dev-libs/glib-2.48
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-Werror \
-		--disable-static \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
deleted file mode 100644
index b954e9b..0000000
--- a/x11-misc/colord/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
diff --git a/x11-misc/colord/colord-1.4.5.ebuild b/x11-misc/colord/colord-1.4.5.ebuild
deleted file mode 100644
index 7599850..0000000
--- a/x11-misc/colord/colord-1.4.5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 meson multilib-minimal systemd udev vala
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="https://www.freedesktop.org/software/colord/"
-SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-
-IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala"
-RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
-REQUIRED_USE="
-	scanner? ( udev )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgusb-0.2.7[${MULTILIB_USEDEP}]
-	udev? (
-		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=[${MULTILIB_USEDEP}]
-		virtual/udev
-	)
-	systemd? ( >=sys-apps/systemd-44:0= )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus
-	)
-	>=sys-auth/polkit-0.104
-	argyllcms? ( media-gfx/argyllcms )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/colord
-	acct-user/colord
-"
-BDEPEND="
-	acct-group/colord
-	acct-user/colord
-	app-text/docbook-xsl-ns-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )
-"
-# These dependencies are required to build native build-time programs.
-BDEPEND="${BDEPEND}
-	dev-libs/glib:2
-	media-libs/lcms
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch
-	"${FILESDIR}"/${PV}-build-Fix-building-without-vapi.patch
-)
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-
-	# Test requires a running session
-	# https://github.com/hughsie/colord/issues/94
-	sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die
-
-	# Adapt to Gentoo paths
-	sed -i \
-		-e "s|find_program('spotread'|find_program('argyll-spotread'|" \
-		-e "s|find_program('colprof'|find_program('argyll-colprof'|" \
-		meson.build || die
-
-	# meson gnome.generate_vapi properly handles VAPIGEN and other vala
-	# environment variables. It is counter-productive to check for an
-	# unversioned vapigen, as that breaks versioned VAPIGEN usages.
-	sed -i -e "/find_program('vapigen')/d" meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddaemon=$(multilib_is_native_abi && echo true || echo false)
-		-Dexamples=false
-		-Dbash_completion=false
-		$(meson_use udev udev_rules)
-		-Dsystemd=$(multilib_native_usex systemd true false)
-		-Dlibcolordcompat=true
-		-Dargyllcms_sensor=$(multilib_native_usex argyllcms true false)
-		-Dreverse=false
-		-Dsane=$(multilib_native_usex scanner true false)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dprint_profiles=$(multilib_native_usex extra-print-profiles true false)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddaemon_user=colord
-		-Dman=true
-		$(meson_use gtk-doc docs)
-		--localstatedir="${EPREFIX}"/var
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	newbashcomp data/colormgr colormgr
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch b/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch
deleted file mode 100644
index cbf79a8..0000000
--- a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2bbcefa35225ba836b1672449f1de59ce9a90078 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 18 Apr 2021 16:46:52 -0400
-Subject: [PATCH] build: Fix building without vapi
-
----
- lib/colord/meson.build   | 2 +-
- lib/colorhug/meson.build | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/colord/meson.build b/lib/colord/meson.build
-index dbb3d19..3126046 100644
---- a/lib/colord/meson.build
-+++ b/lib/colord/meson.build
-@@ -146,6 +146,7 @@ pkgg.generate(
-   description : 'colord is a system daemon for managing color devices',
- )
- 
-+if get_option('vapi')
- libcolord_girtarget = gnome.generate_gir(colord,
-   sources : [
-     'cd-client.c',
-@@ -203,7 +204,6 @@ libcolord_girtarget = gnome.generate_gir(colord,
- libcolord_gir = libcolord_girtarget[0]
- libcolord_typelib = libcolord_girtarget[1]
- 
--if get_option('vapi')
- gnome.generate_vapi('colord',
-   sources: libcolord_girtarget[0],
-   packages: ['gio-2.0'],
-diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
-index 9526ea4..9f17553 100644
---- a/lib/colorhug/meson.build
-+++ b/lib/colorhug/meson.build
-@@ -73,6 +73,7 @@ pkgg.generate(
-   description : 'ColorHug is a simple display hardware colorimeter',
- )
- 
-+if get_option('vapi')
- libcolorhug_gir = gnome.generate_gir(colorhug,
-   sources : [
-     'ch-common.c',
-@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
-   ],
-   install : true
- )
-+endif
- 
- if get_option('tests')
-   e = executable(
--- 
-2.26.3
-
diff --git a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch b/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch
deleted file mode 100644
index de56fe1..0000000
--- a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d68cd11cd31d379e4f3bb4c964b17fd50c8c54a6 Mon Sep 17 00:00:00 2001
-From: Christopher James Halse Rogers <raof@ubuntu.com>
-Date: Wed, 11 Nov 2020 17:13:19 +1100
-Subject: [PATCH] tests: Don't use exact floating point comparisons.
-
-The tests asserting that cd_icc_get_version are exactly equal to 3.4 or
-2.09 fail on (at least) i386, armel, and s390x because floating point is
-hateful.
-
-Signed-off-by: Christopher James Halse Rogers <raof@ubuntu.com>
----
- lib/colord/cd-test-private.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c
-index 4b16ca5..231c4ae 100644
---- a/lib/colord/cd-test-private.c
-+++ b/lib/colord/cd-test-private.c
-@@ -1494,7 +1494,7 @@ colord_icc_func (void)
- 	/* check profile properties */
- 	g_assert_cmpint (cd_icc_get_size (icc), ==, 25244);
- 	g_assert_cmpstr (cd_icc_get_checksum (icc), ==, "9ace8cce8baac8d492a93a2a232d7702");
--	g_assert_cmpfloat (cd_icc_get_version (icc), ==, 3.4);
-+	g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 3.4, 0.01);
- 	g_assert (g_str_has_suffix (cd_icc_get_filename (icc), "ibm-t61.icc"));
- 	g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_DISPLAY_DEVICE);
- 	g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_RGB);
-@@ -1727,7 +1727,7 @@ colord_icc_save_func (void)
- 	g_object_unref (file);
- 
- 	/* verify changed values */
--	g_assert_cmpfloat (cd_icc_get_version (icc), ==, 2.09);
-+	g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 2.09, 0.001);
- 	g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_OUTPUT_DEVICE);
- 	g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_XYZ);
- 	g_assert_cmpstr (cd_icc_get_metadata_item (icc, "SelfTest"), ==, "true");
--- 
-2.26.3
-
diff --git a/x11-misc/colord/files/gentoo.png b/x11-misc/colord/files/gentoo.png
deleted file mode 100644
index 2268399..0000000
Binary files a/x11-misc/colord/files/gentoo.png and /dev/null differ