gentoo resync : 25.09.2021

4 files changed, 3 insertions, 13 deletions

diff --git a/profiles/default/linux/musl/mips/package.use.force b/profiles/default/linux/musl/mips/package.use.force
index dc332c759843..9fc197b1445f 100644
--- a/profiles/default/linux/musl/mips/package.use.force
+++ b/profiles/default/linux/musl/mips/package.use.force
@@ -3,6 +3,3 @@
 dev-ml/llvm-ocaml llvm_targets_Mips
 sys-devel/clang llvm_targets_Mips
 sys-devel/llvm llvm_targets_Mips
-
-# The only working option
-dev-util/pkgconf pkg-config
diff --git a/profiles/default/linux/package.use b/profiles/default/linux/package.use
index e45526319f5a..a283c16b146c 100644
--- a/profiles/default/linux/package.use
+++ b/profiles/default/linux/package.use
@@ -1,15 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mike Gilbert <floppym@gentoo.org> (2017-10-29)
 # Override default from make.defaults, bug 635822.
 net-libs/mbedtls -zlib
 
-# Mike Frysinger <vapier@gentoo.org> (2015-11-12)
-# We want busybox statically linked by default as it is the system rescue shell.
-# But we cannot statically link pam, so turn that off by default. #468580
-sys-apps/busybox -pam static
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (2011-02-13)
 # Disable deprecated bsddb module of Python 2 by default.
 =dev-lang/python-2* -berkdb
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 2b4f9ea7dd26..c110492efeac 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andrey Grozin <grozin@gentoo.org> (2021-05-06)
@@ -34,7 +34,6 @@ sys-fs/zfs kernel-builtin
 sys-auth/pam_mktemp -prevent-removal
 
 sys-devel/gcc hardened
-sys-libs/glibc hardened
 
 # Samuli Suominen <ssuominen@gentoo.org> (2012-01-10)
 # Masked in base/package.use.mask as Linux -only feature
diff --git a/profiles/default/linux/packages b/profiles/default/linux/packages
index d0b8745d0440..6d35bf72e202 100644
--- a/profiles/default/linux/packages
+++ b/profiles/default/linux/packages
@@ -1,4 +1,4 @@
-# Copyright 2004-2015 Gentoo Foundation.
+# Copyright 2004-2021 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file extends the base packages file for the default profile that all
@@ -6,7 +6,6 @@
 # will have.  Some will have an selinux profile (see ${PORTDIR}/profiles/selinux).
 # The idea is to only create a new family of profiles when absolutely necessary.
 
-*sys-apps/busybox
 *sys-apps/iproute2
 *sys-apps/man-pages
 *sys-apps/net-tools