diff --git a/metadata/md5-cache/acct-group/flatpak-0 b/metadata/md5-cache/acct-group/flatpak-0
deleted file mode 100644
index d16db75d77..0000000000
--- a/metadata/md5-cache/acct-group/flatpak-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: flatpak
-EAPI=7
-KEYWORDS=~amd64 ~x86
-SLOT=0
-_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=d5c296339840d06c120fc5993b68fb4c
diff --git a/metadata/md5-cache/acct-user/flatpak-0 b/metadata/md5-cache/acct-user/flatpak-0
deleted file mode 100644
index 03afe12d14..0000000000
--- a/metadata/md5-cache/acct-user/flatpak-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: flatpak
-EAPI=7
-KEYWORDS=~amd64 ~x86
-RDEPEND=acct-group/flatpak
-SLOT=0
-_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=723cabba1ed8b5e3612971c58a9a0abb
diff --git a/metadata/md5-cache/app-admin/customrescuecd-x86-0.4.0 b/metadata/md5-cache/app-admin/customrescuecd-x86-0.4.0
new file mode 100644
index 0000000000..d567ba11ae
--- /dev/null
+++ b/metadata/md5-cache/app-admin/customrescuecd-x86-0.4.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst postrm unpack
+DESCRIPTION=A system rescue cd or usbstick for desktop and server based on gentoo
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/customrescuecd
+KEYWORDS=~x86
+LICENSE=GPL-3
+RESTRICT=bindist mirror
+SLOT=0.4.0
+SRC_URI=mirror://sourceforge/customrescuecd/CUSTOMRESCUECD-x86-0.4.0.iso
+_md5_=295053385db55c2248a41913d59d1d1d
diff --git a/metadata/md5-cache/media-plugins/qt-avif-image-plugin-0.4.0 b/metadata/md5-cache/media-plugins/qt-avif-image-plugin-0.4.0
index ef0d965169..d5f0b9e2ef 100644
--- a/metadata/md5-cache/media-plugins/qt-avif-image-plugin-0.4.0
+++ b/metadata/md5-cache/media-plugins/qt-avif-image-plugin-0.4.0
@@ -4,9 +4,10 @@ DEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libavif-0.8.2 >=x11-misc/shared-mime
 DESCRIPTION=Qt plug-in to allow Qt and KDE based applications to read/write AVIF images.
 EAPI=7
 HOMEPAGE=https://github.com/novomesk/qt-avif-image-plugin
+KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libavif-0.8.2 >=x11-misc/shared-mime-info-2.0-r1
 SLOT=0
 SRC_URI=https://github.com/novomesk/qt-avif-image-plugin/archive/v0.4.0.tar.gz -> qt-avif-image-plugin-0.4.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcdb2f8707751bca30bdb7bd6be00597
+_md5_=ace16d35cd08ab879c9b4da81d9d9aca
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.8.2 b/metadata/md5-cache/sys-apps/flatpak-1.8.2
deleted file mode 100644
index a59ae7b92f..0000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pyparsing[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure setup
-DEPEND=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 )
-DESCRIPTION=Application distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-IUSE=doc gtk introspection kde policykit seccomp systemd kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-PDEPEND=gtk? ( >=sys-apps/xdg-desktop-portal-0.10 sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
-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 )
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.8.2/flatpak-1.8.2.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cedfffb739fa86859704bee9720377ea
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 80e3a03b20..f60ac46e2a 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1,13 +1,11 @@
 acct-group/_bgpd 0: System group: _bgpd
 acct-group/_rpki-client 0: System group: _rpki-client
 acct-group/biboumi 0: System group: biboumi
-acct-group/flatpak 0: System group: flatpak
 acct-group/fort 0: System group: fort
 acct-group/gemini 0: System group: gemini
 acct-user/_bgpd 0: User for OpenBGPD
 acct-user/_rpki-client 0: User for rpki-client
 acct-user/biboumi 0: User for net-im/biboumi
-acct-user/flatpak 0: System user: flatpak
 acct-user/fort 0: User for FORT RPKI validator
 acct-user/gemini 0: User for gemini daemon
 acct-user/gogs 1: www-apps/gogs user
@@ -15,7 +13,7 @@ acct-user/sndiod 0: daemon user for sndio
 acct-user/trezord 0: User for TREZOR Bridge
 app-accessibility/mimic1 1.3.0.1 9999: Mycroft's TTS engine, based on CMU's Flite (Festival Lite)
 app-admin/chezmoi 1.8.2: Manage your dotfiles across multiple machines, securely.
-app-admin/customrescuecd-x86 0.3.1: A system rescue cd or usbstick for desktop and server based on gentoo
+app-admin/customrescuecd-x86 0.3.1 0.4.0: A system rescue cd or usbstick for desktop and server based on gentoo
 app-admin/customrescuecd-x86_64 0.10.3 0.11.0: A system rescue cd or usbstick for desktop and server based on gentoo
 app-admin/gnome-passwordsafe 3.99.2: A password manager for GNOME
 app-admin/s-tui 1.0.2 9999: Stress-Terminal UI monitoring tool
@@ -358,7 +356,6 @@ sci-libs/slicot 5.0_p20101122: Subroutine Library in Systems and Control Theory
 sci-physics/SU2 7.0.6: SU2: An Open-Source Suite for Multiphysics Simulation and Design
 sys-apps/0xFFFF 0.8: The 0pen Free Fiasco Firmware Flasher
 sys-apps/dust 0.5.3: A more intuitive version of du
-sys-apps/flatpak 1.8.2: Application distribution framework
 sys-apps/hex 0.1.3 0.3.0: Futuristic take on hexdump
 sys-apps/procs 0.10.1: A modern replacement for ps
 sys-apps/qjournalctl 0.6.2: Qt-based GUI for systemd's journalctl command
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0b39712165..68058eb75a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Oct 2020 09:35:09 +0000
+Sun, 18 Oct 2020 19:05:39 +0000