[gentoo-commits] proj/portage:master commit in: cnf/, man/, lib/portage/package/ebuild/, lib/portage/package/ebuild/_config/

[gentoo-commits] proj/portage:master commit in: cnf/, man/, lib/portage/package/ebuild/, lib/portage/package/ebuild/_config/

[Ulrich Müller]

commit:     94669648977c1ea851b0911a1ec99c64b4c18273
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 14:15:32 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 22:34:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=94669648

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 <AT> gentoo.org>

 cnf/make.conf.example                                  | 8 ++++----
 cnf/make.globals                                       | 3 +--
 lib/portage/package/ebuild/_config/special_env_vars.py | 3 +--
 lib/portage/package/ebuild/config.py                   | 4 ++--
 man/make.conf.5                                        | 6 +++---
 5 files changed, 11 insertions(+), 13 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="*"
 

diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py
index f4f2bec2c..f9a0c3c0e 100644
--- a/lib/portage/package/ebuild/_config/special_env_vars.py
+++ b/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',
 }

diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 8de23e2e5..2981f7e31 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.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
@@ -2278,7 +2278,7 @@ class config(object):
 			for curdb in mydbs:
 				mysplit.extend(curdb.get('ACCEPT_LICENSE', '').split())
 			mysplit = prune_incremental(mysplit)
-			accept_license_str = ' '.join(mysplit)
+			accept_license_str = ' '.join(mysplit) or '* -@EULA'
 			self.configlist[-1]['ACCEPT_LICENSE'] = accept_license_str
 			self._license_manager.set_accept_license_str(accept_license_str)
 		else:

diff --git a/man/make.conf.5 b/man/make.conf.5
index a8f5b639f..adbd6dc85 100644
--- a/man/make.conf.5
+++ b/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