summaryrefslogtreecommitdiff
path: root/profiles/base
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-20 14:45:01 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-20 14:45:01 +0100
commit34dea8e38f88007799629d0a56b12dec480b1d21 (patch)
tree6790873994b58030360328cf5897d934b3b03d16 /profiles/base
parent7932d472a02d4c016ff7dff4b7a5479ab9d1883d (diff)
gentoo resync : 20.06.2021
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/package.use.force9
-rw-r--r--profiles/base/package.use.mask6
2 files changed, 13 insertions, 2 deletions
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 2450d7885002..8461911acd39 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# John Helmert III <ajak@gentoo.org> (2021-06-19)
+# netkit-rsh is last-rited and torque has
+# '!crypt? ( net-misc/netkit-rsh )', so force USE=crypt
+sys-cluster/torque crypt
+
# Sam James <sam@gentoo.org> (2021-05-07)
# Forced on for now as generated headers are now
# included unconditionally.
@@ -93,8 +98,8 @@ sys-kernel/vanilla-kernel initramfs
# Sergei Trofimovich <slyfox@gentoo.org> (2019-11-06)
# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
-# distribution and rely on external providers lke libxcrypt.
-# Gentoo will follow the suit but today we are not ready.
+# distribution and rely on external providers like libxcrypt.
+# Gentoo will follow suit but today we are not yet ready.
# Unmask at your risk. Bug #699422 tracks the effort.
sys-libs/glibc crypt
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8b41e67b4856..4e160ad986aa 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -270,6 +270,7 @@ dev-python/statsmodels doc
# Patrick McLean <chutzpah@gentoo.org> (2019-11-07)
# Collides with sys-libc/glibc[crypt]
+# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
sys-libs/libxcrypt split-usr system
# Michał Górny <mgorny@gentoo.org> (2019-10-05)
@@ -658,3 +659,8 @@ media-libs/opencv contribovis
# Newer (>=4.4.0) versions of Quodlibet have a different library structure, so
# puddletag needs to be updated to handle that.
media-sound/puddletag quodlibet
+
+# John Helmert III <ajak@gentoo.org> (2021-06-19)
+# Reverse dependencies of last rited net-misc/netkit-rsh
+app-shells/pdsh rsh
+net-misc/sitecopy rsh