gentoo resync : 29.01.2021

41 files changed, 272 insertions, 705 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7956de27bab6..b1a1937597b1 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 2c10d413b187..34a923acb091 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,4 +1,3 @@
-AUX cdist-6.9.3-tests.patch 993 BLAKE2B 94ee65198bce01b0aee00c7a561a85a8d72f6fc768cee44bda91a2ffb7072862c459d735e6e9e3efecef3fe214f5f737effbef039172e1319a867dcd6981bc08 SHA512 e95906c1fcd43caee028a431340600e4ae53149974549cdc0e6de6d9a6b20780478271b9e2414c315eafe3e6afb6d20ae35da24beefe22bd90f6b30e51cc6f7a
-DIST cdist-6.9.3.tar.gz 1358492 BLAKE2B 04ec577629924b0a4356bfc44f0fbd3c7c8f0f15197b2fe8a62cde8e2089865a06c4d49366870be712bf0bc5d8f5c47f8c5ee3af602186ecef2c33e15af1b762 SHA512 3588cb7b98c78ff1671f1932474fd9c43e06ce075cfb0fa777903687f5ea84e7382da6014ea6230edad290de5175e3f000ea487831f1584b7efd4c97b8758dc2
-EBUILD cdist-6.9.3.ebuild 760 BLAKE2B afa9cafc2ebd481849b8191f259c4182ac4d66f807ebf310db83cfb601405ca757810dc3e4027d03d14cb855b973035d4101515c074d2dcf4de90b9f756440b6 SHA512 0a78d3b1d17e572e857f8b08731ff2fe7c40a89c185ceeb240cbe4e5848f46c4fa97a6dfcb169b3944c83aa943e2ace6edbf64adb23a834beea7d80babfc475a
+DIST cdist-6.9.4.tar.gz 1362226 BLAKE2B c9f9c85b586718e8cd1fe1a88bed5603b0e1c4ddbf398caab033b3adacc056349edb44f9a597f6810a08fef0598260c350d307eafd16c7be43e556a586294800 SHA512 ba139ab404e8167530cc36461bf83443a3b7d289a4cd7daee2286e9610846ac0b75737899defe08dafa873d1c1b369f9a412c828c98c8aae9130713bf5a7ec77
+EBUILD cdist-6.9.4.ebuild 676 BLAKE2B 814139667be230ac57a8bf7b307a2f30852e7d3a99312d999851132685562ce643d98174ab6212a4d5933c9a03092ed12eeea8c9f96f92b33d42587caa102bdb SHA512 2d11bd2b4b02ba258971be997b59eed7966573ac221a9981efba4b49c9af06353579105648075d80f5bc28f7e0756e197755523bf4f1f9bf9584db5755c02dc9
 MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c
diff --git a/app-admin/cdist/cdist-6.9.3.ebuild b/app-admin/cdist/cdist-6.9.4.ebuild
index 7b119c0cb7b3..7fb25712179a 100644
--- a/app-admin/cdist/cdist-6.9.3.ebuild
+++ b/app-admin/cdist/cdist-6.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -19,9 +19,6 @@ KEYWORDS="~amd64 ~x86"
 distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
 distutils_enable_tests unittest
 
-# only required for py3.6 compatibility
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
 python_prepare_all() {
 	echo "VERSION='${PV}'" > cdist/version.py || die
 
diff --git a/app-admin/cdist/files/cdist-6.9.3-tests.patch b/app-admin/cdist/files/cdist-6.9.3-tests.patch
deleted file mode 100644
index df99b74d9b81..000000000000
--- a/app-admin/cdist/files/cdist-6.9.3-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/cdist/preos.py
-+++ b/cdist/preos.py
-@@ -7,7 +7,7 @@ import cdist
- import logging
- import cdist.argparse
- import cdist.configuration
--import cdist.exec.util as util
-+from cdist.exec import util
- 
-
- _PREOS_CALL = "commandline"
---- a/cdist/exec/local.py
-+++ b/cdist/exec/local.py
-@@ -34,7 +34,7 @@ import datetime
- import cdist
- import cdist.message
- from cdist import core
--import cdist.exec.util as util
-+from cdist.exec import util
- 
- CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ]
- 
---- a/cdist/exec/remote.py
-+++ b/cdist/exec/remote.py
-@@ -27,7 +27,7 @@ import logging
- import multiprocessing
- 
- import cdist
--import cdist.exec.util as util
-+from cdist.exec import util
- import cdist.util.ipaddr as ipaddr
- from cdist.mputil import mp_pool_run
- 
---- a/cdist/info.py
-+++ b/cdist/info.py
-@@ -22,7 +22,7 @@
- import cdist
- import cdist.configuration
- import cdist.core
--import cdist.exec.util as util
-+from cdist.exec import util
- import os
- import glob
- import fnmatch
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index d346934fe74b..970478bb2d9f 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,11 +4,11 @@ AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e
 AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb
-AUX conky-1.11.6-fpermissive.patch 1517 BLAKE2B 6f0c0fc9370955786f74c9a707fd63eb9ead7b5889ab57fe8c6a9326a1ff0253b90c7ccd3f38baa837404787bcded00de46d8132cc0d013ad70910b3fd64f91c SHA512 df645d30e4d6f88348af5dc1c782f6146fab86d744f54d77b0c6561f0f0c2491472e72b55f075a22bc3d16e87a01303955d0a0bffc6495dae390c9904e1f783f
+AUX conky-1.11.6-fpermissive.patch 1397 BLAKE2B 8200932639a6e0366d2c1426747d7de3939f21791c3a252cbe67f336555a9dc98e050114c5298e4d8b62e5b40f4a7a4bec82e1d38746f5a8bba5dba5295bd8c4 SHA512 e8063b7c567aa3aeae8ceab26895b124b865fe2815101d46593359d52f8ca9e830b6caaf2506e86550620df58230c507fb51f643bd0f61d92c232904f483b605
 AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
 EBUILD conky-1.10.8-r10.ebuild 4860 BLAKE2B bfa7ab46f34c8fac5a395869ad3ce175c75b748d87cabacac03a39f7d19ac904f5fd1fbb989fe4dbb6aee947b6d775c06d7941f7eecdbc566e09c17087bd7299 SHA512 b2160e9147005b2cc90020c07f8a7c4c0de7641a88f87ff983e573d24d52edd04ab3cefcea96cceb6579a48e021975248cb8f066b9137542def3c801ba57b587
 EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65
-EBUILD conky-1.11.6-r2.ebuild 4795 BLAKE2B 470cf78bbf13773cfaab634587ae7d03b9c41e89aaccfa02586173ec367a52167df7f35f60931c5dceac8be0138f4c9430c911c8c054c46c08c94f90d9fa149d SHA512 474153c6501ecf562ae7a92b65e40dbe125269d4b25fb98426117ea61f2d4c018f74ccd6b932e0b21872ed36539ebfaf0b26a16b5092b036114af4e6402f6b53
+EBUILD conky-1.11.6-r2.ebuild 4790 BLAKE2B c72c8455185a0125cf63262d97b7fcbf95fb7469eda6bd64a6a436d3b99128ed77987d6e9be6c456c07ea31f2f4b959e545e5a4e501947912ce4e63cf0109f65 SHA512 70dabc73ad704df62433683df9ae7b8ec38abf4dca63a76f7f32a580b1cbff3d02c1dbbb14486dbcd60b9780226a9625948843c0eadefda3581e429fcc54adf4
 MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.11.6-r2.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild
index 827e39e30975..02b12b482a5c 100644
--- a/app-admin/conky/conky-1.11.6-r2.ebuild
+++ b/app-admin/conky/conky-1.11.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
 	ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
 	ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
index 1ac1173ba646..f608769b6433 100644
--- a/app-admin/conky/files/conky-1.11.6-fpermissive.patch
+++ b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
@@ -1,17 +1,15 @@
-From 16be0e1571a586168855bedb6da1ddc732b0bbf4 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@brndn.io>
-Date: Thu, 22 Oct 2020 13:02:00 -0400
-Subject: [PATCH] Build fix for libmicrohttpd.
-
----
- src/conky.cc | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 79633a40..b1743466 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -322,12 +322,13 @@ struct MHD_Daemon *httpd;
+--- old/src/conky.cc	2021-01-24 17:05:43.361378726 +0100
++++ new/src/conky.cc	2021-01-24 17:05:49.055378611 +0100
+@@ -317,17 +321,22 @@
+ static FILE *append_fpointer = nullptr;
+ 
+ #ifdef BUILD_HTTP
++#ifdef MHD_YES
++/* older API */
++#define MHD_Result int
++#endif /* MHD_YES */
+ std::string webpage;
+ struct MHD_Daemon *httpd;
  static conky::simple_config_setting<bool> http_refresh("http_refresh", false,
                                                         true);
  
@@ -20,7 +18,7 @@ index 79633a40..b1743466 100644
 -               size_t *upload_data_size, void **con_cls) {
 +MHD_Result sendanswer(void *cls, struct MHD_Connection *connection,
 +                      const char *url, const char *method, const char *version,
-+                      const char *upload_data, unsigned long *upload_data_size,
++                      const char *upload_data, size_t *upload_data_size,
 +                      void **con_cls) {
    struct MHD_Response *response = MHD_create_response_from_buffer(
        webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT);
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index f4036e8d6a1d..8e86484b7ce2 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -8,8 +8,8 @@ DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a51
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
 DIST conserver-8.2.5.tar.gz 434260 BLAKE2B f057a99db8e2f39f644ac8c55dc75372e74a9736c403ceaee8b70af6418ebec881f0c00d0ed4e0825c5f00900c70e0cf5c340637f5f16d19875448c58172ffb3 SHA512 76a1d75307faabeb04b65c5cd5fb1bb7df22e0ff25769f94a86a4b9134da262e6523ba207c8da1ec5b67299498c807ec92279a10846c0b3f23c9effa4ee01c1e
 DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
-EBUILD conserver-8.2.3.ebuild 2332 BLAKE2B 41d68bea10c5a0e8a351f69fac90c8f0b4b250a541b347ae9411d9c36e0c32cf835b8ddd2435c224436a46cea8569c6600fca1126b40518e11065c08cd4aa1f3 SHA512 4191c9985dec41cca907319c9684c0898114d59d79116f4a4944cf6535669744f6020af0c003e196e3dc1a39012bda501964e715b49f380d16aea0f22babb48e
-EBUILD conserver-8.2.4.ebuild 2339 BLAKE2B 36da2173617d2c970a95a8417992dcbfacb4d139c2674a94a75e00292aae7025dabab5a0249fd83867cf5c5ffd1d8dc643fd0f8d650562f7e44ebca408b02d3c SHA512 a9b2ee02b808c42887f5655efa16ddb70d986c528f8a4017a1f833aa0eed5e024a0289fe0ad018d9f09682aca2547749c7fb8571deed41faf4ad072e787b14b4
-EBUILD conserver-8.2.5.ebuild 2291 BLAKE2B ba84ea1948480e942fdfc466c4f9b35dec108a278db1a89cc6c25036ea58228e16bb279335a097ea761b962afc5fe847afd27b501a260b06d9630ecfb0c46f99 SHA512 ee3f120c30bef5c20e2df9f47d5193e7b4effc7cb41d8d9e2bda473a860b5fa64f02398bd1afb639c18caec52c9aa95d744865595ac7cd4b1f36487a9329cc57
-EBUILD conserver-8.2.6.ebuild 2359 BLAKE2B 7a8f57c66885a00d623585c4b2b7dbd5baa8100eef8d2bfd652e8f26e40ca53fd669ad758f1f85e61db72f331c622b43057479d16e5c02aae0a21cd35e85a06a SHA512 52697fc7c858ae17da8ce8eb23df551e49225666e7d049fa6f0adb15a7976734dbd55deeb7a390c56181b91d033cc7349db56da43f8be6590d037b5450494a51
+EBUILD conserver-8.2.3-r1.ebuild 2355 BLAKE2B 69a01594a73817f9970ae9292709d98fe28c1a704f67edf43cb595be1b251c85da60e40bb7895cffe47275747c73e4ede9e615f5d88dd32ed0ec120df1922ccb SHA512 1ca942d8044bfa96a4cf559c35f3bea6ed823ecb6f75ab540726cd306730778af3d1ed6be4edd5b7c34c4205a9078a5514fbe94a4a6e23557fc854e935589854
+EBUILD conserver-8.2.4-r1.ebuild 2362 BLAKE2B 1332bef8da253cd844a5d4739a08168f0177e4f35164290cbaece881030f3070a9f59a4e58c81c08f147a89cef3c5f080502e59f9e2544bd372b681ce046fe5b SHA512 1747c23444ce723d9e4087914e8f92e487d0bf78a1a962049661e17ce8d9e78afae5fd2190e4ed3868ebb3224611486e039280e7084f6da995bfe9b59f18bc46
+EBUILD conserver-8.2.5-r1.ebuild 2314 BLAKE2B d9c499b8bb6f63dd06fa0b1cf9d3da39fe72a79f7ad6ad8b03bb0cc14f582c25b5d8e8db3cb97ca2c91a64b31eeb878b26f07bdf45c0b8aed98cff463224f6c2 SHA512 03a0f2693df8c77ef2e216b16457ccfd9f2888a964217ff2cacce4f3111f14fdcf4f7d1c636269e11c709650d6b7f24e3186a5ee272d1991324ae58e99cda032
+EBUILD conserver-8.2.6-r1.ebuild 2382 BLAKE2B 0ffad99ee3fc06041600e544ca79d6e475830c2c50768668e507a6e20ca9b9155b4988291607f69a8b5c1b490c1a08fec92561e9cb659de3bb6e6a4d621e075c SHA512 1be3d84c121974754fcb2717cb198fe8849ddfe8406c6a21b8fe625d38e499eaa5b2f186f93770c974a615e3a1de93d678cf8bb0b7a79581a1121bd1cbd13d0d
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3-r1.ebuild
index e2c44ccb1145..7a587ea09385 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild
@@ -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
 
 EAPI=6
@@ -81,7 +81,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
 
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
+		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	fi
 }
 
 src_test() {
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4-r1.ebuild
index 018a794f081b..0bfcdb4896bb 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,7 +81,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
 
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
+		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	fi
 }
 
 src_test() {
diff --git a/app-admin/conserver/conserver-8.2.5.ebuild b/app-admin/conserver/conserver-8.2.5-r1.ebuild
index 8ecd6b02a530..f57c6924689a 100644
--- a/app-admin/conserver/conserver-8.2.5.ebuild
+++ b/app-admin/conserver/conserver-8.2.5-r1.ebuild
@@ -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
 
 EAPI=7
@@ -79,7 +79,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
 
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
+		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	fi
 }
 
 src_test() {
diff --git a/app-admin/conserver/conserver-8.2.6.ebuild b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index aa64a2c5943b..7d0d422f9ba6 100644
--- a/app-admin/conserver/conserver-8.2.6.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -83,7 +83,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
 
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
+		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	fi
 }
 
 src_test() {
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 4db523783e7c..df29a6d828dd 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,5 +1,7 @@
 DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
 DIST OpenDoas-6.6.1.tar.gz 30783 BLAKE2B cf6dabddb9a0ef837355516f7344efca33a639ede126e54466644521b5b1a7073b6cfa96cc8573ef16221a748ae6395f7e4fef4ff912ca7889742fb46d1a4da5 SHA512 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
+DIST OpenDoas-6.8.tar.gz 32307 BLAKE2B f199e20ccd33ed215b280f325d10c36f1449a605aa25ca92c39b43e6d9118a2c2b09e351712489028a06e9c2c087593888a93bf0377a15d1b710c9d6f659cf81 SHA512 4a57079bba353247e645bc07a5d4e78fd01471d193e83751fd87b72cffa4e152c0f7ea172563f767a7193b14489f57bc066b4fee50842d30b5b7f7ce918434bb
 EBUILD doas-6.0.ebuild 757 BLAKE2B 5cc07f49c5d2d6cc265b64cec423210db1a9b7a23420452495a8872821dba52205222e6437abf23e57f948a95a8d3baccc66bc77b88866739d075a3f4275c6bd SHA512 e4ac22ef41bdc89438d4165a1552e4883b5eaa02a484a978f15ceeb07a9775bdbda6a1669feb7fdac5d5ac39396bdd1789c88af2189369cbe339617f9795c2cc
 EBUILD doas-6.6.1.ebuild 810 BLAKE2B 822909eff667a7cdd114699207c8060a4a78d1ec5b4b5c0848b3fb8dab7b3c68c014bcac7025de77cf23e8fdbd3b1e9b9a702050c9766db2ad5de300aead70ba SHA512 a9750e216c02ea8fce289265921bda02492571902e91b90d9b1ce88472b6b4b08c15dff399de6ba9b38e32face6037639b84901001cf8646025600115de7f942
+EBUILD doas-6.8.ebuild 1298 BLAKE2B b437057d344189d9d0ac35415f6160900758b92f2cb5bfa6898a720d8f845fa0c326e2ef97954b708be151bedf5e3ce99a9cd438947e7b4dba34c19728ccd58c SHA512 4ca25de76699c247f8d0d1d434382ef354120a740492986198333528f12ccebdbbaf2ad7bcf529ace007bd4ebb63a855ba9f2cae5398fd3697b4859eb2078f13
 MISC metadata.xml 527 BLAKE2B ec5f403c54f18989467cc64c023cc86f0ccdf3f4d974db83a0a0ed660b1f32caac090b43317e5e2b4de46fd7c92a38d622735f9718b0680020557d378a290630 SHA512 1cc9427b113968557fc9764a552138e5a17ed44ef1ed20cb087a8fb60865b8d3e9331baf1d172180409ff636143ad23e1a6d3e5de6af4a8e7b8a7b9bbdfac718
diff --git a/app-admin/doas/doas-6.8.ebuild b/app-admin/doas/doas-6.8.ebuild
new file mode 100644
index 000000000000..294eda46cd60
--- /dev/null
+++ b/app-admin/doas/doas-6.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=OpenDoas
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc"
+IUSE="pam persist"
+
+BDEPEND="virtual/yacc"
+RDEPEND="pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror //' GNUmakefile || die
+}
+
+src_configure() {
+	tc-export CC AR
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		$(use_with pam) \
+		$(use_with persist timestamp) \
+	|| die "Configure failed"
+}
+
+pkg_postinst() {
+	if use persist ; then
+		ewarn "The persist/timestamp feature is disabled by default upstream."
+		ewarn "It may not be as secure as on OpenBSD where proper kernel support exists."
+	fi
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "By default, doas will deny all actions."
+		elog "You need to create your own custom configuration at ${EROOT}/etc/doas.conf."
+		elog "See https://wiki.gentoo.org/wiki/Doas for guidance."
+	fi
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index d2ab44b5ef46..5d039cdf1d63 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,5 @@
 DIST exo-1.22.2.tar.gz 4684092 BLAKE2B ee5ddab06438cbc7d177796917c97649fefa35630a0d8012da53042098b639f5bd580a676e30567981f55e7fc9a512069804b7c45fddb739ca54c4702cc09955 SHA512 325f9a902de424d197583bf921528bc08fc8336030f7d3d5fe4571ab26ffbdf42bf602331302124c3be1103bf3b645f05e6729752295d5ceaa3cf88f802cde99
+DIST exo-1.23.0.tar.gz 4690475 BLAKE2B 6f28c28dd4dbd015b48ee01aa5edd6b234bdd32702062844ed1e46da626bc411c87892c2b134db4ba0a3b30a77fecbf1b9458a190bf894c41f07f6c67e5e846c SHA512 f0fdb1147c9b9a062e68a1dab2aba797236bff480d44eee4eed07132cad71f1d2fdcf4d32b7ea13c012d74256342cab01c3c7b7bb9ce6af11cb79eb337a83c34
 EBUILD exo-1.22.2.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+EBUILD exo-1.23.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.23.0.ebuild b/app-admin/exo/exo-1.23.0.ebuild
new file mode 100644
index 000000000000..49b1772f318b
--- /dev/null
+++ b/app-admin/exo/exo-1.23.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
+HOMEPAGE="https://github.com/exoscale/cli"
+SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+S="${WORKDIR}/cli-${PV}"
+
+src_compile() {
+	go build -mod vendor -o ${PN} || die "build failed"
+}
+
+src_test() {
+	# run at least 'exo version' for test
+	./exo version > /dev/null 2>&1
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index 60a9d0ac4e73..23dfc5da45be 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -8,5 +8,5 @@ DIST lsyncd-2.2.3.tar.gz 85165 BLAKE2B 9b3ce9ad882f12a0cf800ca0418092807c5c30451
 EBUILD lsyncd-2.2.0.ebuild 638 BLAKE2B 1f579e5958bd7c6d1c6b5900db6fee21a81eeb5f9a48de015165755c94414a6c46ba13a153545540392309832a69f1d0746cd7b5d9b40921ce0c28b40ab74f43 SHA512 1b66a5556a68575f45cdea2ffc2c430d5e433ebb409ab8c39d88882d7f40ce500248d442edd7fddad4d344174ad475d6497732736f1723e93b3a732310073b79
 EBUILD lsyncd-2.2.1.ebuild 647 BLAKE2B e022fd924cf8cb5ecf53f7438adf16eb7babb765a67b5860a88ed345c328509b3e522e514a6aa0f0aafc7aa94392d61e32e7ff81dfb8c3dfd12c7599e1a6dfff SHA512 a415f81f33aee8adc4faa459290836768414705558066b47392e0da7b35583f9f9f9fa09a13d04b482dff4d6d1bc116c6f2b25d40f7e1a6152996209db9e093a
 EBUILD lsyncd-2.2.2.ebuild 647 BLAKE2B e022fd924cf8cb5ecf53f7438adf16eb7babb765a67b5860a88ed345c328509b3e522e514a6aa0f0aafc7aa94392d61e32e7ff81dfb8c3dfd12c7599e1a6dfff SHA512 a415f81f33aee8adc4faa459290836768414705558066b47392e0da7b35583f9f9f9fa09a13d04b482dff4d6d1bc116c6f2b25d40f7e1a6152996209db9e093a
-EBUILD lsyncd-2.2.3.ebuild 956 BLAKE2B 66d4ba92e963f908a45e5a98d09d9251f998478d558be497b4d982d97f58e9c38ee410464ea800f64a8977aa7a4129d3e4a69d748ef5476e398188dccf5c6fec SHA512 3ce4261fa4b053aad943a06ec7bd499fb5787b42aa7b177642c0eb31a8534641a1f333fe00b69151389f0f8a51f13d56cc30f311d45479113d192473993e1d29
+EBUILD lsyncd-2.2.3.ebuild 954 BLAKE2B 4d7a3e741e83e7c7ec8c39e1673246aa87958e5903036cd1cbb0b46bebaf9778f6cbbb857038b9d88d2d8ca9d1abb7de8a71340db35d9f5e187044ebf325c377 SHA512 88f26dad5dee99cf4bc0d693141f923c5a6deb9c4cdeaab4f505c2c666b718b98720c10ea5c7383de25268849fd8e9dd1d9f832f7a72bdaa2d3759469069d1b4
 MISC metadata.xml 376 BLAKE2B 17c9b5e1f29ac7b0ced5031f797ed2d85bdb25df6af44a1d257b75256325371a8290e0e1c20cb535c58326fcd67372a727cf170ca200803ca693670f2c729511 SHA512 1d7d76eea9ec7bb6d1e453675d56610abdcd78801b3d12eee37f082698cdb03aa7775d160b473ec4f67d8e95c6dded3319b74449f4aad97fbb6c91fab5bcd641
diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
index 705a0e4067e6..26b28307c983 100644
--- a/app-admin/lsyncd/lsyncd-2.2.3.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
@@ -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
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/app-admin/multilog-watch/Manifest b/app-admin/multilog-watch/Manifest
index 4626b55f15cc..f179f02ca868 100644
--- a/app-admin/multilog-watch/Manifest
+++ b/app-admin/multilog-watch/Manifest
@@ -1,4 +1,4 @@
 DIST multilog-watch 12291 BLAKE2B 3526d532e51ee9d33f5bb7a15b84255669e315ce3f0490193cd1f58af74d10c3893cbd026576a824cc9641c15ea44cad2a84ee5b1dae5c11ee887f30d0c58fca SHA512 e28933b005243261a9f92c2a3a19e15ac4da2c3a505422e3521f2f1888a6cf5cdac2ee1161449334d27f4a7669b1f266d6760f12641ecf066629e26c98fcd041
 DIST sample.filter 1041 BLAKE2B 19e7fd8b7f547996f51d7f9217bee42ed4adefbf8740931e0db0da3284d7ef6b097ba69950447a6e1a04fef94945875789375ab1dc703bf5fc7e748120e0cf8b SHA512 5164461010629f22c9c19d3341251d3723f5dbc02719e19f7f94c5c4154c0e246b365d9d555f88c9589c95b0fbeabb1408137d4782b1c360325460a008192ed5
-EBUILD multilog-watch-1.12-r1.ebuild 991 BLAKE2B 16c8d2ab97aa43c186adcfae4f51af1242fc8794abe5c7f21025c48a0f7bff6f7c65f489b7c47ecf3143e6950290709a3bd85616745a440968e83098b3c23b24 SHA512 9eedc4f57f714517f4a04602214c87f64347e23ec0a73e6a9b74c98dedaa0be0a7470c5c28b16ea97417b20c336f62008b51a4456a63f39710c844452374074a
+EBUILD multilog-watch-1.12-r1.ebuild 951 BLAKE2B ba6d7ed8b4655e9ee37152550efd27997075490c28bdd441191cedb426b286814b0e36e3fd33f458bb3f87fe49234d7dae8b69c6557edfa7fdfbbb519eca70fd SHA512 fed7671e08e53ddbd359bc35bfe831e7d24573783a052492f73fa1d7a697d3531bf55f374f32a7b614b06099afd49653bb563fa81d9d27e77202a8f271ba3bf3
 MISC metadata.xml 613 BLAKE2B 74a8a6e2c96de9927f3381b4facd47aa3dac52302f39ec30a7daff1a69ecddbae374ce53d8bdc579dfe5fac1eb70b7621b21a884adb9b55cb08d2b1ed2d66b88 SHA512 819de14285bb2c8bef1ba833e8e49ad7ed65034caecdf2becdfc2bfd5c9caa33ed8dc1c026d9c9a8ddffc125be8cc1f7537b9c1279415ced2f36777582099005
diff --git a/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild b/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
index a8298e04e6c0..42009247629b 100644
--- a/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
+++ b/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Watches a multilog file for irregularities"
 HOMEPAGE="https://www.eyrie.org/~eagle/software/multilog-watch/"
-SRC_URI="https://archives.eyrie.org/software/system/multilog-watch
-https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
+SRC_URI="https://archives.eyrie.org/software/system/multilog-watch"
+SRC_URI+=" https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-lang/perl
-		virtual/qmail"
+RDEPEND="
+	dev-lang/perl
+	virtual/qmail
+"
 
 src_unpack() {
 	mkdir "${S}" || die
@@ -31,7 +30,6 @@ src_compile() {
 }
 
 src_install() {
-	dodir /etc/multilog-watch
 	insinto /etc/multilog-watch
 	doins sample.filter
 
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index f711a222ac47..3e2d0dd2b83a 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,6 +1,6 @@
 DIST needrestart-3.3.tar.gz 59814 BLAKE2B bfba00dee7c0f225efcaaa80b301eb38d0ea82645f253c8bef9294102f9f4183433ed1b6efe71a9dc34c65f76364ff3fc2344e840b34f97361f3ddcd0dc9ab4b SHA512 ea2f3cbe228a6b879905bd3b3de8b5e0bb2362e8d3cd566817d2e7d519d54207ff5923eb8e49cbd8ffe8ed50729f4da04bf4d55268e806f49157860584058d50
 DIST needrestart-3.5.tar.gz 67824 BLAKE2B 73af940efa578b145d89cb0724f7103edd0fe869bfb211596109b67fd16a8ddce83060942687c3ca0e861d9d545022845b64d90bc44e39997e8943b1575dd5f1 SHA512 e082ab92497cce7b65da9c625ba0bc2332cc7863c5b7d99a04593c646256da0302519fb7c9fc9823ce0058affdf7eb6a4587a1874881eda8aa4d07032093eb0b
-EBUILD needrestart-3.3.ebuild 859 BLAKE2B cf0291a65f58175de23b840320e586d485be4978de574db6c48ad0046ea9a661cad515ffb154f9e4f25dc8ae55d6172edc1796f4d5d2d9724c8f395cec8a8a7a SHA512 9b18c5ea2c2afddb37efc238a0ac14ffc461d2fd3b1d57f8547f407ed39712404483f5bbcba159a890333d545777d2b9b85ca61a910683f578c86c5e9b04724f
-EBUILD needrestart-3.5.ebuild 874 BLAKE2B 9a4441711eaf20dc2ec30596e9d898cb9c91f30ce91aa236e09948ccf45474fe878b720771819dba22516b1c623705ce798ccbd3523f75547a971cca1d3d44df SHA512 97587e9942c153939ae20922d73454cd1e16dcd5a763f6a93c4bda87dbf644e0ac813fae574a4ee13b32d4865132e6b6ff3e9d66eacd5c728bef7c8f26c32aab
-EBUILD needrestart-9999.ebuild 874 BLAKE2B 9a4441711eaf20dc2ec30596e9d898cb9c91f30ce91aa236e09948ccf45474fe878b720771819dba22516b1c623705ce798ccbd3523f75547a971cca1d3d44df SHA512 97587e9942c153939ae20922d73454cd1e16dcd5a763f6a93c4bda87dbf644e0ac813fae574a4ee13b32d4865132e6b6ff3e9d66eacd5c728bef7c8f26c32aab
+EBUILD needrestart-3.3.ebuild 837 BLAKE2B 96162645388eff943edf52e9af487eecb8123e1ccf101dd9e4ae3564ee4f8ceca7d673f7a26679171d12c69f66e39ebb4536753c32acc4f5d0bc5ee179e75c0a SHA512 9e900a39d78fe2fba7d182ed0698259eca04df70b00d8eb5d6a28ef3af0b3da9c51f39a93cbc2b4b4d82638582b04dbef33a26c553ee8bbe7db9381b2cd956d3
+EBUILD needrestart-3.5.ebuild 861 BLAKE2B b7b83ec474eea9bec718c3a3be0432abd609ecf26d69d34b6b4c6bf0eac40c62c99f1d628b8d8d0f5d08dc7f4711505b32731bef29dc9fff33e5936c5d347ac3 SHA512 da4a25cfe4b244cf6c99c0685321653102f813598387cbae8f998041b2ff31db2a262f6646a6c389d9c77527b5c5319b7d0da77786c4c8d9abe2ce02abbce095
+EBUILD needrestart-9999.ebuild 861 BLAKE2B b7b83ec474eea9bec718c3a3be0432abd609ecf26d69d34b6b4c6bf0eac40c62c99f1d628b8d8d0f5d08dc7f4711505b32731bef29dc9fff33e5936c5d347ac3 SHA512 da4a25cfe4b244cf6c99c0685321653102f813598387cbae8f998041b2ff31db2a262f6646a6c389d9c77527b5c5319b7d0da77786c4c8d9abe2ce02abbce095
 MISC metadata.xml 360 BLAKE2B a0996c4eb2c7dbb05be6ee95e1c0df6ef594d249e332e53cf0c2fbb25513a21da54987ba21171390996a70e2d7d8141913e74f6c410be81c494e0850e895edfe SHA512 110d7d21ababbfcbed16f1ec1cff3c07edcc6dbb05d7806b347401838b0d53d930ddf3a07781c272174f8866bf72a62c187a06d36f06345eca57f040b4fc924b
diff --git a/app-admin/needrestart/needrestart-3.3.ebuild b/app-admin/needrestart/needrestart-3.3.ebuild
index 61b91b443d54..576521c08c4f 100644
--- a/app-admin/needrestart/needrestart-3.3.ebuild
+++ b/app-admin/needrestart/needrestart-3.3.ebuild
@@ -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
 
 EAPI=6
@@ -7,7 +7,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
diff --git a/app-admin/needrestart/needrestart-3.5.ebuild b/app-admin/needrestart/needrestart-3.5.ebuild
index 631c9ffd80dd..a90d4adcab9e 100644
--- a/app-admin/needrestart/needrestart-3.5.ebuild
+++ b/app-admin/needrestart/needrestart-3.5.ebuild
@@ -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
 
 EAPI=7
@@ -7,7 +7,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
index 631c9ffd80dd..a90d4adcab9e 100644
--- a/app-admin/needrestart/needrestart-9999.ebuild
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@@ -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
 
 EAPI=7
@@ -7,7 +7,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
index 43a2034728f6..a170eab95185 100644
--- a/app-admin/newsyslog/Manifest
+++ b/app-admin/newsyslog/Manifest
@@ -1,8 +1,8 @@
 AUX newsyslog-1.1-html.patch 478 BLAKE2B 305c1ab0f22358fe3e60aa75c8978007a30d474529c770a06a4bdc799be9c0b2b9ba50c4aba361db09e1e3dca499f50c9c7bc5f21053bbca814d51290f7848f7 SHA512 fa818e19752a84def2386ff796f52d6ebbb110e632fe63f53f3a8a33cee330270d1bb2537cdfeba815dfdeed02daadfd51f271574c504be0f571dc3bc25ad473
-AUX newsyslog-1.1.0.81-html.patch 500 BLAKE2B 734f264da0de2b612ba489e9ca27519bd775ef1a13f62c3e31dc037a593aa6d9b765d866e4d1726d4207358c6d3cf7c003da25ede55aed9c41f280c35d3508ee SHA512 4d4d3464a4a3892ce65770bcf07bbf25e985f93df9be360703ea3aede7c54860f9d77af93f927c8b479ea0d298b8e4ff65a4fdd7225a1290baee2b19bd00eeb4
+AUX newsyslog-1.1.0.81-fno-common.patch 1391 BLAKE2B 3781cd8b1817b40a8cba848c99cbb8762303a0e87e68bbc69fa52eafe3e04db333a5920e74123c6b72b266f54df1e882897450da1a0157c119f293fe40f61c17 SHA512 dbe34787127eeb1edb54d5d1a2264bd20bd832fbbcd7e637cbf1c7317e2ed19fd33d40a882bd83453cb16335a9af305ca5abacced9cb81a171b1b5c6b7a0e58b
+AUX newsyslog-1.1.0.81-html.patch 428 BLAKE2B f0861cb97bba4cc1a17983a1dbaac22381fed3e3b5bc4ce10277c438b9cc0326a684a5d3b0ebd34aadabcfb28203b83ff3185fa33ef918c180965c703f690e5f SHA512 c8f685f06d0dcd25d395e1c3ee05b6d5e61bf57d91df182c6cff9f92c9ed7c036f00f62ae1eadd5daa085d1224f8c0330bae41887a7a2889f102dbae0ba1e587
 DIST newsyslog-1.1.0.81.tar.gz 174411 BLAKE2B d7916396ecf7dda9928891c3bd1020be45354c9623e53d9a52170567c811b3cad3e82efec8145f51a68ed851c46a6c3fb6e8bf944bedf935f2a6589e4b45d3e1 SHA512 de7ae2f71fb5a2a3fad0eaaa793da1ff2b36bc5757a30c70e8f740da8ea2647aea0422c13c1cc1a5e082e41938cbb590c8bb0ecf46d5d584466069f319db47c2
 DIST newsyslog-1.1.tar.gz 156371 BLAKE2B f9ac2de3059e377e61963af70591ca19bc335ffc96d1aa94770fec96cad7b8200d10edc6ac4ab115b697eb0527a998dd457ea1c0d5a1b529d5cbf5285d5ec138 SHA512 b321ae47ecacf6905858bedfaa5ca8c4230f7b6e5a715f8481331940c0ae53795769524a62d1670b4df27f9e263b407be83527a64ccd54b3ba75d55d3c5149b1
 EBUILD newsyslog-1.1-r1.ebuild 931 BLAKE2B b6f08d32e6a4a55007817fd7c90526328a1273e751bb063462d93fe82f6d05221fd3221c290167b91a88e03c148067caef442634646e08587403a80d59e9e5a7 SHA512 64a6bbbccb5b1487527e5511deb52f07647aac7e90d5a4b6caf095a21b705441ec4f22b94051809eb738cfec9009104b108f950ee66fb7b1f1e8d5400b84737a
-EBUILD newsyslog-1.1.0.81-r1.ebuild 954 BLAKE2B d57f797cef2afa13b6e621ec2d8a1a96090b807f86398d8191c20cc557bd56e89542d70557495fd093b9883e90a4d37cb9a14cd25a793a4fb55c85aa605d42a3 SHA512 8a74eaba3e6e2607d3cbc22934e8cb7e380d4d5045717fd36ec7d9467aa329396e613be7290ca9e0ba90b0ec7c4ad155497f65cb9fa1c5b322bedb79f52ab95d
-EBUILD newsyslog-1.1.0.81.ebuild 959 BLAKE2B 635d50774f8f53b1ea98946e0d0ad337e8ce706b8910770073e14bdf37735880b68dbb03827c5af4a286cd0f5342600252df0e14289e33e9ce581b23996c9669 SHA512 5eceaed73affe0a824e74c12ffae5f914689a9c8d598490f3ea19feb072a94c1337d9ecfd50d9cddebfabcfb1bf1e5b795e8fd0841bc21498d5b71a5a13eba7d
+EBUILD newsyslog-1.1.0.81-r1.ebuild 1015 BLAKE2B 7f13bb3d0d874fc25caf54525ae61ae8fa8f8f3fb3a983b47aca9e1be9ce6c14a4a46bd96f83f8def19b608bbc360aceb21e33583fb56a0d00bfa9dd9a9a1eb9 SHA512 35f7c120a7c9c4bcee5e8cd98021735a2e8c839534a62fbda9ac9184537e493f4e66ef3dd10d29d8853ab2061f061815a0b7a1537d97eaac14bd5e83b35bb49c
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch b/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch
new file mode 100644
index 000000000000..b63e439064ee
--- /dev/null
+++ b/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/707452
+--- a/sig2str.c
++++ b/sig2str.c
+@@ -63,7 +63,7 @@ extern const unsigned int sys_nsigname;	/* also from sys_signame.c */
+ #endif
+ 
+ #if !defined(SYS_SIGNAME_DECLARED)
+-const char *const sys_signame[];	/* defined in sys_signame.c */
++extern const char *const sys_signame[];	/* defined in sys_signame.c */
+ #endif
+ 
+ #if !defined(HAVE_DECL_SIG2STR)
+--- a/str2sig.c
++++ b/str2sig.c
+@@ -29,7 +29,7 @@ static const char rcsid[] =
+ #include "newsyslog.h"		/* generic portability definitions */
+ 
+ #if !defined(SYS_SIGNAME_DECLARED)
+-const char *const sys_signame[];		/* defined in signame.c */
++extern const char *const sys_signame[];		/* defined in signame.c */
+ #endif
+ 
+ /* NetBSD gained sys_nsig sometime just prior to 1.4 */
+@@ -65,7 +65,7 @@ extern const unsigned int sys_nsigname;	/* also from sys_signame.c */
+ #endif
+ 
+ #if !defined(SYS_SIGNAME_DECLARED)
+-const char *const sys_signame[];	/* defined in sys_signame.c */
++extern const char *const sys_signame[];	/* defined in sys_signame.c */
+ #endif
+ 
+ #if !defined(HAVE_DECL_STR2SIG)
+--- a/sys_signame.c
++++ b/sys_signame.c
+@@ -22,7 +22,7 @@
+ #include "config.h"
+ #include <sys/types.h>
+ 
+-const char *const sys_signame[] = {
++extern const char *const sys_signame[] = {
+ /*  0 */ "Signal 0",	/* Fake value for zero */
+ /*  1 */ "HUP",		/* Control TTY hangup */
+ /*  2 */ "INT",		/* Control TTY interrupt */
diff --git a/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch b/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch
index 873cfc10991a..1e2b07019f35 100644
--- a/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch
+++ b/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch
@@ -1,5 +1,5 @@
---- a/Makefile.in	2018-06-24 14:36:18.647850208 +0000
-+++ b/Makefile.in	2018-06-24 14:37:50.216321235 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -763,7 +763,7 @@
  
  .8.8.html:
diff --git a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
index 9b51143e7783..3fb7cf3ec3a6 100644
--- a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
@@ -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
 
 EAPI=7
@@ -11,28 +11,28 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-DEPEND="
-	sys-apps/groff"
-
+BDEPEND="sys-apps/groff"
 RDEPEND="
 	virtual/cron
 	app-arch/gzip"
 
-PATCHES=( "${FILESDIR}/${P}-html.patch" )
-
-DOCS=( newsyslog.conf AUTHORS ChangeLog INSTALL NEWS ToDo )
+PATCHES=(
+	"${FILESDIR}"/${P}-html.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_configure() {
-	local myconf="--with-syslogd_pid=/var/run/syslog.pid"
-
+	local myconf=(
+		--with-gzip
+		--with-newsyslog_conf="${EPREFIX}"/etc/newsyslog.conf
+	)
 	if has_version 'app-admin/syslog-ng'; then
-		myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
+		myconf+=( --with-syslogd_pid="${EPREFIX}"/var/run/syslog-ng.pid )
+	else
+		myconf+=( --with-syslogd_pid="${EPREFIX}"/var/run/syslog.pid )
 	fi
 
-	econf \
-		--with-gzip \
-		--with-newsyslog_conf=/etc/newsyslog.conf \
-		${myconf}
+	econf "${myconf[@]}"
 }
 
 src_install() {
@@ -40,5 +40,7 @@ src_install() {
 		DESTDIR="${D}" \
 		catmandir="${T}"/dont-install \
 		install
+
 	einstalldocs
+	dodoc newsyslog.conf ToDo
 }
diff --git a/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild b/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild
deleted file mode 100644
index a52dcc25d1f2..000000000000
--- a/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="a highly configurable program for managing and archiving log files"
-HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
-SRC_URI="http://download.openpkg.org/components/cache/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="sys-apps/groff"
-
-RDEPEND="
-	virtual/cron
-	app-arch/gzip"
-
-PATCHES=( "${FILESDIR}/${P}-html.patch" )
-
-DOCS=( newsyslog.conf AUTHORS ChangeLog INSTALL NEWS ToDo )
-
-src_configure() {
-	local myconf="--with-syslogd_pid=/var/run/syslog.pid"
-
-	has_version 'app-admin/syslog-ng' \
-	    && myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
-
-	econf \
-	    --with-gzip \
-	    --with-newsyslog_conf=/etc/newsyslog.conf \
-	    ${myconf}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		catmandir="${T}"/dont-install \
-		install
-	einstalldocs
-}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index a1c9d8bd4b3a..c011cb8d3e1c 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -29,5 +29,5 @@ DIST salt-3002.2.tar.gz 15765855 BLAKE2B b26895ababc8551e01baa806c5a0e41dab9a379
 EBUILD salt-3000.5.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
 EBUILD salt-3000.6.ebuild 6377 BLAKE2B 39cb9ce06b9eed29d75ae8747f780221487565da34475b35659f4f5208910216016a02b1cfd52fe5df7662df20e2741f0028c67f3114b2d8d5833a7bca962b88 SHA512 24ce6c7b9364cb3824c218c8bad4fcc6c103767599e3b0c054391cc908ffc81aacc586039de3855bb5f862fe572971fede0890d79ad755e5bf9c9eaea5edb84d
 EBUILD salt-3001.4-r1.ebuild 6113 BLAKE2B bf84779e65c8f2017fa00c1f0eebd46d6e4030baa8fab11146000ce9ddc7e07a37d3d69f968b8daadce286cdc26cdcec16cf7a8e10240f5ee105ebaa5053074e SHA512 acfba7757f991cc6d4478c5095f53117878cb57d747eed2c4805dccc40aa8d3f5f5cc1c0a98402403ab649ea3cb77a8562456fccea96c7580ca7b34aa625c200
-EBUILD salt-3002.2-r2.ebuild 6144 BLAKE2B d0bdfaeae1c54561c8fbb321f6d2b0aa8faf6b24b46b16c0e1a11142e9f9fc5b67c92d83f0e47dfa5047e79b2e4237ee8bd4591af4f451e58e2cc5ddcf929e2e SHA512 9a616f989ed3d6ab1e7649541021c40e8f43e470ed23dbcfe43df44abe5b6331ad456cf7c4be49696b0c2e1135db5491ca4ea3aa2a5cb7577087b24da2d21d3b
+EBUILD salt-3002.2-r2.ebuild 6149 BLAKE2B 52ba5031eb9949451ab830f29df925cdcd0c140c8c3a68e5f84d9ae66697f8f63306ae3bf61e61ba2510fc305c9e912c258cad030ae49afe01594273153cbb4a SHA512 81cbde2f580d885e2483d31ddfb1336ad58140946057565a5115c718e41c7d66c051af9a02d8931a559f71755e627ce95d226f64c5f8054759304a58f873be68
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/salt-3002.2-r2.ebuild b/app-admin/salt/salt-3002.2-r2.ebuild
index 874b6a32b088..87ea8af89658 100644
--- a/app-admin/salt/salt-3002.2-r2.ebuild
+++ b/app-admin/salt/salt-3002.2-r2.ebuild
@@ -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
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index dfe57c5cde53..08026a19632d 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,4 @@
-DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
-DIST sudo-1.9.4p2.tar.gz 3994184 BLAKE2B 110562792fa3d6f3f30fb0f07eefca975f062d41743fb84a34c27bf4c72296aa5f581de1f74895deedd6b47cb235399c52b9d3d818d274c6cdc61c741a0a287e SHA512 5258531d3dca0e812df5f4f8f26665f643c036d42534e3b98f5dd463624e9df0bba2a92c15da0c9958bda7e68f6f10b7b34875792ac9c205d1e70a12bc4f98a4
-DIST sudo-1.9.5p1.tar.gz 4008926 BLAKE2B f033a0dcea98d5b038ee310e76cb9f532abc3aa33880e4f606cb9463d5daf231c7697670c68b2829e3f33f687280c15e026ae700dec527a380e26d6e20fc1171 SHA512 0168f0b61a6c2d2f60a92b5b4d3c3254aed4116decabac3821d9ac2fd7f74bb7b019e35bb8955335315b3b00ddf4e4acd82540df0addc1d9bf4f44b60447a878
-EBUILD sudo-1.9.3_p1-r1.ebuild 6916 BLAKE2B 7971f99a528bb408bd705ee2b0af05d9d7e0ca877e8b86e018a2fdbf02fb973acb96d0ef37263a9bbec48703b1876fcee88b412079405355a415e215c2dfc170 SHA512 00db052adb9cb6a8c7e102fd3799eb716ba8aace160479d8d1ea7019aa128acbad78c375ec5c7be8fee5d5877eec89f4495c50d903797c0e03edf521fded780e
-EBUILD sudo-1.9.4_p2-r1.ebuild 6925 BLAKE2B ea6d177936e545b1a5e3cd5664d2ca9769abf94b723083c8c47f39196429e1246bc6b9816994179f8d062a60cba32a0a49512512b25f4359c5c20aa54ec90f74 SHA512 f893ec6ec6f246516cf29094b0100fbd5c596c687f80bbbd51d5af8dd07123d9cf7aa2426a70d11b470770fb9026a2f65902b8dcfaeb9285804107aa51543961
-EBUILD sudo-1.9.5_p1-r1.ebuild 6916 BLAKE2B 741f4ea11be3cee340892ee3edb12ed740ffba476d3cc0ddd0b3114de4a162016e060c411d8e805a898c43a745a7f0865235f1fe545419ef6e4896270925acc3 SHA512 dc90fa2a229941b9a15dacc00f180f6f2432d36f4ef8526a8d333b274c54817e5fede90d6342b4e05a1e7a9163d84da9897e88e67738910640f0c598c5ac0ced
-EBUILD sudo-9999.ebuild 6925 BLAKE2B ea6d177936e545b1a5e3cd5664d2ca9769abf94b723083c8c47f39196429e1246bc6b9816994179f8d062a60cba32a0a49512512b25f4359c5c20aa54ec90f74 SHA512 f893ec6ec6f246516cf29094b0100fbd5c596c687f80bbbd51d5af8dd07123d9cf7aa2426a70d11b470770fb9026a2f65902b8dcfaeb9285804107aa51543961
+DIST sudo-1.9.5p2.tar.gz 4012277 BLAKE2B 41913887463e4f775564af8d614fb5ed762200aa777dc789ec333842d4f432323474fc952a531fe929b33607cdfbcd18d7fe7470a15d67139deaf855841ed11f SHA512 f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27
+EBUILD sudo-1.9.5_p2.ebuild 6961 BLAKE2B 5ded595af2faca014481f9ac34b4a55f83b897ea0dc7e69224a0bc11e5f108541e67e16f06b5a6ed0eb2f3d58664cd54c79399b95916c4f88540551135ba4fe4 SHA512 3d5a7cb85f03eac8ee370829a73701e7198a04d9c60a6b81f48055c3b65c42a8e34cb257bc0b7e342db0874eddb287e97414b37b8a8cb172e1535f0f380f3674
+EBUILD sudo-9999.ebuild 6971 BLAKE2B 88d262cb3f43386a08851576ba2f3d1f057e8249e206e5008b50c8a05fb5e5a9f0f6ee4b127b801920bae6c89c0af678c0f88a5e1af2746e80c2ec8aa63b9334 SHA512 fe4a0b610929cd352cafab8e56bf6c6a1d34f6c7803bd617b8b8acc99fc940f6fdb4eab04a34adea5fe5113d5a0e824644c3df681ba00585294329d7664565db
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild b/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild
deleted file mode 100644
index 97dbed1a0209..000000000000
--- a/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam multilib libtool systemd tmpfiles
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	if use pam; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild
deleted file mode 100644
index ae5daa1d0fd8..000000000000
--- a/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam multilib libtool systemd tmpfiles
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-	if use pam; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.3_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.5_p2.ebuild
index b85357b30b3c..183dd7b6ece8 100644
--- a/app-admin/sudo/sudo-1.9.3_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pam multilib libtool systemd tmpfiles
+inherit pam multilib libtool systemd tmpfiles toolchain-funcs
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -129,6 +129,7 @@ set_secure_path() {
 src_configure() {
 	local SECURE_PATH
 	set_secure_path
+	tc-export PKG_CONFIG #767712
 
 	# audit: somebody got to explain me how I can test this before I
 	# enable it.. - Diego
@@ -197,7 +198,6 @@ src_install() {
 		insinto /etc/openldap/schema
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
-
 	if use pam; then
 		pamd_mimic system-auth sudo auth account session
 		pamd_mimic system-auth sudo-i auth account session
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 97dbed1a0209..ffa8c7c9bf97 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pam multilib libtool systemd tmpfiles
+inherit pam multilib libtool systemd tmpfiles toolchain-funcs
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -129,6 +129,7 @@ set_secure_path() {
 src_configure() {
 	local SECURE_PATH
 	set_secure_path
+	tc-export PKG_CONFIG #767712
 
 	# audit: somebody got to explain me how I can test this before I
 	# enable it.. - Diego
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 70f605865223..b494b8b33831 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,5 @@
 DIST system-config-printer-1.5.13.tar.xz 974532 BLAKE2B 44e748d2fc20edefe58e1c8dd3781aff28af93e57356a9969e051813bf4f04f72c4e895b587e86614df6fb4984a4d610e8e1a1e17777801ae8912b6904679c72 SHA512 f4fbc1b20b35aa5b33bafdffc8a7490cc3c55e0b33bd9e925f1d3e01532c0a7bb87f80a04dd6da6fc492edd9fea74bacb0ce16ff64ceac622722fe1f9a77a6b7
 DIST system-config-printer-1.5.15.tar.xz 1005764 BLAKE2B 4919c555444829505b09b658ce0fd016ba235260f8c8b4db751e6a511afba5d5975e5f9570f5fe74fc35d158bbf2dd3ece99aa568ec1bb850096e5f12f0fc0b0 SHA512 b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e
 EBUILD system-config-printer-1.5.13.ebuild 1942 BLAKE2B 26bd1079a01eebc8f49335d5756f310471b686bfe8966d5b993040c0636d6eaafee272eb8da305b07df0a8880e1db4899fdb61f9cd929ff1c829dc1e07c667f3 SHA512 e25caad24daf23975975b52bf2ea241e06b462573dd0e2129cebb9de467c94e035e5f3e64914d68123d0da8f40276071d9600888992b57ad9b316556a2bf1ab3
-EBUILD system-config-printer-1.5.15.ebuild 1947 BLAKE2B 2d6401f250725a79d029a10b73e08721c37904f2a7a015b8970d00e22a6631607dc06c3b6a186f2145aca6535a474879c5fd9426b91af68e6fcdc79fb215b1e5 SHA512 b7e9155c46dfd20c548cca7538e72aee51214124540d2996c41ea2b770f93418ea5cef87e6cc6ef748ab3cce5e167d7f33a88426e90d05d119d914e30e4cef4e
+EBUILD system-config-printer-1.5.15.ebuild 1943 BLAKE2B fb4b08219ad0a2bdc3efbf2428f27166463e01b54fd02df366e57f18a8518ae7d9ec60cbe95c4f8f8ef104f769c29610a4ec033c5b003c50984acc238c5f6588 SHA512 b8a374a81f1655394a3030dc8752229ac793cc2e86277920efa6a4c4dab2db33fc439b07b59100ed3b4f49ce6cb7029d4eaad8c71d927039ee88d138c4172615
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
index 2ea09c424a65..f5645ce026a8 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="gnome-keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/undertaker-scripts/Manifest b/app-admin/undertaker-scripts/Manifest
new file mode 100644
index 000000000000..89b6bd5c58ee
--- /dev/null
+++ b/app-admin/undertaker-scripts/Manifest
@@ -0,0 +1,3 @@
+DIST undertaker-scripts-1.tar.gz 6608 BLAKE2B 82aaf4395f480b2ac7194c9d0022a1001e0f6e3fd137db030bac8d0d0fa80e7f51a086dbdc611c6698a765b467178d9c85518947fd26cc062904142babec3d72 SHA512 a946e669628f1dba4ff6846fa79a5eb1ea44cf19b3ec2d5d24d6792f0d621e262514d346379be88c1abc529373e0cfadb83eed9ba1cd4d4e2f73a078fc20fe04
+EBUILD undertaker-scripts-1.ebuild 794 BLAKE2B f98f61b0ed84b6e51c528269c047170fc402dfe62b8860dcb26dcace0d43ae7ee925e4841da1330cb30fd40a853623fd0b9711efc97a3f8ea7b8a77628e458f7 SHA512 f828caf7856e5d7315986496c608a590cc895e0064c9ab1f35b62f7dc78b90b17934b09283ea3edac4b2fab0d1f2ee14f64275118bdf1676e8fc4b17e7d01207
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-admin/undertaker-scripts/metadata.xml b/app-admin/undertaker-scripts/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-admin/undertaker-scripts/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/undertaker-scripts/undertaker-scripts-1.ebuild b/app-admin/undertaker-scripts/undertaker-scripts-1.ebuild
new file mode 100644
index 000000000000..66f7653df73f
--- /dev/null
+++ b/app-admin/undertaker-scripts/undertaker-scripts-1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-single-r1
+
+DESCRIPTION="Scripts to help retiring Gentoo developers"
+HOMEPAGE="https://github.com/mgorny/undertaker-scripts"
+SRC_URI="
+	https://github.com/mgorny/undertaker-scripts/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/python-bugzilla[${PYTHON_USEDEP}]
+	')"
+
+src_compile() {
+	python_fix_shebang .
+}
+
+src_install() {
+	exeinto /opt/undertaker-scripts
+	doexe *.py
+	insinto /opt/undertaker-scripts
+	doins *.template
+}