1 |
commit: 5dd209d167dce6b94e1d50ad71df191ceae8d9b1 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 27 21:15:30 2018 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 27 21:16:44 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5dd209d1 |
7 |
|
8 |
Deprecate EAPI=6 |
9 |
|
10 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
11 |
|
12 |
metadata/layout.conf | 9 ++++++--- |
13 |
metadata/science.conf | 1 - |
14 |
2 files changed, 6 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/metadata/layout.conf b/metadata/layout.conf |
17 |
index a02126740..91f5b7f8c 100644 |
18 |
--- a/metadata/layout.conf |
19 |
+++ b/metadata/layout.conf |
20 |
@@ -14,13 +14,16 @@ manifest-hashes = BLAKE2B SHA512 |
21 |
# The following hashes are required on all Manifest entries. If any |
22 |
# of them are missing, repoman will refetch and rehash old distfiles. |
23 |
# Otherwise, old distfiles will keep using their current hash set. |
24 |
-manifest-required-hashes = SHA512 |
25 |
+manifest-required-hashes = BLAKE2B |
26 |
|
27 |
# 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670). |
28 |
# 2014-02-25 council meeting deprecated EAPIs 0 and 3. |
29 |
+# 2014-03-11 council meeting banned EAPI 1. |
30 |
# 2015-10-11 council meeting deprecated EAPI 4. |
31 |
+# 2016-01-10 council meeting banned EAPI 3. |
32 |
+# 2018-05-13 council meeting deprecated EAPI 5 for ebuilds. |
33 |
eapis-banned = 0 1 2 3 4 |
34 |
-eapis-deprecated = 5 |
35 |
+eapis-deprecated = 5 6 |
36 |
|
37 |
# Bug #337853 - gentoo's council says to enable |
38 |
# --echangelog by default for the "gentoo" repo |
39 |
@@ -35,7 +38,7 @@ update-changelog = false |
40 |
cache-formats = md5-dict |
41 |
|
42 |
# Support for implicit masters is deprecated, so we need to explicitly |
43 |
-# specify that this repo does not dependent on any masters, in order |
44 |
+# specify that this repo does not depend on any masters, in order |
45 |
# to distinguish it from repos that rely on the deprecated behavior. |
46 |
masters = gentoo |
47 |
|
48 |
|
49 |
diff --git a/metadata/science.conf b/metadata/science.conf |
50 |
index 5c71ac1c4..2a1e51cca 100644 |
51 |
--- a/metadata/science.conf |
52 |
+++ b/metadata/science.conf |
53 |
@@ -3,4 +3,3 @@ |
54 |
location = /var/lib/overlays/science |
55 |
sync-type = git |
56 |
sync-uri = git://git.gentoo.org/proj/sci.git |
57 |
- |