gentoo resync : 04.01.2018

25 files changed, 219 insertions, 395 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 949cb11749a9..d15694678cb4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 8dc3c90d4895..aeb99e145c00 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -9,5 +9,5 @@ DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 EBUILD keyutils-1.5.10.ebuild 2804 BLAKE2B f0f4d4b762592597e38e358c721e6625288ed5b443b37b459d4edf3f285f17d3776a1695d6a04cc24435df297de76b151d2d5ae4939472a88276d72a28db6ab6 SHA512 88cd81319c89a05b6f4f446f22833810e894802809610afc3066df35ad0d426349e964e739aaa34bdc4dab9368d5c728cb791af2486f38f0e966be9c49981323
 EBUILD keyutils-1.5.9-r1.ebuild 2293 BLAKE2B 6839a041eaafe1ea4cfd4706970694883ae01e1c8a39bd031a4368378ded11fce323e7c56e23025e1e523a81ee382bfdfa9ee3f5deddc156440c29d95d30d6d4 SHA512 fbcf7923a757dd2247cb0d1c644e865f03c31f09fa3c880264d1e0b5631e7b8f4611c6206286d8fbba616bba9c0f553d9c1c714744d94e454f309f64ed37980e
-EBUILD keyutils-1.5.9-r4.ebuild 2961 BLAKE2B 7ecc29434f1d8ecd6c89773218e1be3402d400c4eb7ed4838d29fd2a9ac59a3cfb015d39be2d1af9d7fa20bd109f2f1f80474dfc1cee1ba42a01ebaa6427c33d SHA512 8a2f8ec2f1b7ae71f09c9a17ec391b1224fb547d7a1594672ea62f74581be65005d67ea9befc260bbef28686a403a34543eaeb9490081080e04bac5c5c94a5f4
+EBUILD keyutils-1.5.9-r4.ebuild 2959 BLAKE2B d538cefd90fc3980f65e179ff717ac4ccc579218c4bb9547130c51722a191b7afc3907961a1cefe6265d2c08a7b516611e3e97c5e4de265d56e0e34a513d478d SHA512 335dfe2c7207b0c90b132a3b46d769a950cd52c48a2e31c988a1ca98d323e8236c6a7fa898e4e1fa177acd6c38199849c6673692ed06d12a55d6d2ae06314e7f
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 473847a77c1d..c5aed8c4240a 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-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="5"
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 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 static-libs test"
 
 RDEPEND=""
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 7eccadab1d06..aaae983ccc54 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 6322 BLAKE2B f668176173bc45835c6674f95fc28bf674593a16262b65348b84bcbdc8f318184eec52de38465d37439b17ab1d2dd1063f292191369ffcdd823b87ab6ce3da95 SHA512 c1c449277125ff3b987afefe61664e0fe4da13f07b8ef7f7b8eed25e21899c5f9a036b8a1ea2b1af0df1a7a17c0bb4071de0b9df49ee13db8956454f89c05118
+EBUILD lm_sensors-3.4.0_p20170901.ebuild 6321 BLAKE2B 16e0c3e84dacd3fff0966c7dc5d50e5e2634500e3f888fdbd5cbd7192f59f6bc3d7382edee6de5c881fb2e476bf362122b5a40db2185c70e620d3f4af3dd7e91 SHA512 5ffc22459209f78dc1c31280a102b771ee56787aba220653f6b271acbaddadc3ab0a53a6957e57fa814acfc885e6d3cafd78af974ccf758cd1eb2795d9fd0a29
 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 8c52ad1a3359..b5bf887fc5aa 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 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index e2a2354ba127..a1dce3e7039f 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,8 +1,10 @@
 AUX lshw-02.16b-gentoo.patch 4972 BLAKE2B f9b383850aefc180c7e9e5e818921fc6bfc57c6fa49f7b78d5dc66c03855a0e7e0fa1846e1722927090845fe11aa5d8bb97268ad9ddca9afda9b0288222ad3d7 SHA512 723a67b91972d3192a422fbead27fc6c3c7020bc0d0afb0d88792659e345f3379be423517f649eda7555d20bc26583ce8298ba101eba63ba6669e7bf213c8aef
 AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a108fc6f29c6cb62d2a3a64d4de5412be7a460ba217f0ba625aec5cc4efb7ff9c0750cd14073f3b0783a883c1dd1 SHA512 c9492cf301ba06f225d8afab62ab889572f9acede7b63cfc0ae665275b1056981dd85b02d4d49fc6294194a71fc405ded6bf27b3f461e550b0e5a3dc6fb939d7
 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee
+AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
 DIST lshw-B.02.16.tar.gz 1845891 BLAKE2B 57d22af384b9f6f1878439f48ebd31163738744842a7682877126d6f914c1496442d79dc818e774f76ee04c4a284407c5ce53ba72af71571731bb4940f8a2338 SHA512 ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
 EBUILD lshw-02.16b-r2.ebuild 1578 BLAKE2B 95db87dfc3c9acd39aa1e093af275f9c733760ca3a9b5f375d687b04d7d2a482ed84c00df64c348ec71d054d9513dc528bae8fac1021560725f42257053aaaac SHA512 04bdbaab93a5afea433f2bda35b1254c3bbf3b6ce9f918acfdb2d7bf33f0f0d08df5473a7506efe10e04be8036d18e8d9e4ae0f7a37955d906893af546dc99a7
+EBUILD lshw-02.18b-r1.ebuild 1779 BLAKE2B 5fc65b823fddbd74a588f0de3ae4946530e35c221c3d1368a315c2d3d5181c80f34eb5e6032b8b5b4a8e360131487620c1a73d303a4e5d22446fa616a1e8a4c0 SHA512 c82b9b9548ebaf9dce134cc80f290e1199344ec70d9f94a7b742971a320a9419c66e06e4500865d108f73733b50e726cebfe4ed7fb31573deaa12300b457d047
 EBUILD lshw-02.18b.ebuild 1732 BLAKE2B d131f58bfd6f47fe79d4e9a65f2af1d5151522b1a804051179be674fa4b1521aaeeed7c85780df99cd0cb8fcee349f79610aadaf7c16fc9488fc06cb3fa91dee SHA512 2bb39c60194d9648309c2990ab0b354ad758abe3a46e25e21b1aec5444f87b4652a47fa63f71c9242cf9b8bbc05e997e552259b309b48f95f2094914da84629f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lshw/files/lshw-02.18b-sgx.patch b/sys-apps/lshw/files/lshw-02.18b-sgx.patch
new file mode 100644
index 000000000000..92bd6c23e2f3
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.18b-sgx.patch
@@ -0,0 +1,32 @@
+patch from upstream:
+https://ezix.org/src/pkg/lshw/commit/5e5744732b2dcdf83845919256388b3842033183
+
+From 5e5744732b2dcdf83845919256388b3842033183 Mon Sep 17 00:00:00 2001
+From: Wenkai Du <wenkai.du@intel.com>
+Date: Fri, 22 Dec 2017 09:57:57 -0800
+Subject: [PATCH] lshw: fix segmentation fault when /dev/sgx is present
+
+When Intel SGX is enabled in kernel, /dev/sgx is created and is
+picked up by "/dev/sg*" glob matching.
+
+Signed-off-by: Wenkai Du <wenkai.du@intel.com>
+---
+ src/core/scsi.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/scsi.cc b/src/core/scsi.cc
+index b38dda2cd8a8..75061c0fb195 100644
+--- a/src/core/scsi.cc
++++ b/src/core/scsi.cc
+@@ -30,7 +30,7 @@
+ 
+ __ID("@(#) $Id$");
+ 
+-#define SG_X "/dev/sg*"
++#define SG_X "/dev/sg[0-9]*"
+ #define SG_MAJOR 21
+ 
+ #ifndef SCSI_IOCTL_GET_PCI
+-- 
+2.15.1
+
diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild
new file mode 100644
index 000000000000..c22eab427571
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PLOCALES='fr'
+
+inherit flag-o-matic eutils toolchain-funcs l10n
+
+MAJ_PV=${PV:0:${#PV}-1}
+MIN_PVE=${PV:0-1}
+MIN_PV=${MIN_PVE/b/B}
+
+MY_P="$PN-$MIN_PV.$MAJ_PV"
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	gtk? ( virtual/pkgconfig )
+	sqlite? ( virtual/pkgconfig )"
+RDEPEND="${RDEPEND}
+	sys-apps/hwids"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-02.18b-gentoo.patch
+	"${FILESDIR}"/${PN}-02.18b-gettext-array.patch
+	"${FILESDIR}"/${PN}-02.18b-sgx.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	l10n_find_plocales_changes "src/po" "" ".po" || die
+	sed -i \
+		-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+		src/po/Makefile || die
+	sed -i \
+		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
+		src/Makefile src/gui/Makefile || die
+}
+
+src_compile() {
+	tc-export CC CXX AR PKG_CONFIG
+	use static && append-ldflags -static
+
+	# Need two sep make statements to avoid parallel build issues. #588174
+	local sqlite=$(usex sqlite 1 0)
+	emake SQLITE=${sqlite} all
+	use gtk && emake SQLITE=${sqlite} gui
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+	dodoc README.md docs/*
+	if use gtk ; then
+		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
+		make_desktop_entry \
+			"${EPREFIX}"/usr/sbin/gtk-lshw \
+			"${DESCRIPTION}"
+	fi
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 49ef7b19ccfe..652df9d41a7f 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,4 +1,4 @@
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-EBUILD man-db-2.7.6.1-r2.ebuild 3144 BLAKE2B 2c4ae19d7ad4da2793a8373b0c5d6e5bc21d968273ca0b2d6314a440898ff97c777bbb0e384065736de4dc6ff4105cb6aba1c2e623851b6e805bfe072c6134ea SHA512 ac56c1d1e2861abd44359991b9ff20b3813dafab9b61a95642b9698255800d3974f23d894957a897358b31d3373ec899ea58496f55f9e01e44e6ee24e6a79e89
+EBUILD man-db-2.7.6.1-r2.ebuild 3176 BLAKE2B d819d9d41383366f43dad8780c13c839d4fae8b360ac380e014218201b090bad8c716d6f707d5922105538f63b4c9bdeb0ad1d5212b7bc48951bad05b4647f0c SHA512 e9861c885954e45aeacf0ed1ac7fe74fff8056867d4d8ce06f215dbe3b8a7fe071a01c6461d818ebdc0840315a5502c22e39fb51e41c4517cf765b15696c546e
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
index 783e32df0f9f..b9db3fb1151e 100644
--- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.6.1-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
@@ -16,8 +16,8 @@ IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
+	gdbm? ( sys-libs/gdbm:= )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
 	sys-apps/groff
 	zlib? ( sys-libs/zlib )
 	!sys-apps/man"
@@ -45,15 +45,17 @@ pkg_setup() {
 
 src_configure() {
 	export ac_cv_lib_z_gzopen=$(usex zlib)
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-setuid \
-		--enable-cache-owner=man \
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--docdir='$(datarootdir)'/doc/${PF}
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-setuid
+		--enable-cache-owner=man
+		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
+		$(use_enable nls)
+		$(use_enable static-libs static)
 		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
+	)
+	econf "${myeconfargs[@]}"
 
 	# Disable color output from groff so that the manpager can add it. #184604
 	sed -i \
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 773f37a90ffe..f5b64c68eaf4 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,14 +1,6 @@
-DIST man-pages-4.09.tar.xz 1521560 BLAKE2B a1a8e9e926940b48cdf17d682b38ff761cb3e5a5799bb192fba3f8715b7094551d1dca02d4fa9c70b1c6a198a5d9308a4435b80291130ffb9485e55b79cfe231 SHA512 695f90b9f4721d041de0441e240afce88e49f4ea5ffea855262da3cdd0f3f2b6401f2728786da3afa2245aef84d41c0c449415e7e78e408b69c9214ddb4c74ad
-DIST man-pages-4.10.tar.xz 1556948 BLAKE2B 97617ad6ea148ebf4d919a42f6dfe23a11534efecaba168746aa919668bb351316fc26829fcbe1dfd7d039580096ef131f75b21b151a726bbb5877e29197d199 SHA512 6c5b8e1339a02054a5346ca3ff665c414ef178e69fe0d064d4ad7dc372ba364df2753bf605a682cc366c12661c42b9fd17567c72a0f24173f9b086d79cf354d4
-DIST man-pages-4.11.tar.xz 1574380 BLAKE2B 52f55bda9452d7c1f5217b977fb37739c6e33d0301683d40e1274013604ba55c00e1f64a1404c8790f41cf07fd6c00885bb25a9f1ce0ab21a99efe1f354e10b4 SHA512 cc1282467255d5c078b099ab6dbc407c5f56fa66fb3f5789286bc66c98b229cae88bf8afdafa7c9609a37c87cdb1401bb381cec25c64690ab69faf4d00787187
-DIST man-pages-4.12.tar.xz 1583664 BLAKE2B 424126b2822e3a61ca7bdcae85af85ccb901284e71cb245806cc48261016af03d9d4397a9af130fe155409ff028fcc2acc37ae210343a7cfe8d3f4403c231738 SHA512 03ab6fb4d3136ef31add16859706f965f954249bd0a44250c8a081b3e1260dce74d50112f1f56af079c08c46049aeaa71b48ccb7d1a3e57a1fc4a495c38647ce
 DIST man-pages-4.13.tar.xz 1593424 BLAKE2B a77c38fd3d23a66eea93c2e81efd2c49fc2053980c669804d747b38cf1447a4fb4119a02f521a4984659a8ff490e165fb994429770a1352eb47afcc1c22a58c8 SHA512 86479372cbe2ba5fcad3e2049f52ec788a4aa2d8056cadf7b248eaa776064e1c9387a42d0a77f4bde4385214c11aac117b1e99745459260ca639c656c01698b7
 DIST man-pages-4.14.tar.xz 1611348 BLAKE2B d06d6d5bf67f5a17ca685bb1a6742a4d300791c1ed715372fa9bacf3006cd73c4b43434ff7c0a21e3a15082ca1bee91c8559751225eed2946da23c6f4d66e71d SHA512 d7163aacc6c3da914182d685d459d24ad60182e2cc528d72b08b565a9e2901ec319c8b44aef9b7e20838e146e159834482c62ba1b65823d5a06794283ebef41f
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-4.09.ebuild 1621 BLAKE2B d7496e88d7c9e41bd38b68b88158ae16a7a52db64e83937b82a87c97934484e87b27fe5a1be659d2bd1a0ac10a52bf6fac3c4d2a3ef82ff5bb87f4d600f9c0b3 SHA512 6f6ea6f112514a64ffb90ad4be93e5106ac88558037619b3c6532833fd988ebae8029680e4aa2dfd6e4ec3c901369d4f09674cb98e6c3d703883697ed5163646
-EBUILD man-pages-4.10.ebuild 1672 BLAKE2B 24f0cff2a682c99a18ef367e9b26b233e4c75e17eaa234573aff308294b50daabff965b5fc3b879badf346be9d730b96d7ff72359cabab4b0006baa32646dd52 SHA512 b4740db0a08368d4437de045e0c731c53977818083846cf09b47eb398a67cbe17790c74376ac526eb68ffa46198637d64647ba0ffe5b6d805d7c3eba47482cf8
-EBUILD man-pages-4.11.ebuild 1708 BLAKE2B 7c774fb701ed131f6b57ca5635d407c06ef8b0782ecbbadaefad5f4ed45ca5e5ef82114626450b24d23cd6dcb5dfa7dc97ab33ac12ed3fcae544420161076096 SHA512 79d8ada8174877aa2fb081fd5ca70c4f812644e802cb469b3e12f34f8db434cb1a97000f999e8ec5679005c67fa289fc8a4423e6e5de15324f35d0d0ada200a5
-EBUILD man-pages-4.12.ebuild 1708 BLAKE2B 7c774fb701ed131f6b57ca5635d407c06ef8b0782ecbbadaefad5f4ed45ca5e5ef82114626450b24d23cd6dcb5dfa7dc97ab33ac12ed3fcae544420161076096 SHA512 79d8ada8174877aa2fb081fd5ca70c4f812644e802cb469b3e12f34f8db434cb1a97000f999e8ec5679005c67fa289fc8a4423e6e5de15324f35d0d0ada200a5
-EBUILD man-pages-4.13.ebuild 1708 BLAKE2B 7c774fb701ed131f6b57ca5635d407c06ef8b0782ecbbadaefad5f4ed45ca5e5ef82114626450b24d23cd6dcb5dfa7dc97ab33ac12ed3fcae544420161076096 SHA512 79d8ada8174877aa2fb081fd5ca70c4f812644e802cb469b3e12f34f8db434cb1a97000f999e8ec5679005c67fa289fc8a4423e6e5de15324f35d0d0ada200a5
-EBUILD man-pages-4.14.ebuild 1708 BLAKE2B 7c774fb701ed131f6b57ca5635d407c06ef8b0782ecbbadaefad5f4ed45ca5e5ef82114626450b24d23cd6dcb5dfa7dc97ab33ac12ed3fcae544420161076096 SHA512 79d8ada8174877aa2fb081fd5ca70c4f812644e802cb469b3e12f34f8db434cb1a97000f999e8ec5679005c67fa289fc8a4423e6e5de15324f35d0d0ada200a5
+EBUILD man-pages-4.13.ebuild 1656 BLAKE2B 7650d6534578d341081f46fb3eebb42c8d615890bc5801657545bdf6f4ce79d90eda92a2d84ffbbea335506aa7457fbc623c0fdfca1577044fee556fd6841bd5 SHA512 1ef27b1652a2545a20fc1381db1df98dece0abe38b959d3b2067164b0e4e6dd5d7794d628920e62584b2326bd80b3ddb3c4547874073ac0c044632c3bd4a1c07
+EBUILD man-pages-4.14.ebuild 1669 BLAKE2B b427d543ba1d875f5813bc446b159701821076b102ff257b40d3130e32b7e69c3d51c59581b889a36c8c9756b8810d5025372e83f0a35b65069bca170bec98d9 SHA512 c8d91238d078e348e9ce864e72c943ca34b7142df06f1f28593646324da1bcd38ae4f926afee34549096266025bb6683de65553830266c659fd32c596205c7f7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-4.09.ebuild b/sys-apps/man-pages/man-pages-4.09.ebuild
deleted file mode 100644
index 02403e5770ee..000000000000
--- a/sys-apps/man-pages/man-pages-4.09.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 ro ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900
-RDEPEND="virtual/man
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2"
-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_ro? ( app-i18n/man-pages-ro )
-	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
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.10.ebuild b/sys-apps/man-pages/man-pages-4.10.ebuild
deleted file mode 100644
index ddfd9b5a5b60..000000000000
--- a/sys-apps/man-pages/man-pages-4.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 ro ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r3
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2"
-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_ro? ( app-i18n/man-pages-ro )
-	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
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.11.ebuild b/sys-apps/man-pages/man-pages-4.11.ebuild
deleted file mode 100644
index 257d28c42577..000000000000
--- a/sys-apps/man-pages/man-pages-4.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 ro 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-r3
-	!<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_ro? ( app-i18n/man-pages-ro )
-	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
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.12.ebuild b/sys-apps/man-pages/man-pages-4.12.ebuild
deleted file mode 100644
index 257d28c42577..000000000000
--- a/sys-apps/man-pages/man-pages-4.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 ro 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-r3
-	!<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_ro? ( app-i18n/man-pages-ro )
-	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
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.13.ebuild b/sys-apps/man-pages/man-pages-4.13.ebuild
index 257d28c42577..2f0635cb9bd0 100644
--- a/sys-apps/man-pages/man-pages-4.13.ebuild
+++ b/sys-apps/man-pages/man-pages-4.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"
@@ -14,8 +14,8 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 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 ro ru zh-CN"
+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"
 
@@ -33,7 +33,6 @@ PDEPEND="nls? (
 	l10n_ja? ( app-i18n/man-pages-ja )
 	l10n_nl? ( app-i18n/man-pages-nl )
 	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ro? ( app-i18n/man-pages-ro )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 	)
diff --git a/sys-apps/man-pages/man-pages-4.14.ebuild b/sys-apps/man-pages/man-pages-4.14.ebuild
index 257d28c42577..34c06eaed5d3 100644
--- a/sys-apps/man-pages/man-pages-4.14.ebuild
+++ b/sys-apps/man-pages/man-pages-4.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"
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 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 ro ru zh-CN"
+IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
@@ -33,7 +33,6 @@ PDEPEND="nls? (
 	l10n_ja? ( app-i18n/man-pages-ja )
 	l10n_nl? ( app-i18n/man-pages-nl )
 	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ro? ( app-i18n/man-pages-ro )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 	)
diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index d5282921cdca..3c49d9daa4a5 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -2,11 +2,9 @@ AUX microcode_ctl.conf.d 210 BLAKE2B b90844f3ec85a308d56ce230dcc948faf797564036d
 AUX microcode_ctl.rc 590 BLAKE2B 09dd568f72522a4a95c1c036f4032d7bb45754c0f46b6a5ac9573eb00e5a3d81c97caad5b47ed742df3d91ea5b8863d2ac69c570975ed96957e8313a6e723fda SHA512 a81eaf5628b62472520b59773e58ffa99938e70d9efd0f1c25cfe8a953f7a8632879657347147323c7299cc022c89bc82a7409fdf2d2aa59afa7173ef9d13438
 AUX microcode_ctl.rc-r1 621 BLAKE2B a4166842f8b8496a8b8b1cdac930b960a8c510d59a40def39552d5280aa66e381d9807bece1f07f9ed2d0b237950f187cc4c4080dde6b86a6cc3da11e747a406 SHA512 543e389ce415df3beac1a84f0d2b4dbdd7ad4a5f9bf33a51e4cbe34fc29249a5d0e044aeaefcaa17fcf38be1f53a5a75f04bd6116d7d5d9e91851bceb3329564
 DIST microcode_ctl-1.23.tar.xz 755448 BLAKE2B ad7811536584343254fee8ee77a192834ef3aedac49615d8a4d6dd46f8ad68f01d1a01ee8e54988ade5f6878dc903da0c9f08a93f5efed041cc7bd43c864969c SHA512 f33b4fd43c39b3d4e9b6eb9a12285c7ea26ee43e6c4aa1e45f9aa92a0d2b7d55d1a950ee82d8aea5c86faa15dd1e85e829719b6c772a2c09f262bea630bc7edb
-DIST microcode_ctl-1.27.tar.xz 856240 BLAKE2B c9811226e0ad4d26d3ca82b90d8fc34486bb88e7d4e811e543fbd88da8ca2f5cd4b8f9a535f804f2690b0c02e2ac8ab686837a0bf14facd3e792ac1e7502ce1a SHA512 ac4bce583f756b777488605687fe1bef0038763ed4a0afc51b454140f00caf04ef8a6d790d95684aa82c857f9cefd59b2413b96ad3d0c349da4b88166c5aa556
 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.27.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
-EBUILD microcode-ctl-1.28-r1.ebuild 1035 BLAKE2B e82bd192b0ee75ddeb53a1112ddcb1aa5846fe2e8c84137509fa6b723cdd4b96eb6f0d7176d83d538a86ed032f6b19bef726ac31896a2f0617d44b11c1e91a44 SHA512 a63bb4b08ada1fa9e4c114f4a7c8019201e29260282b75cc58247264602191bfe83a4076f8673bb591443f08c3e9e8723e1952f7bcf7bb0951a457572f527964
-EBUILD microcode-ctl-1.28-r2.ebuild 1147 BLAKE2B 9bb9e2be7a589eaf4ffc30ebf95bb9a6f7f38019c5b598659dc7a037fa3051673c2185df8bfc7007205436246214cb40260ae8204f2ba0876ed33350b838bf95 SHA512 c6782fc6a6919a2eda6f6b229c0498b4ff1907cee8eab2dcfdf43017a6849cc996af39202daaadf2d7093c51752984938e7c77090c4b1529b7c2c7001bbdb4aa
-EBUILD microcode-ctl-1.28.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
+EBUILD microcode-ctl-1.28-r2.ebuild 1146 BLAKE2B 3f0c1ec0dad10983e2e239cfd60c095398270fbb22f8e5db97244b28d79b648fc4ca56aca0b22a577076bfc4e80048a75d10e318907fc248a02e32e03f0277d1 SHA512 abd0d5b0ebbbb5be403096b74838ebafb4da62a5a75867f5643996a0088ad68b94a7a68b58d25e22696a35ff01fc1350769c4b65b6b00e05f45fd7fdf89d23b1
+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.27.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.27.ebuild
deleted file mode 100644
index 0943b22c05d7..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.27.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit linux-info toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://fedorahosted.org/microcode_ctl/"
-SRC_URI="https://fedorahosted.org/released/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-
-	newinitd "${FILESDIR}"/microcode_ctl.rc-r1 microcode_ctl
-	newconfd "${FILESDIR}"/microcode_ctl.conf.d microcode_ctl
-}
-
-pkg_postinst() {
-	# Just a friendly warning
-	if ! linux_config_exists || ! linux_chkconfig_present MICROCODE; then
-		echo
-		ewarn "Your kernel must include microcode update support."
-		ewarn "  Processor type and features --->"
-		ewarn "  <*> /dev/cpu/microcode - microcode support"
-		echo
-	fi
-	elog "Microcode updates will be lost at every reboot."
-	elog "You can use the init.d script to update at boot time."
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28-r1.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28-r1.ebuild
deleted file mode 100644
index f7ff8cd2c453..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.28-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://fedorahosted.org/microcode_ctl/"
-SRC_URI="https://fedorahosted.org/released/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.28-r1" ; then
-		elog "The init scripts have been removed as they are unsafe.  If you want to update"
-		elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
-		elog "details (and bug #557278 for genkernel users)."
-	fi
-}
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 4ca58a106615..c6baaaeb0bda 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/microcode-ctl/microcode-ctl-1.28.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28.ebuild
deleted file mode 100644
index 0943b22c05d7..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.28.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit linux-info toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://fedorahosted.org/microcode_ctl/"
-SRC_URI="https://fedorahosted.org/released/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-
-	newinitd "${FILESDIR}"/microcode_ctl.rc-r1 microcode_ctl
-	newconfd "${FILESDIR}"/microcode_ctl.conf.d microcode_ctl
-}
-
-pkg_postinst() {
-	# Just a friendly warning
-	if ! linux_config_exists || ! linux_chkconfig_present MICROCODE; then
-		echo
-		ewarn "Your kernel must include microcode update support."
-		ewarn "  Processor type and features --->"
-		ewarn "  <*> /dev/cpu/microcode - microcode support"
-		echo
-	fi
-	elog "Microcode updates will be lost at every reboot."
-	elog "You can use the init.d script to update at boot time."
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild
new file mode 100644
index 000000000000..4ca58a106615
--- /dev/null
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs versionator
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Intel processor microcode update utility"
+HOMEPAGE="https://pagure.io/microcode_ctl"
+SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="selinux"
+
+DEPEND=""
+RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
+	selinux? ( sec-policy/selinux-cpucontrol )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dosbin microcode_ctl
+	doman microcode_ctl.8
+	dodoc Changelog README
+}
+
+pkg_preinst() {
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.28-r1 ${_v}; then
+			# This is an upgrade
+			elog "The init scripts have been removed as they are unsafe.  If you want to update"
+			elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
+			elog "details (and bug #557278 for genkernel users)."
+		fi
+
+		# Show this elog only once
+		break
+	done
+}
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 69b650b27ecb..339a5f791d96 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,5 +1,7 @@
 DIST yarn-v1.1.0.tar.gz 874168 BLAKE2B 2c2e00237e4c1264ba3167f5fbeb40ef64d9ca42b05bd4e005673437c9c2ef084e93db00811840aa6cac6fbdec912cff654b09a81bbd6ccfb954d1e14128cd79 SHA512 7ce740ac47d8ba42c47d0262979fcd1d22daede2a298e1743341c52584bee7d4beca8758c118deccaefd9cb0bc2780a37e110ae3633af56ac6916ae0389eadf6
 DIST yarn-v1.2.1.tar.gz 885691 BLAKE2B ba7a291e4b071cd285e890fbd8af2a1adf78bc7a65ddaf7adcebee2b8bc15d4b98293eeae79be5ad664daa6a56d553ade1fd5e50aaafc7ed2f980ebfe4feac58 SHA512 cb61788e16cd3537073b3a8711ce6a29f7e14380cea20ca16144e97ed05ec62c685b805a18af9e70d16f7aedb4c460cad97027e37fb43596f97570386d596477
+DIST yarn-v1.3.2.tar.gz 886500 BLAKE2B 224503241b646bd6befe6571022e1081c4e9cce2371ce0c111704a6f0ceb7c4b4f0267c9c37d05feec60311cc7804706fb47d130ca64e6182590e88d8476b386 SHA512 d488ae56b60884bb42e5e2ac8a0359c6947e234ed8b5bba12a93f24abb4419b4a6fef708c35df8caa9e68edca3fe570d1dcda9295d29438e45a32ef5d029aedf
 EBUILD yarn-1.1.0.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.2.1.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
+EBUILD yarn-1.3.2.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
 MISC metadata.xml 249 BLAKE2B 40574a5c45dfb1d3be956c6034adc79f009243f2fd43280002f05cc451d8f7f5b8916c815660693a8ca3cfadd9dc5a5fc52b52211f9e256dfbbac2b26c5bb2c7 SHA512 d406f99c7fb4c5839522e07fbee81cf55330fc0c4ba6fff5281179f2ea7c21048e7cbd5563665b9a458f8b5a9724dd1fb9ac8641e2bb192f1514358902560f73
diff --git a/sys-apps/yarn/yarn-1.3.2.ebuild b/sys-apps/yarn/yarn-1.3.2.ebuild
new file mode 100644
index 000000000000..bb76e804940f
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.3.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+	fperms a+x "${install_dir}/bin/yarn.js"
+	while read -r -d '' path; do
+		[[ $(head -n1 "${path}") == \#\!* ]] || continue
+		chmod +x "${path}" || die #614094
+	done < <(find "${ED}" -type f -print0)
+}