[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/default/linux/, profiles/features/hardened/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/default/linux/, profiles/features/hardened/

[Michael Orlitzky]

commit:     0f7838027ac84f2a57d98823e8b259677fe6ef36
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 15:31:24 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 21:52:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f783802

profiles: unset USE=modules by default.

The "modules" USE flag was originally enabled by default in the base
profile so that any ebuild inheriting linux-mod.eclass would have its
kernel modules built by default. However, the name of that USE flag is
now controlled by the MODULES_OPTIONAL_USE variable, set in the ebuild
itself. The best place for the USE flag default is therefore in IUSE
(in the ebuild), because only the ebuild knows the correct flag name.

There are at least two packages, media-gfx/graphicsmagick and
net-im/mcabber, that assign a different meaning to the "modules" flag,
further suggesting that a global default is too blunt an approach.

This commit drops the flag from base/make.defaults, and also from
default/linux/make.defaults where a redundant entry was present.
Thereafter, the override in features/hardened/make.defaults is
unnecessary, so it has been dropped as well.

Closes: https://bugs.gentoo.org/635720
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 profiles/base/make.defaults              | 5 -----
 profiles/default/linux/make.defaults     | 5 -----
 profiles/features/hardened/make.defaults | 1 -
 3 files changed, 11 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index a0a1d4f977b..6e1ada342cf 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -92,11 +92,6 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 # Netbeans modules/clusters
 NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
-# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
-# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
-# Build kernel modules from linux-mod by default:
-USE="${USE} modules"
-
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target
 # Updated to include ruby23 on 21 Jan 2018

diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
index 4d580b1ba06..0716de8a14c 100644
--- a/profiles/default/linux/make.defaults
+++ b/profiles/default/linux/make.defaults
@@ -53,8 +53,3 @@ VIDEO_CARDS="dummy fbdev v4l"
 # Note that adding LDFLAGS="-Wl,-O1 ${LDFLAGS}" breaks dev-util/boost-build
 # because of whitespace.
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-
-# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
-# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
-# Build kernel modules from linux-mod by default:
-USE="${USE} modules"

diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
index 1502b08728f..88e165c4611 100644
--- a/profiles/features/hardened/make.defaults
+++ b/profiles/features/hardened/make.defaults
@@ -24,4 +24,3 @@ USE="${USE} -berkdb -gdbm -tcpd"
 USE="${USE} -fortran"
 USE="${USE} -cli"
 USE="${USE} -dri"
-USE="${USE} -modules"