diff --git a/acct-group/flatpak/flatpak-0.ebuild b/acct-group/flatpak/flatpak-0.ebuild
deleted file mode 100644
index 808e706322..0000000000
--- a/acct-group/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-KEYWORDS="~amd64 ~x86"
-ACCT_GROUP_ID=313
diff --git a/acct-group/flatpak/metadata.xml b/acct-group/flatpak/metadata.xml
deleted file mode 100644
index 7a38bb9009..0000000000
--- a/acct-group/flatpak/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/acct-user/flatpak/flatpak-0.ebuild b/acct-user/flatpak/flatpak-0.ebuild
deleted file mode 100644
index 59e29e9e3e..0000000000
--- a/acct-user/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=313
-ACCT_USER_GROUPS=( flatpak )
-KEYWORDS="~amd64 ~x86"
-acct-user_add_deps
diff --git a/acct-user/flatpak/metadata.xml b/acct-user/flatpak/metadata.xml
deleted file mode 100644
index 7a38bb9009..0000000000
--- a/acct-user/flatpak/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/app-admin/customrescuecd-x86/Manifest b/app-admin/customrescuecd-x86/Manifest
index 047efe18f1..fbeeb1a2fe 100644
--- a/app-admin/customrescuecd-x86/Manifest
+++ b/app-admin/customrescuecd-x86/Manifest
@@ -1 +1,2 @@
DIST CUSTOMRESCUECD-x86-0.3.1.iso 1426063360 BLAKE2B 8116b657aed9f5fb9ac0d56f6284bc45a4e050ad7e84cd4cb7c5217b07c9151c82776589aefa3c030cf766106bca7948d48cde2055c408c4e32ea081297b6117 SHA512 3aa0d2ab54920a19046fc1038313e01a99287301b06f25b1346c54d680c4ca2395e9c9010b3299cdc94a0198ec0f63209d09a1d086243e3b82216e7f4d63e0e6
+DIST CUSTOMRESCUECD-x86-0.4.0.iso 1322811392 BLAKE2B f93550977a41d1d19a35f7ff2cc2cb7cdd94eb1ca1ade9fed6db7d7963297366b839c5590a17f85f2dec13e86588d651e94792dd12064f094eaffe3608117e03 SHA512 45bb47fc2b72e653c8f9d23a483aa5c59a92aabd306240d06f33d1c7249c905d7961670cbefc6d9d132a9a5fe1fdc7743ee3f1356a8e58724fea6a3073b08a86
diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild
new file mode 100644
index 0000000000..4c3a5f629c
--- /dev/null
+++ b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="CUSTOMRESCUECD-x86"
+DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
+HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
+SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
+
+LICENSE="GPL-3"
+SLOT="${PV}"
+KEYWORDS="~x86"
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${MY_P}-${PV}.iso"
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.4.0.ebuild b/media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.4.0.ebuild
index c48879bcae..6d0fae2c7a 100644
--- a/media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.4.0.ebuild
+++ b/media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://github.com/novomesk/qt-avif-image-plugin.git"
else
SRC_URI="https://github.com/novomesk/qt-avif-image-plugin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS=""
+ KEYWORDS="~amd64"
fi
LICENSE="BSD-2"
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
deleted file mode 100644
index 3fcd56345e..0000000000
--- a/sys-apps/flatpak/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST flatpak-1.8.2.tar.xz 1424468 BLAKE2B 4ade582176cd4ed494d0afc2a75b81168dc2263183d4ec2ef731b2d3ccbd96a7cc0fdb012f07966b4429529ab69c79b32abbcc4c1a8640b030d3ba2edfbce36d SHA512 f27c05b2621328dce31e4c31ae097765864bac84f6c1fada23f48c0235c6b85f447948a07861653f7bed4e17e43f8ff3d2c60263e23426c765c787b5f447a4e2
diff --git a/sys-apps/flatpak/flatpak-1.8.2.ebuild b/sys-apps/flatpak/flatpak-1.8.2.ebuild
deleted file mode 100644
index 4d360f6993..0000000000
--- a/sys-apps/flatpak/flatpak-1.8.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Application distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk introspection kde policykit seccomp systemd"
-
-# FIXME: Automagic dep on app-arch/zstd
-RDEPEND="
- acct-group/flatpak
- acct-user/flatpak
- >=app-arch/libarchive-2.8
- >=app-crypt/gpgme-1.1.8
- >=dev-libs/appstream-glib-0.5.10
- >=dev-libs/glib-2.56:2
- >=dev-libs/libxml2-2.4
- dev-libs/json-glib
- >=dev-util/ostree-2019.5[gpg(+)]
- || ( dev-util/ostree[curl]
- dev-util/ostree[soup] )
- >=gnome-base/dconf-0.26
- >=net-libs/libsoup-2.4
- sys-apps/dbus
- >=sys-fs/fuse-2.9.9:0
- x11-apps/xauth
- x11-libs/gdk-pixbuf:2
- policykit? ( >=sys-auth/polkit-0.98 )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )
-"
-
-# NOTE: pyparsing for variant-schema-compiler submodule (build time)
-DEPEND="${RDEPEND}"
-BDEPEND=">=sys-devel/automake-1.13.4
- >=sys-devel/gettext-0.18.2
- virtual/pkgconfig
- dev-util/gdbus-codegen
- sys-devel/bison
- introspection? ( >=dev-libs/gobject-introspection-1.40 )
- doc? ( >=dev-util/gtk-doc-1.20
- dev-libs/libxslt )
- $(python_gen_any_dep '
- dev-python/pyparsing[${PYTHON_USEDEP}]
- ')
-"
-# FIXME: is there a nicer way to do this?
-PDEPEND="
- gtk? ( >=sys-apps/xdg-desktop-portal-0.10
- sys-apps/xdg-desktop-portal-gtk )
- kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
- has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- local CONFIG_CHECK="~USER_NS"
- linux-info_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # FIXME: the gtk-doc check doesn't seem to be working
- # TODO: split out bubblewrap
- # TODO: split out xdg-dbus-proxy?
- # TODO: We do not provide libmalcontent yet.
- local myeconfargs=(
- --enable-sandboxed-triggers \
- --enable-xauth \
- --localstatedir="${EPREFIX}"/var \
- --without-system-bubblewrap \
- --without-system-dbus-proxy \
- $(use_enable doc documentation) \
- $(use_enable doc gtk-doc) \
- $(use_enable introspection) \
- $(use_enable policykit system-helper) \
- $(use_enable seccomp) \
- $(use_with systemd)
- )
-
- econf "${myeconfargs[@]}"
-
-}
diff --git a/sys-apps/flatpak/metadata.xml b/sys-apps/flatpak/metadata.xml
deleted file mode 100644
index 7a38bb9009..0000000000
--- a/sys-apps/flatpak/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-