gentoo resync : 02.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
commit: 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree: bac2a67fb24ac0836147fe370d30e1610ae1845d /sys-apps
parent: 2f8db31405fac68eea6f7257d58529243815033b (diff)
76 files changed, 521 insertions, 333 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b3debbba2376..6ac5c0712dc1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/checkservice/Manifest b/sys-apps/checkservice/Manifest
index 07601187b4dd..7efaa38de02e 100644
--- a/sys-apps/checkservice/Manifest
+++ b/sys-apps/checkservice/Manifest
@@ -1,3 +1,3 @@
 DIST checkservice-1.2.0.tar.gz 40614 BLAKE2B c098777dde09db6710e79fa82406110a44722479567929f0408c8a418e41c9aa53be81882259142abe7763d5402251d033c964913fabf012cb0cab9c5ba31fac SHA512 2548936ab8cc9f3dfd65ee74f0c583b48994f5d5aae4efadb7ba978b691c4d2105c999c368b381b5f823c7623183c59507259f602f3832cf4713979f34ed4f90
-EBUILD checkservice-1.2.0.ebuild 1301 BLAKE2B d5b1b503fcb7ccf39c8b32c098a6ad420580f26247464298a2c67ffeea7549973ca337e98648709a70fe75703048b674c9915f723b264d0c2d3dbbdc098fff26 SHA512 6eaf5fed57e1f4840a9b1b38243ce8d123c9c1baf561d9a79c9dfe96fcc8a8b5d8f8bb7005b26a85f0709e43992e3986b4b7c22ddc84ace5a92958e70e6b86f4
+EBUILD checkservice-1.2.0.ebuild 1309 BLAKE2B 69067fc4f76ba2c188d6bcf319fb81f44f69fdb9b5dae56bd07e1bf966e609293989f0a50a778b9705c0ec83f778e21e4214e71b3029618d0ccea2598edfe3b0 SHA512 5485b8072c18fd0381185e3347ce702a64dae77e1daca0ec39cd1dca23c81de9d6f656768fb480797707d40043f2dfd4c3850688a2294338c13a9fadb69f5007
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/checkservice/checkservice-1.2.0.ebuild b/sys-apps/checkservice/checkservice-1.2.0.ebuild
index da5e9876bc30..428a8a64ee89 100644
--- a/sys-apps/checkservice/checkservice-1.2.0.ebuild
+++ b/sys-apps/checkservice/checkservice-1.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Check the status of services running on local/remote machines"
 HOMEPAGE="http://www.linvision.com/checkservice/"
 SRC_URI="http://www.linvision.com/checkservice/files/${P}.tar.gz"
diff --git a/sys-apps/cpint/Manifest b/sys-apps/cpint/Manifest
index b666babf6c6d..eaab503059fd 100644
--- a/sys-apps/cpint/Manifest
+++ b/sys-apps/cpint/Manifest
@@ -3,6 +3,6 @@ AUX cpint-2.5.3-kernel.patch 1454 BLAKE2B 3a52586bc642fb5ef3df08eb85ab81759557d2
 AUX cpint-2.5.3-prototypes.patch 1008 BLAKE2B 87928ee43fe5fd650dbbf65906172e9c97769eeb1cfff339346904b949fc1dfaefc8a30b28bca54ea0c614242fb739b60b582b6c28de2e28174e7f4d8df3bbca SHA512 ab78d5f9ea13962b2037a4fd67a88968d2fd71184389dcc7824d633eef3f2e129cd99901093656b23c126636ce7692f04c9dc315c698eee259d123ce4b77db3b
 DIST cpint116.tgz 20626 BLAKE2B 95383207abfdfd1465a299160f5cd881df0d8211218f7b0080049be8abb9ef163c445d4d0739e06a84b2a733cc7e8bc70ea7592b971cd86cab019af9d31fcd50 SHA512 6c839ab2808e5c86d7e9fb502798a8cf38c80854d9f08baf4574f99e736c677217ced92772b3df18211f45d38600c1668f11d0fb4677f7dd57c00dbcdab3d7d3
 DIST cpint253.tgz 31143 BLAKE2B e1891244857f22664bc80c7520c065fa18afd1d27a44de52fbbf1914104e36129858450998aea06eaeb06307b51867606256f33809cd7093cc6bc588c238f4b2 SHA512 ecaddee3d2b0c408828b9fd4f1c8bf0026ab8f3654f8792ef504ddfaa848a3ee6b4197f93d044768f3dad49b28dcec175246fe20454cbc7baa162c463bebf221
-EBUILD cpint-1.1.6.ebuild 565 BLAKE2B b286d7df33b5cb33443f0d5ea1f8f8fcd3b5f5fd6e814b4bc69a48b11d002188c8a2a8c2d4572aef2dc058be7819ded640ef5ef8b022df84211abb4b9ba07694 SHA512 ba116feae6a4b1a7086f5ca5c6612e00fa17636b891dbc5c9708bc94f2f2052feac8572f425630807344dd782aabdd58ef6558ff4f66b9748002358b640782ae
+EBUILD cpint-1.1.6.ebuild 573 BLAKE2B 7ab020385ba1fc3c29b2a09c89bfa914dc23f9badb256ce5cd44f968931a17985eb77cc491042170093faf665b96aeb5a36ddd42f1a7b18dd73826bfd7027ea3 SHA512 b67e2bc85adb81f9219195aa0bf4efcfd161b90fc6d113e8ef3fe60ac622c613cc8271c786294206e923b253beaf126cc04a953cc80cea774e33d6ca1b3e0f35
 EBUILD cpint-2.5.3.ebuild 650 BLAKE2B dbaa947d873ffdbae168abba3801a5d4a6dd4565800822ae70f134da0354bf51b3d4614963a9940675df568a6609768a56441116ff7c964586e0c0371f4fc47d SHA512 ad7e8b9960c06413598b1cbaa607ab3bee0826747c5b99071434b865d0b8a163de9259806127f21be7c765ff39c94ea279645915ba94170d1eccba15645fe97b
 MISC metadata.xml 338 BLAKE2B 42f7c7c447b5017a4077b209c8e052020b72efc41d798e566bff085475cb901d8e7e4f6c2cbe53980fd0498c88d0d5123ce4f0740a318d1d3d67a9698981db97 SHA512 b0b29ca2593c1435924d3594cacd8576bd60b050435f732e0e804d407297684d33003d98b7ba2030cbf96c8509f77b5b0526ccd3d25eeb41161644fe633b664b
diff --git a/sys-apps/cpint/cpint-1.1.6.ebuild b/sys-apps/cpint/cpint-1.1.6.ebuild
index 106d7db762b5..04daacb1e3f1 100644
--- a/sys-apps/cpint/cpint-1.1.6.ebuild
+++ b/sys-apps/cpint/cpint-1.1.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit linux-info
 
 MY_PV=${PV//./}
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index cf494248087c..52a4c6c83799 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,5 +1,5 @@
 DIST cracklib-words-2.9.6.gz 5536645 BLAKE2B b0ac23e8777cb094cec565e9728ca8dd37359cd19c2e2d4cd215635f462e464fb27fc5a9e560895804df4e519c465845b381a8cd47fb4d6f9b9c62109ff661e6 SHA512 fc5bbe7699c9c9e3f39f5c82f53ec8a4ea85e08d5513188a2f6423f92779008b87d85cfcf87a9a5d13a49b04c30f73890cd4d3fa7cd4a6bdac5c1ebc18e18bc3
 DIST cracklib-words-20080507.gz 4515718 BLAKE2B d0de98d661d45462603e3150160e2a3ed984d22691a9c96509592e37d919e3d877414f8739443b22ac448b988e707c1b60423c337f482f8aad110f65a21df708 SHA512 d21055d6439a2b92b23ab6fd31222d9330315a0b44f53fae308ce5749a9fcb33b7df982f85ca8e2d6d2f9cc4c7264dfc3ed454edbccecd76289713df09fd633e
 EBUILD cracklib-words-2.9.6.ebuild 724 BLAKE2B 4da2a3c2db2d763597b9f0eb7d3208e815e5df98b3a8441db00d8666d47da859c7be57b310b489a2202713609d124afa4727ad4a75284a674651f38c35013452 SHA512 5047dc2726c2841957f7041fa8d7fa9b024320eaeebaaff4d37c64a261f070d20b33e8daadea0068526c51607aace26df762328cf7f32dd516c6c38899c818b9
-EBUILD cracklib-words-20080507.ebuild 689 BLAKE2B 51037a5c1a32a9e035bac2ad0f1a3123181392fa2668c65f6b24ef07355198d8c5b5b5544846df8863d001ed32556aa242e7d18ee042a3b9e14ae95a691ef064 SHA512 0d426520278367ac0aa857d7cacdb3cfce467915176a70c5a24548cc856061346fec4255d415c5e56874498874d35aac1fa67bc01dd897c21f1cab13b229b0cf
+EBUILD cracklib-words-20080507.ebuild 697 BLAKE2B 3dc22c46a24242452db7f2d2a7dbd23d0242337f0aa9621ffc8547bebd0e0086a871119cd63b08c6d8f9f4f340856b0c3ac4aca4738b421afad9693fe251ad24 SHA512 77a4c378a60857fff904af365827c2e8af48bc93f0d393e8fa46b37812631789191570ea60fe5f8f209af3495dc4545f9eb30d0ae0d8dc78f7f11a534aed1e1e
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-apps/cracklib-words/cracklib-words-20080507.ebuild b/sys-apps/cracklib-words/cracklib-words-20080507.ebuild
index 4223618cd7cd..c26b90e73bed 100644
--- a/sys-apps/cracklib-words/cracklib-words-20080507.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-20080507.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="large set of crack/cracklib dictionaries"
 HOMEPAGE="https://sourceforge.net/projects/cracklib"
 SRC_URI="mirror://sourceforge/cracklib/${P}.gz"
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b2751c8d2c46..27f3a4a3db71 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,10 +3,10 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
-DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
 DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
+DIST dbus-1.12.8.tar.gz 2071751 BLAKE2B 9ba26d48f34b4d328335917bbc40d5f4423a48f90b0436783a8d6d290bc8b99c54aa31d23efaf52ef90748d53e68b7c0e3ddce0f4ce26ea5369acbd57d726b84 SHA512 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3
 EBUILD dbus-1.10.18.ebuild 7378 BLAKE2B d258aceeb402a50f56a971ed97e5789b15f9c2c32b64adf0570e67fd78911813e7c3f7de8c41f43e326b120561ee27b179aed6424a7db2e438067e8a1b1233d5 SHA512 e2a689defcb78cb6fec98ec393af42c8e1b71f7ad2afe1c9fc2d039ffb7b0b3684ea13ed06f1127567dbb8b6621c0da259334070ef1e22982d75a3c9ade491eb
 EBUILD dbus-1.10.24.ebuild 7386 BLAKE2B 767c81f2173c494a53e70576acab80946879adc6ed2edcf63332eb926dc2d2dfcf1c61bd606df299480cea26f66a7d5fe77c7c84bc60ed89a838d1038a8000a8 SHA512 9e7ce68ca8a1e0399bd53eb27d41b539dc6680f71c776532a955ba1ce8d6c1e3fd014b909a2ec3f78b5fd8bf9e3300487998df891938b0379c773d0868ea7cac
-EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
+EBUILD dbus-1.12.8.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.4.ebuild b/sys-apps/dbus/dbus-1.12.8.ebuild
index d53c2a80ec6f..d53c2a80ec6f 100644
--- a/sys-apps/dbus/dbus-1.12.4.ebuild
+++ b/sys-apps/dbus/dbus-1.12.8.ebuild
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index af3ec1f917cc..48d52ab62466 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,3 +1,3 @@
 DIST dcfldd-1.3.4-1.tar.gz 163141 BLAKE2B 99954c674907196020dc1eff86103122897accdf0ff20ea0e6d5582d7fb87e4bcebfd12bf774f47e402853240896bbd536500c79ae6e7b478a3611171745dcc3 SHA512 04b53adf62c6b468ff816e2cd94cf360eb5315eb980e2aa7d71afae706ec9c4683430269e82d712608be265710907fdaaa1316e4f734b7481ee9395a37926c7a
-EBUILD dcfldd-1.3.4.1.ebuild 571 BLAKE2B c93e0305d2a3fc66069db23e8d15a82ad691401badad018c414941f965694b3ed3bc071b7c7d0d1d52130fe818a308867933410dcc1d2b99e3118c4cc9e4a9b2 SHA512 0da9d3c8a7653f688d4eedf757322f27e728213dec48880f2b0c379623984a071f305aa0f8153e590c9f22ccff549fc21150a8fff98a782c8abd566d514484e5
+EBUILD dcfldd-1.3.4.1.ebuild 579 BLAKE2B 103e0d59ffa0a4bcdb83b954fcc048ed3ffcc876945bbddfcf9dffdf89872b4aad5defa068d37ac777be9e573897d4724e911e92e55e0cf3c2b8a9d849eb6d48 SHA512 aeb7a194e6f5a949ada035ebe6edd34f69eb639c80942d2b3b19d9a0dc053abe31e3d73ed48dfc0aa7b8c07a6b4e99be45ca5eeede80e814ef3f241cb2be5d7f
 MISC metadata.xml 243 BLAKE2B f8089442435627fe2c9fe0a53eb8637e58f37e443e0a12f8a62a96fff8bfabe3ce5d8744c4e54fc3dabe665ad2cadc2fe45cb6fd622cd5a5985767728651feee SHA512 8bec7ef7efabb34196784b71ed7c96e2c2e604665ab3ae6ce6f41e6b719e7b8fc4579e2ec6effce2181017d12784651019f5464623dfbc4f0c9b0437c2bae182
diff --git a/sys-apps/dcfldd/dcfldd-1.3.4.1.ebuild b/sys-apps/dcfldd/dcfldd-1.3.4.1.ebuild
index 2de19e5b9187..a95a4fdbd213 100644
--- a/sys-apps/dcfldd/dcfldd-1.3.4.1.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.3.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit versionator
 
 My_PV=$(replace_version_separator 3 '-')
diff --git a/sys-apps/fwcrv/Manifest b/sys-apps/fwcrv/Manifest
index f405932addc5..ecdc873a79b1 100644
--- a/sys-apps/fwcrv/Manifest
+++ b/sys-apps/fwcrv/Manifest
@@ -1,4 +1,4 @@
 AUX fwcrv-0.1.0-endian.patch 1732 BLAKE2B 6a47f15282d2b2082dd50dfe2bf558ea76d1e1ec7501a56a1b8a6d385c7b8a492f113f57d8cddbf34bef6ec34e9a7e9b5fa7cb25d9b7c165fcd2b96e372b739a SHA512 8340779195deadd122ae4998fa971d2b3edc5c150dda7681d07289d3b741dbb408eefc447532c2221e3487d7edfc6b27e7135977974273c4ea171a18914b072c
 DIST fwcrv-0.1.0.tar.gz 76154 BLAKE2B ceb8827f5dab62820fc68fa9389ecf6810f99a5e668b5a00b0adb0a8a2f480db857501b17702e07104696bb83a1d3b8ef5bfcb8bcc5981765d4206fb917aaff1 SHA512 875762b706effc9a149c1686fc51567bce845e1ea611faf1775c2d4ce87bba5257405b8c9953e042dcc485d9a203930f4dbe0df5f0a0e010bc65bceee9c0bee6
-EBUILD fwcrv-0.1.0.ebuild 610 BLAKE2B 77e6cbae96639e8ec01e5181ceb5b44bb1e0532fac15da04530c8fe71fd2882d336641c1356b12053b75779c78ecc916b664f66ffd80eb9a8660e96e244a84ad SHA512 f27572788e4ed80e78a2dd4d942b0f84441b56494574eb5de9f32e370aa4fcd11bfe2656243cf9789d5080bb8c9466aec8c37f45e01127d7c435c966af710903
+EBUILD fwcrv-0.1.0.ebuild 618 BLAKE2B f92932c7a9dce5aa6deba70e3e390c8be6b5523e10a74a3ee95b017a96d251e1ea4704cf6428fc88906ace31301c85559db4f78668ca74138961c1c86e92a3e5 SHA512 0c0454afbe2ffe3feecc8b8147e8aff09fe90f210f87ae90440a88ea9f4b7bea3440672056daf564a7f8514875e5f7ef6138f75af84a1237bc7b111478c04121
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fwcrv/fwcrv-0.1.0.ebuild b/sys-apps/fwcrv/fwcrv-0.1.0.ebuild
index b37e8edb8dd9..00c84549cc16 100644
--- a/sys-apps/fwcrv/fwcrv-0.1.0.ebuild
+++ b/sys-apps/fwcrv/fwcrv-0.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="FireWire CSR Config ROM Viewer"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 7f885448e710..a9e89da34a11 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -10,7 +10,7 @@ DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688
 EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
 EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
 EBUILD gawk-4.1.3.ebuild 2003 BLAKE2B 55c637567276e73fbb4032c3d297480a769ee0769a354ec491a857da2afb9708ad650d5f70db1224d315dd82675316cff38ef0ac3af83cbcf280dbfbbc24078c SHA512 87b224aa2cd9b231eb088b588242860ef323913ec64cb403f7622504f82e8d4431fc7f0b53d5bfe33df5c2852b5b6390b235870d4a9e3058fd4803dab2eeadd4
-EBUILD gawk-4.1.4.ebuild 2092 BLAKE2B cc3b756077a761cb1ae392bf37c1541e1c84ef86197b26e24a74c7dca7606e36e124039fa50ba08bbaca978ab7117be8f1a88acc4ebc14376b466f1505ba9101 SHA512 f62f71fdb3e8ce67c4803d16eb5e94ff885be3c600118a32ea4cbc02b0ce84ca37900605c17789a78851ea5c1b4ff1775b5af86b49184f6e868fcc7e3f52eca5
+EBUILD gawk-4.1.4.ebuild 2091 BLAKE2B be60bed6d3882d4c879928a513b335a9027a4bdd3679170c5b6e8ecedab5d2d1ecab44b8d48796eaea8de617dbe4f8ecad55ea53a0058a02cc7672a54f4593bc SHA512 6e5491b47841e72d192b7e968d480b9b12ed41d8cbd702dd9d1afe948bf80e98e48c90a9a89d7f6377c9e69c2b0f3e86bfc8fdab6e03d1e50c87307660568d27
 EBUILD gawk-4.2.0.ebuild 2217 BLAKE2B 7167b9d789eb38036c4ae2d46ee00c8ab29dcf959920e92a3529380fd132126c27ef5125cfa52165551fb6134217230512f98a31259316f4977ff5013df56038 SHA512 8711fd432cb13b920561bf5ced80694c3cfdca84932301bf5ffa505a3fdc0d1d07f108534ba18cb386cc05061afa00466d301d46b69abc5502f315d094a982aa
 EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
 EBUILD gawk-4.2.1.ebuild 2204 BLAKE2B 82c60e85badb8d968c796c6aa83ed366b0b399fb32342bfecabc6aeba7dbfce73361b5a7968d9a61269d0c25cfda7c5add6159f62aee7dd6fc35f4f1bf93445b SHA512 b814c89f185cf3086c7a06f2bfe2a1bae616a9b5bfd062ab9c230c043f9072ead65ab438295b5c7abb430bcbc9a5c601ce41eb8ce1a0b8e429fbbb9a3881bb6d
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index d724377a8796..90886233ae56 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 1a867a23c81b..068af95077f8 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
-EBUILD gentoo-systemd-integration-7.ebuild 790 BLAKE2B 832c964768cc11e471072af09c212e363dadb71e5c0d11115afa628b848d2a9cfb0b734326615c2fc0f4ec84ed8ffba31e56a790cb9788226a2e4c1080f11926 SHA512 db7e4eb29352d3d40f82ccb6f102c440356dfba800571a5d1faf4700f0a666e94744dc23012482531d0e517715ecafd01c2e34c386b47957826629aadd008d2b
+EBUILD gentoo-systemd-integration-7.ebuild 789 BLAKE2B 70548e7073ee54e6d5642f384d97aa680a4167dce08689fad61b826b831697945033e7c40f7233a9eb609b088268857c866f857c0340d6020640f97a4b21f3e0 SHA512 9b3c44924d7b17410b04361d0b810cdfeb5dd257456f51a0170499b9ae51ea571e43b79d3505cc254ff942cb2a2c0399dd5762389ca8706b22e31cc8ea4e8dc2
 EBUILD gentoo-systemd-integration-9999.ebuild 792 BLAKE2B c851b9979d395f5d3d458eb7f0a1237ce1b17a1f0e6538f17a039f51d6ea3dfad6cd9dbe30cd216e8f4437e4407fce5868867ee3698a928295db7d06775196af SHA512 cefd3d785b861966a977948f1095f959249f33c7ee9de9e1021026d4ec76bb9ac09311fa8c5cce19a5726d92e23bdf940b0bca91e3551755fe61848283c7eed6
 MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
index fe7a753e2b03..8d77981d2977 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 inherit systemd
diff --git a/sys-apps/hwdata-redhat/Manifest b/sys-apps/hwdata-redhat/Manifest
index 193684b61cfa..046a5b5a215d 100644
--- a/sys-apps/hwdata-redhat/Manifest
+++ b/sys-apps/hwdata-redhat/Manifest
@@ -1,4 +1,4 @@
 AUX hwdata-redhat-0.217-python-3.patch 227 BLAKE2B 457b3e02ec68f773ddeba3e2ae3a10e6a6db662ee5e324e0745fa872010b59ed2c0b703a294e2c675baf58e0bff3131cca3e390b1ed52939f507ae1655d68c80 SHA512 eed127d4d5b4b33c8f7e1bf25c7a7d5a09c1ccea37d7fd8f0c1139dc000b6879763edd78cb26fe978100d24f3092b2474a6e20535e8aa0363da435e775ef579c
 DIST hwdata-0.217-1.fc9.src.rpm 735079 BLAKE2B e1e25329a42307c36be611d66db7f016d8e4c360c6d84086c830d1d0c47a9a764501cd45f6dd84298a5da52c21f9d9a05ba5875867b3386e358f4af56fa98de6 SHA512 31f057d62283adb926b3e89f4128e256a111d92e6bf0a63adea752d94be2b2e86ffa7535ba6d77a84373dc1ddbc5feb53e337520a8eb6063937e573cccef2634
-EBUILD hwdata-redhat-0.217.ebuild 1054 BLAKE2B 6931d4ce63737443c80b45e630b1cc1d47418217793c66d33f40afd44060dc0d56c53cf9fc0ba744e13fb5280160847a4f625943a97bb3d2ba3218df9333f782 SHA512 f0280270f749136d151b712cd59ee5986f116817d17a0f516ba49370ac4cc08c5898bd235adb93acb0251161c51e4f750f74faace14505aad2bec198ba9c2e3f
+EBUILD hwdata-redhat-0.217.ebuild 1062 BLAKE2B 285eb29de9c699e8061ba8105254f14d8909ec01c9e0b7c5fa1b8a628f5df6af49a226007863fd7bbe3f24e7b9910a1f862f17340febaa8d7c2f569927153eb5 SHA512 ce5df8511f7277990f52a41c8132767be3a3d9bd5a166748ed77754f6e536aa2a133a001043397f13b1e4591595fcd528d9d60ed449c80397f8a8f47fc5cfb76
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild b/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
index 399b71c320a6..50087ae66629 100644
--- a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
+++ b/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic rpm
 
 # Tag for which Fedora Core version it's from
diff --git a/sys-apps/ibm-powerpc-utils-papr/Manifest b/sys-apps/ibm-powerpc-utils-papr/Manifest
index 0686b5a132bb..607e5067a9df 100644
--- a/sys-apps/ibm-powerpc-utils-papr/Manifest
+++ b/sys-apps/ibm-powerpc-utils-papr/Manifest
@@ -4,6 +4,6 @@ AUX ibm-powerpc-utils-papr-1.1.6-removeinitandvscsis.patch 949 BLAKE2B 64056eac2
 AUX ibmvscsis 1674 BLAKE2B 35275773582c68f649e91d62e5a3f6c18e8eaf6a8b396cd74747284b7a650892d4c6e63bca9a2a99daa54da21dbdd8eb9dc4a07786a01906cd5369893182283d SHA512 130f9a13a425e0af489eb135e48d8f77e0af6a6321ad080c3638a3c122a3f25bee4d9da1f8cea2d4acb234f35f67e4696ed40a8ae818be811912aa77351d3ac8
 DIST powerpc-utils-papr-1.1.0.tar.gz 202321 BLAKE2B f9cb5f125c5445f74157de37ddd21a3dc2d8e9ae6d63ae24f96aa1f7e232975046fb743684f5f490e49bd1e79dcb94d3ad6885ed9563105645c0f39808bfdba4 SHA512 4d222373c1bd1a9cadf74110ed0423bd099309d27b6e0f2e3c2d04adda02ad76611c3605954ca67a5a5e869d93241ef756c76b49d6207fc0a68a8eb7cf088a4a
 DIST powerpc-utils-papr-1.1.6.tar.gz 231283 BLAKE2B e3ec0bc26e3285dd4351657a832167420719cf13fb644985e64c40e2f3c31ad51672c84a7e0c415b11c5030c00a740a63e48eb62b422bc97f67d9ab7f33f52dc SHA512 e6c532276a4ed6749ee43af539a07be80777674927d2dc9eb65d95a9b57aa0b902e5fe2be65947f9fedd6e060a44657769c6f9faeae49a78cb4803d038f56377
-EBUILD ibm-powerpc-utils-papr-1.1.0.ebuild 1371 BLAKE2B b604f567e94fc494a79f9a5e2f2971a76ae0eea6b1a52aebe3bb02c6e874cb9eb8ae3f1f0f1e38ed253ba6fe4d8765bbd63df2c6b0c891fb4982d7d5a3b7bd9d SHA512 1ad816c5ded2ed66c71ab5f857d5660a3bb026566060920476b3424ed2b9dfa19846c94d4eca9c4af86c406857601b5872c6b805709ff408bc738ee8f8478fa2
-EBUILD ibm-powerpc-utils-papr-1.1.6.ebuild 970 BLAKE2B dac060ce0e12938c11453323e681303610902e0a27260039b137a99d37db0b19de95ce4dda6d597ac34933154285113c13dcb06574e9525a24ca14b028239cc1 SHA512 746cbd100e9fe21c18669872f98218832a7be5abf22ab60b3272355c651f316a3d2a03a8346973278b81baec9c1850ccb7294eb7348fc1c8528f6f47720c3b7d
+EBUILD ibm-powerpc-utils-papr-1.1.0.ebuild 1379 BLAKE2B 6af08ae5e3323cce30295a9989d6b1c6b50af0db845dcf91717cfd91fce9b111ba21bea913357eb577a40f08a47d05a7e26d8012e2d2997660bb6cc44e4e8924 SHA512 6478f14630f31f8fa988c3989523a12027f7de0f4dc127fd9a466a1dbbb8b697f5f8615c1acff14a6d5c63b60944f73d2e26487b1015b30f505e3a94a9d38232
+EBUILD ibm-powerpc-utils-papr-1.1.6.ebuild 978 BLAKE2B bba6a40392de5ed3bca56a609df3a93922266f0054b1b69c54721038c50e48c8456b8e031dd6f34a42d7152880f0daacd73076be2a535da365d830ce859b8cf4 SHA512 984b1c2a6f33d05f5399406a521e954654cfe0445f04ada8194e5322144e45ac8fa82e9e2547e5beeef76f328ef477843ef0842041ffb69b078400fa0e8ec730
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
index 1d217b3c6e6c..04d747ed2130 100644
--- a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
+++ b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 MY_P="powerpc-utils-papr-${PV}"
diff --git a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
index a78a768b20f6..19f2a4f32884 100644
--- a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
+++ b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 MY_P="powerpc-utils-papr-${PV}"
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index fe3fe0638808..1679a24e2d7f 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -4,9 +4,9 @@ DIST powerpc-utils-1.2.12.tar.gz 347762 BLAKE2B 3bda5a275dfa4bd6e86b565acfb01bab
 DIST powerpc-utils-1.2.2.tar.gz 345299 BLAKE2B de43a79b62302a2994bb6dbb84a1ffe34f33b0bed150e3fc4faff0f3499988f329fc1309bdbb1bc78089b690ce53666b1757b36bbc63e3643d9590a7ed6c45d3 SHA512 e33b5294aff5d66a61740e4817ff274004f9798073e21a3eff896858d43dfa2dcf43669ece58f0fdcb503d42109d9bf574d2f35a0c06da3cd9139b34a249b929
 DIST powerpc-utils-1.2.25.tar.gz 367466 BLAKE2B 6419903c4b954c78dead37f07fb89ce94de35386dcfbf70739a0cf3d141f37b3c4d3da27aeb7fcd8df874c99bc6cf5d51203a3c2521be97a050c59682686e451 SHA512 33af208dcd6ef9d66b96ec3eadab2eee48017860db9195eea0c59444a5dd414c326e1a737d6c324396219901ea594baaad6f49c8f3c36f5e806b4923d049b14e
 DIST powerpc-utils-1.2.26.tar.gz 371200 BLAKE2B f32688091c79a7dcbf849ca008534a65803bcfaf06ce11df072a2f54315f31fbe247d93fc170a7b69ecf5739726ae04bcd03dc6acc357b931bb4c695a823634b SHA512 8c8c45128e89cad5bd1a37699a8b628c269b7fe9d5ebc5893ddce8ea8b77252708f5a2a4a454af71224709a44c999446e5d5b7113ba24efc4227b6ff90a1fffd
-EBUILD ibm-powerpc-utils-1.1.0.ebuild 849 BLAKE2B 463c105fdf1ae376708853c05a97cfd0ce064e6cdd922de85ad26fb595a819b48ddf6cd74b416d4d79257455c8d1600dcfa708edf735ed426a3ddde380d439ee SHA512 84135cbeb4d3e122e873eef82e8f778afb4a2cc9569b5a7434f00579479006532257ada8dfa7a5347dd3e65d425d5f5771234f59326418a80a04c10569b391d1
-EBUILD ibm-powerpc-utils-1.2.12.ebuild 590 BLAKE2B 84230ca22cce4b644322588aaf786a5cc26be9c1ef107e462dd00dfb09ce943f45e160e67e520c5cbf8cf9fd493ced03e0989d3ee28ea6034e19b041f50ab345 SHA512 ce54aeba99fe7fe63b38cffc9ea5cbade543e782bb08926be0c5fd61d4650ee04773cab44ac4130e4bf92b7974d1ef3754dee12e863bdca27203e0c3022142e2
-EBUILD ibm-powerpc-utils-1.2.2.ebuild 657 BLAKE2B 9950e073fc7d86bb3a579174a5fc91f0cb782309e2252c5832a3e0093cc92ab1cc51197dcca33f6b99b7b2f7fda6029cc24e95ca80fd44cb7a08a88926da8bb7 SHA512 341ea057733cc93c0f87015060e3578fad85a65dc1523906f160ea7c619a6ce6c66bbf4c148f2f28cb0e8ecb3f2b9984c07bcf75861944efd30997c51233be70
+EBUILD ibm-powerpc-utils-1.1.0.ebuild 857 BLAKE2B c8ab7b6792ec00c94ba266eb7a1a0e1658348475e05d684121b26e0dc4a4851097e4471f31ae18d28fb0aa36d99e87697831dfd5b0afb566c3176cc469352c5c SHA512 1c7c6482ee809c72c6cffbbf34a221550e4036da8182acae9eeae7436d91b78f5e68095b90853c2edb0ce7decceaf14ab804cb7ea7535bdd9c7d70c263bcedcd
+EBUILD ibm-powerpc-utils-1.2.12.ebuild 598 BLAKE2B 55310cc9bf52a11ce113932e4d977426d8f6aa097594c2848cc9d3255327cd1aae4ebd62c91e71f03de2412b5099e5b166e9a69e1d4ad6f41bd2f72266c45599 SHA512 f5ee07b477b3302506f59f51f9a5344cff50148ba852f4227e8c29f72c378912be984530b5f91997d5cfe9e408cf7c576f44c5b2c9661a15ea616fb431d820c6
+EBUILD ibm-powerpc-utils-1.2.2.ebuild 665 BLAKE2B 56679bcd8f743edaa510ddd414eba7d4489db7323561cb1f232c10d21cc497d2b695ee155206a787566564298161da68b56721e3365faecb0517f8e2416eded9 SHA512 12def0f5b6ee857471ddb14ff098ff67e75f820e2407e5f613bb70c21a9fd03232cf94e46b3a3c0e3274282b38bdc6543a45af4c7fbdfb852e5df56a877b8f04
 EBUILD ibm-powerpc-utils-1.2.25.ebuild 561 BLAKE2B 1485722b43ef7f9bb2bdb0ffb66a15a21a062c0c034c13936182dd341cbcd0389995ff3b2a076f0a3dc4a12696cb3f1252a2e9777572e887c80a42f1b2bb2acd SHA512 d32c597cf482f8d80d13c1632308e8077a5644e278a344504d97375d5cdd91053bafdd3eadbf01208c9d3cfeaf534f73f00796aaca87e8f900f4ee8eaeb7bff2
 EBUILD ibm-powerpc-utils-1.2.26.ebuild 561 BLAKE2B 1485722b43ef7f9bb2bdb0ffb66a15a21a062c0c034c13936182dd341cbcd0389995ff3b2a076f0a3dc4a12696cb3f1252a2e9777572e887c80a42f1b2bb2acd SHA512 d32c597cf482f8d80d13c1632308e8077a5644e278a344504d97375d5cdd91053bafdd3eadbf01208c9d3cfeaf534f73f00796aaca87e8f900f4ee8eaeb7bff2
 MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild
index cd6fe7a2257c..0fa7f2eb131d 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 MY_P="powerpc-utils-${PV}"
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild
index 1a7cf1232260..6e252ccde6fd 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 MY_P="powerpc-utils-${PV}"
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild
index b851115982da..311d2bf1e0e1 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 MY_P="powerpc-utils-${PV}"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 2072eac569a1..f4392b38fb70 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,20 +1,16 @@
 AUX 90_kexec 199 BLAKE2B 37bcd66beccc32a884b0c2fca9cbba14784b8e6bc7238c14397f0ded788b503df1f7d6fff01c9b9a6bc159c1a6e01821c4c78c144091a7e13bb2bbe88ab5a98c SHA512 31837eb7df9b5c9b63c5f500e55fb584e315ac20f328490ff812a265f1a01604724bf4699f142255f7c5fa78cb2d8f2d6220a91961ac90df644b5d545d47ca39
 AUX README.Gentoo 937 BLAKE2B 88a8912015e1cab0d382661d6bdc82689c91970d6d84c949e99a932b4d153b0753183380930b753d23d1c40ab7f44cae784f716e54bc3609a28741ab0b5b1348 SHA512 f082763692def43a97866b88443daf08a2bc1b0dccdc90160d12effa16e1293d8db6935c72ca9dd5502f844078241cbecdfde15b6e8f67a2cca8f3e89f14e654
-AUX kexec-tools-2.0.0-respect-LDFLAGS.patch 293 BLAKE2B b8a5c43b2236381e27229c546449a8bef122541488c186b4eb74c3b4c4d4706a8aeb1a820b1c56ceb45ada1784418eb9ded73f4afa7e5206ceab07c7cce4c9d8 SHA512 c5213462a1e543a357c128af51c9da260fcfa5bcddd9d6bd2fadc84f0456722752e2e7a5584de84d1beca580e07e40ec424eb2577d604beb186403975f7fcd1e
 AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 BLAKE2B ad62ae055cd4443ee4dcb4d9a5be1c918a9e1337545f60c683a1a47b848020d0f8fbdc38c7111e505424783191faf3e221ffa642169d2d055d5e17e6b19b9d0d SHA512 c7fe9176db7c3f9c84add1c263c5a695684bf1db55d47152534f0bbb97c084ad5d3f2090307d0bdfcf5622fa810aca3c104f81b3d24baa76f42d3f32d1d4bbad
 AUX kexec-tools-2.0.4-out-of-source.patch 816 BLAKE2B 88dc0a8f01c65a32b6ae081ea222760845fe243aad1057e3620ed4c932a32edebf943f9557b2f67751bbcea1f91778c0c065e246d419d5725eb68edcb1e58ced SHA512 4839800f99e2bdb7dfbf3aa1f3ad795feb63b4e493812a50d4baa839a27b5e96319c4e848969cbcedf627a32ed5fbfb312461c2ac89b73daaa7f8f680f35f504
 AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190febf582f3ab7e8b821091321036bff104ee5cebab21062830c774778ca17a34a2df76065cfb8 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
 AUX kexec.init-2.0.13-r1 3655 BLAKE2B 25c2f1a607042520cdf5b52e5945fc38a119c090488613c7ca889b8f821cbf348475e4a28d6e0134a3a98cb32ebc79410b21f343154b8e15a9c259114557e047 SHA512 1d04e14e6fe1debc55fa23029a68f78f2d2a408c12bee6d55252109da178c3dbc998db4ccc7f05f7f8c65b333b50d6a1da7bf0d325ee6cae2f00840078d8a457
-AUX kexec.init-2.0.4-r2 3507 BLAKE2B b3ba5edc86fb18f86110348886ea89d38a5421948c69eeccf3c8931abad533e0614ec2eabb174d673c8b6590768cac802c00fdb0f48d2c2286faa9c5591127e0 SHA512 a1b1d907a349b66b97bdbd04fcb0baf03add50816538591a6273e2c3e991b36dd9e15cbe694d915e369ad425c313673b2f9dfd756000fae22102c73ed07deff2
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa SHA512 8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
-DIST kexec-tools-2.0.15.tar.xz 286944 BLAKE2B 00344b607fbbca77398e74bf7f6506efa124ddb4ad0f2e55424a40b90ac0d1a6336dd43f4c8804323e12598f1647cd105880960abfda7df8215c787dae150bda SHA512 0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
 DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa SHA512 f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24
-DIST kexec-tools-2.0.4.tar.xz 271604 BLAKE2B f3359e91295b1c37bd94d3ea7889e948e0716781375f3387077962313615986947b0ac134023876b88cf92b5f0b5e1d3d5d97099ac799d0ba182b58f1bb4674c SHA512 2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
+DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
 EBUILD kexec-tools-2.0.14.ebuild 1700 BLAKE2B 13e47f83fcb672fb4bbc33234f4e1b249171ce883a3515c3d046243c6981bf211652d37e3d4d952850abda95c130ebeb8b909270221658b148725aa20158aa99 SHA512 3fbfc404e7e83a7a74efa5d1ffdf18239ba0e342a0a8a53d1e18b5cc97dd3258d78448b1c5ba20c22559ad18a4488917f3a9feeb711a98fb5720b65cbf47053a
-EBUILD kexec-tools-2.0.15.ebuild 1709 BLAKE2B 659d4ca60e032a34c793e9a2076192b1e89d43576122940456343f5d5b662476fd3c31aac0fe4013facabfc3d02d0ed9e6dc82085c4cee3bf9be71921a99922f SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7
 EBUILD kexec-tools-2.0.16.ebuild 1763 BLAKE2B e04d8b08d79df40644ecc4f2940dd68de6e3201756d7282328fc362b8770e65961cc4f0fdc928ecd63d966132202043c3e1b1a89b655ae779d5d2e9a258ed4d2 SHA512 59e742b204778dbcdde57368509d0a76456dbad1495e3a977de6dbd59e9156447a8ade274bdc916ef62bdb615f3018b3a7f238ac9b1704b35d301599a4f06274
-EBUILD kexec-tools-2.0.4-r2.ebuild 1639 BLAKE2B ffd12a8db13e9075fb7992fdf1c59c52de7f1c950dd25366513db71f41856a977c55e88df61ea3581aefb61ce4ee10abc61cce4048a3bfd32fd3a8925bac26a8 SHA512 0b1fdd825a235646f6589e1043a7edb190d3aeab6ec4dc153235140995d5ee6b09c226eb159182a3cebfcd9ff9251e241ef12fc0313a6f092a8187e197a3ce82
+EBUILD kexec-tools-2.0.17.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 EBUILD kexec-tools-9999.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch
deleted file mode 100644
index 040d138ece06..000000000000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdump/Makefile
-+++ kdump/Makefile
-@@ -18,7 +18,7 @@
- $(KDUMP): CC=$(TARGET_CC)
- $(KDUMP): $(KDUMP_OBJS)
- 	@$(MKDIR) -p $(@D)
--	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $(KDUMP_OBJS)
-+	$(LINK.o) $(CFLAGS) -o $@ $(KDUMP_OBJS)
- 
- $(KDUMP_MANPAGE): kdump/kdump.8
- 	$(MKDIR) -p     $(MANDIR)/man8
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 b/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2
deleted file mode 100644
index f60cb2a7cafa..000000000000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-image_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	KNAME="${KNAME:-bzImage}"
-	if [ -e "${KNAME}" ]; then
-		echo "${KNAME}"
-		return 0
-	fi
-	for x in "${KNAME#${BOOTPART}}" vmlinuz \
-		bzImage-${kver} vmlinuz-${kver} \
-		kernel-genkernel-${karch}-${kver} \
-		kernel-${kver} kernel-${karch}; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-initrd_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	INITRD="${INITRD:-initrd}"
-	if [ -e "${INITRD}" ]; then
-		echo "${INITRD}"
-		return 0
-	fi
-	for x in "${INITRD#${BOOTPART}}" \
-		initrd.img-${kver} initrd-${kver}.img \
-		initrd-${kver} initramfs-${kver}.img \
-		initramfs-genkernel-${karch}-${kver} ; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-mount_boot(){
-	local ret
-
-	[ -n "${DONT_MOUNT_BOOT}" ] && return 1
-	grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1
-
-	BOOTPART="${BOOTPART:-/boot}"
-	ebegin "Mounting ${BOOTPART}"
-	mount "${BOOTPART}"; ret=$?
-	eend ${ret}
-	return ${ret}
-}
-
-load_image() {
-	local ret
-	if [ "${KNAME}" = "-" ]; then
-		ebegin "Disabling kexec"
-		kexec -u; ret=$?
-		eend ${ret}
-		return ${ret}
-	fi
-
-	BOOTPART="${BOOTPART:-/boot}"
-	local img= initrd="$(initrd_path)" mounted=false initrdopt=
-
-	if ! img="$(image_path)"; then
-		if mount_boot; then
-			if img="$(image_path)"; then
-				mounted=true
-				initrd="$(initrd_path)"
-			else
-				eerror "No kernel image found in ${BOOTPART}!"
-				umount "${BOOTPART}"
-				return 1
-			fi
-		else
-			eerror "No kernel image found in ${BOOTPART}!"
-			return 1
-		fi
-	fi
-
-	if [ -n "${INITRD}" ] && \
-		! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then
-		eerror "Requested initrd: ${INITRD#${BOOTPART}}"
-		eerror "could not be found"
-		return 1
-	fi
-
-	[ -n "${ROOTPART}" ] || \
-		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
-
-	[ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline"
-
-	[ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}"
-
-	local msg=
-	[ -n "${initrd}" ] && \
-		msg="with ${initrd}"
-	einfo "Using kernel image ${img} ${msg} for kexec"
-
-	ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}"
-	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
-		local ret=0
-		BOOTPART="${BOOTPART:-/boot}"
-		if mount_boot; then
-			mounted=true
-		fi
-		if ! image_path > /dev/null; then
-			ewarn "Cannot find kernel image!"
-			ewarn "Please make sure a valid kernel image is present before reboot."
-			return 0
-		fi
-		if [ -n "${mounted}" ]; then
-			ebegin "Unmounting ${BOOTPART}"
-			umount "${BOOTPART}"; ret=$?
-			eend ${ret}
-		fi
-		return ${ret}
-	else
-		ebegin "Configuring kexec"
-		load_image
-		eend $?
-	fi
-}
-
-stop() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
-
-	if ! yesno $RC_REBOOT; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [ -f /nokexec ]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	ebegin "Configuring kexec"
-	load_image
-	eend $?
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild
index f3f01574c051..89ef61b3896d 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-	AUTOTOOLS_AUTORECONF=true
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -42,7 +41,12 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	elibtoolize
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+	filter-flags '-mindirect-branch=thunk*'
 }
 
 src_configure() {
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
deleted file mode 100644
index 89c77e7586ba..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.0.0-respect-LDFLAGS.patch
-		"${FILESDIR}"/${P}-disable-kexec-test.patch
-		"${FILESDIR}"/${P}-out-of-source.patch
-	)
-
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-	# to disable the -fPIE -pie in the hardened compiler
-	if gcc-specs-pie ; then
-		filter-flags -fPIE
-		append-ldflags -nopie
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with booke)
-		$(use_with lzma)
-		$(use_with xen)
-		$(use_with zlib)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newinitd "${FILESDIR}"/kexec.init-${PVR} kexec
-	newconfd "${FILESDIR}"/kexec.conf-${PV} kexec
-
-	insinto /etc
-	doins "${FILESDIR}"/kexec.conf
-
-	systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "For systemd support the new config file is"
-		elog "   /etc/kexec.conf"
-		elog "Please adopt it to your needs as there is no autoconfig anymore"
-	fi
-}
diff --git a/sys-apps/lcdutils/Manifest b/sys-apps/lcdutils/Manifest
index 59bbef45c7ce..5e60aaa135b3 100644
--- a/sys-apps/lcdutils/Manifest
+++ b/sys-apps/lcdutils/Manifest
@@ -1,4 +1,4 @@
 AUX include-stdlib.h-for-exit.patch 1165 BLAKE2B 0a3f425a53c21a3613c5151e77836b254ce8aa8cf876703df3fbfb61310b5f223bce1e77f9d83c3512d18a5bc3f11e389433d1adfc2de5eb59e48f21ef782f98 SHA512 3356faefff0c258025bc76abcdb188a47558ed83c613be744fd5fd245f63fd5eb60417738d68c75971b5ad523e047b06c5969d0e8be28b9e9beb3aa4f7e667fd
 DIST lcdutils-0.2.tar.gz 10819 BLAKE2B ea493a49cc1d121b1edb848645f189b4996463e0616dc418e938658767cb56b4ca3982bda0d7349eb303b88ecd3015fa2d8c178607ad14311ca5a0af57a2305b SHA512 ea7140b7b27aade66d025b4c4c7441a2357d03f5081f67ccac8175e709e8f20bf800208a72675eacfca1af8329c01b9e8b1a9bd910bf858bcbdb8aff3c2169f4
-EBUILD lcdutils-0.2.ebuild 718 BLAKE2B 64d4645b5d4a3619eaa66abd4e5be5ad737757857ff19bf5cf63677c4887c80d865799032ba469e8d67530e00fd53fb39bfa72d8ff4f6a64ad4723dd52b07ffe SHA512 25c7404ddfdb9d0345ddbcc2ce5bfdb9ef93664ef9ec0e373498a0fb8e25f72f5df1def7181b349e82b6090b71557a4a77cf64a67187998c3815d425bb2f5bc7
+EBUILD lcdutils-0.2.ebuild 726 BLAKE2B 1fc03db86040605893b4ece1b582eb1d3b07d93ca7f377b11b4e7406ea971312efbfb7c883d0ab6e86671ef0e994470b60b99f6b983357a72bf6e5c9537aefef SHA512 62d09e49dcae09d2f34cc18c0e7e82e1a6d4df93996ccf55832f58e315157052cb0314fa3194d4eaf7eeb40cfec24d83f8372230d2012e390cfb4eb6bfd4c580
 MISC metadata.xml 375 BLAKE2B dc1da69c818d8740e699ffbe55df71b5d3728c0a3ccd47b2a87acc90e3026c2aa2cc5098eaf15da2dc4048b9d36a90933db295fab501fd70b7e04e6841dd47ec SHA512 db0267b82ae887ad69ba5196396d803b84344a6fc22aeb05341a80ffc6993e4538bf79d55f3d670d7947749a87de59eb4f1f0ed7c4a6cbcecf51e7feaed83502
diff --git a/sys-apps/lcdutils/lcdutils-0.2.ebuild b/sys-apps/lcdutils/lcdutils-0.2.ebuild
index e62acff23069..86daddae5bf8 100644
--- a/sys-apps/lcdutils/lcdutils-0.2.ebuild
+++ b/sys-apps/lcdutils/lcdutils-0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="Cobalt RaQ/Qube LCD Writing and Button reading utilities"
diff --git a/sys-apps/lkcdutils/Manifest b/sys-apps/lkcdutils/Manifest
index be304bae4d03..3865a1ae34e6 100644
--- a/sys-apps/lkcdutils/Manifest
+++ b/sys-apps/lkcdutils/Manifest
@@ -3,6 +3,6 @@ DIST lkcdutils-4.1-1.src.rpm 1502922 BLAKE2B 94544e552bef448241b3bf345b817734f9a
 DIST lkcdutils-4.1-dhv8.tar.gz 8227 BLAKE2B 2c322dc155328e0190a8f19300eb01e8488b7de9adb0393d2c7dd3aad3c1072593115fc8905767b5c84ae5667cbe43bbf56f14a584b7b2ef8922eaf254a1615f SHA512 a16885802a937c16c33a70fc29ed5304cf610e01b10b7da331f474143bffa84fffb3e3d34d8438e63da0af9a43383de1eb4ea779c81508465b28463432526074
 DIST lkcdutils-4.1-savedump.tar.gz 21626 BLAKE2B a99c997a7116a5808e10cc1b8aa85b123ace69d11daa3dcd9090b7411865446dc8fc50ca7cb24cf7463ebd29a283d939610b2d005a290be8342d261b3f0142f9 SHA512 00620d8e438b512005c9d9c19743595c5c0d0a5563c4833aeba597cd77b9e17d3c46f28fc2df6c53dc8f1200c3a88c7bd67f0007925337f0c81b975971e511ee
 DIST lkcdutils-6.2.0.tar.gz 2967595 BLAKE2B 8f58d3ce688ca207a21b94a6c3438034926fdc72f1cbb24caa63472a9971d7b6ae21d1f72452157b75cbafebda8bd62f781a11acd155d5365d032cb7a90f36d6 SHA512 963f095448b28526f9db88efb77a32e7c05accfea3af175048600727dd8cce02a47743a5e4fbd5f359f8dff41538d4c90c201bdee5cb9c2ae90973f6377aa20b
-EBUILD lkcdutils-4.1.1.ebuild 1845 BLAKE2B 446eeeb8acab74461e1f702d1fc20d156a5024f987c5e279d5a85b6c6e6e85b7589a5023e555e486693862134f1b83faa5eade10f41666810b01d83f0e748d19 SHA512 31ab75986c94ed79f3e226e3a73c31e50d9f188f5745fce95f5cd110589908fd9b06c4724330546d0ca06b7fcdd5f82ed0d4dabdf7f1670eeee6aa0fa30f1b0f
-EBUILD lkcdutils-6.2.0.ebuild 652 BLAKE2B 7fa8cd7efe56e47226b0674a6efdd96183332662dd97f723f3a7fcf2b2b0b8aec3bec50f8694e48c5d1354b7428b947ee94789192c7156eb6799cb24cb197e5a SHA512 4fc3159cb82d2b0e35ddd4c36233ed65a0b2829eb85a7538471487ba38b33c1d3add1a1c88f67ed1bffe3b8de78f3a358446657ec808a5d5ce74a97cd17e59cd
+EBUILD lkcdutils-4.1.1.ebuild 1853 BLAKE2B e1a3587fb4b5a3fb69d62c63a8e988b7828e4a73b7a6b064b026c407acf801f92685a4b7d7b84a3cb1b08ae6f7202beb49c39166a014ec7c6add0991e5439bb3 SHA512 bfd06d494ad70ba257ada33b884f495ef219c3099cbef632cf8f41f37f1150a1cf81eee14546b236241916335f9051d3b6ac52478da412796747222442a9f6ee
+EBUILD lkcdutils-6.2.0.ebuild 660 BLAKE2B bedc47c1a69680dc49a00b593f29b31d45814bb25f14cee0c1044e30cf4c536fe718c2602b880dd80e6086d406581c3a18c8072926be1dfea92856560ce54906 SHA512 bd48aca04d9d4a8267e03c3b7939b42cef7b77944cf69f9c68ea2e9d06ed2b7bdef629d31977f5ff6479056804ddaa4581905d040dadcddf71a01818967e905a
 MISC metadata.xml 290 BLAKE2B 320dd10901e23177315eeb9ccfebc0fb113ce4aebcda3c90ada08b94d00579af040905c5a493c83175be11e9fe44f077b17b0225f2aa21e748e1d498309618f0 SHA512 c56bd2e7b716591ab6c6d36b3531659578018f200f17af1d9098bb89e8a67e75df759ba72814ac269b01bba1b208447a4ac5bc55ef849073c676e8bf09ca0cbd
diff --git a/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild b/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
index 9f4504f158e6..a0df8d83992c 100644
--- a/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
+++ b/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 MY_P=${P/4.1.1/4.1}
diff --git a/sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild b/sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild
index 15a9ea3e19cd..61b01c9546e7 100644
--- a/sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild
+++ b/sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="Linux Kernel Crash Dumps (LKCD) Utilities"
diff --git a/sys-apps/lsadb/Manifest b/sys-apps/lsadb/Manifest
index c334d97de662..1cc27fb47a43 100644
--- a/sys-apps/lsadb/Manifest
+++ b/sys-apps/lsadb/Manifest
@@ -1,4 +1,4 @@
 AUX lsadb-makefile.patch 224 BLAKE2B 0ab70a22363bf1f3130ebfed8974f58448a38c60f8fcb72e34c324aca9d195942560bdb4345e6862af5f17406a2301d041df9eb08930e49ae787c38b6ae647b1 SHA512 1e7d158b5e17b0fea943879d1f6aeb20cbb2ad4fabcc5233f8143ef2943d218c7d263e87959f3159ffb6d4c1539cd14e0b2a0cafc502757e8a5a733e0f638787
 DIST lsadb-0.1.3.tgz 7098 BLAKE2B 54fa717aaf0ed6800e592d1da5b6f3c4872c5b1c5ad62fad1864734ee4d0ef7336371a799fe3ea214918f69c720d9f0d2d2ce1f8be93c7969711b5c54ae69f56 SHA512 cb5193ba4e3806a140848dd7b06e08e115ac95f12fe2e4dbd7a0b464926cbc0ecf1113331bbbeedc72fd1d51b7d87f3115ce4772efcfe7bee20dc2d954dcf646
-EBUILD lsadb-0.1.3.ebuild 655 BLAKE2B 185ba2807877bbdcbce175074ee04c6074bf2f667de349a9eb6d954935d4906fc58fbd9b803ffb1c80de34b4b300eee762094c6ddd2dee9991262a63ad528480 SHA512 6b5402e8f4b83e05d99df522b143e0953e2e19e8051dd670ad3ee179645ac3965965817643600ff63534671381592d68c0c58a25b0619316f1890bdc74306a0f
+EBUILD lsadb-0.1.3.ebuild 663 BLAKE2B 3005b3d5bc4dffe47809d2c3eb92c4efc08cabfa23169c92167a0c9d6a4feebd0ad7ada6813a22bb3a0aa694e80494cab78c6ebd84d4a14ba23731b2a3535c4c SHA512 953c07c9012f44c121088922330cb69e3caede836484ff192a6968324442ec0a1a11b821df3bd3a033feaa3a0cf07bb0b4a67f210c5626ce0e00a88c8200e64a
 MISC metadata.xml 263 BLAKE2B e66994388bfb417186bf7a8f1d7e8b12c243f9fb8b2a5d911129327b569829be2cf0896c099c3ae4b283f10636dbf03e109b7d7037f4373b98827d27a4dce8f7 SHA512 f72954ee8887da0e1b3e59effb6eb40294102e91b1060c2d736fa47a3a12513d959b44e77fc62f881408e38d30a47f1c5b1c4a0d9c3646b5fb75118e5295ea5d
diff --git a/sys-apps/lsadb/lsadb-0.1.3.ebuild b/sys-apps/lsadb/lsadb-0.1.3.ebuild
index 8c526cc30bfa..6c9ce989b8ad 100644
--- a/sys-apps/lsadb/lsadb-0.1.3.ebuild
+++ b/sys-apps/lsadb/lsadb-0.1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Prints out information on all devices attached to the ADB bus"
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index a0666536a04e..4e8d4bc11845 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -3,5 +3,5 @@ DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345
 EBUILD lsb-release-1.4-r1.ebuild 732 BLAKE2B 86e83fb65af3f76b58fda76f2005738c4ae724a9fce7b13c85664262bba7e817ddb42697000394cec90830a5e280f62ff0b61a00781fcba8937e55e7deb09a75 SHA512 ec24e3ade879837b901ac4beee6bd354d0070965386683c40ce27d3b239ad8a5522f77ffc07f96a91c685c4ccbeeae006257e1420d60d58e6a59ba33cd7550a9
 EBUILD lsb-release-1.4-r2.ebuild 854 BLAKE2B ca559ce9afc79b56a947e6dc4d91e445f26ffcde324ad75d5fad418499a226dc25b7473f541d258dba3bc853e08cedfb4d05613e64650a13d60071b3daeb2193 SHA512 ab5356625e24fc97349be711516cf346d21bb3a414c72ae5d6c95cf18b307df74ff8a1ded89d700ef65307b3c79205644e815d2281725c265e3ff61c4cef4dc8
 EBUILD lsb-release-1.4-r3.ebuild 920 BLAKE2B a7359b9175593d3c9ad4d59dad100430eb7f4f3bb5878b223897d185c07a980d009a3265d00117f9230493a04f3878921860e8cc2605a5e19024b2cfc3b6ad17 SHA512 d846432c4d125ab6e3efbef4846b020ce169f50a7566068e52cbd82b5e9fc03bac8f2a6cd55ac1cbf33e51e87d3bc60f11d807793ee13880a906c92b4061b2b4
-EBUILD lsb-release-1.4.ebuild 682 BLAKE2B a3ede22a4bbb350d836cf3bf1a88238b252cc64a9baed63b2ca54ad826a62e8172221228c4c93f2cd9778d6fe51855d73636dcbbe2ed013b7e3b49e521ccbc59 SHA512 71356ec02e8d4bf81e89353224ec36b86ba6c082fdff2bee7456851e1feed034217a1b49aa9ebe0b43ad2a651161a5341361ff4eaa47baccc8b1c3e61aff6bbe
+EBUILD lsb-release-1.4.ebuild 690 BLAKE2B 6c0f11ac818e4c90150aa66f1497a565119e9733df7fb471f275cc8b0348958e0097dd27cd83c478d84b8e5f52ea8650a24ccb29c9048c23907f61e710ea26de SHA512 e1a2159c9549ad1596eeea49734f85c0b46497c36778df27c6477c570e26170d0a4875d656b7f825497c0573d06c574695b7bcfc15cfcb458892905a48b3ec26
 MISC metadata.xml 795 BLAKE2B 3af7256256701726c04244c09e8cb8aa9e560cea0b16502412f3565235cae17ab172daf4cc26cf7356ef021d2989752c733a8d4250d241e32e1c79f2149622b8 SHA512 e0951bbb925a0729e886a608c2b177fa9a68aea5571316d0d89f8cae3fa6f48c97aeb37c1393ae429f02ec40f640fe237836f018ba31c2a3d0b9a81ef2661dcf
diff --git a/sys-apps/lsb-release/lsb-release-1.4.ebuild b/sys-apps/lsb-release/lsb-release-1.4.ebuild
index 334652e4ce99..312c56d272dd 100644
--- a/sys-apps/lsb-release/lsb-release-1.4.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="LSB version query program"
 HOMEPAGE="https://wiki.linuxfoundation.org/lsb/"
 SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 53a0f0b9d2b4..b0a90d610ff1 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,8 @@
 DIST man-pages-4.14.tar.xz 1611348 BLAKE2B d06d6d5bf67f5a17ca685bb1a6742a4d300791c1ed715372fa9bacf3006cd73c4b43434ff7c0a21e3a15082ca1bee91c8559751225eed2946da23c6f4d66e71d SHA512 d7163aacc6c3da914182d685d459d24ad60182e2cc528d72b08b565a9e2901ec319c8b44aef9b7e20838e146e159834482c62ba1b65823d5a06794283ebef41f
 DIST man-pages-4.15.tar.xz 1622184 BLAKE2B fac4895411bead3f2ce7ce642206f80ec7422b11b0cbe96abdbb855e24acb1f271c07c7f3d2b07105c46062b0f07c54c9ee06281ba3dd81224e0304174a6842c SHA512 cde896add266e672347841a9116e5d182084044c4543a847945825f98962192f0e8278a4f562fc47a580eb2ddc3d669ffc75a21922219b4d3c36cbe8a792e205
+DIST man-pages-4.16.tar.xz 1630064 BLAKE2B 7c436ebc01d5248378f40fa8f8004bd2e0760a8409b419d4d7aadf8f0075bfa9b89801172b328856ed0f0a70b75523a489957a9aacba66e893698bea1ac98efc SHA512 df282a0480e2c1cc74e4ba02d6ff02ba95886b6583058c737028ea609b916270ba7dcaf075e0c450fd4b49b335979765abfc7d0a75f5570eec5fa2381c10201c
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-4.14.ebuild 1656 BLAKE2B 6fa0129e7c8c1d11245ee519595377d1fb6a5c3a894c7b340d73c22121928b498f1b0612806a97010bd9c44a7958fe9d3ec334e5d0769ef73310e06870fd29e2 SHA512 e39d42d12106ef69a497bd48326e9d2a20528a4a8e329e8fbd3f8a3dff57acc3b3481971763598ca1f89f1cb27f4de486268ab4e44bb1e3b3039250ebf8957b5
 EBUILD man-pages-4.15.ebuild 1669 BLAKE2B 3317382390ea2b5186ae194d7d9f301ea5aeb6f9cb50e7ecca17a2f5be140c77a51c672205618f05ef5162a19446938e01192075c81de46cc679df676bd36e76 SHA512 be4068e5cebe0a97b615bd9b00f9f9911ed98f69598d37ae37d4c74da43e6791b19c4c3814ecc2032d8301e48a7cb1afb99c54c9f4db267729208542d16609e4
+EBUILD man-pages-4.16.ebuild 1674 BLAKE2B 535811be8d0e7f17d8af2272e66e8623d21b546e4c820207adb27545c1730c7d14ed3e40e3a8c05559224600d9be0c82af8809cac7778caab64cb02c3935b208 SHA512 b166a38aa5517ba146016734260b8e0137b65260d59ae27408b6960f1db9187c27184ddcff54776149094afbfc627cbcfe732ddcf774943fd8837277f5bf1ee6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-4.16.ebuild b/sys-apps/man-pages/man-pages-4.16.ebuild
new file mode 100644
index 000000000000..29ff57d6d8fb
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-4.16.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
+	mirror://kernel/linux/docs/man-pages/${P}.tar.xz
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
+IUSE="nls ${IUSE_L10N// / l10n_}"
+RESTRICT="binchecks"
+
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<sys-apps/attr-2.4.47-r2
+	!<dev-libs/libaio-0.3.109-r2
+	!<dev-libs/libbsd-0.8.3-r1"
+PDEPEND="nls? (
+	l10n_da? ( app-i18n/man-pages-da )
+	l10n_de? ( app-i18n/man-pages-de )
+	l10n_fr? ( app-i18n/man-pages-fr )
+	l10n_it? ( app-i18n/man-pages-it )
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_nl? ( app-i18n/man-pages-nl )
+	l10n_pl? ( app-i18n/man-pages-pl )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+	)
+	sys-apps/man-pages-posix"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
+	dodoc man-pages-*.Announce README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo || die
+	doman */*
+	dodoc README.Gentoo
+}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index bcadcdb5d4d9..774f20fe2934 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -18,8 +18,8 @@ DIST memtest86+-2.01.tar.gz 165984 BLAKE2B 6d339755472515734a74216d50d9b5f716439
 DIST memtest86+-4.00.tar.gz 270327 BLAKE2B af33ecc65e2418d84a008f659c1c5fa5949c2b16963da08c1f15cfc89681c6900d46d9f3d15d9beb545eedbb641c174c37a53b1a6ebef63a7b9ff9d7034f28b8 SHA512 3d2075ec5fe18ce356f75bf473aa189ba6153269c63be263f13e7d553f468a57f147f1e62dad16ad9ec4fb57724e1c67c69eeffb33db3e1f6300357f26b586ba
 DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
-EBUILD memtest86+-2.01.ebuild 1274 BLAKE2B aa17b6ae13a7691a7dcbc1240008a5bbeb467e040439de65f30171027ee8bc2ec9c25df380efd3504ee906bc2e5c1a28b4abb0300e802418afc91528503ee4cb SHA512 655c83fac387e581f37a3e7e8971df20070f98c683eedc9e23d5aa9c0d6fbd769079b03085e1d7883026ad82cb5cebbf07ecd7be72cc64f36cf4335652401a54
-EBUILD memtest86+-4.00.ebuild 1924 BLAKE2B 24610c8a2fb43e20933befb99b430007ca68a5fc5e6293d15f5db001f741edb7431554bbb1084e92d2dc59946bc737854b3288a610b81ea2cef15cb93e6039ac SHA512 f8227e6fa3356670da2b6619aa5f3a2256e65727d6a030c625f9318c25938bceff3944c3f954fcdc5dd3e1f7cfc7deebb02266fe5a16c5c801804dc36b826c76
+EBUILD memtest86+-2.01.ebuild 1282 BLAKE2B 0d237e23b7ff5393683e793cd40ce0b1b27cccd851579c553ad15c1fa9a2f6ae2436794f339cba2242a61c506fefabe04252e4540960108468f4547e236e4950 SHA512 f7feb596e0b4ca6c9bf3fd14a14051cb7f4f3d94570f27c9adc8fbc162313c95476111cc7995284d30d0ebada100485184df4a0a70c36e8d90da25fa0f9b9a89
+EBUILD memtest86+-4.00.ebuild 1932 BLAKE2B 847e74b095bf46b34f7a9edda230822a9a12d3666125e9170ce3b8bbb136cba33e639f0f40d53773ed8e3f08c5cd6234c8784ffe6c63a58fc3738f1bafbfb156 SHA512 e18073eabfe5e206790f7cded2834ebf28d531488af9489e10f3b332d76a0a1f1ab5e071479e22fd1bbb0700489d3c9486a9f8038a3d147b658cb02008221db9
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild
index 4eaf769135dc..2051cc102de5 100644
--- a/sys-apps/memtest86+/memtest86+-2.01.ebuild
+++ b/sys-apps/memtest86+/memtest86+-2.01.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit mount-boot eutils
 
 DESCRIPTION="Memory tester based on memtest86"
diff --git a/sys-apps/memtest86+/memtest86+-4.00.ebuild b/sys-apps/memtest86+/memtest86+-4.00.ebuild
index 4f8aed6b61c9..354fe5b3134f 100644
--- a/sys-apps/memtest86+/memtest86+-4.00.ebuild
+++ b/sys-apps/memtest86+/memtest86+-4.00.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 QA_PRESTRIPPED=/boot/memtest86plus/memtest
 
 inherit mount-boot eutils
diff --git a/sys-apps/netboot-base/Manifest b/sys-apps/netboot-base/Manifest
index 5912acd222f3..5d488cb18f3b 100644
--- a/sys-apps/netboot-base/Manifest
+++ b/sys-apps/netboot-base/Manifest
@@ -1,3 +1,3 @@
 DIST netboot-base-20050110.tar.bz2 4313 BLAKE2B 7c15f052cb0b731a7bdccf8a92b04df00f03448826fe5f8a0738edeee5a933eed9998a2549211288ab8c2fd066972771e545f508959410a6bb07114cd7d50130 SHA512 f40e289b178e75b9463605cc77ff395a08758e6641cd6298a62ef1900f21dd7be2d76e0bbad1a1140f60c8ee1a47496bc67fab7a93d2314cc6abd3ee306b265d
-EBUILD netboot-base-20050110.ebuild 886 BLAKE2B b1462a2196917f97cb048fe54ef7d4cf4b1985cd965203ba53a7d7dafb5a23a70415e8dd26db90e48b9a44de68b529914f43a8d450df0e5ebc9950f30f272e7b SHA512 c7742dd310c38f495051322558cb856db1db926740529e40f55f08ea145d8e043bbc3b7e270bc736237e2e3f62c698785feb449724e4150e00398dfd4c9bc545
+EBUILD netboot-base-20050110.ebuild 894 BLAKE2B daa1a502166aa47ca988bfba035b4bf1ba34bfdf1de556aac06731d47a58738af0cebaeef036d4abf31f6287931a1381513fd300bfb8c281bd4de7aa17a7223b SHA512 75c3921b21861ceade116600567c31deac3f36d0d63fb5be64716b8f9631edac21e429959e140cb007ff0eab4ba600978fb538adbc838d7f3b6284e3f5ffbb2b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/netboot-base/netboot-base-20050110.ebuild b/sys-apps/netboot-base/netboot-base-20050110.ebuild
index 9ba289517bb3..f0711d345acf 100644
--- a/sys-apps/netboot-base/netboot-base-20050110.ebuild
+++ b/sys-apps/netboot-base/netboot-base-20050110.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs
 
 DESCRIPTION="Baselayout for netboot systems"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index f8230c350d87..c82a8c67be3e 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,8 +1,9 @@
+AUX openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch 761 BLAKE2B 78fcfe2e48a6b13a2c65837fd185f90f5db423b3bbadc12fd1ad07139b354ad3a79c03d95f8fe29270960df1fe477d95ed818874a84d79da436e9ad674d0f6ae SHA512 3ece21313c9c3465a0d5ac2d9358824f80165a1edb193ec0e237b38aefe5ac25d1c7a8c992134c78e7416ea6294711a2a0e86d369e8456b85a59eaa402e34a10
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
 EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
-EBUILD openrc-0.35.5.ebuild 9963 BLAKE2B e820565f8be3bbcf21ed330e3b1ea02f8590372614c7d6ac5a001636cc6d56708cae5ba181e1ecfa521deaed8996de0edee602579e28719d810e3830e9eb0d3b SHA512 da4193b443398edcf3f7da57e370127236b504078cdd685952d2aa65b0c4e60d82b130f5ecd0f1bcfb2d4eee89ba414b59f82c4ce5f5dbe9cfc7fbe9c5beda94
+EBUILD openrc-0.35.5.ebuild 10049 BLAKE2B 20a347eb789266d9462c49509ba62b26963a982a4f586a91ff073cafdf4b0dbacaab9bcbe47a36a86b33228c34adc9117a42a9e4f4f2aa0226993e0b50da05b1 SHA512 8a54f2c6c96766d03d69a0460635fb29f064edda9a96baa27b9057f2e7406f87f397001169148fb874df0555826589c4aa23d5f78d58df1861872ce8762548e9
 EBUILD openrc-9999.ebuild 9963 BLAKE2B e820565f8be3bbcf21ed330e3b1ea02f8590372614c7d6ac5a001636cc6d56708cae5ba181e1ecfa521deaed8996de0edee602579e28719d810e3830e9eb0d3b SHA512 da4193b443398edcf3f7da57e370127236b504078cdd685952d2aa65b0c4e60d82b130f5ecd0f1bcfb2d4eee89ba414b59f82c4ce5f5dbe9cfc7fbe9c5beda94
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch b/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch
new file mode 100644
index 000000000000..b547fe2b61e5
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch
@@ -0,0 +1,29 @@
+From f4e2142089487b7f5c99da949d7bf8d038724df7 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Tue, 1 May 2018 13:28:57 -0500
+Subject: [PATCH] Add _POSIX_C_SOURCE definition to Linux build
+
+We need this to allow builds on uclibc-ng based systems.
+
+X-Gentoo-Bug: 650908
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=650908
+---
+ mk/os-Linux.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
+index 2479ff5b..9e8a1485 100644
+--- a/mk/os-Linux.mk
++++ b/mk/os-Linux.mk
+@@ -11,7 +11,7 @@
+ SFX=		.Linux.in
+ PKG_PREFIX?=	/usr
+ 
+-CPPFLAGS+=	-D_DEFAULT_SOURCE
++CPPFLAGS+=	-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L
+ LIBDL=		-Wl,-Bdynamic -ldl
+ 
+ ifeq (${MKSELINUX},yes)
+-- 
+2.16.1
+
diff --git a/sys-apps/openrc/openrc-0.35.5.ebuild b/sys-apps/openrc/openrc-0.35.5.ebuild
index 3420adf2a4c3..820ec13085b0 100644
--- a/sys-apps/openrc/openrc-0.35.5.ebuild
+++ b/sys-apps/openrc/openrc-0.35.5.ebuild
@@ -59,6 +59,10 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch
+	)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d1e03f64e191..84c69d4b9b76 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,6 +8,7 @@ DIST portage-2.3.26.tar.bz2 970245 BLAKE2B b854bef894327b9e4beabca55d70368d32654
 DIST portage-2.3.27.tar.bz2 970480 BLAKE2B dc46362773544102d9a07e686759d454a37177e9ac6e88d664c1aeb1676b9fb4e12662500f1de63644ad5eaf69d58bf85f38339c18d695cdc42930746dedb731 SHA512 791c87ffe958e883fe16562e69e606dd7ff860c13b2262b3eaa665f78acacdcb547c5e124b69d2c0faa36147fdc7c1d60669dee43b7401ea4f89784a619f81fe
 DIST portage-2.3.28.tar.bz2 975684 BLAKE2B 70f944700bba66e369877ffdb76c829d6521d429c65ded482482058639478c1c6e27366cb509252e59a4c3d2d295211f4efc2cecd84f7790674429a42a399a72 SHA512 208237faeee844bca829adc42b0407c246e09e91d5c5850c27696eb201f1009a87dce0b28cbbca4a27f2c9d58c0c102387a41483c976642acade83679a980777
 DIST portage-2.3.31.tar.bz2 986684 BLAKE2B dc2a6e7da211da98320b872b26af46138791e2600d261fbff21823576804ea04dc77bc69c5f64d94a9bc3d0ec9cba0630b9093c12c426ae0561471092c837080 SHA512 7cca6aa6e8e6ce7ee3902686b437ea09c398630f46926d568a35f94b95be3c6ecc53a4ab6ee99d52c04755d5144900cc3aa84be24a49533518f8c50a9301ffb8
+DIST portage-2.3.33.tar.bz2 991303 BLAKE2B 13dd9ca00d1c651d7e6697586209a485992eb39ffc076e1b4c5ec2bff0939e0c9cc1c5cf1db36185d1011aac0ac98f6c82b06224174f9788241f17aee352f6d3 SHA512 3eaf1a878e458dc2f61737ef8ce5812ad95add2f0d14cc56aa0082d12cab6fa4c565229d52dec52dc629fc7694875918c5cd4301a29c91492123260dd957ef0e
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
@@ -18,6 +19,7 @@ EBUILD portage-2.3.26.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0
 EBUILD portage-2.3.27.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
 EBUILD portage-2.3.28.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.31.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
+EBUILD portage-2.3.33.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.33.ebuild b/sys-apps/portage/portage-2.3.33.ebuild
new file mode 100644
index 000000000000..376030121e07
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.33.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1
+			app-crypt/gentoo-keys
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+	einfo ""
+	einfo "This release of portage NO LONGER contains the repoman code base."
+	einfo "Repoman has its own ebuild and release package."
+	einfo "For repoman functionality please emerge app-portage/repoman"
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/qcontrol/Manifest b/sys-apps/qcontrol/Manifest
index 651067dd8724..cea59a2ba413 100644
--- a/sys-apps/qcontrol/Manifest
+++ b/sys-apps/qcontrol/Manifest
@@ -3,5 +3,5 @@ AUX conf.d 133 BLAKE2B 4d77e38035348a26a1dc576cdc681ef41e10104730158e4c3f58ea40b
 AUX init.d 2211 BLAKE2B 5656083b4689db24bfa77b07704316123a4690e8160d355b42d6bdc359a9ace495ae52b72199e31573307b400ec6e9bea02cfd5e9e136a5faa7b3d94591b3a8c SHA512 66c6c4f30e93f759ca7a9875e23ed82843d9cc728c14c7bc7fffee3fbbafefa57244155649986c547264f500a21d0099efd1195d1810b47370c8f77ed79e4dde
 DIST qcontrol_0.4.2-6.diff.gz 11426 BLAKE2B 5f4374d2a6a2f79ca357827437d7ec42c6122b8f3ba008bb8c39adaf80a2edff24ed4f0abb29780ad70cac09eb1d39124d3d9762d603c896c8857ad7b8e7910e SHA512 ce450d04c72052c8e7ce0bf26d21d9942d3ea02b958b510efdf26d368ee69778eaf61bec2084c4d21cc1a5d281d1331e40b7bcaf388b4b59174a37ed037dd984
 DIST qcontrol_0.4.2.orig.tar.gz 18344 BLAKE2B c90d3d31ffd624bad11e70a2c700e0e058c9fa6cc2cfa6bb803471df67d07d03a88ae134d5543dbbefe30b5870089a29151614a545dc171de5eb4732d6592461 SHA512 f132faff54833f11ae79622dc8e33b4e0f2516f7377633ff47a4ebe71335503c5e4892723c049b00888622ce059026cd97c6856b425b94163ec09887bd21e81e
-EBUILD qcontrol-0.4.2-r1.ebuild 1448 BLAKE2B ce53dbf508b9432181c7ef5a32ee7d03e883fea279d45cfa5a4112c2bb36d7dc95eef25e717a2eb963dfe6ab268755185a2532ef6fa3a8ca98eea949f56ebed5 SHA512 7ca0a56ad49b33509c794bb08b2dc0f0163d258c1a29b36818ae03a86bd753913837b4017b7ae481ea8dceec117a0318fd3eb8eaa56a30f733eecfff5c5d93cd
+EBUILD qcontrol-0.4.2-r1.ebuild 1456 BLAKE2B 69b682ca190ddf7a456e46999e4e5b899e12b89d24d6ebd68d853dea01b3f619ead24c1dda0de31ea9741440b6be107c2b961ab4229fd45dc6d65bc94a14f720 SHA512 53e948c4a9d04a2bf34961864f5fef6c90baacfe95aacf9280bec35602190e5041ab5d9cd1fdbb292698da0e716986ffa69c93ba016facba67732ef8e853456a
 MISC metadata.xml 367 BLAKE2B 8a20a869201a1a69097488f15283baa6eaff5e80667974605e34470d0fbeef210efce302a5feb1b30075273c468b96cf197125d7f7dcdef93faff7b35fb34664 SHA512 ee0131a33df4a79331dfe2a7485d71b05f8f386d3b6ce0b26ab76a7c9f8d9b20efb931fda54d499feb9dd6c3feba34299cf8943fbac2ffea2076e634d49087de
diff --git a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
index a5e90afd14d0..f135fd986def 100644
--- a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
+++ b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Send commands to some microcontrollers, e.g., to change LEDs or sound a buzzer"
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index ec64f9625461..ccc048968bdc 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -4,5 +4,5 @@ AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
 EBUILD rename-1.3-r1.ebuild 909 BLAKE2B f19745cd4b9de20bd1cb205c85931fba29c41cf8045acb6891769bb2a723bb0a2cd96e0ed96ebe5c77ef31ba6265716ec47b5c567b96c2b77f48c37309b6f45d SHA512 cf894e062fb1d57cd665a688e89dcc9c8d18e67c1eea970137399e9926d43dc61731b48acd930cb9f0f54979fc0ccb52c4a55839bb861dfe83f793bc6529e3a7
 EBUILD rename-1.3-r2.ebuild 904 BLAKE2B c622dd555b9ca55842551f472d8f58e889ea075e2bed2ed8ec98e05efaa4ff787c62e5a3eeb76d96dde06b00280d1edf0a54eb866fbaed2679686d53aa8033d6 SHA512 a219a73bae81d3edbb11aa389f621c7d371c8395124eab360ead04bae52a1e3e8cbfd19f7286cb503ea23b2d1957bd6e62cc2aebe07399c4c19cbe81c8b70bd1
-EBUILD rename-1.3.ebuild 901 BLAKE2B eae1572c51512e69f94795274c6502b57fa620f9eb91f85ff7eed79180021150e31278b53f4591d42ca6e2c23d0e45757401db8d11c345c6b1223f9921461c99 SHA512 494884b7cd285c34c5ae6139b3c93a3a6e42051a9431be5437a46d06ecc4ab9605f2752e6003f10c9103859edfa2e89d8bdc8266862b485ce890f608f1b6e269
+EBUILD rename-1.3.ebuild 909 BLAKE2B 0a2c9bec5c6a7c76e7fc5a8a188b60bfd65738d91c738db2abf56e478269d732c520ffc185f4a67f724286cb99274bf385b9bf6323608e8f8e4cec58a67eea41 SHA512 c7a6f92d25f30982315a46eee0804926d0c65c8f7eba250473ddcdc08935ea2b13b62b4c81fed1a8312156f637d8a1d8418f066f5595bb8e59ccfef3504a61df
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3.ebuild b/sys-apps/rename/rename-1.3.ebuild
index 4ca676599f64..1a881725c83f 100644
--- a/sys-apps/rename/rename-1.3.ebuild
+++ b/sys-apps/rename/rename-1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs eutils
 
 DESCRIPTION="tool for easily renaming files"
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index c069b1c6a9ce..dd7a298bc46b 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,8 +1,8 @@
 DIST rescan-scsi-bus.sh-1.29 15654 BLAKE2B 4009d515d200c2c26baece3ba94f84167cfbc2cd9d2c91a1d928bc119a5a98b63397dae90489180453d7c810700b495b230a23c6791485132e3aa34620afd786 SHA512 dc6bfc5b8c4948c193bcf2522e6f4dedaacf9a9283eaedc9c3bcef0cf3db57a3ed8f3a95b8501853a75e1c83ad28850b291a76217b4c57690e663f3dc63587d7
 DIST rescan-scsi-bus.sh-1.56 22469 BLAKE2B 132ce0990f742ad3f25bf7c30cb9ce1b8392ad67bc31d4040701969a8712b751108ca74f6d24e3e0307d421ec87906c9920c456d609421b384beb961ef04cb73 SHA512 bdd27471568b1ce8b4d9ccc6783f294d141d56c5d5fa5ad46a7ffe983efd46877e25ff67b7869edb4e22ad182d47140c2167a58b80a141f4b3dde9c7e10ae57b
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.29.ebuild 966 BLAKE2B 71850e34810b2bdd6c79111b2ec0cdf650b31f00558733374e4154a9f4be5c8c0fce95d0835c24c221615bc69d2dc2eef60c0f1acd97b7ebb61f86cf3b2838fe SHA512 6e6248190eee9883982498adcec9fd3a9cdda60a4197f98dff774d2ae6e4803f480cbda05d76e18de72fd1d843c74f086bb367c46ee825d0e281d821366b8be4
-EBUILD rescan-scsi-bus-1.56.ebuild 982 BLAKE2B 4d47db4dc6feee760a17e1e0a77c1da67431155ce23040e0101658978a043632c0c6fb22d268eb0c52ebf2dabaf514cb3d3a71079ddbfb77cbfdcae8a0573046 SHA512 1637009072361ca505628049144bd36e017e18aa48da739e42b518a09435d5e4283a9a35b226c07c02552441dd1568cfb820ca82d1dd793b88bd33dc5da6e03f
+EBUILD rescan-scsi-bus-1.29.ebuild 974 BLAKE2B 57f737949b2d7ff16b8c12dcc8a6e0f54b2bbd6834c440f67b449ba3e30ff5c8e85b38adab422359e27bdb56ca03c60bd5039716b3b75d08358c9e7131733324 SHA512 1bd2d0620c3ece51fc4924e61c2775d7a4d17f23066038b95a6be35f1b19948625265954c93d61c2273d24b8c3b659c01ef207cd12865d04ea1ff98778c7f822
+EBUILD rescan-scsi-bus-1.56.ebuild 990 BLAKE2B 53b00122644cdf88cb81fe45066993ae047b3fc649a6637e8de5bde4c485d20abd2c9da54576c3dd763b7c5c8047529baa621ca6b88eb9f7992f76bf82ab2f80 SHA512 58d09b0573c2b10dd931d85fbbf17671734a73905c0f3c027f582bc49c12a6fa769e585ff8a33eb0431105c3337ec16c41a15e5b44bbdd2a90ecc8aa3d93c96b
 EBUILD rescan-scsi-bus-1.57-r1.ebuild 846 BLAKE2B 1db18aaa70ad4d3e8c1b21d2a1e39beee2467c1e8390cea17fb9e27c9b20f187b600460d88f3d770cdcdacca0160763c4744ac222a0c34584b34da5195b6ecb4 SHA512 12cdf6f4b80bb3e41ded7ef9c8ec33ce0fd11a6034ee6b47a2f929440c8d172ecc8c8bf9a70e96aac12d2ffb5ecc6eab8469af2115a135092b7deedec7f408b4
 EBUILD rescan-scsi-bus-1.57.ebuild 828 BLAKE2B 55753ce796f8bdc714a8c11cf7116ab9d5941234b0cd45d85e5d4318b3d0c5b7d3fb2feadb40e2a811a32d78a0637f62c9657540f69b23c6acfb929c59afd682 SHA512 52e3b43135892e7ec92e94b35704b99b53843c18e113ed326e8aee782ce7a44a65db58693d09983ec74498b7072cfe77d8031c91b172ef609826e93a56a7d1d9
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild
index 532c98367098..09bd538c9064 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="Script to rescan the SCSI bus without rebooting"
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild
index b727c157a522..937d29e78f49 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="Script to rescan the SCSI bus without rebooting"
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 2fe371b19cf9..477bf540e990 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,5 +2,5 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 EBUILD sandbox-2.12.ebuild 1918 BLAKE2B 6be8c0e96b32efc06027ccbb1ac287644e368fad5a025556da1ec1587c56a2825fd387cabb76c72759a647fae422c1d4717afe33dc2d95ed4538f733013189c3 SHA512 a079fec80316d2ecaacf7784287d7d6033b52dcd3be83b20582e76a309ece525fea83e4a6d5170ef2ae3d417b421674a63c09c3e0803931cd325b4e2fa2778d1
-EBUILD sandbox-2.13.ebuild 1918 BLAKE2B 6be8c0e96b32efc06027ccbb1ac287644e368fad5a025556da1ec1587c56a2825fd387cabb76c72759a647fae422c1d4717afe33dc2d95ed4538f733013189c3 SHA512 a079fec80316d2ecaacf7784287d7d6033b52dcd3be83b20582e76a309ece525fea83e4a6d5170ef2ae3d417b421674a63c09c3e0803931cd325b4e2fa2778d1
+EBUILD sandbox-2.13.ebuild 1917 BLAKE2B 0f2a6c7e166da0a1a35522a7a88b974f23a1475a0138674db31d1dfdc554b0e72ec9685df5b133ffedcf8291e913b83474c853aa1a13fa54e58e66b5b530b01d SHA512 6396509c7e538eed4094c7294b979653d654e6855f22086ca9cbd7826321a698ed95d0ce9ec608a610470158b6f55c648a5c09798843a01b5080201350fc550c
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index 61425d9b8f3c..bc024e36568c 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index f804d0a86db3..0013873cbb97 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -2,8 +2,8 @@ DIST servicelog-1.0.1.tar.gz 159034 BLAKE2B 71ddc13087866b81b69d6a3e925e8d0bd8a7
 DIST servicelog-1.1.11.tar.gz 318874 BLAKE2B 933ffa91c8f1c33b5b099bdab9a548a4c0d26b0fa04cd313d1639d1acb2006c9fd39ab523930787be2bdda34ec1f41715328c1e6212bf3ab4d7dcb95a1ab3dc4 SHA512 45adabe828a2e700b0920cc89fa4f93ac923cbf0249facbd52e23e1507d3daf12a2e4f2b093539286cebf8291266b2cbdcfea1c17f83a75c537c368885fd398c
 DIST servicelog-1.1.13.tar.gz 357637 BLAKE2B 7306fef7760c0e9040761af2672e267ddc3f5fbd75ef3ff07ca59511724d98d460dea048629be16906d8b3b77f987b5e406f03e0d26fa7a2c6136d3f7f782282 SHA512 2c9b2705825a98fbae3bc1c35f8acd014e5234d316d4c00fcceeb86b9263080fe525dfe71553c935092f8787b7125a3ed39c0cf07c069c56d1e816748698aa94
 DIST servicelog-1.1.14.tar.gz 361289 BLAKE2B 297c03c7d97295567c988eb2080554dfabb3becc159be4cf21a4c431698baa9e50f2af063b274341ec9b9cfd2664defa0aadb7169a518a4cb62b059c0f051cdd SHA512 d7b5e4089f258d69a7a07a46e43f1083fad701a917c150af8b68542db26348c0160dbca6c0d94aa68eb7a4b77139a763780c1af8422b785009567489a5e587cb
-EBUILD servicelog-1.0.1.ebuild 574 BLAKE2B cf176e2e67890478c6f6fdc3dc9b5dbdc2e0e3a42d3232ca9d1839f7e59b0268daf1d6805e54b2b304b48ebdcb93c6ee8d6600e048512b0b7b51f4f0583fb3de SHA512 4ee123ba29912a1c8f6af94ff340d9f161d3337948deccb0f58e2b81c4e5a6880afb38ea410287477ad8f3093a4b56e74e3c17fd09dbb94173724fdb13779634
-EBUILD servicelog-1.1.11.ebuild 576 BLAKE2B 256222c138fce50f66dfa8757db1efdaf0fc2b3f3c6fe12f0269ed68704e1639ba2388a30ee1f5a017741e8f11744189df8d2b19abd5770b40176033b424e64e SHA512 0e71477018307af307dc692452f67c7bb60e17245a722c93f515aa0d315d2f4113379b2c13c52baab2a5a1bff069ff3e416bd233a1168d9cfd3424313883d791
-EBUILD servicelog-1.1.13.ebuild 576 BLAKE2B be05351221e9ebed880c6e4ecdd7a6abc4ac34ff716fdb992fb12f2ec2bf5ece13f9a4a821d008b18f587e51d62ab50e64b832f453436dfdedd76a7e8a8e7989 SHA512 bbcfae2bab5bb948e9fdf597ade226616bd0e98c759bc09567b67c94ca327b1209d02c25919a3f61860d22add096d546558a8145ab195a716aae100f408ad61c
+EBUILD servicelog-1.0.1.ebuild 582 BLAKE2B 6996bf6529fc0dd7a7f656dc4b59efa242ff3e5e7a66d5ec9945b3c040c0bbcb66d48aca8d41a3e89ec359d02370301503c06e0c092286154f697b54ce8759ff SHA512 236be32e77fb094cbe3702681ae51238ab9dc3ba0cc7cfab9ac20e15ab5d15071da42c292d81d34c210af9be7b3e237762271b835b2baab4ae246bc01c517eda
+EBUILD servicelog-1.1.11.ebuild 584 BLAKE2B 6b978491ad12fae746df1e742d921589929655af2065a5aa9be0ee076f4154e29dfdc66ab0a5f6fb479631a5b3075ff05e612d457eac14ad2d20b08414d76440 SHA512 e7bfbfb2d1f55b5694babbf018e845860223159698578877c9a62fadb23f0a9cc6be9b4a86d57771eb22c7b194f6e4b67657941ce429c7b334585df88ea50d6a
+EBUILD servicelog-1.1.13.ebuild 584 BLAKE2B 6b978491ad12fae746df1e742d921589929655af2065a5aa9be0ee076f4154e29dfdc66ab0a5f6fb479631a5b3075ff05e612d457eac14ad2d20b08414d76440 SHA512 e7bfbfb2d1f55b5694babbf018e845860223159698578877c9a62fadb23f0a9cc6be9b4a86d57771eb22c7b194f6e4b67657941ce429c7b334585df88ea50d6a
 EBUILD servicelog-1.1.14.ebuild 434 BLAKE2B 661b8e3016eacc100151f20afad36800280e067b45f02dca6b30ca666b4731b57b55a30e605fefd35d11af2560c91bc0ce4060f9544549a5ad19846e17d8396d SHA512 dfe858e3325b95cc6750cea5d99f7ffe6c55df4a97ff391b396ab38b758181aa4b2307e705308c9ad4b1fc5b48756d859615ecc6371b9623f33fbc7d0cb4eaf6
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-apps/servicelog/servicelog-1.0.1.ebuild b/sys-apps/servicelog/servicelog-1.0.1.ebuild
index b2c2e57e21c3..644400232511 100644
--- a/sys-apps/servicelog/servicelog-1.0.1.ebuild
+++ b/sys-apps/servicelog/servicelog-1.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 S=${WORKDIR}/${PN}-${PV}
diff --git a/sys-apps/servicelog/servicelog-1.1.11.ebuild b/sys-apps/servicelog/servicelog-1.1.11.ebuild
index 629067277a36..aca803c06b57 100644
--- a/sys-apps/servicelog/servicelog-1.1.11.ebuild
+++ b/sys-apps/servicelog/servicelog-1.1.11.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 S=${WORKDIR}/${PN}-${PV}
diff --git a/sys-apps/servicelog/servicelog-1.1.13.ebuild b/sys-apps/servicelog/servicelog-1.1.13.ebuild
index 5496eb70dd9c..aca803c06b57 100644
--- a/sys-apps/servicelog/servicelog-1.1.13.ebuild
+++ b/sys-apps/servicelog/servicelog-1.1.13.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 S=${WORKDIR}/${PN}-${PV}
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index eb0234a5fa5e..0865d877d711 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -6,6 +6,6 @@ AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b272
 AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
-EBUILD setserial-2.17-r4.ebuild 1075 BLAKE2B 2472d28473658c27440e6535b294d5365be0549c34297bd61722289925ab8ea91d8c5208d7ffd251fdff024a50a2b76c865bd69109108a4c14443b62b5463425 SHA512 358e3802389eab9aa24edd99ca22cfa7c1e16dcd7ffeb8251d56c70a1b36993eb31c067edd9d669b5b8ce74c5786e53e5de6da76592a32c721a181d825123b14
+EBUILD setserial-2.17-r4.ebuild 1083 BLAKE2B 6c246ed10618b6c4c727409dd551a631e4f5bb6e4e6084511919ccd3e895b365598ae81eb681f52b33bdb4d64f0f48f8eef3f3b8dc1547f42aa287c7d6562664 SHA512 cc77e626fea8ca7369269f648fd61bd96969f51566ffba788123b720123e51f2e95d5405f18d4b12ded9cb7de5568553be47bcdcc8ae5f5a0db65bd3385db97a
 EBUILD setserial-2.17-r5.ebuild 950 BLAKE2B 05476fa9e1c88f2804f87b47544d2a26b41add3c5ca0364970d4a299ceff5af684aab45cfebc8a389ed616298e0833895eee7d83e77daa06fb7780c3e4ae7cf1 SHA512 262e77337e085578c742cc7548e971aed5aac4c0188c29c78d8c6591a7d09025a1c35b0e6e9422b2c80b0a93e3a9df04bd89cd2287c31473944a91cf4f1d5d0a
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r4.ebuild b/sys-apps/setserial/setserial-2.17-r4.ebuild
index ef2843bfe222..bb48f5c974a1 100644
--- a/sys-apps/setserial/setserial-2.17-r4.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Configure your serial ports with it"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 8f04520d8bad..61d08e294b76 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -7,5 +7,5 @@ DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
 EBUILD shadow-4.5.ebuild 5324 BLAKE2B 7e31b15f14edc3434fa1acca45a5c4955f78e5794d342d09834a0f9dbccb16c1d71e83952fa971a71f03844f6868fa81b16da7b473383156f10cebb2432b0ea8 SHA512 baa289b709d84f9b056d2415ed147d0bf80bed3e3645ab7738617693d7b8ada235410cf95c1d944044125bbab79f9feb101bcb1cd2d74eb33fc709346711107d
-EBUILD shadow-4.6.ebuild 5362 BLAKE2B 9a8b299498327ee7e8431d79fb5bfea1000b3af19432e557b2548dbb8f52bab2188b551e13a0ebb9f5a1859cfc4504f31725620bd5267693721ecdfb83e1355a SHA512 421275eb670c8b6339fea5c24fb3a4fdc11fbb7a4d7a429a01bbbe5174f42128cce4834c990221ba5ac1164ff9f31be96340450b653e7db3986f78dca5380791
+EBUILD shadow-4.6.ebuild 5359 BLAKE2B d2c233dee8b593193a3506678de255931c6c0d57e528fea76de5c6f67173ce91f360f9598aa8c4d3b875bec02e87e5bfbf35051436e68ba9c6586c6a084fccbe SHA512 b79912b20015e82101d29794f8cd625846a6a13276495d389a3254fb22450dab7950159ded8818b1ed52de18c4fa3ef541bb0f5ed77519dbee2154743fd53449
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index 1d0cf5b9914a..5d1c572b3cfc 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-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"
 IUSE="acl audit +cracklib nls pam selinux skey 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 )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d466b9d6ccad..79554f871d0c 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,7 +15,7 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 DIST systemd-238-patches-0.tar.gz 30019 BLAKE2B 0f393865cd6bcd815c1a6e932c0e5a25e125768d2bdef072d5fa7830b9ea012d0986380a1cdea8e369e1fffe89ea7657e4d55de2bae0d785ae374796a4e7c64b SHA512 f7e6fb7bf3b5cde2717a9e5dcd779a4595d6185d1ecdad8405a075edbb55b32c2573558f6af119ff50ea0df8eacef12ae7ee710fadd269f83db0985d76eb22dc
 DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
-EBUILD systemd-236-r5.ebuild 12922 BLAKE2B 861984963426429351ef99c8f0dfa0133bbb21ca37bbeae9ce5c31e726a4c265d3b3280e37841b01f200d5c283ba3b9252469ae4d1ce79fe02366bc1c7ac1f82 SHA512 38f92e4f61fd74144470d0d7055bb19b47cad7c475ee2b66364de45ed2031ee76027b73d56180a1e14f97c63758f248c434aee5714fbe3ebafddf8f2801bd10c
+EBUILD systemd-236-r5.ebuild 12921 BLAKE2B 4b8df5c5939fe8fe9dd814228eebb7d9419564ed91643353955edfb95290d2423c7291564c690a75fc48035de1c45fb5441a0455beecc3964f3fa187d4b8a4eb SHA512 d0cd0b8c31b40322227db7f4a5621d0e1ae73e1bea30e5ee0b88de14c0b1bad2d05c53a3c86c77bfbe16325556e5108198514974a428dd5c0cd56f4583663c18
 EBUILD systemd-238-r2.ebuild 13145 BLAKE2B 026520104d0f8fc395bf19b1f04d0a5f46a22dcbbc02dab148469f8c88ec7ab9c80a2d8416d594cc3161c71f794c755db37ee71bbe0d51061a7f1b9df3dcc22f SHA512 8183c0bc11f9385721f02fbc6da07eefdacb84f18eae71fd01bbddd8f6c4aab8f7c9f015fc3bd8a54acc6394c2c9c77656360e2986712c2c899bc54cb977cdc4
 EBUILD systemd-238-r4.ebuild 13047 BLAKE2B fe8bf96af2b3e665151c4118721ffd60e2b84991883d06fd75134e49ab92b455c7c190a9424228769000addb8d2998530037e15938e5f8669a90844150b59b5d SHA512 e384cee4eeb6ae614725131c2a61f75950060ebfc04f970c19583b093d1ad93fe95d7084cc9014e68a557fe5869ed7706f2addc7a5badab7af8927fa0174d4b6
 EBUILD systemd-238-r6.ebuild 13050 BLAKE2B cde2f02fe5711d80e4caabcc93cb5cbb76987305116f0dc4676b9433d0d3bc7fc4292f210e0ab9023351cc060c7fee6bd59f8b7ff23ef7c0662f22f61b87ca52 SHA512 ad8b56b5d219b03f0a73adcc132fff250d59428b914f32b8c3d47bd982a6ff81d920bcd81edbca537d2397e575bab94812f69cf71fc316e1ae045217a32bf0eb
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index 0d53bc5e946a..a39294c568af 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 450b6ff36349..8aa2bca2d11c 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -16,6 +16,6 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r17.ebuild 2467 BLAKE2B 6c7e824f9b04f39482eeb87f0bc8dc8b3a92eae7366647b3c06912ca945041fbd963eee67cef8dd9d5aa4fb9d50dde7659e2b0f2dce59ad2040ea259e9d0ef3e SHA512 5691a29591259022e80a6cfbaba6d4755846223b14bce64c7df0e0e7ef08c57877f612b6e2b19da7d90a0c4dc8b3d8d5c8885a1b21eac19bd48bf527739e10d3
+EBUILD ucspi-tcp-0.88-r17.ebuild 2475 BLAKE2B a65829306f631512fa724017a5fb23c6b978057c9800b9d9744f3b336ef26597a6e57317d4b70eb551f1f25a92141736b92a0b128e38e6f85006708d6ac56607 SHA512 389039ec00726d92fc6e4fccdb0db013a6efcc2feb95f5922efee9f8bbd74f90816c4f9cabaff1553525fdf8a4ee5eb9fcd1fdba4be66cec20903a644ade1b68
 EBUILD ucspi-tcp-0.88-r18.ebuild 2110 BLAKE2B 3e6f928478d0737dc74be8cf08cd182f020b07f99ab878ca1c3aeeb5776c9a494b20a94db8536b15f67320a8f425d07c621361e7664ac40d31b4c648b5024a47 SHA512 e5b7f51fe7ce2914131a6455c7fe9c474b0530532819c81e01861edbeec654d3de08c7c35182596fe75ab1646a8979955e51c958c8ad98f9d9bc78b5d0cc9e5c
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
index 6fdc72f20f6b..0cef65cf25f4 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils fixheadtails flag-o-matic qmail
 
 DESCRIPTION="Collection of tools for managing UNIX services"
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index c2eca87d2555..c2bf16445fb9 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -2,7 +2,7 @@ AUX ucspi-unix-0.36-fix-parallel-build.patch 507 BLAKE2B 32ee69a9a63efb3b990f4e3
 AUX ucspi-unix-0.36-include-sys_socket.h.patch 339 BLAKE2B d00f18db06e084639a169b487ebe7458127086a31ccae759faf458aea69a6523cc9a6eb69922f161fc861cb3e463b4a73b637011dd8e8e86abd2f9b7080a660f SHA512 a8628e664ec993ab964879ff34b2bea7e70901cbc1f812262057fcea0fe34c64b2b910e4e1c77ba66df84fc8dfed94b69c6dbe7b7da09ddf379764b070a97161
 AUX ucspi-unix-gentoo-head.patch 1097 BLAKE2B 7ec8f2e5dd32224f14f254d55bdabdf70324d9e0b21e31ad525598e125331778434b600ca0b6a275d4758f83611d1abfbce810913d6ad3d7cb4cc1955639b9d6 SHA512 e1d5be425dcdf2bf09031c8a11c384b092a2bda38159db37abff111191dac1aa0b40a401cb068d86f97747dad684a0720f3b5b8f18c2d9caaf64368a71d46c3c
 DIST ucspi-unix-0.36.tar.gz 14175 BLAKE2B 609de0e75825ee458823bd34b41ad1d2072851cd006f6fd603c5082c69b48bc7018242a4b6bf7d2584bf43d79273f223352a3af4868575ee8574c9fc9ba4d819 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633
-EBUILD ucspi-unix-0.36-r2.ebuild 868 BLAKE2B a0e6975602e9014dcf743a152da23c10de6b26b6e49441e71f0e2c75bf1df45195c94eb4baf6d591a2bb7782cbfa03e185063d22fdd910add10c8697fecaa4b4 SHA512 735c533c82e3c268e32c910d846d2c66a6d649e331090b31e549fbfc59192171fce5f819f0139927c961551cf493521d74dff2a1b790ec6c93f9e4c2117fe7e2
-EBUILD ucspi-unix-0.36-r3.ebuild 966 BLAKE2B a61ee8a08a65cf10ad7a0ece13265248d14e28c03250a682af10c713cb791ccd17a6da3068982f01ca5d8d0c104f19d1d5498272eb195d81b64beda344b0da6b SHA512 4d5c666ccb1eb116299aed23f02799e41c950771315704bcf586d9158fd9e6b1bc6250f9c12b043b2fc2246c0482ce0613014d984302c91964b16c21d9d3d408
+EBUILD ucspi-unix-0.36-r2.ebuild 876 BLAKE2B 002132593c7471fe22d2a57fb2d51d295dd8deb2addea67f37e50842f21a2603f01611c9a297a8a014d5fc4b124f9f78684d69f2081a016f600a91d32a1e4146 SHA512 b3a9d11408b01957069657662863c3cc2dbac411aff3770ecbdc17ad91ca4d3287a81c303bf7957ea9d49b7bd8028bdbc67ad9ed5a184a702e565bd7eda3a628
+EBUILD ucspi-unix-0.36-r3.ebuild 974 BLAKE2B 2ae598af6554c6a0345baa60be163adadf12fa63c00cd8f6ff96de9ec6daaaebc7544713cff2cd5f44cb1a18df57dd2814d0747e48b9d0ced90e3ecbd1fa3976 SHA512 798901cc22beb4912e8fa1d779abed5bf9fc5711e43d059019684b88fce3438ebf228bf93ce77172f462aa3bbec784a1f61eac6c3f4af37bc6d5fb147476f9a8
 EBUILD ucspi-unix-0.36-r4.ebuild 1136 BLAKE2B 90bb709947cedc619da1ee9a9cf504ced1267a447610844a874db60b65113e1d76c359c165a1673bc3bb9fa5452bbe257b9ec07a4f975052b0ba1a376e9c4c9f SHA512 4544d8053f3c9a0c98396ae5c49114fb5b580637a3c95f90f494cb477b373e470f30b10b85fa0af9d81e40ba0c6ab9af4768028b093c45ffd5ae2e6ea577fcec
 MISC metadata.xml 433 BLAKE2B 884f889ede3653c18a3e3b4cd133e764ca8a3daa5eee474d698f3878ecca59d176cb5d039cbcc61934e0a84ccc59b9e7766e44551654e6684ee5f2e867cfa7ec SHA512 73fcad2c3cf5f25d07fe4c38376e3375021ddd0e2a2a9e51d05728d86ee2e0b63a28ed5f70d9d31e1643d210852b4b81f0ce605b0d9876dbf131cfd444d6fd6e
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
index c199289d166f..adc83aac1ecb 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A ucspi implementation for unix sockets"
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
index 4510f80e066c..1a88589733bb 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A ucspi implementation for unix sockets"
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
commit	7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree	bac2a67fb24ac0836147fe370d30e1610ae1845d /sys-apps
parent	2f8db31405fac68eea6f7257d58529243815033b (diff)