gentoo resync : 20.01.2020

16 files changed, 281 insertions, 9 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d17096f9b66c..71c940411870 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index f57aac5d2790..6387fa1adfb7 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,3 +1,5 @@
 DIST colorized-logs-2.4.tar.gz 10918 BLAKE2B 767d635155ebb66e212888c8e61e2ab65be665497a84c8820aa8183a5d94d30c9f2b653c16131916a907cb369d3b88a004573ae9eeaa1fda954cee239fa6da05 SHA512 5ac5734409f06262ad470a87e215c305f805a5701a604f1fc744632a25e4a1b8dd9c878897f72ad434b71ebe300c6d676cd53760a34f48b8202a62c765dcbe3f
+DIST colorized-logs-2.5.tar.gz 12331 BLAKE2B 79ee9d5a7d2e683ebba044a8b75666fe5824a087be3b41e9e1c4bb3b52d1d2a57b6dd5f3cc64a48fa6705b9074daa6cfaec61a730223bc3deb21835033fc3adb SHA512 a4849db1124bbf65a54285a121aa723a44b7270498858d0ac5f50892d3d8eb38c8109c3bb457cdf6ffe336e77703ba454217047ed819a0d61f415c5b8882cc28
 EBUILD colorized-logs-2.4.ebuild 651 BLAKE2B 4d089afa28f4db7169f37e9cfd82bb275ef88939ef83d68d2e1448c16d3319701219af3e60d137279aac1b76bc8b5755e00cbd7fa27c536729cdbcb03a26812f SHA512 88c9b0cd17393496e6f735fbb228e8c44643ab7c3949b969fbef06cd52955ab0e9969a5f26e995e3fb11bf9731392feb071230c5f199f878b269d9fa6dc34200
+EBUILD colorized-logs-2.5.ebuild 653 BLAKE2B d3a019cfd33ccad41e76dd96d4581853a1d9320340c71231ce8e645ec08372cb98c6824b8732eb3be1fa263a840a836e8fad7460628c935dd2fc822a0d10eb09 SHA512 1d0d4d72928311208ddb3bd8887d0938ff5ad0744f552cfa55bb0f8bbe33f62af8291e86eba0f5ea6d60d12f8f921f62906af52014e0d7c994a5fbbd606effae
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.5.ebuild b/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
new file mode 100644
index 000000000000..36e9589ea6be
--- /dev/null
+++ b/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+
+DESCRIPTION="Tools for logs with ANSI color"
+HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
+SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	# Rename to not collide with dev-python/ansi2html
+	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
+	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
+}
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 1d1f5ccc492f..cb0928a735d6 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,4 +1,4 @@
 DIST edid-decode-0_pre20191209.tar.gz 57651 BLAKE2B 2a8717547939b7ff25482edc00a158c1cb3ff162b6e450549a274a10b10678fabf20529c9e97a455f6d4bfaf6dcb1db54c38cea3908761432bcd4d15e58271d1 SHA512 8d4c6a15538da1720f0e6c8fc4f9f3f64e6ade0e217a6860016167eb14f752e60bbfe69979f25189979fbc6405b417e8f1a9bf9f2a75a299b4914ce1827b680f
-EBUILD edid-decode-0_pre20191209.ebuild 690 BLAKE2B f51940119b91b70f9fcb64f16de02e152bff13386533fc0da9bfa5319239cef57af8eb9895916328c74cdb98f0aee98d0fec86d8a41d0a3051645b321a878a8b SHA512 416c5afdb4a485196aaab49a0fdd2b13bf83d304c1e228f0dc60c46b0b5285ad52fb0a50913684b03bd86fa51a030425e4681bf84099f652aae629d791fdfdfc
+EBUILD edid-decode-0_pre20191209.ebuild 689 BLAKE2B 8dc24e08bd8c783db4297221c43c5d87efdbdbad8a942d9401361929847a40ba64f3bf0ea4cb0c81b6a9c524e3336176de6303db2c1aca0cc118e01764fd5b3b SHA512 5c57f9f7f871989293bbcae20922e3fba449c895a5406f4cdb71c035afe716f922dbe5579972aba0e3dd8b811595fe018b722d1666c02d3457660794d647f9a7
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 646 BLAKE2B 37a3db350195905c7a4b420d0d2d2d4741cca1b3954d42620a9a411696a734702e145bde400c4d68997aedd0de45d418faacb1d132ab385f8454f7f5c0039260 SHA512 95293d61feeeca16b0341a5c5fad464db4fca0d2dcfc9b7f51cb3d2984f3ff4530d2938d80ecdf658fc2c784368166bc5fbd220787de6564938ee2171f1816e2
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild
index 7bfeda7710dd..8c09b114025d 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="Decode EDID data in a human-readable format"
 HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
 SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_P}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 42b8e479206a..718866b61039 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcore-0.10.9.tar.gz 647634 BLAKE2B e05b091d9ea797fe4207eb750edabf98faa3574b9ee93799554ed525cab5513b5cf45d9f2757c1ba27a3e7add4c55cd51ee57a650d988916e2bc6d03bb78f91d SHA512 efa9e43f2a67e934b7dded190f93f09b860b770097e3715b7f03af3213fc680f5b9d5d9d14c5671d0ef2df9cf0144a009f7fd20e2f28d5c2dcdc685c65bf7232
 EBUILD pkgcore-0.10.9.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
 EBUILD pkgcore-9999.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
-MISC metadata.xml 336 BLAKE2B 1dde157c2023dcc7578651078f6e9ef30ac5eb28bd5edb690a29b329307c3435b4f1cd51288c1661f58362f57c5de7267e497c548c32fd5defbca85f0ec6d7cc SHA512 a48569920d2907935e8cdfb28b2e2d5fa2bd791eef4fa2ec59c0a22caf322c05cc2c68574ce928890e0de873d69e9e62adb2efe82704556ac6ebef82ef6fc876
+MISC metadata.xml 450 BLAKE2B 1ed880d1515c4c2b77b3687ee82db88e2cd719356c68747c17383ef29c28dea830c6c9f480c5f37931245c569b8254c480edf849946495014e10385da0ba4183 SHA512 b9cab67f1dfbe87e95249af65a073cdac83d5a63b717b06593943f0eb87668e13c3eaa5a4127c0da7d0561f2e7f9dcf445028188364d3309cce40660f8d22220
diff --git a/sys-apps/pkgcore/metadata.xml b/sys-apps/pkgcore/metadata.xml
index 98b0e74b0c93..7ed3715756e0 100644
--- a/sys-apps/pkgcore/metadata.xml
+++ b/sys-apps/pkgcore/metadata.xml
@@ -5,6 +5,10 @@
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pkgcore/pkgcore</remote-id>
   </upstream>
diff --git a/sys-apps/pnputils/Manifest b/sys-apps/pnputils/Manifest
index ccfd31f9addd..0370203f419e 100644
--- a/sys-apps/pnputils/Manifest
+++ b/sys-apps/pnputils/Manifest
@@ -1,4 +1,4 @@
 AUX pnputils-0.1-makefile.patch 836 BLAKE2B 4ad883a208c9799ef94b238aa8ec3e0fbecf92a99a73ee413a9ef56a8e131262c8c4125c141974afe22914955152294ca6dbd0acca87246612e04916e0a19411 SHA512 5833c8a35244784fc30a55b4ba53da463222576ba3cc9c15accf25ec0850544d5a863252fc9718ca832550708237f0f7edaf94a278f17c7f04728b24a6c9b9df
 DIST pnputils_0.1.orig.tar.gz 16991 BLAKE2B 699e55dd62e90ef0f5dde40f34c60d1b0d2e47c0cfdd06a82dcb739fd952181a74e7ec5fb90afe2bf91f5c997e9cb6dc7da2c4a1454f9f858e5d28ba324ab1d0 SHA512 0f3b612f29b6c6c79221d9f5e27163dc7766159eeb16c2e1b494305cc4c6c50e9c12cee7c1be9bf12642c9adc568b622822b34d9f5f6a421d2b8f6f784fa62ba
-EBUILD pnputils-0.1.ebuild 526 BLAKE2B 16cd83ab677482450979f7b57d453bfb09a4e8406f962f4209c300ba36c4979c722c2dac198644c6fe879ccee1a5a13c25fc68bdaa3fc611bee65bbdc1f0b80d SHA512 51658aefd122e7dec8dd993e026b0fae3d2d17e1c2c0d8efe13138d74a848cd52ee6094cd20fa1d3455d47b14207a42332e4f12183b8d4400567ea67fd708389
+EBUILD pnputils-0.1.ebuild 525 BLAKE2B ece27463d9ed64ab9e326af4f20f88de2097db33348d815f70d06762c5f3fb67a5496eed38754898d99163a9201fe10cafce9ac1d2075d0688b94363a247cb34 SHA512 ed3570547d7bd43eb29b57cfd6d171715c51283102761f1732e562933dc38a86ba8ba9999ce8e63f530f1e14cc441e5cf17ec39d9bca10517be5aa821c99edab
 MISC metadata.xml 461 BLAKE2B 518f40b53b66ab4ca7d3b4b25530e7f6b59aaf3d6b4f70ba5ef622685b42d9145cd0f4a5a29b669a1c72c9257180a207973bcfdd5da9a3b1c8a0ffdfcda08aeb SHA512 d3f31b9ad193ab5cfbf59e6de58c4e60deac59e824e86c92c5fc5fc3d71a1a6086a6af7cfad8e1f243d625f37e4034fd255bdb2b71281b4fba05631c5d033479
diff --git a/sys-apps/pnputils/pnputils-0.1.ebuild b/sys-apps/pnputils/pnputils-0.1.ebuild
index 23a40d5a8fa6..44b1d2ff7562 100644
--- a/sys-apps/pnputils/pnputils-0.1.ebuild
+++ b/sys-apps/pnputils/pnputils-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://archive.debian.org/debian/pool/main/p/${PN}/${P/-/_}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c8832c095641..4fe9a6d7c963 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,6 +5,6 @@ DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250
 DIST portage-2.3.84.tar.bz2 1043069 BLAKE2B 85ccc209011ef5206e0aaf768ec0276449f5a691f62f8dd65b812b6a285030796180acce89e9f2c8ae05fe4f59505133535f0374bf076846f819477d0a62d231 SHA512 49797ded65091ea7450f3c37e4ca1efb4205bc67e873295b5060ee6d39c1c63313fc1caa8c2f6c7afa6b352cef6d7ef04b8371c66a3ade05ac734b46f807bfd7
 EBUILD portage-2.3.69.ebuild 8116 BLAKE2B 9f3cdde8658a1a2a79a40b3761caf628d01ccb31e5ea1362f51b2d3e94e94a500b266e956346da701632b725d9de71b8723f586cacab0eb807edabbe082148d8 SHA512 2de3f919fe7986557523fe7b1c0c48674ab971804fff1815d0506bc4b98990e336ac20a252ec7738205e8ea2e75ce0302b29b249d002657e15a3fe40fa42ffeb
 EBUILD portage-2.3.79.ebuild 8705 BLAKE2B 7ac051695bf9baed4f6ddce870d09900e5951841261673250b0ffd2d60f1c4aee9864834af3ad11c392a92c92fb09d2295ed1ba5bbfd486a7d6323b75f2b52b0 SHA512 da2ce712f6dac53cba323ba4eef726a1a043ef181bfa61b26da88c33d49ea2c240728fd9ab14adec08520d6e096a536665496cda9a65da96d432ac8d20eef845
-EBUILD portage-2.3.84-r1.ebuild 8915 BLAKE2B f336a8c631a96a927faff6b065dcfd8ef0d9a34fece23e226dce7302bad4ac75cd9367844ae915f4cde79fcbefc267f9762af0bfa0128d922347de2712995460 SHA512 5fc6a30e8df4f7faa0e556290b87916067615eeb849b48a8ffe36ba56a051b42e32257515f3d2ab5b288eb5c118cecbdf83f48a0f3f0122f4d8c4262842df840
+EBUILD portage-2.3.84-r1.ebuild 8913 BLAKE2B 01d719216ef73455dbabb488a43f877d3a83e861aaf0bc7c4ddf5af991b9d42beafafa75b346d5c1b8b95fe44835303e30ce39a1a3e623b54c4971037eeda67d SHA512 0bcaf3ee79b1bb8be85f17ed9ed5e03b631f0aeb2f9fb2c95bb2b991cbc3c7c7955c2da0f8b30958ec8f640f2fde88c50eecb76aa83b433346276f6079d2d6ca
 EBUILD portage-9999.ebuild 7969 BLAKE2B f3045bb8060ed1adb292c72f030f33027776a26bde78e8baca39f83720288bc592bbcf1d0fd13f49c52a55c9f92ca253108ed43d82b02d330158682b2d95c27c SHA512 d9d96777e19a8f3d35beb1f51a826bfa9f15f0c1d403f4284164e2c8a13eb6161a0320b22644569502c249a2d84bf675085cdff5567037df267915198e4f10b7
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.84-r1.ebuild b/sys-apps/portage/portage-2.3.84-r1.ebuild
index 9e21a6247c36..1469effd6452 100644
--- a/sys-apps/portage/portage-2.3.84-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.84-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 770eeef93f7f..bd953167cd2e 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,6 +1,7 @@
 AUX default/useradd 96 BLAKE2B 64b694bdff7f901e19ac21695e3b2eebeb5a03683be5a01e33f96a4e7f94d1059a3ea3703fd4f7167778c8aebb0605640edfd60c46bc48242fae8b37f7182303 SHA512 87b01ac88c2065392fa988871489d8403ef93341b4cfbadb4504f39a2a3396ddef756efc6378868d00627a58a1feb9612eb52a8135558a211a09c6a9ccf3404f
 AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d35c9908ca400bd57dcb234fb7691aa2a5a7646a379553aa6dee0dd96ee569aa492d7f20774e991a90f8602 SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
+AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 AUX shadow-4.7-optional_su.patch 3683 BLAKE2B 084151a48182f2b46830f4bcbe46234f753c169614d12f582acc93bed8c5ce69d8cd6bfeccb9936f0dbcb76efe947ae36e415fd659ffd4ee51c64d3270c33e6f SHA512 7f60622470d77b28d603d85b7873cfa01896f8368a09491fd1a0eac93aa6e763638cb279392b6a787b6be39c961566732aa1057b096480f397a50e1e2b10672c
 AUX shadow-4.8-revert-bin-merge.patch 305 BLAKE2B 2fb6407ed60251b3367931c2c7eb9b2bdaaff565ff5338fb6ffddc9b618963e7835925c07fea0cbaeeee90a03b7e0c571f0e1b9e1844fe9397f4e74672edb080 SHA512 bd821f6af288ac4a3cf9b0de30753626db90d187ece7d53ee7e0d6b7c61dbfecda84bd9ae60958120cc8ddce48055878c9daaa668dd88392bb70b73c7ad4fb01
@@ -10,4 +11,5 @@ DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c
 EBUILD shadow-4.6.ebuild 5363 BLAKE2B 90361141986d5b78eee02f022665073d2af2970949a5406b9aee09b5a7abd7aa8397048596275daa3bba4547380764f2c5ff26d634cbf03f8c387274f016282e SHA512 95c2ab76e365f10cf57277708dca5a5b96b24f1d527cd86d1ab5209f04f51251b3eb123473c77558223ae8c08310af13d2f8fe6e7314f69055933af8a9001074
 EBUILD shadow-4.7-r2.ebuild 5794 BLAKE2B f7a8dde2cac49657be337c7e226e6341c764ee0ed9ab1aa6e9d2bba96eb1f903c9fdb63c77152f5fd1ed1a4493fdd16a87ef6a01010c493650deb0a05da9a8e3 SHA512 9965f73207d382ca980fc996978ea6db7520b343029c61ae0d192ef4cb77dafe89e42142dcf561648c224415d1d696bcc865bce0544744e77579ba62a928e80b
 EBUILD shadow-4.8-r2.ebuild 5855 BLAKE2B 965b32c9bec14bb3974e0bb576fa7cbee71dfee64015da653a6a2d1a08f2ea59aae6b4490f3f24c3ddad7982fdccbd5a3da8e4634778093809d508f2aa0b8c9b SHA512 2feae1d196ef0e6eddf74417ae846921e8c94fa820dc7f10d0e66d7748523db265810080f676291d2cb89d998a5c6467a857ad76d2facf8c76faf8cce5e9a3a3
+EBUILD shadow-4.8-r3.ebuild 5762 BLAKE2B d75b0f31ae6652a7d1513282b1bdbda106988a1e6cd97aacf8bb94cc03d07d2d4d52d9f3cf75f4c723331051407d012bcde828bb62120d9bb3145c9ed06b9a0a SHA512 e89ec9de0bbc6edaa6b25d07690269073e59ac9ee716c95f49b52c6c3bca5a3812b068703dc5a9b78b5980ab40b0db808437ff4180f1fe20991ac83757af7091
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/files/pam.d-include/shadow-r1 b/sys-apps/shadow/files/pam.d-include/shadow-r1
new file mode 100644
index 000000000000..e42e8493ffe3
--- /dev/null
+++ b/sys-apps/shadow/files/pam.d-include/shadow-r1
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth       sufficient	pam_rootok.so
+
+account    include		system-auth
+
+password   required		pam_permit.so
diff --git a/sys-apps/shadow/shadow-4.8-r3.ebuild b/sys-apps/shadow/shadow-4.8-r3.ebuild
new file mode 100644
index 000000000000..ce51a62e4d92
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.8-r3.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+DEPEND="
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	su? ( !sys-apps/util-linux[su] )
+	xattr? ( sys-apps/attr:0= )
+"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+RDEPEND="
+	${DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+	"${FILESDIR}/${P}-revert-bin-merge.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	#elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--enable-shared=no
+		--enable-static=yes
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=$1 val=$2
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh shfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
index 2c923123c186..2c923123c186 100755..100644
--- a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
index 3ea514cce169..3ea514cce169 100755..100644
--- a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc