@@ -, +, @@ - 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. --- cnf/make.conf.example | 8 ++++---- cnf/make.globals | 3 +-- lib/portage/package/ebuild/_config/special_env_vars.py | 3 +-- man/make.conf.5 | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) --- a/cnf/make.conf.example +++ a/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 # =================== --- a/cnf/make.globals +++ a/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="*" --- a/lib/portage/package/ebuild/_config/special_env_vars.py +++ a/lib/portage/package/ebuild/_config/special_env_vars.py @@ -1,4 +1,4 @@ -# Copyright 2010-2018 Gentoo Foundation +# Copyright 2010-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from __future__ import unicode_literals @@ -199,7 +199,6 @@ global_only_vars = frozenset([ ]) default_globals = { - 'ACCEPT_LICENSE': '* -@EULA', 'ACCEPT_PROPERTIES': '*', 'PORTAGE_BZIP2_COMMAND': 'bzip2', } --- a/man/make.conf.5 +++ a/man/make.conf.5 @@ -1,4 +1,4 @@ -.TH "MAKE.CONF" "5" "Nov 2018" "Portage VERSION" "Portage" +.TH "MAKE.CONF" "5" "Feb 2019" "Portage VERSION" "Portage" .SH "NAME" make.conf \- custom settings for Portage .SH "SYNOPSIS" @@ -64,7 +64,7 @@ file (see \fBportage\fR(5)). In addition to license and group names, the for further information: \fIhttps://www.gentoo.org/glep/glep-0023.html\fR. .br -Defaults to the value of * -@EULA. +Defaults to the value defined in the profile. .br .I Examples: .nf @@ -72,7 +72,7 @@ Defaults to the value of * -@EULA. ACCEPT_LICENSE="-* @FREE" # As before, but exclude the "Artistic" license ACCEPT_LICENSE="-* @FREE -Artistic" -# Accept any license except those in the EULA license group (default) +# Accept any license except those in the EULA license group ACCEPT_LICENSE="* -@EULA" .fi .TP --