aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2015-11-08 20:08:02 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2015-11-08 20:08:02 +0000
commit53e89a76f67868ec520ac0b6da4ce1301376ae04 (patch)
tree2a9dddb7fa2e05503a21ef20e3ca8aaf0f8717ba
parent3a15cc2c588145d179d6cf48ba412b798e580a3e (diff)
downloadpaludis-53e89a76f67868ec520ac0b6da4ce1301376ae04.tar.gz
paludis-53e89a76f67868ec520ac0b6da4ce1301376ae04.tar.xz
EAPI 6 finalised by Council
-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 263bbda..bd8a6fe 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 aae1d37..fcd6dd3 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/