From 6f5310418de198e0a1e44ff028d483f22279bb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 10 Dec 2019 14:26:59 +0100 Subject: [PATCH] [metadata] update layout.conf from tree --- metadata/layout.conf | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/metadata/layout.conf b/metadata/layout.conf index 8a701f0..246ceb1 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,11 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For details on this file, see the layout.conf section of the # portage(5) man page. -# we inerhit eclasses from gentoo -masters = gentoo gentoo_prefix +# Allow specific PROPERTIES and RESTRICT values in ebuilds. +properties-allowed = interactive live +restrict-allowed = binchecks bindist fetch installsources mirror preserve-libs splitdebug strip test userpriv # manifest-hashes specify hashes used for new/updated entries # the current set went live on 2017-11-21, per 2017-11-12 Council meeting @@ -15,24 +16,22 @@ manifest-hashes = BLAKE2B SHA512 # The following hashes are required on all Manifest entries. If any # of them are missing, repoman will refetch and rehash old distfiles. # Otherwise, old distfiles will keep using their current hash set. -manifest-required-hashes = SHA512 +manifest-required-hashes = BLAKE2B # 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670). # 2014-02-25 council meeting deprecated EAPIs 0 and 3. +# 2014-03-11 council meeting banned EAPIs 1 and 2. # 2015-10-11 council meeting deprecated EAPI 4. -eapis-banned = 1 -eapis-deprecated = 0 2 3 4 +# 2016-01-10 council meeting banned EAPIs 0 and 3. +# 2018-05-13 council meeting deprecated EAPI 5 for ebuilds. +eapis-banned = 0 1 2 3 +eapis-deprecated = 4 5 # Bug #337853 - gentoo's council says to enable # --echangelog by default for the "gentoo" repo # INFRA NOTE 2015/08/08: No more old ChangeLogs in Git update-changelog = false -# the default *is* actually pms, but better safe then sorry -# since we don't actually need stuff like package.* as -# directory -profile-formats = pms - # Make egencache generate newer (more reliable) # md5-dict cache format (see bug #409445). # NOTE: list md5-dict first so clients prefer it @@ -40,10 +39,14 @@ profile-formats = pms # 2012 was the removal date) cache-formats = md5-dict +# Support for implicit masters is deprecated, so we need to explicitly +# specify that this repo does not depend on any masters, in order +# to distinguish it from repos that rely on the deprecated behavior. +masters = gentoo + # Use thin Manifests for Git thin-manifests = true # Sign Git commits, and NOT Manifests -# but sign neither here sign-commits = false sign-manifests = false