aboutsummaryrefslogtreecommitdiff
path: root/cnf
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2019-02-12 15:15:32 +0100
committerUlrich Müller <ulm@gentoo.org>2019-02-12 23:34:07 +0100
commit94669648977c1ea851b0911a1ec99c64b4c18273 (patch)
tree6ce2bdf86f748ed05ee4c3fe16f79d09a708bd44 /cnf
parentUpdates for portage-2.3.60 release (diff)
downloadportage-94669648977c1ea851b0911a1ec99c64b4c18273.tar.gz
portage-94669648977c1ea851b0911a1ec99c64b4c18273.tar.bz2
portage-94669648977c1ea851b0911a1ec99c64b4c18273.zip
Don't define a default for ACCEPT_LICENSE
In its 2019-02-10 meeting, the Gentoo Council has decided that the default for ACCEPT_LICENSE should be changed to @FREE. We take that opportunity to move the default to make.defaults in the base profile, for the following reasons: - The setting depends on the @FREE license group, which itself is not defined in Portage, but in profiles/license_groups. - Setting the default in profiles will allow to perform the switchover at a precise time, independent of Portage release and stabilisation schedule. - Profiles are a better location to define the default distro policy. - GLEP 23 says so. Bug: https://bugs.gentoo.org/677800 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.conf.example8
-rw-r--r--cnf/make.globals3
2 files changed, 5 insertions, 6 deletions
diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index ffebd24d4..70cb8b19b 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Contains local system settings for Portage system
@@ -84,11 +84,11 @@
# license_groups file (see portage(5) man page). In addition to license
# and group names, the * and -* wildcard tokens are also supported.
#
-# Accept any license except those in the EULA license group (default).
-#ACCEPT_LICENSE="* -@EULA"
-#
# Only accept licenses in the FREE license group (i.e. Free Software).
#ACCEPT_LICENSE="-* @FREE"
+#
+# Accept any license except those in the EULA license group.
+#ACCEPT_LICENSE="* -@EULA"
# Portage Directories
# ===================
diff --git a/cnf/make.globals b/cnf/make.globals
index 5a3015ae2..b4ed8c466 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# System-wide defaults for the Portage system
@@ -23,7 +23,6 @@ FCFLAGS=""
# Approved by the mirror-admin team.
GENTOO_MIRRORS="http://distfiles.gentoo.org"
-ACCEPT_LICENSE="* -@EULA"
ACCEPT_PROPERTIES="*"
ACCEPT_RESTRICT="*"