Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 677800 | Differences between
and this patch

Collapse All | Expand All

(-)a/cnf/make.conf.example (-4 / +4 lines)
Lines 1-4 Link Here
1
# Copyright 1999-2013 Gentoo Foundation
1
# Copyright 1999-2019 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# Contains local system settings for Portage system
3
# Contains local system settings for Portage system
4
4
Lines 84-94 Link Here
84
# license_groups file (see portage(5) man page). In addition to license
84
# license_groups file (see portage(5) man page). In addition to license
85
# and group names, the * and -* wildcard tokens are also supported.
85
# and group names, the * and -* wildcard tokens are also supported.
86
#
86
#
87
# Accept any license except those in the EULA license group (default).
88
#ACCEPT_LICENSE="* -@EULA"
89
#
90
# Only accept licenses in the FREE license group (i.e. Free Software).
87
# Only accept licenses in the FREE license group (i.e. Free Software).
91
#ACCEPT_LICENSE="-* @FREE"
88
#ACCEPT_LICENSE="-* @FREE"
89
#
90
# Accept any license except those in the EULA license group.
91
#ACCEPT_LICENSE="* -@EULA"
92
92
93
# Portage Directories
93
# Portage Directories
94
# ===================
94
# ===================
(-)a/cnf/make.globals (-2 / +1 lines)
Lines 1-4 Link Here
1
# Copyright 1999-2018 Gentoo Authors
1
# Copyright 1999-2019 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# System-wide defaults for the Portage system
3
# System-wide defaults for the Portage system
4
4
Lines 23-29 FCFLAGS="" Link Here
23
# Approved by the mirror-admin team.
23
# Approved by the mirror-admin team.
24
GENTOO_MIRRORS="http://distfiles.gentoo.org"
24
GENTOO_MIRRORS="http://distfiles.gentoo.org"
25
25
26
ACCEPT_LICENSE="* -@EULA"
27
ACCEPT_PROPERTIES="*"
26
ACCEPT_PROPERTIES="*"
28
ACCEPT_RESTRICT="*"
27
ACCEPT_RESTRICT="*"
29
28
(-)a/lib/portage/package/ebuild/_config/special_env_vars.py (-2 / +1 lines)
Lines 1-4 Link Here
1
# Copyright 2010-2018 Gentoo Foundation
1
# Copyright 2010-2019 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
3
4
from __future__ import unicode_literals
4
from __future__ import unicode_literals
Lines 199-205 global_only_vars = frozenset([ Link Here
199
])
199
])
200
200
201
default_globals = {
201
default_globals = {
202
	'ACCEPT_LICENSE':           '* -@EULA',
203
	'ACCEPT_PROPERTIES':        '*',
202
	'ACCEPT_PROPERTIES':        '*',
204
	'PORTAGE_BZIP2_COMMAND':    'bzip2',
203
	'PORTAGE_BZIP2_COMMAND':    'bzip2',
205
}
204
}
(-)a/man/make.conf.5 (-4 / +3 lines)
Lines 1-4 Link Here
1
.TH "MAKE.CONF" "5" "Nov 2018" "Portage VERSION" "Portage"
1
.TH "MAKE.CONF" "5" "Feb 2019" "Portage VERSION" "Portage"
2
.SH "NAME"
2
.SH "NAME"
3
make.conf \- custom settings for Portage
3
make.conf \- custom settings for Portage
4
.SH "SYNOPSIS"
4
.SH "SYNOPSIS"
Lines 64-70 file (see \fBportage\fR(5)). In addition to license and group names, the Link Here
64
for further information:
64
for further information:
65
\fIhttps://www.gentoo.org/glep/glep-0023.html\fR.
65
\fIhttps://www.gentoo.org/glep/glep-0023.html\fR.
66
.br
66
.br
67
Defaults to the value of * -@EULA.
67
Defaults to the value defined in the profile.
68
.br
68
.br
69
.I Examples:
69
.I Examples:
70
.nf
70
.nf
Lines 72-78 Defaults to the value of * -@EULA. Link Here
72
ACCEPT_LICENSE="-* @FREE"
72
ACCEPT_LICENSE="-* @FREE"
73
# As before, but exclude the "Artistic" license
73
# As before, but exclude the "Artistic" license
74
ACCEPT_LICENSE="-* @FREE -Artistic"
74
ACCEPT_LICENSE="-* @FREE -Artistic"
75
# Accept any license except those in the EULA license group (default)
75
# Accept any license except those in the EULA license group
76
ACCEPT_LICENSE="* -@EULA"
76
ACCEPT_LICENSE="* -@EULA"
77
.fi
77
.fi
78
.TP
78
.TP
79
- 

Return to bug 677800