From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A510D1381F3 for ; Thu, 1 Aug 2013 19:12:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EE27E0A90; Thu, 1 Aug 2013 19:12:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEE95E0A90 for ; Thu, 1 Aug 2013 19:12:53 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F3E233E917 for ; Thu, 1 Aug 2013 19:12:52 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 617) id 689532171C; Thu, 1 Aug 2013 19:12:51 +0000 (UTC) From: "Sven Vermeulen (swift)" To: gentoo-doc-cvs@lists.gentoo.org Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en/handbook: hb-working-portage.xml X-VCS-Repository: gentoo X-VCS-Files: hb-working-portage.xml X-VCS-Directories: xml/htdocs/doc/en/handbook X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130801191251.689532171C@flycatcher.gentoo.org> Date: Thu, 1 Aug 2013 19:12:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-doc-cvs@lists.gentoo.org Reply-to: docs-team@lists.gentoo.org X-Archives-Salt: 59fb3cb3-1004-4d07-aefc-8a8e365fa7f1 X-Archives-Hash: 09c72c86036ffe927821d440ff1fc9d6 swift 13/08/01 19:12:51 Modified: hb-working-portage.xml Log: Fix bug #479386 - Update ACCEPT_LICENSE example, thanks to Ulrich Muller for the feedback and suggestions Revision Changes Path 1.82 xml/htdocs/doc/en/handbook/hb-working-portage.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.82&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.82&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?r1=1.81&r2=1.82 Index: hb-working-portage.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- hb-working-portage.xml 15 Aug 2012 07:20:36 -0000 1.81 +++ hb-working-portage.xml 1 Aug 2013 19:12:51 -0000 1.82 @@ -4,7 +4,7 @@ - + @@ -13,8 +13,8 @@ maintain the software on his system. -7 -2012-08-15 +8 +2013-08-01
Welcome to Portage @@ -410,17 +410,18 @@

The variable that controls permitted licenses is ACCEPT_LICENSE, which -can be set in /etc/portage/make.conf: +can be set in /etc/portage/make.conf. In the next example, this +default value is shown:

-
+
 ACCEPT_LICENSE="* -@EULA"
 

 
 

 With this configuration, packages that require interaction during installation
-to approve their EULA will not be installed. Packages without an EULA
-will be installed.
+to approve their EULA will not be installable. Packages without an EULA
+will be installable.
 

 
 

@@ -454,28 +455,19 @@
 
 

 License groups defined in ACCEPT_LICENSE are prefixed with an @
-sign. Here's an example of a system that globally permits the GPL-compatible
-license group, as well as a few other groups and individual licenses:
+sign. Here's an example of a system that globally permits the free software (and
+documentation) license group, as well as a few other individual licenses:
 

 
 
-ACCEPT_LICENSE="@GPL-COMPATIBLE @OSI-APPROVED @EULA atheros-hal BitstreamVera"
-

-
-

-If you want only free software and documentation on your system, you might use
-the following setup:
-

-
-
-ACCEPT_LICENSE="-* @FREE"
+ACCEPT_LICENSE="-* @FREE atheros-hal BitstreamVera"
 

 
 

 In this case, "free" is mostly defined by the FSF and OSI. Any package whose license
-does not meet these requirements will not be installed on your system.
+does not meet these requirements will not be installable on your system.