From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74C32138334 for ; Sun, 19 May 2019 21:05:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86128E01E4; Sun, 19 May 2019 21:05:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A614E01E4 for ; Sun, 19 May 2019 21:05:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D8103443DD for ; Sun, 19 May 2019 21:05:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2F8B5EF for ; Sun, 19 May 2019 21:05:16 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1558299910.16ffd91a723a52836baa7598ae870e485c75a014.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/embedded/, profiles/base/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/base/make.defaults profiles/embedded/make.defaults X-VCS-Directories: profiles/base/ profiles/embedded/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 16ffd91a723a52836baa7598ae870e485c75a014 X-VCS-Branch: master Date: Sun, 19 May 2019 21:05:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ce40c81d-9623-4e4c-a4a4-b5729a6d9498 X-Archives-Hash: da5922827c71d0e74b80cb24d8b1db8f commit: 16ffd91a723a52836baa7598ae870e485c75a014 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 19 20:54:00 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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 (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"