[gentoo-commits] repo/gentoo:master commit in: profiles/embedded/, profiles/base/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     16ffd91a723a52836baa7598ae870e485c75a014
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 20:54:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 19 21:05:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ffd91a

Revert "profiles: Change ACCEPT_LICENSE default to @FREE."

This reverts commit d82b624db1131d0c392d21c76dbcb084612521be.

Reverted to work on better user experience for existing systems:
Users are currently only prompted to accept licenses when installing
packages, not when updating already installed packages using licenses
which were covered by previous ACCEPT_LICENSE value and are now
missing (unaccepted by default).

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 profiles/base/make.defaults     | 5 ++---
 profiles/embedded/make.defaults | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index e6652a62610..2ffb8d9669e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -52,9 +52,8 @@ KERNEL="linux"
 USERLAND="GNU"
 INPUT_DEVICES="keyboard mouse"
 
-# Accept only licenses in the FREE license group, i.e., with
-# the freedom to use, share, modify and share modifications
-ACCEPT_LICENSE="-* @FREE"
+# Accept any license except those in the EULA license group.
+ACCEPT_LICENSE="* -@EULA"
 
 # Tomáš Chvátal <scarabeus@gentoo.org> (23 Mar 2013)
 # By default enable libreoffice implementation only.

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 3382ca7db56..a00f6334f28 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -40,6 +40,5 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
 # and not by user configuration files.
 PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
 
-# Accept only licenses in the FREE license group, i.e., with
-# the freedom to use, share, modify and share modifications
-ACCEPT_LICENSE="-* @FREE"
+# Accept any license except those in the EULA license group.
+ACCEPT_LICENSE="* -@EULA"