aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--paludis/repositories/e/eapis/6.conf4
-rw-r--r--paludis/repositories/e/eapis/Makefile.am3
2 files changed, 4 insertions, 3 deletions
diff --git a/paludis/repositories/e/eapis/6.conf b/paludis/repositories/e/eapis/6.conf
index 263bbda47..bd8a6fe73 100644
--- a/paludis/repositories/e/eapis/6.conf
+++ b/paludis/repositories/e/eapis/6.conf
@@ -1,5 +1,5 @@
-# Configuration for EAPI 6 (draft)
-# EAPI 6 will be specified in PMS.
+# Configuration for EAPI 6
+# EAPI 6 is specified in PMS.
source ${PALUDIS_EAPIS_DIR}/5.conf
exported_name = 6
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index aae1d37c4..fcd6dd326 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -11,6 +11,7 @@ eapis = \
3.conf \
4.conf \
5.conf \
+ 6.conf \
exheres-0.conf \
paludis-1.conf \
pbin-1+0.conf \
@@ -22,7 +23,7 @@ eapis = \
pbin-1+paludis-1.conf \
pbin-1+exheres-0.conf
-future_eapis = 6.conf
+future_eapis =
eapidir = $(datadir)/paludis/eapis/