gentoo resync : 03.11.2019

18 files changed, 164 insertions, 61 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index af7d84c8161c..e7108f397416 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index c9bff7afae28..b667004a108f 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -9,9 +9,9 @@ AUX atd.confd 214 BLAKE2B 73cb9a8efa568f11620029521e93b7a2e424eeb860d462663ea4ea
 AUX atd.rc8 289 BLAKE2B f1ef6e087b1eee30b272a88feeb7f45ec1e4bc78f3c016b48c0ff353e6171a6e73eb3b3e043e5b8500864bab07aa419928a8e0c132bb56f18975b800d51534dc SHA512 a8517b4a754ad096aa72d975b556925c566963657402ffe0c00ed3fbc22a84f6c32917c8d2021e6244339d171352e429d1c360ad6c500de6c60a444e07d006f3
 AUX atd.service 215 BLAKE2B cf87d9dec0b5a24c5c94b41f2c7aae52c369b9f05ea77a09d2853c87c5746b00f0d980559560441e8a1a0a262734bb534987b73802c5e670ee491e8c03f1b280 SHA512 8795fe73ea9837b98732018d6e154797e1d31e4696416c910e4637ffc2c516626fed836d2a0f571a890b55c513f07d69b3c9c8d73d1070c6df88a8e9e1812902
 DIST at_3.1.18.orig.tar.gz 124499 BLAKE2B b7c65d33fea3d3345ec7d1eb82652c787cfa86520bdd8ac0329baad5cd19cf85ffefe695e86480d38833abe131da8e9c2ea8685699bcfe8baafb3e2cfa57502e SHA512 5ec7512663461ffa1922cef0d99c3cc4882defbea7b1ab855b05bb83e9d3817535db73db74413bcc8af005c956032ec3dc7c83ac16fde96bb315094dae654042
-DIST at_3.1.20.orig.tar.gz 127666 BLAKE2B 8fd0350859e59e61c72f6c67c174ce05bb9c6cffa77792ded11be43eb24d6d1cf2f9f32719657b937e5a11ba8eabefa0e94d5254f05ab79a3daa40c30af97bd8 SHA512 20a13512a86f988728f590712f5bf8a23f4dc44f4b42521a4dd4783dc1ba7ac2016ee87b4c2c14f2346a5839168a983d99c3195e947014aea3096a3db16d176f
 DIST at_3.1.23.orig.tar.gz 126284 BLAKE2B b2af9dfa4ed87ee93489b98acae6b7eb005d6db7e2401ec7d4d21353af636b232d57e92e4cd6e81f52115aa9d29fadf440809a9d77cb1eb5d40d42ec7fe640b0 SHA512 ee5cf5abf32cf1e89746e427d1cc20005ef49fad47db55512c90042a77e86b2c15f5de029c79573bc86ce4aead6ed2d561b89812510aadbc5763f9288b467cfd
+DIST at_3.2.1.orig.tar.gz 127577 BLAKE2B 4e8f4aa889075dcede894062b2926afd7892ef15d4ca5bf855b699d1dab9f49a56fd5bd8da376b178032e70cdef72eba2a7d9d6da577982773351633ce85d003 SHA512 8109b2acf220ffc14ea78e7d5671507e8cad41a163c1d7f96de18aae05c8617071c6306e04446450190f492a65ca31f51ed040fba5719b67625a58f738fc9c9e
 EBUILD at-3.1.18-r1.ebuild 2311 BLAKE2B 0377b205ee39bd6c41044c8270b68e4650b4fba2e5417a33b3992d7c14723b7326347ab557bdea6835e3f4240bfc0478b84dc7ea4b0c237d00dce880201a2a8f SHA512 251e4fbf8bec2735fba9afeb4f6d228b1f7fb1583cda93b897228bc94af39760cd6d4b18a2dbd7cc33f43b3c31737f429094193e1329d1d81edb5917b284d259
-EBUILD at-3.1.20.ebuild 2306 BLAKE2B c83393c117b6491e1bd524a7cd55a5669463ba14cf93492bfee748aeedf2b9389aa4bb578a45afcc4ec7916c40dc5102c97fb3ace25c2c4c88f65943955b6b8a SHA512 3f6af273f54c48f81061fc80a61d4e1c34d2a88b32ade2d1e9bade5268d6649b39335bf60b72540c1f867701f4df3f8122d8a8e8b18d6cc1a732f7a263773c5e
-EBUILD at-3.1.23.ebuild 2334 BLAKE2B 5e3304773546326ac46e8444308b8cce904c2dd6750427d1ea0f5996733c4c23687489e450d34516af200b52cd933d55af97a837247fd06b711070d5deca57a9 SHA512 925ae1a5377f82d731382dc9e60d90bffd2950311bfb9374e5238d23ec5c4eab0e4de45c419c000f05cb17beafe53592f199a43a71a428c37a9703ce894a4e8e
+EBUILD at-3.1.23.ebuild 2328 BLAKE2B 47f529910fd96a7dcdd93a329a44740198ad5b4c27d5867b3a65905adbe0c7aa61f94daf9882bd070f9752280d90acd4245756756397bcbad10edaf0c58c159c SHA512 c82e01f7e3e14c1c2667241cac291172531832630e8206319db589e8ec7db4008a135775d13617ef9f9f54afbed48d8a9ae9490d87bd41503b55f1fc58909529
+EBUILD at-3.2.1.ebuild 2485 BLAKE2B 3ed0e725e117229d5a54179ff3766baedcde6cc93542a364aef2a3b7f7d557c8366b74e02eaf74489b49ff2cffae70b3736bf7a1ffce2ae23ea4f564e2689c60 SHA512 f5556b86e3ebba67decc01b7f7c0d5a40592ee3a5bda409c1960909416b28b9a1d38dbc0e3e9d11259e8db1a08a994505d3ab0c9ebe8376d714dd48604e15e63
 MISC metadata.xml 364 BLAKE2B d51cc643a5646e05725088bafb99711097593b9c7e6c78207dd6668c8c4c2830964dcceb5c66cb60b8cde463ad14e968c4d2950326e86c931e84199a3efb909a SHA512 5c5d603a57b16255de5c049c237206242c440c61ee03237b85f7909e434f877fe84082f2989d6b70646c106a4b97ef380f6fbc87ead1fbca0a3886c38d65c57d
diff --git a/sys-process/at/at-3.1.23.ebuild b/sys-process/at/at-3.1.23.ebuild
index b432dbc4887a..891620a37493 100644
--- a/sys-process/at/at-3.1.23.ebuild
+++ b/sys-process/at/at-3.1.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam selinux"
 
 DEPEND="virtual/mta
diff --git a/sys-process/at/at-3.1.20.ebuild b/sys-process/at/at-3.2.1.ebuild
index 81f677ecf7ae..21c91df88bfa 100644
--- a/sys-process/at/at-3.1.20.ebuild
+++ b/sys-process/at/at-3.2.1.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils flag-o-matic pam user systemd
 
+MY_P="${PN}_${PV}"
+
 DESCRIPTION="Queues jobs for later execution"
-HOMEPAGE="https://packages.qa.debian.org/a/at.html"
-SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="http://blog.calhariz.com/tag/at https://packages.qa.debian.org/a/at.html"
+SRC_URI="http://software.calhariz.com/at/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/a/at/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -35,6 +38,7 @@ PATCHES=(
 )
 
 pkg_setup() {
+	# Cannot be moved into pkg_preinst!
 	enewgroup at 25
 	enewuser at 25 -1 /var/spool/at/atjobs at
 }
@@ -45,17 +49,17 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=()
-	use pam || my_conf+=( --without-pam )
-	use selinux && my_conf+=( --with-selinux )
-	econf \
-		--sysconfdir=/etc/at \
-		--with-jobdir=/var/spool/at/atjobs \
-		--with-atspool=/var/spool/at/atspool \
-		--with-etcdir=/etc/at \
-		--with-daemon_username=at \
-		--with-daemon_groupname=at \
-		${my_conf[@]}
+	local my_conf=(
+		--sysconfdir="${EPREFIX}"/etc/at
+		--with-jobdir="${EPREFIX}"/var/spool/at/atjobs
+		--with-atspool="${EPREFIX}"/var/spool/at/atspool
+		--with-etcdir="${EPREFIX}"/etc/at
+		--with-daemon_username=at
+		--with-daemon_groupname=at
+		$(usex pam '' --without-pam)
+		$(use_with selinux)
+	)
+	econf ${my_conf[@]}
 }
 
 src_install() {
@@ -66,18 +70,19 @@ src_install() {
 	newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
 
 	# Preserve existing .SEQ files (bug #386625)
-	local seq_file="${ROOT}/var/spool/at/atjobs/.SEQ"
-	if [ -f "${seq_file}" ] ; then
+	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
+	if [[ -f "${seq_file}" ]] ; then
 		einfo "Preserving existing .SEQ file (bug #386625)."
-		cp -p "${seq_file}" "${D}"/var/spool/at/atjobs/ || die
+		cp -p "${seq_file}" "${ED}"/var/spool/at/atjobs/ || die
 	fi
 
 	systemd_dounit "${FILESDIR}/atd.service"
+	keepdir /var/spool/at/atspool
 }
 
 pkg_postinst() {
 	einfo "Forcing correct permissions on /var/spool/at"
-	local atspooldir="${ROOT}/var/spool/at"
+	local atspooldir="${EROOT}/var/spool/at"
 	chown at:at "${atspooldir}/atjobs"
 	chmod 1770  "${atspooldir}/atjobs"
 	chown at:at "${atspooldir}/atjobs/.SEQ"
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 7649d5413f0f..2584d8458391 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -12,4 +12,4 @@ DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c0
 EBUILD criu-3.11.ebuild 2916 BLAKE2B e25e06379c1056adf33c0172f59bbc335fc0dc4b3b3a170e9a8fd2c3119b8a33911b987205743af750db106d409ac4d6cfd1c800e62743168e3c75c37b27d28d SHA512 f3844e81b27675fb686445f3cf6809d9ba7b6586064d448f39d51b5206e49bbb18597f9d2faa8238022480eaabe1c7f8b5467a8ece6753f4953b241c937ba4b0
 EBUILD criu-3.12.ebuild 2874 BLAKE2B 368f7827df6885d59dd84d11378867bdc4dd4d82647c2cb04bbf687958260c98c06fd45d23eb9f8ce0f8b7cffa82ab2107209adf220a3f4c446510295b2fa3e5 SHA512 bea1cdca4ff07ff1e6c22ab95f5eac4607f6d3a6531150f35ada3d448fd6969b4ee404bf75281cd3f852c38c63d38d83b27377406ddc1e6819978debe9144597
 EBUILD criu-3.6.ebuild 2546 BLAKE2B 1fac46e62a8a92a88cf840d6a15b0790ea539a5755ac0361211c091985570cc4d65d4b6b1d44ee6fb186d94a03f0dda66d4fde0ede4913854cabaec1ee0819d1 SHA512 5fb0da6796b5bfff9c5ce22cc0b68196111b67528d4d6aa821ea3c18d323caf3252138cc26e97c3cf6021b2d3f21ca1db070d40fd40e4b58f6799b22d638af77
-MISC metadata.xml 480 BLAKE2B 55ce3f89b53789b3ed3e9a19fd4dbf3184941572269b3ef489c3cbbef8bac8a3aac58ea84887ac0c99919797e74c289ffaa617fc8370f936c9c34c27b976ace1 SHA512 0a108eed5d8cdb1818b9c497377b3a83b282354c9402f1ee6473df4eca6ab75f508b3faba55a88007ca225238ac0c00fa1c0d845fdd4c98556f1c03b6f33a764
+MISC metadata.xml 379 BLAKE2B dab824549f773238cce7faf9e016b1b49c6215902f8d59c6518067874b80a4eb922c5e57e2db1815b1d761ab299c93b269b8f6628d3fc8e83ccf85c66e26f530 SHA512 d0dfe8190ed96ba069d4e932fa599752803a9560d62425cd1275cec6c309b88ce14218d7be0ff6e841c052228a421070abc9ffd5a66cb9dd59dbb80e920b95df
diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index 1a679807e0a8..cba283f8ff96 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 08be8e56ea22..1f94669cde3d 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -2,7 +2,9 @@ AUX cronie-1.2-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a75d78
 AUX cronie-1.3-initd 274 BLAKE2B 11ea62f09ca1263b9daecfcccc422d4ce28c200e03a1edbae91db9cae770910490a5c34f0f3e8a6a7ccc677aca6c555450fd9b2e7ec7aade163552f5613cbbd8 SHA512 f80a745dd00c62518dff3faff45bc79df97254e275bd5d26a1edc7452c23cebffa1d3eb3cb1767b23f40eae462f9432cca87b5b075a143169e056b38f21e85ae
 AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a
 AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
-AUX cronie-crontab 477 BLAKE2B 3ae5d23fbd5439a314d087f95f7cd469d7c7c617c2d7f2c4b8671b550228906e8e68d539085b260ee52c4b27384d000ba34878f648310b50ba7bf1d6b6ef41e3 SHA512 ee626c83612bc143c5a1ba816c8147751ce519d0bd0de6adc2132b930872259ae4ecdcd465563ebce43d5fa913ab5e52a36392ae7933a71b3ebcdab840742ebb
+AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
 DIST cronie-1.5.4.tar.gz 122452 BLAKE2B 042961390807c22aa1db3ab592470538d9a348d33fee8f088dfa20e45ee72c72d9502bf5eb5a957494c55d99a6705b94774442f5a2fb06eeab1aa0b0e1a4d6ae SHA512 40a8cd750bc18dcb264e88cf049b0ea66f053b7b6cc10f38fd4f4e6b912871f41ce7ad126521a08203e81c00846e001016b47da3c5e8730a7b49fc970d7b2a6a
-EBUILD cronie-1.5.4.ebuild 2431 BLAKE2B cdaab32822e96c8ce04c3628db23ebe20be0007cf80577e9a342ea97a0ae0806c3c56f775132222ff6e3e65d8d16bcec86841ce77cd1f1ab27cf028b18e6e712 SHA512 70e5a1af10c6436005a5e2c066050428126d155a49e7b7a67cd35097158db99816fcb9fc612f15dc1456c1bc34e7c132504440530f8f00bf04e959bde3dc5c74
+DIST cronie-1.5.5.tar.gz 124642 BLAKE2B 19bb690a2ae66b9b99dcd0536c115fbdf46c0f1c58922e08fb31d9789df3358438001bd4b6b55d16e99e3927364c618ac22cb04661db1245d09709fcb58eef1e SHA512 88b0e877e5b36a0063b37a6ce82133117c95ebd4435ce843e09c6247ac50f36c66503b850aafa75512fab07d46a110ddfdf52e7e984638ed794588e338547166
+EBUILD cronie-1.5.4-r1.ebuild 2420 BLAKE2B 9a2e02ecc5ebe89e87171fe77531a7bf09e290f5add13eebd7ae6825e6fe7250ff74302a22f28edbe515e508430034b729600078a304a02eed9f239008b3d469 SHA512 e673663b3492cb24600698d44b9136e103562a058e9cae221655fed079b825e82147aedd3ed54835f894cea700f59ea91fdda7081ea5aab5aa7e5a58b326d781
+EBUILD cronie-1.5.5.ebuild 2430 BLAKE2B 548c1b190bfbe68939a31e7f96543dd1dea0f34eb0de3e91cfabf269a54024f22b0ad5c09e9ee503b4336a0b03e8302d681771a9fa7763e0acddb9a7a4cd51f7 SHA512 864e2da7d72362d51e1ea881a750c4953d93377a3a308f05d5b457363a0b11e078236d5cfdf9b134486a1a567ddc367e5eb0b392eb809f02f608daaaca47b174
 MISC metadata.xml 891 BLAKE2B fe26178ef61d59391ea0ec3817c37bf3ca71b196ceb070244099a7cb1a34110c5c0d0903b682d08f1afc69ed2fd9a18aa9aaee21d61e22f388625dfa7a63a908 SHA512 91d9c91d6997261d59cff08c5c2724476d6709993debf0dbcf4abb38d2c99fe301e7d64ed759fd660e9774e81a8fb51e147a0a194ebe733ed6f9c80940ea7658
diff --git a/sys-process/cronie/cronie-1.5.4.ebuild b/sys-process/cronie/cronie-1.5.4-r1.ebuild
index 82d3f8f131aa..29ca8c72c0c9 100644
--- a/sys-process/cronie/cronie-1.5.4.ebuild
+++ b/sys-process/cronie/cronie-1.5.4-r1.ebuild
@@ -19,8 +19,7 @@ DEPEND="
 		elibc_musl? ( sys-libs/obstack-standalone )
 	)
 "
-RDEPEND="${DEPEND}"
-BDEPEND="
+RDEPEND="${DEPEND}
 	sys-apps/debianutils
 "
 
diff --git a/sys-process/cronie/cronie-1.5.5.ebuild b/sys-process/cronie/cronie-1.5.5.ebuild
new file mode 100644
index 000000000000..33cb53bf2828
--- /dev/null
+++ b/sys-process/cronie/cronie-1.5.5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools cron flag-o-matic pam systemd user
+
+DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
+HOMEPAGE="https://github.com/cronie-crond/cronie"
+SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="+anacron +inotify pam selinux"
+
+DEPEND="
+	pam? ( sys-libs/pam )
+	anacron? ( !sys-process/anacron
+		elibc_musl? ( sys-libs/obstack-standalone )
+	)
+"
+RDEPEND="${DEPEND}
+	sys-apps/debianutils
+"
+
+#cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
+)
+
+pkg_setup() {
+	enewgroup crontab
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with inotify)
+		$(use_with pam)
+		$(use_with selinux)
+		$(use_enable anacron)
+		--enable-syscrontab
+		--with-daemon_username=cron
+		--with-daemon_groupname=cron
+	)
+
+	if use anacron; then
+		use elibc_musl && append-cflags "-lobstack"
+	fi
+	SPOOL_DIR="/var/spool/cron/crontabs" \
+	ANACRON_SPOOL_DIR="/var/spool/anacron" \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docrondir -m 1730 -o root -g crontab
+	fowners root:crontab /usr/bin/crontab
+	fperms 2751 /usr/bin/crontab
+
+	newconfd "${S}"/crond.sysconfig ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}-crontab" crontab
+	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
+
+	insinto /etc/cron.d
+	doins contrib/0hourly
+
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
+	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
+
+	systemd_newunit contrib/cronie.systemd cronie.service
+
+	if use anacron ; then
+		local anacrondir="/var/spool/anacron"
+		keepdir ${anacrondir}
+		fowners root:cron ${anacrondir}
+		fperms 0750 ${anacrondir}
+
+		insinto /etc
+		doins contrib/anacrontab
+
+		insinto /etc/cron.hourly
+		doins contrib/0anacron
+		fperms 0750 /etc/cron.hourly/0anacron
+	else
+		insinto /etc/cron.d
+		doins contrib/dailyjobs
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	cron_pkg_postinst
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
+		ewarn "or ${PN} not working reliably anymore."
+		einfo "(see https://bugs.gentoo.org/557406 for details.)"
+	fi
+}
diff --git a/sys-process/cronie/files/cronie-crontab b/sys-process/cronie/files/cronie-crontab
index 275f06c603d4..89ac6315c795 100644
--- a/sys-process/cronie/files/cronie-crontab
+++ b/sys-process/cronie/files/cronie-crontab
@@ -4,7 +4,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 MAILTO=root
 HOME=/
 
-# For details see man 4 crontabs
+# For details see man 5 crontab
 
 # Example of job definition:
 # .---------------- minute (0 - 59)
diff --git a/sys-process/dcron/Manifest b/sys-process/dcron/Manifest
index 48e466885c74..2d84871e5324 100644
--- a/sys-process/dcron/Manifest
+++ b/sys-process/dcron/Manifest
@@ -6,5 +6,5 @@ AUX dcron.init 449 BLAKE2B 2c2ff6e7e39282dd17b9d64705a96aebfda589f7276b0047c5ebb
 AUX dcron.service 151 BLAKE2B b8e3fa583592f6a3719356ed4d7b7429ba0cfaec2a6398af398df3a3b959b74659b6b89b7899c1bfb1c9ce048c00be6790aae650a88b5cfb5cc7ea51020e9fce SHA512 7249396786f5fc3b52981d0344c52bd56151d8ead161111a90a5b30c2985a39486aea3e263a6ddbefcb53d88a67277038bd88cc6480ce3d788093bac16835d1c
 DIST dcron-4.5.tar.gz 44978 BLAKE2B c77cea026b074eed11200bb335cc2f58f7346410f88ae50685db137583beddab14e50394233b8e0f27ae7e3bf30c7875b539db84c32236f78f52bf91862b3272 SHA512 08521391d16ba5adf80278ec2a734319c26c48841fd94b119c0b27d744c2cfb3562b1a3630135a03d1c43b1668d49262713abb20ff5f7ecd397a2a19a2f6105a
 EBUILD dcron-4.5-r1.ebuild 1150 BLAKE2B 95d02f72bece8da3b0b693622e259876c6044a2719c578f9f6687c07711581632aab686b9e8adf6a982223cd16b47e72e11edbfc18b8243e3e89d2d6d4ef0a44 SHA512 b1c9e815fc98048e4a362d39b9165abcf5dbf4c38fc8c5fea91493c024e61af9535cd985176d0d9c1c5a9273ea22d4048d3d2d760023ca04d5f1e7f39713fbfe
-EBUILD dcron-4.5-r2.ebuild 1171 BLAKE2B 4c771b30ba7b458d20c4b712628a56d4017bf69d45430c824181265e3a9d9c569025b834c3fef38e85e8e53eed15a1d209fb4610c8544cd007dcdbcdd0596ac6 SHA512 2806c3a0234763cf9b94923e6c884ff39d4828cd9ce2385545fb9618b366b8beceacca64915fb1f87f9410706ca11f3859e55e86d7c65a368784809e9a4a0a22
+EBUILD dcron-4.5-r2.ebuild 1158 BLAKE2B af116dde7f620f1140d412473114440ce7990dd92add2024a057dcef9ffecac631e1e90127e13f91dabdb721c41e6107172df48bf31b943f653e80fa0a6af5ee SHA512 6b144f9d6ffb66739d369041a94fe86f567da1e61d27acc644e53f870160510f42361f1742a549a48a6bfae36bed093d03e32cf8cb24a9d0b8bf09dad8738824
 MISC metadata.xml 646 BLAKE2B 5f14f2604db704722425788bfffc6416afd2abd34b019cc8596dcbcb575e3e4d0aac99ed0310a7fc8bf384db80116f8fd80d8177c0f6b79b9ab96394548bb473 SHA512 4a4fdf29b18fba800638c08f29bfec7afe0976a2c0e9c554c55c2f713e12e5aff509d0472387b782b7444fa951985d1af9a44779bab3cffb66645a3877deb44e
diff --git a/sys-process/dcron/dcron-4.5-r2.ebuild b/sys-process/dcron/dcron-4.5-r2.ebuild
index e0d83c3e1c1b..7a1d340cff82 100644
--- a/sys-process/dcron/dcron-4.5-r2.ebuild
+++ b/sys-process/dcron/dcron-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ DESCRIPTION="A cute little cron from Matt Dillon"
 HOMEPAGE="http://www.jimpryor.net/linux/dcron.html http://apollo.backplane.com/FreeSrc/"
 SRC_URI="http://www.jimpryor.net/linux/releases/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 961ab6c7fcb3..22f52f2b8d5f 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,6 +1,6 @@
 AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
-EBUILD htop-2.2.0.ebuild 1438 BLAKE2B 59f56c30fd3d89080160f141b183bbba94983fa41cdde930352fae56108e917dfd5e5b1729e141da3afc0d36943b32f8e601b9efa433ad4ebd4e1e4be95299d0 SHA512 879fda36ea2a0e92a7764156b5b4ed97a735fbc61037eff527783981d16bcfc14a1b6ce8dde23964026e91d2b36af841cf7e4f2bad7afbf696dca8dc3aad2546
-EBUILD htop-3.0.0_beta5.ebuild 1803 BLAKE2B edcbe23d078f45705e827adb20d1636b6e8ec4e819741eea686aa2699e2e74a5455857a0d577c6c563ab76f71373d90f74bb2e2ac7a0ae0bad581a00fbde3bdc SHA512 5a51789009aa2e3e8689c0825a0a819a8237ba357b3abae2adb4d91876f1495789c93818ba80be6d345a8bd4ce0008e4ae0a43acfa14f0f36111ec5f60b24abb
+EBUILD htop-2.2.0.ebuild 1445 BLAKE2B f9001e1ea35540f5f4ffea518d2e62d59988db9d4ca8d134d3516c6432619417e4d73e4ec085b8db86b070e4a2edcf902e20210a083bbcd40b98dac68c3d0cc8 SHA512 b3f8050b5060d2873952af92efbac2ca4f8a165c2dba76f4cdcb96326448fcababc47671dcc5cd5ad68beb80c560eb9b3a845ca280e7f993c6e9084eff44150c
+EBUILD htop-3.0.0_beta5.ebuild 1810 BLAKE2B 5b2238056ead6339ada69829223f9a47fb1da117f464857d7f86562828a605ed1a5d72a210b05bf658709a400323f99eff4c0c74d6f3df6209023e50e598f2d7 SHA512 0378f564217d33284ef6dba7921bd70d7d5166c0a28062de39c25d3f92ec3d4047f5531a9c84eb39b8b70a8374d3425bb4c924708c21a43966eb267fe57ba408
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index 409f8e533b1b..f8475b10ce6a 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses:0=[unicode?]"
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild
index 21214c0f29d0..70dd81d76717 100644
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_beta* ]] ; then
 	S="${WORKDIR}/${P/_}"
 else
 	SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 0d60aed6941f..2ef1028d55ee 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -2,7 +2,8 @@ AUX psmisc-23.2-killall_check_truncated_16_char.patch 4440 BLAKE2B d04ab70003cb9
 AUX psmisc-23.2-old_comm_len.patch 602 BLAKE2B ebcf12e6debdef6a708594f2193103f41c36babd2b5b6ae2027c17364102fc906bf88cd275e2a9183bde62d94da6106fa2eb36cdc62af4a77ca0623be2cc8d01 SHA512 fea4df7b9cabfc5e02628a7876a032027c738f1515b049caf5ccdc376cc6a64eacd1c232d006ab102c5c5aed9e0b40c3cbd23c9e698312dc853b06abd2809c8a
 DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
 DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990bef66ee779bf44887625719e7342da05137222a6636df7a0e520c39318faba3e7a1022c54fd9f3f172ecc851 SHA512 a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8
+DIST psmisc-23.3.tar.xz 306668 BLAKE2B 871ac8b4cbd12b17f932e0a317ea9af9f0ebe12e1adb012a8cbd19f13cb8bcfb42268f577c39307ab615c42f8fa71b355877938481b04ca092a3f8ab9c80f5a2 SHA512 84e99ecb1d8125cb0adf34a76da21f75ed8498003a27941af0c1315853a95d3a0519d58ed21cc51c32327515670e745778a7eca02125d687498ee8ab1db4d238
 EBUILD psmisc-23.1-r1.ebuild 1273 BLAKE2B 9c98494ae95fa7e7f9ba859b07905f82f7a24757e8b60b1555f0dd6a74514550550bdb8a6aef826f4be48d0e8390d6f536dd13f9fb82fe055efc262d99838863 SHA512 23ea8e69530e30ea5d9fc92060ee0d0f0aa9e52501ec169cb1033e7887aebad73b52a06c996f064c988d11d21574de1279ebd7ee29552991e09c419edbb7d9b1
-EBUILD psmisc-23.2-r1.ebuild 1283 BLAKE2B 33c7b2e180fd3e5a28cbdf69f0428d3197b2fb23aa01225649fc2799f43ad47f18e8be62d2d974e7d4a53e1c97177e49b6702ac2a48c4ce45ec248de03182c24 SHA512 21641e7161b35ddc7a8b3510928cc5b5800a6f660552520171918ee2d889962c759b0421d6001e458ee7451ea30d24f2642cc2a119ef7dfb89044aae55754252
-EBUILD psmisc-23.2-r2.ebuild 1400 BLAKE2B 0c29b984d036e5aafb5f47b4ba0288350df983bf538d522844b5aa4f2fd0df4c370a83f742c11eafe083e07ce1a63c029dc118714b7e7df91706cf42ca515e4a SHA512 2fae25042995cf890c0fecb189fad9d8ffdc6f8687a3f85fb31de33b47391aec212469ed323aa3d4cf5698cb582253d21da292253741928068bb836a4590d1fd
+EBUILD psmisc-23.2-r2.ebuild 1278 BLAKE2B 9b8c173dd9a770d29c9b666d276831a6c1db8307e620570e6dc77f2fcdba6c4ca7bd3fc8688afe994cb2ef1f33fbc56134c627b33139a106568779a13e631d4f SHA512 e4f0112e716350e690416fd58611e62c9ebf58837aabd225e6e038b16fe3d8e2ab1e6d16183b40ac4413046e0e12a553e5fed1e19a71adc413df0f18996aef0a
+EBUILD psmisc-23.3.ebuild 1154 BLAKE2B d10bbd47bd6d8af3077edba5c0405901661bbd49d11ac1e7ed89bbc764dc591365e9205f03bc797ba6efdb6644f33619382375a3b7802fc66eff2b9e30018c36 SHA512 a38e39b8226fa938323609d0d2123f29ba2b91c66d33040077a9a60502d60660b2e5565f34637ed866466f1a93ed06f75a1b3c16deb48c0fcf73c85265f1e99a
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/psmisc-23.2-r2.ebuild b/sys-process/psmisc/psmisc-23.2-r2.ebuild
index 41d7cfdcd71b..4225c2b0e2bf 100644
--- a/sys-process/psmisc/psmisc-23.2-r2.ebuild
+++ b/sys-process/psmisc/psmisc-23.2-r2.ebuild
@@ -36,12 +36,6 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
-	emake
-}
-
 src_install() {
 	default
 
diff --git a/sys-process/psmisc/psmisc-23.2-r1.ebuild b/sys-process/psmisc/psmisc-23.3.ebuild
index 2157294a11d1..720647fe094d 100644
--- a/sys-process/psmisc/psmisc-23.2-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A set of tools that use the proc filesystem"
 HOMEPAGE="http://psmisc.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
@@ -31,21 +31,15 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
-	emake
-}
-
 src_install() {
 	default
 
-	use X || rm -f "${ED%/}"/usr/bin/pstree.x11
+	use X || rm -f "${ED}"/usr/bin/pstree.x11
 
-	[[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd
-	[[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1
+	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
+	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
 
 	# fuser is needed by init.d scripts; use * wildcard for #458250
 	dodir /bin
-	mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die
+	mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
 }