10 files changed, 2 insertions, 10 deletions

diff --git a/metadata/layout.conf b/metadata/layout.conf
index 64c6e25..d670319 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -2,4 +2,5 @@ masters = gentoo guru
 auto-sync = false
 thin-manifests = true
 sign-manifests = false
-profile-formats = portage-2 profile-set
+profile_eapi_when_unspecified = 8
+profile-formats = portage-2 profile-set profile-default-eapi
diff --git a/profiles/aster/eapi b/profiles/aster/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/aster/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/eapi b/profiles/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/ivy/eapi b/profiles/ivy/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/ivy/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/lily/eapi b/profiles/lily/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/lily/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/orchid/eapi b/profiles/orchid/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/orchid/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/targets/base/eapi b/profiles/targets/base/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/targets/base/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/targets/cmdline/eapi b/profiles/targets/cmdline/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/targets/cmdline/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/targets/desktop/eapi b/profiles/targets/desktop/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/targets/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/profiles/targets/hacking/eapi b/profiles/targets/hacking/eapi
deleted file mode 100644
index 45a4fb7..0000000
--- a/profiles/targets/hacking/eapi
+++ /dev/null
@@ -1 +0,0 @@
-8