gentoo resync : 06.01.2018

40 files changed, 121 insertions, 71 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1febb7af3764..6970812124e1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 4568b6efe70a..d033eee8ae5b 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,6 +3,6 @@ DIST debianutils_4.7.tar.xz 156276 BLAKE2B 9d32dc8222b67d4f1f91d58af0811412924f5
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
 DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
 EBUILD debianutils-4.7.ebuild 955 BLAKE2B 62f8d18a91a707314302473daab1d2e4645261e552036378271500238251cca8b8c9c9156532832637aeab5045ef1b8528c21fca9ceae8d4424a826862145bb9 SHA512 581e2efee6fc722bb26cb3f5072758f119927455e584c41be27562906d405309d121e9e7cde3d5427d6399f7e9519423ad4a7e99650a2214a142963b27f22cca
-EBUILD debianutils-4.8.3.ebuild 968 BLAKE2B 6d70ccc127d77adbe481ae71eb079b8df99127d787ef6d3bcf6a38397a79af541c3feabfd0f8bc20e17fe397df4adcd83e516f4d1c734a6050473bb4a39341f3 SHA512 4a51937c37662af7ee5effc26f1ebe29dcc8b3111ffb11225b8529c3863a193fb02c1a8203eaf910b2c6daee66c0de6314d57aa97507d8f69c9932f20b61b9a0
+EBUILD debianutils-4.8.3.ebuild 965 BLAKE2B 3335e2356567f2bd8e729c7ab0c664161875a02feb6b77969b05220421a26b84da50c108487a742c8f50dec044719a2aa93eda00b6561b26fd26b1ab0315ef0b SHA512 d02cefcfe6b86c4d3053e354fb1855b23451719a6a27e60e808fb9485ae5df7a90b21fe7c7decc9e1e8e4a120bb27d23ee06cedb7f57e8bc672e911d4b625f9d
 EBUILD debianutils-4.8.4.ebuild 975 BLAKE2B b0578fe970dc5497fd7989f35e5b0e111ab901a660e996e5ee067a3f6d8fddafdb528d45ecfbed166bf5cba006552265269d18fd9cee6fd20d7af9a38d563947 SHA512 17f0039fc61ffe48e27a993465d208397abed8d50c823af3cab45749c6d841a96e2b1717b970d0ae98853b8b65f4b201d85012d9dceddf7dd21f64fceec1c7a5
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index 6abefe767bcb..4515c60786e8 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="kernel_linux static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 9030e52360e9..b4f5e8fd972a 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -6,6 +6,6 @@ DIST hdparm-9.51.tar.gz 133725 BLAKE2B a507046d1026e901fb0feb9c61dac60d8bf8427f7
 DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
 DIST hdparm-9.53.tar.gz 137009 BLAKE2B 934cec5d88033c14e7f2d182f2e1dc9f9dc63583208720fb748fd29b99cd54253fdcf7379443043787457c3fdabb83ddb55295f9f4abe0635ae2e4fd7e296bd1 SHA512 7d293d603c6bda5fa8ce389b69e6738c4ba920846a1f7443c89edd2f5085b056541afb1824921da4b38be43f992ee9a8cb7006bcc3156d3e5224823276c4d0c7
 EBUILD hdparm-9.51.ebuild 1068 BLAKE2B da518c793f37b34bed3ba283e7152d4fd4ebca37548090db5dac52c14141b513f47e16ae06c89e0dafbeaf92af76728d158c8c7539cad5f91f2c623f865e8dcb SHA512 af88b4d68dbb6c844b170a0313bb0ba98b6a0b2e36b3b2b6e45a5e6f6f6129f2a2aafb6b0fa63177b2af717cac5c0e322f3ed00f7ffe6a6c941dfa8145d3d7bb
-EBUILD hdparm-9.52.ebuild 1078 BLAKE2B 04f88e42887f4f70692822a3665992ddc6a5363cc1c8a55862a078cc5ed8ab7e795cf1e7ae7adcdad60cda5912f0b714cafb36afd53000e4967c45b5769a8734 SHA512 ac4011c806f47a3738bef9e0665f4b7f5bde684b201d312b1c6f0cd117a1a66527204091b02cbfbbc8b4eeb715507e1f5e52aeee29a7e0e7af2aa860530e019a
+EBUILD hdparm-9.52.ebuild 1073 BLAKE2B 61796d398f727736721f0ba771af2c140423de8ab401718514f0723cc12dd8c8586e27517a8f0c2d3aa0d59273fccb0884522d5f91deea617860217d9ff97cbc SHA512 cd1962e2d766ab7239545d948cda3869d5b8efa386d5ca568f6e13cf45f18949cf5ad43a494d6591f0b50ce04377f2a259ec85b01b4fc85a6f6e1fb56d3f3f31
 EBUILD hdparm-9.53.ebuild 1056 BLAKE2B 2bb3d67c186613200c7f17e6f13bfc058bf8c1d2c340e898ed687621a5e3f0e803f53a7d01f076551c96ad7b987453758bdda5d19fcb4aba1b541a53f5459c70 SHA512 d19fbe544788be2a9705938eddee7fe27178a9c282f75061c1fc20f11c7200a676b34586351c6b330258d71abef3c90d3c1f94251343a14c01e90adeb60bcf3c
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild
index 974af72c31e2..4d9e49c9ba68 100644
--- a/sys-apps/hdparm/hdparm-9.52.ebuild
+++ b/sys-apps/hdparm/hdparm-9.52.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 681d2305eb7f..c9b878096338 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -6,5 +6,5 @@ DIST less-520.tar.gz 337959 BLAKE2B e3008ec61b9095c7e0f696a662478e1aaeb9108dc26a
 DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
 EBUILD less-487.ebuild 1440 BLAKE2B dded5fb96b09a7de894e13c701ecd479ad1b1569094500f3701aa58f58b8f2d46106b8d9c82ac16f9b9e648655f87d788de5a71d7d0f69d357184a656a1bec51 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c
 EBUILD less-520.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
-EBUILD less-529.ebuild 1402 BLAKE2B bf76dfbaad663a235de3e07524ad5d96d4b01ede632c8514318a0792d6c7828524e3983fccf6d19be802a24fdfcaf901512a9a16437cda28512c3bc701bb82e9 SHA512 4baaf7654ae9d8d5ec7b68555a4e992f610e3e65e57db80e9d60e803348a556d6b20dc75cd69a898d0f1bd411a32035b8ee254c795fa2a203ee5d5b988017da1
+EBUILD less-529.ebuild 1398 BLAKE2B 0269654a66d29b38dcb8bfca235b75ca75cf5588fb3dfdc352e22caef4ad9e08a568f8103492de30160b1ee9c27a46f7e57d72b2186250e123473a5bb00784b3 SHA512 4b146f6728b5e65e8c8c0d1b773f7c352297efab5970c0085f0ba233362dcaa424de28e75b9113c96361d29f598ba1f1a1cb24362eb1f2b8cfe7f843f76892cf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild
index f2b37d773330..4e0c072f95ca 100644
--- a/sys-apps/less/less-529.ebuild
+++ b/sys-apps/less/less-529.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index aaae983ccc54..f7372089c15f 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -10,5 +10,5 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm_sensors-3.4.0_p20160725.tar.gz 206868 BLAKE2B ba79935e1acb62d5f31fc53975904ab7fd19f619fdc5edc342bcfa1f8d2e16e3ac41711ad33bc9766ece89325236887d722b06c9d6698c420e9506d77dca7ef6 SHA512 abae5c4ba2ed0b763fda918e2ededb2148a3edd1d33709a34b91a33398a64e8988d14c5d16a5c756bf55beaa383e661c76e1acccc7b5ef858aa772e96878131b
 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
 EBUILD lm_sensors-3.4.0_p20160725.ebuild 6228 BLAKE2B ecc79b6e0477eaf39f433818c60fdf5c2a432d91083bc8a0a7129c1faace0ebc37dae69131a54f4b42f8b8edc2a374602cad98bb1b925a6ddae70c20bbfdaf34 SHA512 70cea8ee4f232d5121340e681443af417cf7d6f550fe9611985801a69963537283dc4a597df36abcd9862e23b7ba5d03e9a5de804180a587de89ad391795f963
-EBUILD lm_sensors-3.4.0_p20170901.ebuild 6321 BLAKE2B 16e0c3e84dacd3fff0966c7dc5d50e5e2634500e3f888fdbd5cbd7192f59f6bc3d7382edee6de5c881fb2e476bf362122b5a40db2185c70e620d3f4af3dd7e91 SHA512 5ffc22459209f78dc1c31280a102b771ee56787aba220653f6b271acbaddadc3ab0a53a6957e57fa814acfc885e6d3cafd78af974ccf758cd1eb2795d9fd0a29
+EBUILD lm_sensors-3.4.0_p20170901.ebuild 6323 BLAKE2B c2d298c2f39b9373d02511e0ee048da685d0f443c15c663d8a828f3a5e366d34650dc0a0d49701796f8f802a4d565f3ffbf1d025c7a7be30a8b66cf7c977eb76 SHA512 2310a5d500f50c32ada879f55bfeebf38eb0e6562b073508d8535fef2c17c810f96d30f64978bbbd96f6f88bd07799ec8129b57ce7d9225b49e887a1f3d167cb
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
index b5bf887fc5aa..3775c232336b 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index ec157d49d770..7e3fe0b11649 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -6,7 +6,7 @@ DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c
 DIST mawk-1.3.4-20171017.tgz 460819 BLAKE2B 91cb4cd039ea7773b788db87389f8ec34914afc8b299fecfdd579fe89fc4e6d731bfdc9c06a2c6c3d75ab9e1022bf5dbe1c662962d6ccd8a8f6fe4f8589927ca SHA512 4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27
 EBUILD mawk-1.3.4_p20150503.ebuild 825 BLAKE2B 1d5b1fb1ac43e06b019f86bdf8ca9fa2d4392e27fee2160e13b46c90ee567979d70442be3aea5d96f73497502238d919da684a6268d7918802f8d57aa7389db8 SHA512 7f7b0386ae02ee8bd6b2a3df4218f3dd732b22e9154b8bd37ed15afbeba2a145aa02161e64b8e2be78d4e6d9c2b58e3d4fa4c7d5b557f434c1cdf21e593bd749
 EBUILD mawk-1.3.4_p20160615.ebuild 870 BLAKE2B c25882ed451d83bfea7ca5dd731a6d532396c91f7a38236ae2b884cb5f504341a937da1dd4bb22805b6f94488414756a182bcd6e3e5eaa21ef74e8c90805e7f0 SHA512 5841a8486c4a59f16c1add9e9aceb89fc428b29a29359ce17e451dd46f66c0501b4260463f4b152e1403e391d86c30638edef328ee31ae9ec1b0b4aa0238afe8
-EBUILD mawk-1.3.4_p20161120.ebuild 878 BLAKE2B 438ed36e28fe7fc1fa09fbdbaad36d6f8ce5780972170ebb3fdfe04dd66da5ccaed8d8910bffd0841f732336e2cba0437dbe37b642abb2e35f151ca9205ea820 SHA512 0606dd2ad1d6f4e4ee59bed3c67d475da4f63b2ea7df8f84c045deb1afe919ee140c4a76da73cbc5dfe62c41df46b3faddfb0b20307b02bf2e6d41892d92927e
+EBUILD mawk-1.3.4_p20161120.ebuild 876 BLAKE2B 4ba3886f7863b138916aaac05e5119760324d8454764086976ce6646aa3e9791db61dfef3aa7854cfcc58a9c2580b6def586a14d21818c5c911ca55e179d569b SHA512 2f6adadb92dc35ffe2deee4fc5418740fa4c721cd39c9501986eec11259d2050a8de91c2c375457be452d1d013f02199dd848e6a3b09732c9db86800089c333e
 EBUILD mawk-1.3.4_p20171017-r1.ebuild 1037 BLAKE2B 9c36e6b12d6a7b1c6448ed423509032464388849efc66312b24c8e7ba3efc11d94c3f425077f949514609bfcabb10da2d849a1977c919d068350c8137c942d14 SHA512 550d5d3f9123d402ecf442a94c8ccd87959eb8669a490e766e16d7b93acb5d3d23562527c5aac727cec44f1d068b339016dd901ac192662f06da3803f7ecd6a6
 EBUILD mawk-1.3.4_p20171017.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de
 MISC metadata.xml 359 BLAKE2B 988733eff41a4556cdb4f8d66adbe2864f33f4245ab1ba3a1456cb3b189fd12138cec7666d2fc125d275865a028274aaf5a41396430721ac96b913dc2f667f94 SHA512 bb64e60075207240fabd037108c2885b934d0dc0a72bdcce4c8c138555b1ebb4de811745235ee11fde75559ddf55f9488b71f53aab7e92df61099cba5ec28d2f
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index e70a4f0b2ee2..b45844d5b5c7 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index 3c49d9daa4a5..cada8550e899 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -5,6 +5,6 @@ DIST microcode_ctl-1.23.tar.xz 755448 BLAKE2B ad7811536584343254fee8ee77a192834e
 DIST microcode_ctl-1.28.tar.xz 876760 BLAKE2B 8523bdc59ab21a6ec2e1110116bfb4c7a18e859e7f1da65d9e765274b47d5c1909d61eb18017ecc9369b7eedb43cf11cbdc495439aaf1c525bc8d8f7c63ca3a0 SHA512 ed5deb0f96c895b7783c23a1c91d2e03f713a793a21140b049e1b5f08f553dce103b4a11016ebd5076424b1032342d009d952e0089badfea2e91ad486d2cf7f8
 DIST microcode_ctl-1.36.tar.xz 3553884 BLAKE2B 0667971e546a135aba6c49f7eb04908595540ab3ecaebbb175cabda0aeb3396fdb145245a7fab44ec095f447f88e3b78990b22cd4f07568ac4b80ef321109fa1 SHA512 be35b670eba65747aef8bc7a78e989d3481fa0cbfb1635332821da75decef2540f3249ab6ecbe5b95f4d52e9a982cda2c7df31d2f406c0ba27c0354b6b70c2bc
 EBUILD microcode-ctl-1.23.ebuild 1271 BLAKE2B 8a7adc9b789dfdadf4a44ee4301040c0047f4e68bc71d46b04acbfe2b1d9978415d6e184d328d05c39b65a37b59db34d5b274cc1168cf52e93775413862a0a0c SHA512 b5ef619c8b5821e4a52282f34e7e4880962e2d9d6f8f279f3ae7553ca5a72e28c69f4ac921b1370ea199635c63d705e89e78968ff3fe5520556c4732fbf68355
-EBUILD microcode-ctl-1.28-r2.ebuild 1146 BLAKE2B 3f0c1ec0dad10983e2e239cfd60c095398270fbb22f8e5db97244b28d79b648fc4ca56aca0b22a577076bfc4e80048a75d10e318907fc248a02e32e03f0277d1 SHA512 abd0d5b0ebbbb5be403096b74838ebafb4da62a5a75867f5643996a0088ad68b94a7a68b58d25e22696a35ff01fc1350769c4b65b6b00e05f45fd7fdf89d23b1
+EBUILD microcode-ctl-1.28-r2.ebuild 1145 BLAKE2B a82fc4d8ce1175a9f7361afd20cdcd4e5c61a067840118b011b6f733700bb2f75a8a6e795113a44ee2c173886a4762f757eab072abe746dee0f8a8eace8ab8d3 SHA512 397d5831a6aafc2217c0094cc4a31c1fc2943ec7fd084b9325492e471662acd2dcc727d7a9d7d28cf90f7cfef74b55b373e2ed795170bf3c75fd5c91cd0dc7ec
 EBUILD microcode-ctl-1.36.ebuild 1147 BLAKE2B 9bb9e2be7a589eaf4ffc30ebf95bb9a6f7f38019c5b598659dc7a037fa3051673c2185df8bfc7007205436246214cb40260ae8204f2ba0876ed33350b838bf95 SHA512 c6782fc6a6919a2eda6f6b229c0498b4ff1907cee8eab2dcfdf43017a6849cc996af39202daaadf2d7093c51752984938e7c77090c4b1529b7c2c7001bbdb4aa
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
index c6baaaeb0bda..5385973e6115 100644
--- a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="selinux"
 
 DEPEND=""
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index d97de8ad2447..21474b74c1eb 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,3 +1,5 @@
 DIST miller-4.2.0.tar.gz 3373505 BLAKE2B 5051f310a70ad151aa8fd80dd4b885e78561dfb1fd14fa3a49ffb9928ce55acb59220b2b122b798256a0d258fbe4216470cdf8aec37be2fd26ac5ecb1f80e982 SHA512 f176dc2ce4e733ac1e4e331f17554d4ed089344a5f571bcc9d4b3b227f6c950fa0355f1a5b934e4f9467d9a22448e2842c586a4e6c424a98ec89170cd70b1714
+DIST miller-5.2.2.tar.gz 5024653 BLAKE2B c13b6fb03404ae93f436997510aaaced2e11616b42fe132b9a267b1e71c2b7ada5bd310a20bd0bbd50ca6edaac915ebd68885ef4de1558aea63d9753b9f69125 SHA512 64ab35db6382cd9bf819249a57b88a142fccf7d6facdc6b9fdf3005b82bb2567f57b64d52a29b5f9d44c941974803339eb4a34c6648fdde2c82cc7c2f98e727c
 EBUILD miller-4.2.0.ebuild 1228 BLAKE2B 86b062942f884c71ad5e3b0634bf3e5721d78aba4392547ac4a7394c51ca5d00766d9f3e6e61aaf730ae5861fabaa4c72fb1553eaee91f8a19840c5a4390abcb SHA512 0df8acbd893e5c67546b23a89b7b6f4ccb930d802e8648b636410d6ca71d5e8a9aaa2b4a452006efc54bcd9699ee32fb12310b0e7043d7f7151c24707c155b30
-MISC metadata.xml 247 BLAKE2B db1e11c869409f9a8784a1d6cb02fe7a7251e0324b348106635de4c78e48e6d61a707858fc7ff551e7d91483edb7e5be038954bbf1c3b6e5e13ec63cf67e845a SHA512 1d569a62d1a657cfa27749346c970866599d29264aac8a94fb7db0aefa141edb879a083b1500c804463a7ee0a2e489cdd478ece3d7f2a7fdcc9630f99baf25eb
+EBUILD miller-5.2.2.ebuild 1006 BLAKE2B 9aaf6def1265e67742abb5ddcf3a0672e87cdeca70dad9a73f3747c746eb495f2d806dee04a98991ad668494abfe827831edb951d2766daaa8f9534374777367 SHA512 0ec603a2203ac034f5546dfd90f46da42c19f0757b73131d1b6ba1d87c5f314a1cb0fcd5fd56e93619617aa9bbe79f148720cc1f9ab10b9aff0c9bda3cc39bf9
+MISC metadata.xml 457 BLAKE2B ca81aa24bf7634b723208b902df033b665fb97b195f002a2a8250c4e00db0b93da2be68af87b23cb7cc749b479735121d58b1cddae4a6a69cc67d7bf04860596 SHA512 1d55a1c34c8c1c1b69036028b9d2f65b8d36b1f102da9041d3e4469c821d0bba20c56d88eb7641ce9f3b8ab26e4ee756595028f9f77345b1fbf19c2aa09237b1
diff --git a/sys-apps/miller/metadata.xml b/sys-apps/miller/metadata.xml
index b514bd71d71f..bea67532f6a5 100644
--- a/sys-apps/miller/metadata.xml
+++ b/sys-apps/miller/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>herb@hlmjr.com</email>
+		<name>Herb Miller Jr. (herbmillerjr)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">johnkerl/miller</remote-id>
 	</upstream>
diff --git a/sys-apps/miller/miller-5.2.2.ebuild b/sys-apps/miller/miller-5.2.2.ebuild
new file mode 100644
index 000000000000..7d27a1bf9b8d
--- /dev/null
+++ b/sys-apps/miller/miller-5.2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
+HOMEPAGE="http://johnkerl.org/miller"
+SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+DEPEND="sys-devel/flex"
+
+src_prepare() {
+	default
+
+	# respect flags
+	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
+
+	# disable docs rebuilding as they're shipped prebuilt
+	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
+
+	# disable building tests automagically
+	if ! use test; then
+		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_test() {
+	emake -C c/reg_test
+	emake -C c/unit_test
+}
+
+src_install() {
+	local HTML_DOCS=( $(usev doc) )
+
+	default
+
+	doman 'doc/mlr.1'
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 76b5742b6c78..71d559ab2d2d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,12 +6,12 @@ DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c32
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
-EBUILD portage-2.3.13-r1.ebuild 8523 BLAKE2B d8676285889a5fbc2abc9397bb24f61d1e4fcc8a344d30ed0ad33c46712d72ad62db529b3c48051e031492d4e120a29ba1c685d168e56839867bac56f1a7c29e SHA512 d0b618bad2028b8dafaf0ec06b2807cbf2a044a13455e62a7f5f42fed4032f7e84e0231cbf3f9d8be1d2841f922c627ac7f6676375cc87512626a62ad9d023a6
-EBUILD portage-2.3.13.ebuild 8220 BLAKE2B 1c71ce90b2d0d0ff9ecdbc842e9178cc5ba3e3016c3d00243f6dfa43772ce8fe6719965bc7f6f968a24ebd267442f3697b698dc5e8e947aca85f611cba33a12f SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01
-EBUILD portage-2.3.14.ebuild 8523 BLAKE2B eed0ce93cc3d1401817cbcc14c12bf76157dda41294958ab2d72ae72187f62d220e3cdde93b40d3f6c7b80e65f564bfb062b2a37230c8200d855b4e585165b80 SHA512 439a5e2521e74d4a5b73e91f9e3f0ae29b3eaa01c6bb3e2f3420f2ee838b6fbb60438e785c30e9806fb7cd65d7dbcf6062d1b3f61a4792c01326ab874dbacdfe
-EBUILD portage-2.3.16.ebuild 8371 BLAKE2B c1442999cc4e36d94412fd451b8a403cf8afea392a798312518f0ee1c13579efffdc2ce3d815f375942ffa34225cf40dd3a4387e7c7f31c3b43dbacf6378991f SHA512 dc064087870150d8c0629e6d7f95f704728b08ee85464c9d228f3e425a74bacded772d6a1ff1371937686b50960410e9e5cd9824ad58e8ca3ae2b10ba3b3b263
-EBUILD portage-2.3.19-r1.ebuild 8428 BLAKE2B 9075d773241c24498b19fec3d55422847c985eec8e4b844ffa12da18ff8c114b3b2038185d1e35b081bfde3f9428381ff15e30499d3b128db8d7b8ca3f1820ad SHA512 5f3a1e2e42ee60bf967ca3ec4f7f4ba8fd32299e5fd50200a3dabae0c1b93c79c31014010465af0a1b053dc4ac22fd36213c000a2fe6ea80cf0e257a686234c2
-EBUILD portage-2.3.6.ebuild 8661 BLAKE2B 79789262c8d2cfea53c24291ee9b1d638bee592c2eb6435b22f6996be43bd5e0bf76df39df74163b98297d6ecd11c24fe4b8ee0cbd84b7a62196c0b9de4ef8d6 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4
-EBUILD portage-2.3.8.ebuild 8211 BLAKE2B d615c9a0ae6df8f649f6ccdaecd6a404f9196cc62008b3bc38801c8e355b82b0288c00e4c52e481961fa6f568c0cfd4425a4ec7e313d08f9be143623ea2cfbaf SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a
-EBUILD portage-9999.ebuild 7962 BLAKE2B d440eec904b791027f608f0530544fc315cce51b1c482d4d08b13f3858e7d826b0c913a8291c6f3dff30ff0c057010a04f3900596816f85a46539ac842644e04 SHA512 4fa544a39cfd515b5d9113715b993a58e53fd697f4027961daf5c05a3600e9e46a838a7eb948bd1c04baf80e9580f2f63a5629d49875ff07d17e7258a778c74c
+EBUILD portage-2.3.13-r1.ebuild 8512 BLAKE2B c02a7a2d22b02cacc76a8a517c2edd4cbb779135217783b5be724e6fe3b67b05374b7efc1332dbb8ab387212b91dcc7c0af0b33336a936a37e782c499910bc5c SHA512 40a2e9c4d67064aad6d2691ccd4f1ec283db448fd5718654eaafad6292cad67b001823c24ea919332f4ea5ad3336167dafbf0614902e3b443810548347468f6b
+EBUILD portage-2.3.13.ebuild 8209 BLAKE2B 1004c283bb2b76242c9abc06664d4370867265c55ba9d62a1f477e769dce602018f6777891ea9f5674f0ae0f86ef52bd13ff5c353f48e7b711a418b2514af776 SHA512 9c190f7b21e34fd33e4d63185cefa011fdd9ced949c8310ea84e959db7834df725fa5d89de22fab958e6942589f44dae2e4b17047c060395ec69f0f7e9bf70b1
+EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b7963b196ec4853bcb3cef900711ae50d0776200d8f9b74e7552022435dd7f260266c90e49b7bc0a4319a082673 SHA512 60ec8c92d5a46572945d90b9136f4b2f7e4fdf439beabe2d03563002075fa8cd3edc6fd101694795837de770e0545aa6083e2023f7a1483161f7355e8327215c
+EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
+EBUILD portage-2.3.19-r1.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263
+EBUILD portage-2.3.6.ebuild 8650 BLAKE2B a455ad0c60356d9e27115f20ca098536fe8ba76ec67c44a6244a5cbf1f2aeb3d5700e332a462decd77a78285bf9d2200a41a8487a0c8465b78625f1a9dcfc2fa SHA512 19083847eb304f04dcf63f3362ae6bc6fdb14cdb0f40673841e5155f9c9dd9578734dc93a8b8721cca3546b42a45b838feafc7632b35e916280d55041e5fe1cb
+EBUILD portage-2.3.8.ebuild 8200 BLAKE2B 56f16c92f0bc5947db43fc1dd88adc6b025cce6d96905d611b49b32d1deca4aaa9ff5417c2372ad4841688b60074a1e4e932dae5c0b6db0a57d06d31931d9dd2 SHA512 38f2576117d7ad3212ef0a2176c99093ae1f612c6a4010f745604e95fa8e1d647d03f5910514c64c0b3a47f5bd2ee0bfb862aee814a027e3acd9948d4e49e75f
+EBUILD portage-9999.ebuild 7951 BLAKE2B a1b82cea5366a9ca1b6291a997328035a5c1d84591028227f3f96f84905ea73b0074ef3e6f90624272ed23b7783971b6425e9609b7e93d77774ec15f6cfa02e7 SHA512 e158702758f00977e4f8f59371ea8025f019cde06aeb2ceb29a2f90a52582fe6a09169ed71da58cf2946d6bd4c8e867aa204141d02bcec7628d24a54bf14365d
 MISC metadata.xml 1147 BLAKE2B 7a665b1c7a67e5f14020c1604c846840698a973885b6ab3d48c1ccd0782504a4ded3b12c81ccf3b17e539a593ee03a7ea23ec1656d65b0aceeeb59cf67e76408 SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
index 9499a46d6fc1..ab04b7ce90b3 100644
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.13-r1.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=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/portage/portage-2.3.13.ebuild b/sys-apps/portage/portage-2.3.13.ebuild
index 35e02ea5602d..fc6f962041e2 100644
--- a/sys-apps/portage/portage-2.3.13.ebuild
+++ b/sys-apps/portage/portage-2.3.13.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=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild
index 2a721a6a55b4..c60736c0528f 100644
--- a/sys-apps/portage/portage-2.3.14.ebuild
+++ b/sys-apps/portage/portage-2.3.14.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=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/portage/portage-2.3.16.ebuild b/sys-apps/portage/portage-2.3.16.ebuild
index b61efef9fdd1..0487401d2d72 100644
--- a/sys-apps/portage/portage-2.3.16.ebuild
+++ b/sys-apps/portage/portage-2.3.16.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=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index b4d889b80920..777f27ef0d54 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/portage/portage-2.3.6.ebuild b/sys-apps/portage/portage-2.3.6.ebuild
index 997eb5d0ceb8..e4a7c2f62378 100644
--- a/sys-apps/portage/portage-2.3.6.ebuild
+++ b/sys-apps/portage/portage-2.3.6.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=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index 12b9b2935fe9..9542e621b6ea 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.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=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 3464c42d7189..69caf4064227 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
diff --git a/sys-apps/preload/Manifest b/sys-apps/preload/Manifest
index 939cf41c4a7e..86c822f0ba1c 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -8,5 +8,5 @@ AUX preload-0.6.4-use-help2man-as-usual.patch 1170 BLAKE2B d887f3b410c03609af026
 AUX preload-0.6.4-use-make-dependencies.patch 533 BLAKE2B a52158e33778b7a12e3e87bfbc3c0c1ff4231b923c23f075f762a947628eb35256266ca1bdc5b0269e2ecedabd29be27c0ea7ebfe8a944e7c4d0e0917ba24e96 SHA512 060c96b9b3fe38eac79d6a39945ff4efbe7639804e97715a290d5397fff523fb8d483393305187249c61ac1acbc719f4e56bb7e5a3c1513e6384ca915ad773a0
 AUX preload-0.6.4.init.in-r2 1506 BLAKE2B 35622512e6321e8de7e40b41a37e25a4d4f628663050ec2c8fb4cb9220273017a4cf716464e1247d078b411773c451025e7ebe75d36055167f2940f544b60453 SHA512 0e6a058f1825f537152ddf1495dc4101f8add5ca4ce759c3cf6425025c19c5a4361d9abed447511b7d9f081c665d65d7d2f828c13a59ddfcb5f88e5529958e95
 DIST preload-0.6.4.tar.gz 140750 BLAKE2B 4992d2876bc7109d30551c16933c7b107e548d577faf2f78246bdeb6dfe16a81e09edce3a4f0ce15df346a28b81b730e246c7cba431b3d451ceaf6f48c8757bc SHA512 ffb533059b8c9cd171b0d02d52fc8c9bc45284fb16e12b9698ab74345d0e4f66cee61e17922074f7fbfaa90db254e473f815718fc72a689bb55346fcda9e823c
-EBUILD preload-0.6.4-r3.ebuild 1703 BLAKE2B 8018a4db1e1135e55f867f8577b0e2fc25cf3a52241a03880a9a450b48de7892b98b67950ac2b7872f7e29a874b74c18faa5691aa076c2b14e02c4a62996e56c SHA512 8091828a42c2aff05f2ec3e1e4995a7d50bc7468c0e004cdc568dbf5cb490bd8fc5ea12d74985eb23251befcc1df85189c897d4a13bb2b0a7b0677bc06228295
+EBUILD preload-0.6.4-r3.ebuild 1681 BLAKE2B d615b1f5ff1763d7e9b603e9c0746ac09b25b21e74dbf4553d4f08cf8074d115dc787f208fb261046f23ed114330757db278ebcb64b2b2238b17d6f8ff2372d7 SHA512 1fcb076e07dca79ce44945c576d8432408ddf4331f9e164a835a818f816b019a73930159064f26beadd90e263ce716d3c279e10c1da8f696ccb0aa24fcdb04c5
 MISC metadata.xml 501 BLAKE2B 8079beacb5e347c6518927650fc9fbdea72346afffad6b07697058aeba06a6f1f9f5667f572b49c41b2ce188c3a4fdba3dd5d5f172c8eefe8c13a2102c5a9c47 SHA512 8909054cca7097e0d17a2bbbfc343065ade5a7d433b6729b8cf902ed9730856081303d7a3af13350a4fc78a20a00c01e8fd33b526cd28c82f5031fbe8abe7e76
diff --git a/sys-apps/preload/preload-0.6.4-r3.ebuild b/sys-apps/preload/preload-0.6.4-r3.ebuild
index 0a88e6470aff..486415f63b80 100644
--- a/sys-apps/preload/preload-0.6.4-r3.ebuild
+++ b/sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,8 +13,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="vanilla"
 
-WANT_AUTOCONF="2.56"
-
 RDEPEND=">=dev-libs/glib-2.6:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 0a41a72591a2..476e7580cbe2 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,5 +1,5 @@
 DIST pv-1.6.0.tar.bz2 107723 BLAKE2B 95118fc6406f73e800e99468457ba00f0b8f0345eef58f7ff7f4e10b90419cb36b37af094dbe5bd84b7832dfcc96e536dfb845a061f99a0b118192e90821fdc1 SHA512 bd405901812ca50b910adbcf1d2c540dc0b8612f03687866734a79cfa5b5b8100024c18a1d1413c6613e1f2085989cbb77907da89bec7eda37cdeaa7597129d5
 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
-EBUILD pv-1.6.0-r1.ebuild 1391 BLAKE2B cc149d4e0bc6d5fdd5d279c2f949ff23b756f18703f3da2fadfef2f50eda16ff5c240cde05c0fa230ceee0d29cdcbe269b08d27e03eaae7d4717b8c783049c90 SHA512 63861b0ffa75feca60f9c18b230999f6e24067d6a51124127b6251871ea3a024c4a74b551945c0c3150c70590968a2dfd05b5b8637dc47020b1e05742812599e
-EBUILD pv-1.6.6.ebuild 1411 BLAKE2B b692fa74efa806a844bf0ab482a5d0fc8c201ff6bb5f43f30c8340adc621918da6139fe838b05cdd68cb1c53381187140cceb9dae8b9c5c4a2ab977f2a4cf518 SHA512 9899cc2a3459e7e7a1c5204a541e6512daf67d4d5c62d116d078e0bbc7c70cc51f724291eff5ee7da4d0319ecf1fcfe194f6cdadf212bb3d2db44fe574184406
+EBUILD pv-1.6.0-r1.ebuild 1367 BLAKE2B 68332f62167add5091841d2d8c8c9ae9379296eea40471674880ec53034bc4a6da69d935042ebb57960a0996bc3a586a955fd7b69837e488842011ad3b8dd04a SHA512 2e13378c2cb765413a6fc87e6b4f6ded4afee8a27b5468b71cc17a688231acf656b9f1234d3b4fa84d3218430aeda4ee53120e80808ced958088109dcf05377b
+EBUILD pv-1.6.6.ebuild 1387 BLAKE2B c5ac5ecf279ea270868427da6ceecaf3423b1436d634f2731a514f7920ed926a17d5a07a974dc34ec5b857e13cfd04fa60d3863263bf56e14199b37a3e85f902 SHA512 615d2b1caccb65b522a620a640f4f2f4830e401076036d06eb9f9e08efaec7085baebb5426c546f03ab31b8f5ca7bb0ae2c5e0eee7bd070c5ad2d403a10fc816
 MISC metadata.xml 334 BLAKE2B f38b13fd2aa1e836db200a4f9867a5cbc50caa54372977003b4dfd52f92dc2a165d121de1bcd86e7b489911c31c64bff30af3364930ac708dc8f26f7dab6fa14 SHA512 ae252c205325a4937f8ab6c60c8be5a032ff8f11087b7a1fe737ed9c4fa6325b34dbcab9bc16467096de93baa330cec51909f72686cc4152d653fd1456333fb3
diff --git a/sys-apps/pv/pv-1.6.0-r1.ebuild b/sys-apps/pv/pv-1.6.0-r1.ebuild
index 1a443a659545..03cae302ea4b 100644
--- a/sys-apps/pv/pv-1.6.0-r1.ebuild
+++ b/sys-apps/pv/pv-1.6.0-r1.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=5
@@ -14,7 +14,6 @@ KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
-IUSE+=" ${PV_LINGUAS[@]/#/linguas_}"
 
 DOCS=( README doc/NEWS doc/TODO )
 
@@ -38,7 +37,7 @@ src_configure() {
 	tc-export AR
 	local lingua
 	for lingua in ${PV_LINGUAS[@]}; do
-		if ! use linguas_${lingua}; then
+		if ! has ${lingua} ${LINGUAS-${lingua}}; then
 			sed -i configure -e "/ALL_LINGUAS=/s:${lingua}::g" || die
 		fi
 	done
diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild
index b3b8222481a9..a411e2bb0770 100644
--- a/sys-apps/pv/pv-1.6.6.ebuild
+++ b/sys-apps/pv/pv-1.6.6.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
@@ -14,7 +14,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
-IUSE+=" ${PV_LINGUAS[@]/#/linguas_}"
 
 DOCS=( README doc/NEWS doc/TODO )
 
@@ -41,7 +40,7 @@ src_configure() {
 	tc-export AR
 	local lingua
 	for lingua in ${PV_LINGUAS[@]}; do
-		if ! use linguas_${lingua}; then
+		if ! has ${lingua} ${LINGUAS-${lingua}}; then
 			sed -i configure -e "/ALL_LINGUAS=/s:${lingua}::g" || die
 		fi
 	done
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index f5d278c56bf8..e14f4f8e6344 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -8,6 +8,6 @@ AUX shadow-4.4-prototypes.patch 1232 BLAKE2B 757a6db113b6873994dcacfd6867a14e7d3
 AUX shadow-4.4-su-snprintf.patch 849 BLAKE2B 62cb1498bd79991373b1bc8241a07dfcd731ebba7a39406958b30bd0287c8acab65a9a22bcee8ba95073e36c7a8d0b1931b988b4b5963041f61db9ef4c5dbdeb SHA512 2aaa1c847ec34002c6e63af66fb36664e0fc5dc0b719ab38959043f990e84191f5e2f85c2dc44e324abcfe67691c9a9b8181da49077031e2eaaf979dde95b2d9
 DIST shadow-4.4.tar.gz 3706812 BLAKE2B b4dc056643ea507af975df68a1775193c942227aef4ff0d19fcc70392e5410da076d3cc9ad1c58082ec992f2aaa35037dd7de9e6563f783aaed96b2007055ab1 SHA512 c1e0f65a4fbd0f9d8de38e488b4a374cac5c476180e233269fc666988d9201c0dcc694605c5e54d54f81039c2e30c95b14c12f10adef749a45cc31f0b4b5d5a6
 DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
-EBUILD shadow-4.4-r2.ebuild 5521 BLAKE2B 0f4da4a37cf2ceefb74b489c13c0dd5dc2d548b0c7bfd70d0959d00d986bb78ccd6cfc621c7392af639d6899450ea2c814d605c27def9308f70aac04497e529d SHA512 db3958bf4835aba1ae029add8c6b43ba3698c198c47707b96ef4e5a10145baac3124bd22139bb4051f90defcfafc0b94d83f502e63a8fde2760117374594cbd0
-EBUILD shadow-4.5.ebuild 5362 BLAKE2B 80152730e266e66c14b16763a639dd309c233733080955fb41b1b4c4e625b45b0f961728eca75b4df89c48d71a206a6c16f01752386285eeaf0c5213eeb5af5b SHA512 745123831ab15d52b9f7f6871af87e8d13c2baaf4ecbcbd8e13549ace90b111a3ec92a5a35deb418d5ef62229641cef1e2add485a8a22e2405cdd0a651991117
+EBUILD shadow-4.4-r2.ebuild 5484 BLAKE2B 988704357c01c35a2808b48c921c6de6ac6eb06429e6a35945263fba094caf8bddb0d4fed6ef236845f7983671dbee109d95a01f84703e7b4fc59a7fe26ce569 SHA512 8584c5805f4729a4ab42ccac22a558b0899258f9408cae4a9c5570f6b4ea7f9a969da92393ce456f1d5e2a5199bacbb5317f3433a7d41afb5b52e280493b0f56
+EBUILD shadow-4.5.ebuild 5325 BLAKE2B c2849ceaf174e3ea0a660c7da8912f60d4c1446119759c1d98131ee493074340c1bc149e3c542552f56a802cb5b56d2d0db60b36860afe858c84a00122bbfeb1 SHA512 1f1a6dc525673045fee660b661bf772aea028718b172f386560999b884807f1b3e0dd6a9a6ef6a9c89ebe79d9a0ff14526c62dd77d7c9ca96ebc55f1243a870a
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.4-r2.ebuild b/sys-apps/shadow/shadow-4.4-r2.ebuild
index 429fa198d37f..8226ece43369 100644
--- a/sys-apps/shadow/shadow-4.4-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.4-r2.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="5"
@@ -15,7 +15,6 @@ 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 )
-IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
 
 RDEPEND="acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
@@ -69,7 +68,7 @@ src_configure() {
 	if use nls ; then
 		local l langs="po" # These are the pot files.
 		for l in ${LANGS[*]} ; do
-			use linguas_${l} && langs+=" ${l}"
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
 		done
 		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
 	fi
diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
index e1ca2b3ce598..0863851a2f6c 100644
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ b/sys-apps/shadow/shadow-4.5.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="5"
@@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 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 )
-IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
 
 RDEPEND="acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
@@ -65,7 +64,7 @@ src_configure() {
 	if use nls ; then
 		local l langs="po" # These are the pot files.
 		for l in ${LANGS[*]} ; do
-			use linguas_${l} && langs+=" ${l}"
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
 		done
 		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
 	fi
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index ac32057c2fe2..8295cf946517 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -8,6 +8,6 @@ DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd
 EBUILD smartmontools-6.4-r1.ebuild 2534 BLAKE2B 3395b22b8bdd26c78404016cbb5f48a91b9858ffbff70ae3ca486fc3d32ca9603cbd752111693691a91b5c04982f07987391745514af782bf31d4644d8314223 SHA512 1b0d02e5d4a493cd7926a93c92b3b78951f3580228ca19864113dbb09f12ce936866d50d528bdfb66f94b88b8f99660fa5d7181a81008b4badfaa7ef362a187c
 EBUILD smartmontools-6.4.ebuild 1639 BLAKE2B 103e33da5b3605be940863b879ab2a4859036c3ce1206052b08cd9f0f88acca4d3f56513049a24ac57dcbd2e3c2413fdfcf4dc973fc19645c735feb2063ba122 SHA512 c9b07c80d4e4355bc2c4ebce895efe35ed70d5a31eab3eb8298c1cc947a42cb1c4bb81d57cb46816619580067aeec246f49bc581a788abb7c912d0ef898f8448
 EBUILD smartmontools-6.5-r1.ebuild 4043 BLAKE2B cb6764d3186c03fc1df0878d00b7ced1d1e5036e8e3e7afeeb552e3d257cb51c3173edc07b738d111b41eb73f83f67967a9bd9ed071ab11478e12fdf5a0ea20c SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5
-EBUILD smartmontools-6.6.ebuild 4092 BLAKE2B d37fdc7e122b84e80e686c353afbb279b52c213c34aee7a575d372430664c75c9ead851bb7b4777b3d49c42ef766230885673d587bacf5a6b07d92b7779460c4 SHA512 b911eb71b6f19f23d4e4a22cc2a4630daaec7a1c469f95e3e02f28102f39799045eadec4f300879e19b40998b7ecaaf46a4f780832a795e02cd162de1f8aee72
+EBUILD smartmontools-6.6.ebuild 4088 BLAKE2B 859677f35897b545ab56bcf04e6890b5ffa0c0305d88568243f09904c30dfb64c35f532aadce4ada683532e4deecb4c4efc65c54fd1e50ac2a041094b7b37989 SHA512 a51bf9d5780f23772bd417c9b1d7e2bc40ec810660e8f49da2a949261886e43a6c477d3c041f7057cccdd1890b1027bca64501ad2bc4da148e65c97e686e4ab2
 EBUILD smartmontools-9999.ebuild 4094 BLAKE2B 2af97f4da8bb0b0f5a1c6f9bc275724d69b4687e3ab7890f021d9e2fa25fccab24769dde1a08d61464f8977b6cd8c912b906307feb119e9f94eb83ce204cf0c7 SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a
 MISC metadata.xml 718 BLAKE2B 4172ef96f081f77b7f701d2f11ed1eae3cd7342815fd3643373f8bb60802a273d8308dc4ff8e8d36349f8361e04213ee2d94619045a16739aa2fa75560c7cfae SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54
diff --git a/sys-apps/smartmontools/smartmontools-6.6.ebuild b/sys-apps/smartmontools/smartmontools-6.6.ebuild
index 08ff1631b9c6..12dba68cb900 100644
--- a/sys-apps/smartmontools/smartmontools-6.6.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 90181b2b9cef..8d97746a8d84 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -14,8 +14,8 @@ DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-236-patches-1.tar.gz 3331 BLAKE2B c4ef8881252e79f920572eb73210b205f36ee2a45aaba4bea5e5e8b2f89b92b79deb8e30a62c9163fd0bb2fbc2215e0dda6ca3388b71e4349a8659591c23064e SHA512 d4c93968d03b5f2f2279b030e65399a7d1971eab4d9be8f2122eab67b1fb7b24eef46993beab8400fc782954dc78f400778c3fff5ba4f6c51a14eeb1931c3862
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
-EBUILD systemd-233-r6.ebuild 13584 BLAKE2B ff12a0a8567efcb2e1946bcee741f7f9812953a486711409d0d264d1b28098dc797ee52b7507ab92dcf5b87d516f698689a39a179e676ea1e29b6a7ba837aac2 SHA512 b9c58ceeb3e02b13a0e4b6c6c58d43f0f9f2fe7e487c47e9b33de6f77e2c6139941ce5204598b745dc746c365ae6119f8b7f8ba022195ae844c237fce6f8f4cc
-EBUILD systemd-235-r1.ebuild 13506 BLAKE2B 0cbf4561d133839204ff6a7fbd5d984ef72ba0859977b308a58f0d92ed7dbe01eccb38ef2b66aa1423321f014fece45f90a48d18d68c63cf8e7c76e5c82c2637 SHA512 ebacf9761e113be1f8fdf1d1e54ca95ea6c4f3736942b86d6cfc6d18c792178d5a85611e37db4966296e6044fc5263b27e22d4bc8c73ed991cd6f0c9074aa0a3
-EBUILD systemd-236-r4.ebuild 12977 BLAKE2B 05c987a7da3c1f63a32bb8a3b30611ff307c053986bb7648d9132608d74e714bdfab4682c4b6d3815723444acb727b05fdeef1faeb26e8a70e5b84a4ce81875a SHA512 d95a10baff7d28001a2899cb450f834289c26fb7eaac1d75315f3bc12c40106627214080091c6b6202619fe4be6fa49d3969487a6612920d35453d96ffde6ee7
-EBUILD systemd-9999.ebuild 12916 BLAKE2B 6fc7eafd442dee19f373b3ff1c12fed6be21fe4d32ee4ec3c919b67c7ca4b23e4ac341060230ff78018d6e9416d2d51a98e7494351f5d034d09ebe576fb004dd SHA512 f0d94381647e27cf553f200f3a9e918139107de5277bc40f830627c00bb6a087d4b23cd71e406bf2c1e25851621de74e2c99e1e19cd506cb2378988da738a388
+EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 888f373f78f0ba49f91d765b1568c7b6183b2cc2794f66cff37bf1518aa926148ce67411077de68f45419021bd4b99610e4552b1bd7d84dd2a3ce594f109be43 SHA512 ba05ead8530e2276ebde9b5dbd76d129ddb80224cb551114bcd0d55a079597a77b57f1bf58be520b74bbbb419a0c4020cf1039897a6d01c1e839fe3b67cac711
+EBUILD systemd-235-r1.ebuild 13515 BLAKE2B a7c8172b85924b970a5104681c0577c447408d88232eff3dd9a607b86f18952db48ed358c7451834291214432424694e5873719a1e0d2d30888d9747d3313729 SHA512 263a14227163ca7d4a993f150e864a67e7ccc1092f808a14493206f418780453e4e74df3b700cb746060d46da5025d8c0db5841404db09afc13e2e968bdf93b8
+EBUILD systemd-236-r4.ebuild 12986 BLAKE2B 1ea709672003c2864317751b1471e088bdc5cd430a9449fe28b43840d9af53ecbcfa4877bf6a9eb0f96999a5d4ad4c47c7b548d5125196c5df5984a187868210 SHA512 ed6f3ff41b7266f6010e73d67659619836f17f8900e64d0172b335631ae75e2d357af0ceeb5424c691a546e9b4cf5f68ff2a01d766fa73319567a0b628752ac7
+EBUILD systemd-9999.ebuild 12925 BLAKE2B 44e3ff49e2898a8199a1d106de12ceb286e33dd810e6fcc046ededd7f720914c355f5ab189af07b2f8d4951dbee1ad4046fc403fc357d6d6a13c67e67045d39c SHA512 f31ee8d40c1eb31af6a06b58a79c3121b824eec0ecbc0e8d3a37ba77368d8c3f3b96e2167f1d7ca10690c1963da37a0394989c0d4ba8789e39666924c5188b26
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index fded2f5f4a08..a9934d819924 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.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
@@ -112,7 +112,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
index a0800a27a1d6..2727ae07b8b2 100644
--- a/sys-apps/systemd/systemd-235-r1.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.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
@@ -110,7 +110,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
diff --git a/sys-apps/systemd/systemd-236-r4.ebuild b/sys-apps/systemd/systemd-236-r4.ebuild
index 816c66a23733..be31a53ad519 100644
--- a/sys-apps/systemd/systemd-236-r4.ebuild
+++ b/sys-apps/systemd/systemd-236-r4.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
@@ -109,7 +109,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7122881b52d1..7e7bcf41a449 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.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
@@ -108,7 +108,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"