diff --git a/app-forensics/libewf/libewf-20201230.ebuild b/app-forensics/libewf/libewf-20201230.ebuild
index 7893f14..39688a5 100644
--- a/app-forensics/libewf/libewf-20201230.ebuild
+++ b/app-forensics/libewf/libewf-20201230.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit eutils
diff --git a/app-forensics/libewf/metadata.xml b/app-forensics/libewf/metadata.xml
deleted file mode 100644
index 5ab6ff4..0000000
--- a/app-forensics/libewf/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- canutethegreat@gmail.com
- Ronald Farrer
-
-
-
- libyal/libewf
-
-
diff --git a/app-mobilephone/easytether/easytether-0.8.9.ebuild b/app-mobilephone/easytether/easytether-0.8.9.ebuild
index 217871d..9d5fb89 100644
--- a/app-mobilephone/easytether/easytether-0.8.9.ebuild
+++ b/app-mobilephone/easytether/easytether-0.8.9.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=7
+EAPI=8
inherit xdg-utils font eutils
KEYWORDS="~amd64 ~x86 ~arm64 ~arm ~ppc ~ppc64"
diff --git a/app-mobilephone/easytether/metadata.xml b/app-mobilephone/easytether/metadata.xml
deleted file mode 100644
index c93caac..0000000
--- a/app-mobilephone/easytether/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- canutethegreat@gmail.com
- Ronald Farrer
-
-
diff --git a/app-office/insync/insync-3.8.1.50459.ebuild b/app-office/insync/insync-3.8.1.50459.ebuild
index 712fb88..4f27264 100644
--- a/app-office/insync/insync-3.8.1.50459.ebuild
+++ b/app-office/insync/insync-3.8.1.50459.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit rpm xdg-utils
diff --git a/app-office/overgrive/metadata.xml b/app-office/overgrive/metadata.xml
deleted file mode 100644
index e6dcf53..0000000
--- a/app-office/overgrive/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- canutethegreat@gmail.com
- Ronald Farrer
-
-
- overGrive is a complete Google Driveā¢ desktop client solution for Linux
-
-
diff --git a/app-office/overgrive/overgrive-3.5.2.ebuild b/app-office/overgrive/overgrive-3.5.2.ebuild
index 05d2ce1..64f3f85 100644
--- a/app-office/overgrive/overgrive-3.5.2.ebuild
+++ b/app-office/overgrive/overgrive-3.5.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=7
+EAPI=8
inherit xdg-utils font gnome2-utils eutils
KEYWORDS="~amd64 ~x86 ~arm ~arm64"
diff --git a/net-fs/goofys-bin/goofys-bin-0.24.0.ebuild b/net-fs/goofys-bin/goofys-bin-0.24.0.ebuild
index 35526f1..b7e549d 100644
--- a/net-fs/goofys-bin/goofys-bin-0.24.0.ebuild
+++ b/net-fs/goofys-bin/goofys-bin-0.24.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="A high-performance, user-space file system for mounting Amazon S3 buckets (binary)"
HOMEPAGE="https://github.com/kahing/goofys"
diff --git a/net-fs/goofys/goofys-0.24.0.ebuild b/net-fs/goofys/goofys-0.24.0.ebuild
index 5529819..fa10ea1 100644
--- a/net-fs/goofys/goofys-0.24.0.ebuild
+++ b/net-fs/goofys/goofys-0.24.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
EGO_PN="github.com/kahing/goofys"
diff --git a/net-ftp/filezillapro/filezillapro-3.55.1.ebuild b/net-ftp/filezillapro/filezillapro-3.55.1.ebuild
index 7c979d8..286167c 100644
--- a/net-ftp/filezillapro/filezillapro-3.55.1.ebuild
+++ b/net-ftp/filezillapro/filezillapro-3.55.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
WX_GTK_VER="3.0-gtk3"
diff --git a/net-ftp/filezillapro/metadata.xml b/net-ftp/filezillapro/metadata.xml
deleted file mode 100644
index c93caac..0000000
--- a/net-ftp/filezillapro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- canutethegreat@gmail.com
- Ronald Farrer
-
-
diff --git a/net-misc/freedownloadmanager/freedownloadmanager-6.19.0.5156.ebuild b/net-misc/freedownloadmanager/freedownloadmanager-6.19.0.5156.ebuild
index 21f9821..215cfba 100644
--- a/net-misc/freedownloadmanager/freedownloadmanager-6.19.0.5156.ebuild
+++ b/net-misc/freedownloadmanager/freedownloadmanager-6.19.0.5156.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=7
+EAPI=8
inherit xdg-utils font eutils
KEYWORDS="~amd64"
diff --git a/net-misc/nomachine/nomachine-8.4.2.1.ebuild b/net-misc/nomachine/nomachine-8.4.2.1.ebuild
index 2902fc6..e039070 100644
--- a/net-misc/nomachine/nomachine-8.4.2.1.ebuild
+++ b/net-misc/nomachine/nomachine-8.4.2.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit wrapper desktop
diff --git a/repositories.xml b/repositories.xml
new file mode 100644
index 0000000..28dfa14
--- /dev/null
+++ b/repositories.xml
@@ -0,0 +1,14 @@
+
+
+
+ canutethegreat-overlay
+ Random, sometimes useful, Gentoo ebuilds.
+ https://github.com/CanuteTheGreat/canutethegreat-overlay
+
+ Ronald Farrer
+ canutethegreat@gmail.com
+
+
+ https://github.com/CanuteTheGreat/canutethegreat-overlay/commits/master.atom
+
+
diff --git a/sys-kernel/dkms/dkms-2.8.4.ebuild b/sys-kernel/dkms/dkms-2.8.4.ebuild
index 79440da..9257cc4 100644
--- a/sys-kernel/dkms/dkms-2.8.4.ebuild
+++ b/sys-kernel/dkms/dkms-2.8.4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit eutils
diff --git a/sys-kernel/dkms/metadata.xml b/sys-kernel/dkms/metadata.xml
deleted file mode 100644
index 1355e6b..0000000
--- a/sys-kernel/dkms/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- canutethegreat@gmail.com
- Ronald Farrer
-
-
- dell/dkms
-
-
- Dynamic Kernel Module Support (DKMS) is a program/framework that enables generating Linux kernel modules whose sources generally reside outside the kernel source tree. The concept is to have DKMS modules automatically rebuilt when a new kernel is installed.
- An essential feature of DKMS is that it automatically recompiles all DKMS modules if a new kernel version is installed. This allows drivers and devices outside of the mainline kernel to continue working after a Linux kernel upgrade.
- Another benefit of DKMS is that it allows the installation of a new driver on an existing system, running an arbitrary kernel version, without any need for manual compilation or precompiled packages provided by the vendor.
- DKMS was written by the Linux Engineering Team at Dell in 2003. It is included in many distributions, such as Ubuntu, Debian, Fedora, SUSE, and Arch. DKMS is free software released under the terms of the GNU General Public License (GPL) v2 or later.
- DKMS supports both the rpm and deb package formats out-of-the-box.
-
-
-
diff --git a/www-client/brave-bin/brave-bin-1.50.113.ebuild b/www-client/brave-bin/brave-bin-1.50.113.ebuild
index 938efa2..910708a 100644
--- a/www-client/brave-bin/brave-bin-1.50.113.ebuild
+++ b/www-client/brave-bin/brave-bin-1.50.113.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=*
BRAVE_PN="${PN/-bin/}"
diff --git a/www-client/brave-bin/brave-bin-1.50.114.ebuild b/www-client/brave-bin/brave-bin-1.50.114.ebuild
index 938efa2..75b5b1d 100644
--- a/www-client/brave-bin/brave-bin-1.50.114.ebuild
+++ b/www-client/brave-bin/brave-bin-1.50.114.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
BRAVE_PN="${PN/-bin/}"