14 files changed, 31 insertions, 122 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e667b370c5bb..ad0e4e373147 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 9334529c8786..c09cd6c6c9ea 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -6,6 +6,6 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
-EBUILD apache-tools-2.4.29.ebuild 2657 BLAKE2B 8ce57db2791cabda2304cca05bd023b09e7516f505d278caef6bec6f4a356165ac01dddb3076cfea8638d2ab7cc8d2131ef6d4b6f1adfd021911fd8ce4e76cee SHA512 c68bd22cf194f89187053c9c3a2a86ecb39321aaba39b6cccff755385e28d4b1405e84018009c29b5a14c3ff6d00f5fc8c845e05703421f3a63e52f5395689d8
+EBUILD apache-tools-2.4.29.ebuild 2656 BLAKE2B 575d33fc6ad9d95ec105f4318af317759f02135370ce8ffbead49cdb8ed9c61803f3652a50736ed9a1696ce902af9426002da2ead7ff8de7a3b783c5b76d340b SHA512 ef4f840c6f8fe5ac3bc12836b31a73a5c5038a58ee60259ebc9c52ac353803deacf78f56be837b30706ccd00c65aa9fd5e861fdd88bc86f758fbab390c63efb2
 EBUILD apache-tools-2.4.33.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
index 7921ae4a88ed..e05c604f2b66 100644
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 4cda3638a41b..32d9bf7c67df 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,3 +1,3 @@
 DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
-EBUILD doas-6.0.ebuild 760 BLAKE2B 2d04b25a4e44ca9b1e4ab1617a4a418b7ee3fc85e0567238288457b8d41db56eccb96104328b1293520ed1490ecb4a9147be8e754df1b967c12ccaa58967b2b1 SHA512 ad68334d6e0496cef6f35f976b478e4247182bda49d8a17171f709e706857370dab1de2b570d6d4839f7c71b5f48a5ea6bb220731a61a076acf317e5ec87b3c4
+EBUILD doas-6.0.ebuild 759 BLAKE2B b464cbe922306990bbe10bf49cfb287a5be9f1bfc6e9508df7182c7daf5dc786276e4af63ad2723d2314e58a30acd3a0a7012697f679a6c6e59f8c9f7ec4f290 SHA512 28fc11ada8266651ac3f84eb084526ca8f7dfcb076467d06dec6af5ad6595263a3e781cb04b62d97242424873fcf99e72877c392e72301b68997e20b9636ac90
 MISC metadata.xml 435 BLAKE2B 63f345e2db83040c0cd34cce3dbc5f1f53495f3dc6c4b54ef9b09085eb32708a81dbe1e36f8702649cad0f2bae6f3affa4d95a5e996df5d66d6d0425136c09b6 SHA512 87342e8a10501960ff97fe359c4caa697269db4d95e5e008705aa23467b164a25c6cb8c7158530c39cd19a1840192815c3e336b09ce71938bc56dbd2819b18ec
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
index 4a32035bdb82..0249bca14a16 100644
--- a/app-admin/doas/doas-6.0.ebuild
+++ b/app-admin/doas/doas-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm"
+KEYWORDS="amd64 arm"
 IUSE="pam"
 
 RDEPEND="pam? ( virtual/pam )"
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
index 76e9e5e39a27..1bbca4aa3b8c 100644
--- a/app-admin/logcheck/Manifest
+++ b/app-admin/logcheck/Manifest
@@ -1,8 +1,6 @@
 AUX logcheck.cron 184 BLAKE2B 5b773a77dace97e78efa565d8edf3bd715f564721ba0097e82a3894009fa86b6faffd3018a5270e224de2aefaaf07afa76c40b507d6ddffcf5ca4fb137ac6c09 SHA512 fd0b1bc8c836b766bfbb6102012996d27e378475571167b4d4df98301793624483aca2bd51ec19a2aa367e78b062ddde67355452db8dc1d69fe84a20a2081c30
 DIST logcheck_1.3.15.tar.gz 162397 BLAKE2B 111e16f482c8610ffc39c518b3fd523abaa9720e7873bcadba58d85bd13bd7a8a9d93881e64f5d8cc5cb30c8254f2216fe97d1b77fe1cf77d5e14859ec701621 SHA512 45c9e779fc1d1f417aea3f02e70eff4dbc7cd0b45e04f7efc458a4552866686cbb095d0b5ebaf32a57d423a3753b4573277a464f5539789350b087569e025abf
-DIST logcheck_1.3.17.tar.xz 130956 BLAKE2B 16fc80f983a17d55e4b5fdcefcc95657e99bb3f5229655b768ab6116a874bf0f080c368bae235802370534df27908d22f52168b9cf1123fce05f9b4d5a484015 SHA512 e4a30b6ccd7a9f0f51354b1a6e577f6a3837e3db078f61b3d3ceaf630a1f1eeae03324e6ec58307f8f723dbd017e1543c15f7dc34e50c0eeb9ee0b160b2c879d
 DIST logcheck_1.3.18.tar.xz 131252 BLAKE2B 024259d965c02d5f27a82f1df1e947d48e4b1bad705882243c4b743a1c061012f2437ecab1a97265f5a330fdec2f813a36c078dca282f54fdfaab03833340320 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f
 EBUILD logcheck-1.3.15-r2.ebuild 1189 BLAKE2B 008db9b5797783571c1ea2d7ffcd4909609ab206cfd0e9dffbd06ab2cc34d865246ff78d32de3905a2eca8410fd87b149b6c6b6cc1c2312121226c3942cd7209 SHA512 bcfc87c796cbbd553ffc18a5777ca0114c7be968512d17fc42c8dd99e80658e4d93d88208823258bebdce1323a2715aeb3a4df3888da11776bd946f9bbebf0aa
-EBUILD logcheck-1.3.17.ebuild 1190 BLAKE2B baae848c9c1ef93bbe2773bbf5ada3eac7300ec1ccc13f78929c564796b70c442026726bc004e2106d222c17fdc95ff62c0bdfb39f1a66ef55e9323ad3e23aae SHA512 161ac902f0aa625c9c26c41956926d39d63f50f8daaffb3df42f0f8faf68d45e5392b4679c1e8294f1140388692801f318644de18b6b38953ac784886f4758da
-EBUILD logcheck-1.3.18.ebuild 1190 BLAKE2B 7a298bdd14f5a957d28af0d5e6c64ad4c3d3674894af41f731c9e7a0c2a84e6d16ead3c112814bc0d21a8a1c8d29bdaa2995312a7abd31a75fbcf367ce61b202 SHA512 792074adc44cd65d44be803f9f0ee718dcfde3d6436b2662c02736811a163d3fa8a080500f5e2dde94c5fe086095cd6169b309dfb9cc2c923c451007451f35a0
+EBUILD logcheck-1.3.18-r1.ebuild 1368 BLAKE2B 7f7fedc652b010c6c4c0c9b36ac2f25a80147a39f718472d3f6a5598ee6974492ba8ac236d58e3e31d036c4dc56cb313ac39025f0f1c3ef8b93660e6800c3daa SHA512 a4532de06b10fc2d119d279feddfa78b1d912699a96a00c6b73c03f8011806cae7a44fd4e9db0829f7600dc240ddb6190702d496a5107875726292cb9953b0fe
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/logcheck/logcheck-1.3.17.ebuild b/app-admin/logcheck/logcheck-1.3.17.ebuild
deleted file mode 100644
index 412128f50978..000000000000
--- a/app-admin/logcheck/logcheck-1.3.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="http://packages.debian.org/sid/logcheck"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-admin/logsentry
-	app-misc/lockfile-progs
-	dev-lang/perl
-	dev-perl/mime-construct
-	virtual/mailx
-	${DEPEND}"
-
-pkg_setup() {
-	enewgroup logcheck
-	enewuser logcheck -1 -1 -1 logcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
-	# the directories removed are empty.
-	rmdir "${D}/var/lock/logcheck" || die
-	rmdir "${D}/var/lock" || die
-
-	keepdir /var/lib/logcheck
-	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
-	doman docs/logtail.8 docs/logtail2.8
-
-	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}/${PN}.cron"
-}
-
-pkg_postinst() {
-	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-
-	elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
-	elog "for installation instructions."
-}
diff --git a/app-admin/logcheck/logcheck-1.3.18.ebuild b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
index 05809634d694..4dab96b452d8 100644
--- a/app-admin/logcheck/logcheck-1.3.18.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit user
+inherit readme.gentoo-r1 user
 
 DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="http://packages.debian.org/sid/logcheck"
+HOMEPAGE="https://packages.debian.org/sid/logcheck"
 SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
@@ -15,20 +14,32 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="!app-admin/logsentry
+RDEPEND="${DEPEND}
+	!app-admin/logsentry
 	app-misc/lockfile-progs
 	dev-lang/perl
 	dev-perl/mime-construct
 	virtual/mailx
-	${DEPEND}"
+"
+
+DOC_CONTENTS="
+	Please read the guide at https://wiki.gentoo.org/wiki/Logcheck
+	for installation instructions.
+"
 
 pkg_setup() {
 	enewgroup logcheck
 	enewuser logcheck -1 -1 -1 logcheck
 }
 
+src_prepare() {
+	default
+	# Add /var/log/messages support, bug #531524
+	echo "/var/log/messages" >> etc/logcheck.logfiles
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
 	# the directories removed are empty.
@@ -36,6 +47,8 @@ src_install() {
 	rmdir "${D}/var/lock" || die
 
 	keepdir /var/lib/logcheck
+
+	readme.gentoo_create_doc
 	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
 	doman docs/logtail.8 docs/logtail2.8
 
@@ -45,7 +58,5 @@ src_install() {
 
 pkg_postinst() {
 	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-
-	elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
-	elog "for installation instructions."
+	readme.gentoo_print_elog
 }
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 221a89363be0..c337250d07d8 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -10,7 +10,6 @@ AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2a
 AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79
 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
-AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75
 AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
diff --git a/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch b/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
deleted file mode 100644
index 9e58d93f7dd4..000000000000
--- a/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 18fb0be96a146589ccbd642caa9244480c51140b Mon Sep 17 00:00:00 2001
-From: Matthew Summers <msummers42@gmail.com>
-Date: Mon, 9 Oct 2017 20:38:52 -0500
-Subject: [PATCH 1/2] addresses issue #43307, disk.format_ to disk.format
-
-This change fixes breakage. It appears the disk.format_ func is
-aliased to disk.format in modules/disk.py
----
- salt/states/blockdev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py
-index 4b0dc5ca81d..e6ecfeab3f1 100644
---- a/salt/states/blockdev.py
-+++ b/salt/states/blockdev.py
-@@ -159,7 +159,7 @@ def formatted(name, fs_type='ext4', force=False, **kwargs):
-         ret['result'] = None
-         return ret
- 
--    __salt__['disk.format_'](name, fs_type, force=force, **kwargs)
-+    __salt__['disk.format'](name, fs_type, force=force, **kwargs)
- 
-     # Repeat fstype check up to 10 times with 3s sleeping between each
-     # to avoid detection failing although mkfs has succeeded
-
-From 16e1c1dfc86920b7a00dbf7c39b805c359e4d13b Mon Sep 17 00:00:00 2001
-From: Matthew Summers <matthew.summers@syapse.com>
-Date: Mon, 16 Oct 2017 09:47:40 -0500
-Subject: [PATCH 2/2] fixed test addressing issue #43307, disk.format_ to
- disk.format
-
----
- tests/unit/states/test_blockdev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py
-index e5899f1c70a..9b559dddfe5 100644
---- a/tests/unit/states/test_blockdev.py
-+++ b/tests/unit/states/test_blockdev.py
-@@ -100,7 +100,7 @@ def test_formatted(self):
- 
-             # Test state return when block device format fails
-             with patch.dict(blockdev.__salt__, {'cmd.run': MagicMock(return_value=mock_ext4),
--                                                'disk.format_': MagicMock(return_value=True)}):
-+                                                'disk.format': MagicMock(return_value=True)}):
-                 comt = ('Failed to format {0}'.format(name))
-                 ret.update({'comment': comt, 'result': False})
-                 with patch.object(salt.utils, 'which',
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index ad0730b617c8..77eec9295db1 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -4,7 +4,7 @@ DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d
 DIST sudo-1.8.23b2.tar.gz 3078589 BLAKE2B 4d3a003d168ef27382ff77d656c82ff830a53e402f4f717ad5fdde9eb1619b1d4af453d2dc9534b7206665d8a89e710a10b6f1343b5242e6a182737436365ddf SHA512 0fe984db67c3589b501c97cabd3e4a006bf6364f3397c73a46b34a14055226225416c2aee08a5fc60f5ac06e50a8fa1db9ed8ebf3c76989870e84457ea84e356
 EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
 EBUILD sudo-1.8.21_p2.ebuild 5809 BLAKE2B 06a01d30fb9642371be1a050d768eb42b011e1eb4f86238a96bfa7187025413badde2d92294411b6622ea55406f3d9aaa1492883706abbd999f42ae8a666ebdf SHA512 2847d70298fae4993128794f4b47dc093f3571f01ba5b1c60d221031b16385ab070b44c7c81dcea862e046bc5f390cda1f9af933c6ec196f7b198a4e7c36fe07
-EBUILD sudo-1.8.22-r2.ebuild 5997 BLAKE2B a822f9c5414dfd00c36d71d17e1061cde43a7dd065362bffbfe1184171e67dcde5d4d011bce3837bbec3e89e1b9232bbcbff71251c8658b3d0ace5dc2d55df69 SHA512 57bd6d63b6b12a5b0ee7ae82e773eaea17c28c8447c8df8cd620d4dbd116c2a376e361b30cbac8e7414e269274f43997eb51264967c44ab4f82fda80790036df
+EBUILD sudo-1.8.22-r2.ebuild 5996 BLAKE2B c39d0f62b5a35cc83b770b650ed90c6166caf976c1866d5166ab02045e181b6dfb7a5e7d789c8237dc9bb29dd243d0829a3f5b94bb2faaff67b4a0f32443bbf6 SHA512 dba017a242af87b476788104f8fb24bb9a98cdee74cb4220c790d135316500db23caf9bd7ee17312f04d66e359454fd41e85e3a9c2e209b64967000061584954
 EBUILD sudo-1.8.23_beta2.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
 EBUILD sudo-9999.ebuild 6141 BLAKE2B 3fde1d106dc229a8bcf8c3231de2fac5695a61c2a87382bb22a5ef3a2959c7777b5c332d79ce22a5e8e82c7a15a71b688c42a08142ad2d564ae0e8654b4b3459 SHA512 4a8c1406ff43a6b32d24d277b4741deeeb075e68fb3ecf93afbf6a8c15d505595780daabef93f01d9b40ea599ac05a846f01e5736208592ee8c7db55398ae2f1
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild
index c42447f0b815..bb13092ea546 100644
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 0629631687fb..f81686594c78 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -25,6 +25,6 @@ DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f080
 DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4689 BLAKE2B 4383f97ca7f901ea7837d911409092fb45ca1d09e98c4d584755f3b91d68f1b53b19d08df77912b05edc3d25023873e2e192ffc9c6a856057b306759ff2571c9 SHA512 a71b12aa827d7538503344e2ae6bc8712ba9469bcf18e224a32a55948ef1ff0d2de6f43408b391ff06bbcc1ea1884c0f839cf0de6cec8d1af4d61d66299c3660
-EBUILD syslog-ng-3.14.1.ebuild 4788 BLAKE2B 608ba34c9ed4eee07b80245c723c9b79015a90ae333cd7cbd2e668daec6ed008d80f083be9512a0ce6bb31029be15616914dd03b053363a97bda32fa4fd3332c SHA512 4e527fb42b4f8c486f8a40a3fcded6b88fd84441b5d0283fb16a487ac40760bb755df406643485ad02bbcd0657937a4abcedbc5f42d2bacf69bde077da34aeb9
+EBUILD syslog-ng-3.14.1.ebuild 4800 BLAKE2B 827277cd46a8484ab39656177f1bdbe4ee1e4e8715257289aa4642835f6bf5030c006b4147d9faf07888526e5dfc724967dd95efbb102867e2c2d5d3db03029c SHA512 5e36a93088045183cb8c2dc55809cef3412c1872f3eea356dd96569553d12d3fc3df624870d9b5a66558087781efd0769a880c35253485fdf6697e2371092563
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00
diff --git a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
index d7961f4b8c3c..c700adcaabde 100644
--- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"