gentoo resync : 13.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-13 06:19:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-13 06:19:51 +0000
commit: 8be70107efbb417f839292165ee39d07a062046f (patch)
tree: 013918887ec4a00f0cefdb4b4d1313cbc3054305 /sys-apps
parent: 343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)
38 files changed, 654 insertions, 493 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b2d74cdf4649..dbe483135fe2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 3a4c194d4364..dc08cc5de6c1 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 DIST baselayout-2.3.tar.bz2 32266 BLAKE2B 6535bb451e393accd7c041079188c8c76b318f449adf2e5d1579496a27951de12b8404fb4ded3c143b60fe59ad04017a1a53e4a4ce864559f192fc96f1269a05 SHA512 cf9636c7d5c1fb4abf63dd931dc8ceaa30cf871f5e576a53dcc207abd54b8eec7778a1ef29766e2e8f5c0a098b9b3d07361717ae190027d1e102aceb4a07cacb
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 EBUILD baselayout-2.3.ebuild 8346 BLAKE2B e69042d75377e5993f7f834cff27fbb30ecc5c1b1f6bceae70b96c6c077918e214d1d25b2b335f9c711ec32bb0edbeed3daceb4a98860342e7ac0e9e66b15304 SHA512 c2efae56623e39a6dcb13a064810c900bb22bdd9b04f31b1837c4a56a48cf2135eaaa3340c72e2ebf4ac5800d8ba2ee03083d2edf0c3181ff465b6a87cc7d4c1
-EBUILD baselayout-2.4.1-r2.ebuild 8590 BLAKE2B d69044e26bbe76022f9b6e3dffe9efa1ca165e1a9c5c39c462966a5a4369c0dca69a80021d6475c1f2ca400bb4f8b3104c74f1fbfe7dee8722c376e0fa32ac69 SHA512 7165d72ad79dda758181d7f623ec10b75463961cc6a19355ecea2b3ac3ce873670afdb82ab266d3be44add9ddc13176e1fdb48d8bc551b87c06f2b162138241f
+EBUILD baselayout-2.4.1-r2.ebuild 8586 BLAKE2B df33e986a6d7f0135b7e0861c6a8f689c1eefded615d4d40f18fb1885b725f6b6c3115596c5da399426e54a40facf577fd4d6cdfdfb2ca59f520a79859dd6366 SHA512 c7816cb2f1dfb69608ee0a3ea12fe5bb4c4a94b63f281ebc727b6faae11e796cb2393c696bd04c9a197268c8d3fc73e8caf59c849ba2dc359597ff4a7396ccd9
 EBUILD baselayout-9999.ebuild 9191 BLAKE2B defd00dbef7c524e118b8d863c7eae6f87870d25169ea7919c43c68b5e20892b214d7cc72637dfaebb29b50eab546e38a8cbb745d0eb236a5155c4cdf20f8799 SHA512 0cc07338bdc4eaba42770dca5fb7be1e0c025325f9879d3a0d4081edd3e9f6dd11a7c1ea24d2ab2eb19b28ac2648f14877cf305ef65b6d9bd7aff11fc3d60e0f
 MISC metadata.xml 447 BLAKE2B 8d2a924108bc62d05d6324741f3f5b008ce6a5197b5615c2a798dfda5bfccffc1b489139d41f59668298bb5947c25be4c08d818499008d188544706f53c8af0b SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index bc82d2ddcdb2..ec9e36e9794c 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index 35622b197fb9..f825784ac46b 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,3 +1,3 @@
 DIST colorized-logs-2.1.tar.gz 9997 BLAKE2B 5d6b184102c63dad8526f1feebbd84531a18f2505801f4bedd62cbdfa04bd919b750b60b37fec5449b1a5b98500dcbd7feec7b7155ca0c779d31ea66d8305e28 SHA512 d03919cfa19d6df41bcb9dd6bb29e436febff4ed4d50d9ce83910bfdb61acbf323ecd4dcf9eaa9cfae3bb338b2107f1d156815848b8da8b470c50651650dfee1
-EBUILD colorized-logs-2.1.ebuild 656 BLAKE2B 92bbc9f7f776e1bc9d00317883acbdeab1e59e4f10aacda88546b6c9c6ec3f91d555d761b73caf2c3833def414ebb78b7bf724b3ec99a9d3e8f2a46ec1d2608e SHA512 5f765f2673ba17c90019125c2c2fca9c0cfd0feab5559255a17dcaa6fdc2ab87f001d5dbb2b3ffae5799e43a169c074b925c17a445b6b4ecae8f2214cb362986
+EBUILD colorized-logs-2.1.ebuild 654 BLAKE2B 071c425ab82afe77eeebbf396dc06febd8b517a700ed4f33ac84ca4489fee4c09f714763c4e4a46edc410330df9b8854a9039218da8c9ef606402e00311804bb SHA512 0b3354ed6b78821856f61b70a9925ee2bb27972a44c1982bd287a539674bfb7c961016f3d8685a751b4a1e3262c7fb2753bc0faa3ed143eb335d7e9abb5b8bc3
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.1.ebuild b/sys-apps/colorized-logs/colorized-logs-2.1.ebuild
index 2d9ecaf97f24..0e22beb33d1e 100644
--- a/sys-apps/colorized-logs/colorized-logs-2.1.ebuild
+++ b/sys-apps/colorized-logs/colorized-logs-2.1.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a6b26866160e..e0070cf3f0a6 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,5 @@
-DIST fwupd-1.0.0.tar.gz 1466486 BLAKE2B 284f17eb9150251ca012f5b09eed925a397d77375f6d4ab1d0872b6a3c1c7ded4f76d8d8c158797154696b04e8856b9ddd1b185dd0df8465c50d93beeaa3335a SHA512 6bf5e691b2d958b28e6002bfbc06bd19440876aea8dc55f761e10e039141e12df14a6ec8c2f2479b82770feeee4a15296229dd662653841bb0b41d4ea61fa422
-DIST fwupd-1.0.1.tar.gz 1498681 BLAKE2B 3320c540d5395c28ab778d40e5a9901f877a7606b5e5188a7bc8e1c17648916c52e752363f07e01e5381894feb9df7034064bebb62a9088fbaf8affd01685d34 SHA512 f89455563d8d587bee6c6f4a9a1ff75401d803a89087ddb73b9260e2578e581bdc315593b7bb3466318a52123383c9499cba2fe3ead0fe13efd40d907a753345
 DIST fwupd-1.0.2.tar.gz 1516078 BLAKE2B bdc0d54fa0058a329d409debd41c4f83f7036669b3356ca82d86a1233ca567841b1758adeb8f8abbfb7f9bda004934ba970747da413dc4862e459792a42745ec SHA512 52773590255b0a120c56f5f8b58243e88fcc322d8f2348b5f463db4107aebd4df2769103e003d095b1d0571c598c0274af0b7da4a248e4dd1786156697170e06
-EBUILD fwupd-1.0.0.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9
-EBUILD fwupd-1.0.1.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9
+DIST fwupd-1.0.3.tar.gz 1534438 BLAKE2B b578bc4f8a53bd596f13a2bc45e5229b30a9aacb837fe3ef3b267eaaf5e8e277c21b9c2b915495d5b58a36b386b9b223ff219cfe2082ca6d18fae2cbd37b1ff9 SHA512 4a39c6d2da5ca83f9bf2a6aba9a63cd716622f6bfda4760c7abdc73932d86dc41305cc8780b3292b208c285fddda6edd926d58d2c90847e34130e6f145b5c6b7
 EBUILD fwupd-1.0.2.ebuild 2468 BLAKE2B 3e2171512869cfb08ba0121dabcdeb527acd5da45248506a6c03558d622d1ec3d13a07da08d68bdb3a27b9228db8f82edf773510cafe7c21b13ed52f54200269 SHA512 2d640bf0f2e71955c75a99cbdf856a30f8d48cfcd027c9b2b6515edf0227d5baf4764fabf672bb4a3840f5a3cd19abf2a245b53c35e4e5043bb05b67a53a5d12
-MISC metadata.xml 838 BLAKE2B 94e61de164b7858afceebb163391c113e557d7d962c40650ac2e45a334e2347ad5ee42123ca5e878693a0768ca9819ce29e64650b0dae6d0e49c558d46550ba3 SHA512 22e958ed755f3d824fed8f164fb20943947ff1038382e8983104e15c4b0b57540f940da6933a2a121e4795ddafba817cecf0fde92e563d5b875574c268eb4f4c
+EBUILD fwupd-1.0.3.ebuild 2468 BLAKE2B ae4b1a59eb7e81f6faf75b7df3b1a7bb446df4207dee13f286a86b0783029e9da3b9f34453305b77eacaa96358c24546cd4eb0086505d82192e7a0fd30011da5 SHA512 3fccd7b9c663b765bd07c2eef41a10e4d4a4f8085901f5c3e510e00810a8eb3e52d45c0bf2b63b72abcf1005b883676f2a82f818aede3cf136df8cb1406db612
+MISC metadata.xml 738 BLAKE2B 53421e28e9d5b0d92a29b909ea234c22d38992979bc1f3d34781f9956a1250ba68e6f6c88f951ad1b029cc020d02ab80e7ab50bc5115084f53069e93985e37ba SHA512 d598e706e5d818a91f91589cf4e16f484e3bb574e1b778b681f1d927bc6014600841169f46765a325c5e27ee8360151e8c2ae2701f9ef1e826807ec924698124
diff --git a/sys-apps/fwupd/fwupd-1.0.1.ebuild b/sys-apps/fwupd/fwupd-1.0.1.ebuild
deleted file mode 100644
index c102d10d91b7..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf +man systemd test uefi uefi_labels"
-REQUIRED_USE="
-	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	app-crypt/gpgme
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=net-libs/libsoup-2.51.92:2.4
-	>=sys-auth/polkit-0.103
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	elf? ( virtual/libelf:0= )
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
-	uefi_labels? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-# tests require some ominous "certtool" which has not been packages for Gentoo yet
-RESTRICT="test"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
-	default
-	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Denable-colorhug="$(usex colorhug true false)"
-		-Denable-consolekit="$(usex systemd false true)"
-		-Denable-dell="$(usex dell true false)"
-		-Denable-doc="$(usex doc true false)"
-		-Denable-man="$(usex man true false)"
-		-Denable-libelf="$(usex elf true false)"
-		-Denable-synaptics="$(usex dell true false)"
-		-Denable-systemd="$(usex systemd true false)"
-		# requires libtbtfwu which is not packaged yet
-		-Denable-thunderbolt=false
-		-Denable-tests="$(usex test true false)"
-		-Denable-uefi="$(usex uefi true false)"
-		-Denable-uefi-labels="$(usex uefi_labels true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.0.0.ebuild b/sys-apps/fwupd/fwupd-1.0.3.ebuild
index c102d10d91b7..de768b752cdd 100644
--- a/sys-apps/fwupd/fwupd-1.0.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.3.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
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf +man systemd test uefi uefi_labels"
+IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
 REQUIRED_USE="
 	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -30,12 +30,16 @@ RDEPEND="
 	>=dev-libs/libgusb-0.2.9[introspection]
 	>=net-libs/libsoup-2.51.92:2.4
 	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.3.3
 	)
-	elf? ( virtual/libelf:0= )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
 	systemd? ( >=sys-apps/systemd-231 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
 	uefi? ( >=sys-apps/fwupdate-5 )
@@ -75,19 +79,19 @@ src_prepare() {
 src_configure() {
 	xdg_environment_reset
 	local emesonargs=(
-		-Denable-colorhug="$(usex colorhug true false)"
-		-Denable-consolekit="$(usex systemd false true)"
-		-Denable-dell="$(usex dell true false)"
-		-Denable-doc="$(usex doc true false)"
-		-Denable-man="$(usex man true false)"
-		-Denable-libelf="$(usex elf true false)"
-		-Denable-synaptics="$(usex dell true false)"
-		-Denable-systemd="$(usex systemd true false)"
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dplugin_colorhug="$(usex colorhug true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
 		# requires libtbtfwu which is not packaged yet
-		-Denable-thunderbolt=false
-		-Denable-tests="$(usex test true false)"
-		-Denable-uefi="$(usex uefi true false)"
-		-Denable-uefi-labels="$(usex uefi_labels true false)"
+		-Dplugin_thunderbolt=false
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index a6f7b5108871..dd10e28c07e5 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -9,8 +9,6 @@
     <flag name="colorhug">Enable ColorHug support through
       <pkg>x11-misc/colord</pkg> package.</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
-    <flag name="elf">Enable libelf support through
-      <pkg>dev-libs/libelf</pkg> package.</flag>
     <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="uefi">Enable UEFI support</flag>
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index c35429cda918..85b01e1afd59 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,7 +1,7 @@
 DIST hwids-20170328.tar.gz 2049249 BLAKE2B b9dd6dc98c9eafd4f1eb1e129a53bf10ebc4b3b718c9bc134cb5b3f5c2dfaa9626607b4f6edc8f35b811e3a7404cc967d5e9732398880dd5b96a76ca6e97cd37 SHA512 ffccbcda78f856b93026102d1d7f62f4639910671c63e30471c990b1029db94b542c555b6ad69820f8a91a45ef9d52c320b9767d38ff08b6e72c041a28e6f0f3
 DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a4bbfcd250ac3b96259b3c2eefbade8b0555fcffeafc35e46ce07551bdc6d26d25d9913d7a584945b52f7e744dfe SHA512 6f1d2e3d7b7fc260f02b3cc87b46385292503dda2a46dea4e69b02915e9d411e9682fb98ca921eb45289e416320a8ef46a3df0753f8f820d20c719663076bd88
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
-EBUILD hwids-20170328.ebuild 1445 BLAKE2B 10fcadbd95e9f6f6f75c1b4c0bcf8ab4a4ec9ef6c8ec2b3d413ee5247e7c5194d128004077278edef9c74ab92212823f1ad3ddb7231bd77a47421af70b66acb8 SHA512 bde4d3969c19eca2dc0b037473d2bc93fc7ef5aa79c5d23f7e2476fc6f51adb304b324658b005faff9d73ef918c0c8d73a57dd56dd297f2a3685f40204ca03c1
+EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
 EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
 EBUILD hwids-20171003.ebuild 1719 BLAKE2B 3bf86ff4b2a95b72dc19f2b8cdcecd3eb1dfa60ce0b7a3f288552f292d8598f8c6ed147b7e5a790b969bd9e5ece39cde8eb0e5e649c12f92ed28f2ae64a5cf10 SHA512 b7ecee65b754aa40ab65204f08803728560156e4c54df221df8163432ee488a284ea43cb5d4b26ee68a86765c776963d6cd5e0fa2e5a0482febc1aff8b240bc0
 EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
diff --git a/sys-apps/hwids/hwids-20170328.ebuild b/sys-apps/hwids/hwids-20170328.ebuild
index 26e95e33c5cf..b59f80cc2afc 100644
--- a/sys-apps/hwids/hwids-20170328.ebuild
+++ b/sys-apps/hwids/hwids-20170328.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index e68a2b27d9ca..f3fabf5020ea 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 2957 BLAKE2B bbbade2fc5082d6a325931e6fe03c6997141c50e44b461e94553f42917544c42a5019b345b1a2a850895762e2649cdc182972bc7320d2d4f34747353ed12f93b SHA512 be012496cb7ea1185ba7780ae077c10d372f9a4147b5477636eb5567a0b56eff02eb170d6e4c3405e91a8ab84c4f22e1c0d9053bbee367b1905a55c6bacd4cf4
+EBUILD keyutils-1.5.9-r4.ebuild 2951 BLAKE2B 9900bae33b3e40f55f9a8a82de36398fc0933ed73ee6c2e6b3883469f383e8f5c49f0af6321dab0b6b983d903822748c690d768658b53ae44a47702ee9f63337 SHA512 ed51b0f3ef93d81f135b20d5c54ae867221c8da2a4246706c62af409a97a462bbb5c85f587c8951a654fb3a9134b4b77965b7a9b98a094f40db7e5ea6d1759cb
 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 c5a160fb1459..9a2e98de587c 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -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/kmod/Manifest b/sys-apps/kmod/Manifest
index 005741c11d8f..459de10b7018 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,7 +3,7 @@ DIST kmod-23.tar.xz 450376 BLAKE2B dd38b6d8853e40cb8c9939cd3c68bfe3b36e58445cac9
 DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 EBUILD kmod-23.ebuild 4902 BLAKE2B 22ef9ed75e115712545c6923ba982d5e1a271b4a61576760a2af471885a32727d70c5e44542d68b545e333440e417052c16f069b50efe92c54b3d480ae1e09ae SHA512 b38be77d4f89ffda2551a3c5ef2b85146ba27254d0c109425b7ad0fbfdc1528381f605a1e354a06f3321eb5b63bba6d6ec955245135f54a3a2a5d131667360e5
-EBUILD kmod-24.ebuild 4917 BLAKE2B 948c3e51bd2fbb7270dda317ea6baecf40e736082a9af262a3afe86684348f689349ca3d81930a454980077466cd0250dbe534196cbf8261d25f9add57e23008 SHA512 c8715b0176a7c02da837e6ee113f576b115febe9f5b93636bc5438b2c11d4a005bda1569fb414a50cc4fa115bd5e32bb66615cd75a2af4712f73c3fa49a993f7
+EBUILD kmod-24.ebuild 4914 BLAKE2B d44e7e1a325d992cc650d25227c55b3cce916cf92a148e1e429f6b4dd41146c01dce144e029f3138900a5903bd82fa59a0562284cfd3c9e9b8cc837d3f23dec8 SHA512 84d2501285ef621e977dcd94fff0c4597f8af303174533b69c17e1782afa831d12647fcbe83bc6ceb67d321ca50940191e29d180e1bbb496e4567c8045317272
 EBUILD kmod-25.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 EBUILD kmod-9999.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild
index 77b0a8b5ccdf..ae6cb6730b93 100644
--- a/sys-apps/kmod/kmod-24.ebuild
+++ b/sys-apps/kmod/kmod-24.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 3ba294d29ddc..ee8df8260e16 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -5,6 +5,6 @@ DIST openrc-0.32.1.tar.gz 223808 BLAKE2B 4aadd36e371de56d5c2b59597ab04c1b004be73
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 EBUILD openrc-0.28.ebuild 10123 BLAKE2B 93866eee80dc86f95a4e1f2a506832048720a01608c020108bc20a54936b857b1e5e5c1f88625c01afa482247677977c33c478ef3ef38519693b01e4d09694bc SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72
 EBUILD openrc-0.32.1.ebuild 10162 BLAKE2B 2948ad5e2f905ccd933861ce20c1ccf8dae1a51e3f11086015f250d217c76f70cc87d99ecd8fdfc1f525984f2337841dd0d3eb83fa5ff8c9369fa8f8f476b65c SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0
-EBUILD openrc-0.34.11.ebuild 10160 BLAKE2B 97e3355b42deb4be403255b041f8c631b8a5d5177411964e38486ce3d8b4d8dc14205b746f5ca20081290f346083a0734edcea7e0dad35a3aa05d3c2d7085cf5 SHA512 715d9547706b7adb9cec57f75daf35af86d3da375b4518b501a7f0bdcdd722effc12087cf2c817ffcc58216a513282a255d4e47ab2d33a6a0999298870f5ad61
+EBUILD openrc-0.34.11.ebuild 10157 BLAKE2B c40f4e35c5be8609a061e763521eccea6c6a83f1b3e244157a9100387e68c8a9e300930b217aad9d9f9dd4e234485fd8258cd90d272255856840117a6aee8e8e SHA512 36f92e6cffb5effa0304c2117ae436649d9f2a885917a43c5b71d9c46f6327188d32ac70ef82c30d9d869727341c26ae0776b23b1bcb6e0de9515301c3d4f827
 EBUILD openrc-9999.ebuild 10276 BLAKE2B 40b25d0b8dd57aed46814ad381caa3df4a6b56f3f66c5271943eafd83d44f536d8fd654fa91efe00ce20a51c01f40c871cf0c94ceda41b81ddc89bf301dfd88e SHA512 370126a545dec34a34366badcd11ead8588c58f2e8414c85afb80c3544c94610caa7fb258118a7d2b2b4b289d8c67cd3d7119fd2ff4410613a1a1942be984506
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild
index 91c0a038078d..129eefba81e6 100644
--- a/sys-apps/openrc/openrc-0.34.11.ebuild
+++ b/sys-apps/openrc/openrc-0.34.11.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index 4e32e851804d..985c133fb0e8 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,9 +1,5 @@
 AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
-AUX razerd.init.d-r1 448 BLAKE2B 8f872bae7951d745f6e1f3e57788d7f9486152cb5bf7b0e8be543673e2d8c29faa114cdc30270e6e39c99b9074652f974ecf4fb62c21794c0afb93238acdbf21 SHA512 4228b7d18c546e6c8d840c3ff3b4e3690e89e70bab156e3f6646c9fb68c23adb0ec0ca40fbbe28d3c768c75a0b27deec2890df26566e40c02e4dbe7f4890530a
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
-DIST razercfg-0.23.tar.bz2 69425 BLAKE2B d233a102871f8cbd19398c154e52e9a2400dc9c935c180e8a228a860c53c0cc185a4d3003f3f07e7d6f628d10a40b267c6a28b3e5b351b368cd15c96b7eca42a SHA512 79c795870efa960b42abc70710b4bebe793acb9e732943207ca4b34d35ba926af4877993db888829dbacedbe327324fba0ab2ef82ced1d653b4aee23e154fd8b
 DIST razercfg-0.39.tar.bz2 178142 BLAKE2B cf2d92d24a0dbfdae4045c2dab30a64bc4de64d730c075a4d852790ff62bcbadd714953fac925e69b671355cbdfdec7ce9db5693fbfa8e2aab69de6247c95c1a SHA512 165fee898a01b7f0086eb6705ef9f24fd8b8836025c071f7851a493181b8d193d0db70fc1731a8586de1f1c795aab4d20bb4ee8526b612c66ba3c434c6e10137
-EBUILD razercfg-0.23.ebuild 1420 BLAKE2B 7ac0d6f3a6813bbd56b04d1e47fc1a9728610538bc53b70c843c846845dfa62985523bb4fafcad79ba1013cf2eabc54a0984dcc39d1d0d8d1acd26e0c87b586c SHA512 5305f308818675fa7a3fb4057d545bc493b2999536f6ea0f89a5d94b4a84f00633a20ea1b21370892d5e13b3869addec838ae90acab7d2a57d9dcdaae2eba8ae
 EBUILD razercfg-0.39-r1.ebuild 2199 BLAKE2B c0c3506070627a55a110f1e1a709f04d5b37d4b34da417e31978a32f8978152665197c7eafeea2347e97b8737280ee0ce94cfd7c6a3608105661c946d54c2253 SHA512 b2159f2534e6ec259b174c8cbbd2768cddb992a7c4233d1d6b777bdf68e5bcf4685e2f0a4b8de0b1492944fce8f8267850bf2bd555e0ecf297f95f56ab098e5f
-EBUILD razercfg-0.39.ebuild 2084 BLAKE2B 83c810b78416dd25e4432f029865c6bf1bf9b489b37fd9e2e19ccdca13debda615e342dce5c0edcb0f82ecc338a5fecc5eb18ad46b394e5680ae812602a53343 SHA512 2a6b28d9f06b97165e036f28dd50dee66a7a2fc78f5ec152ab898a341f208bf8d397151b10c0981684592664c61a56990194d5c729adaf2d2d61c235a64f22d1
 MISC metadata.xml 886 BLAKE2B dee29a5b317f3b4b36ed7a4baebf09a3da4d282e548e6d826c42ab4bb23cf0664fdf1a059e1273dce6cce15321b26447a9f666ac3584e8d68a4fc812f9f5029b SHA512 2076e37094d47851ca979be25c695bdb40533d1adfa81520992a1a6c88191c5cfac2e61f0ad2ee50efef0b7fcfe3b0aca993275aa1c05559d09644d37f466599
diff --git a/sys-apps/razercfg/files/razerd.init.d-r1 b/sys-apps/razercfg/files/razerd.init.d-r1
deleted file mode 100644
index 304d91196bc0..000000000000
--- a/sys-apps/razercfg/files/razerd.init.d-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use logger
-}
-
-PIDFILE=/run/razerd/razerd.pid
-
-start() {
-	ebegin "Starting razerd"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/razerd \
-		-- --background --pidfile ${PIDFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping razerd"
-	start-stop-daemon --stop --pidfile ${PIDFILE}
-	eend $?
-}
-
diff --git a/sys-apps/razercfg/razercfg-0.23.ebuild b/sys-apps/razercfg/razercfg-0.23.ebuild
deleted file mode 100644
index f902f7fa366b..000000000000
--- a/sys-apps/razercfg/razercfg-0.23.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils multilib eutils udev python-single-r1
-
-DESCRIPTION="Utility for advanced configuration of Razer mice (DeathAdder, Krait, Lachesis)"
-
-HOMEPAGE="http://bues.ch/cms/hacking/razercfg.html"
-SRC_URI="http://bues.ch/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+pm-utils qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	pm-utils? ( sys-power/pm-utils )
-	qt4? ( dev-python/PyQt4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e '/ldconfig/{N;d}' \
-		-e '/udevadm control/{N;d}' \
-		-e "s:/etc/udev/rules.d/:$(get_udevdir)/rules.d/:" \
-		-e 's:01-razer-udev.rules:40-razercfg.rules:' \
-		-e "s:/etc/pm/sleep.d:/usr/$(get_libdir)/pm-utils/sleep.d/:" \
-		-e 's:50-razer:80razer:' \
-		librazer/CMakeLists.txt \
-		|| die "sed failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/razerd.init.d-r1 razerd
-	dodoc README razer.conf
-
-	if ! use qt4; then
-		rm "${D}"/usr/bin/qrazercfg
-	else
-		make_desktop_entry qrazercfg "Razer Mouse Settings" mouse "Qt;Settings"
-	fi
-
-	use pm-utils || rm "${D}"/usr/$(get_libdir)/pm-utils/sleep.d/80razer
-
-	python_fix_shebang "${ED}"usr/bin
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-}
diff --git a/sys-apps/razercfg/razercfg-0.39.ebuild b/sys-apps/razercfg/razercfg-0.39.ebuild
deleted file mode 100644
index 05d798d71a69..000000000000
--- a/sys-apps/razercfg/razercfg-0.39.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit cmake-utils multilib udev python-single-r1
-
-DESCRIPTION="Utility for advanced configuration of Razer mice"
-
-HOMEPAGE="http://bues.ch/cms/hacking/razercfg.html"
-SRC_URI="http://bues.ch/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pm-utils qt4 systemd +udev"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	qt4? ( >=dev-python/pyside-1.2.1[${PYTHON_USEDEP}] )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/udev )
-	pm-utils? ( sys-power/pm-utils )
-	virtual/libusb:1"
-DEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/libusb:1"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i CMakeLists.txt \
-		-e '/udevadm control/{N;d}' \
-		-e '/systemctl/{N;d}' \
-		-e "s:/etc/pm/sleep.d:/usr/$(get_libdir)/pm-utils/sleep.d/:" \
-		-e 's:50-razer:80razer:' \
-		|| die "sed failed"
-
-	sed -i librazer/CMakeLists.txt \
-		-e '/ldconfig/{N;d}' \
-		-e "s:DESTINATION lib:DESTINATION $(get_libdir):" \
-		|| die "sed failed"
-
-	sed -i razercfg.desktop.template \
-		-e '/^Categories=/s/=.*$/=Qt;Settings/' \
-		|| die 'sed failed'
-}
-
-src_configure() {
-	mycmakeargs=( -DPYTHON="${PYTHON}" )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/razerd.init.d-r2 razerd
-	dodoc README.* HACKING.* razer.conf
-
-	if ! use qt4; then
-		rm "${D}"/usr/bin/qrazercfg{,-applet} || die
-		rm "${D}"/usr/share/icons/hicolor/scalable/apps/razercfg* || die
-		rm "${D}"/usr/share/applications/razercfg.desktop || die
-	fi
-
-	if ! use pm-utils; then
-		rm "${D}/usr/$(get_libdir)/pm-utils/sleep.d/80razer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use udev ; then
-		udevadm control --reload-rules
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	if [[ -e "${ROOT}"usr/bin/pyrazer.pyc ]]; then
-		eerror "A stale ${ROOT}usr/bin/pyrazer.pyc exists and will prevent"
-		eerror "the Python frontends from working until removed manually."
-	fi
-}
diff --git a/sys-apps/readahead-list/Manifest b/sys-apps/readahead-list/Manifest
index 2121267d4f9c..58902d4c5c41 100644
--- a/sys-apps/readahead-list/Manifest
+++ b/sys-apps/readahead-list/Manifest
@@ -4,8 +4,5 @@ AUX init.d-readahead-list-early 516 BLAKE2B 61f56105177fa70318a0076ba327f9795023
 AUX readahead-list-1.20060421.1016-gcc-4.3.patch 200 BLAKE2B ba4051a07214477f948af0e1c310b97e43cd7aaed9c1d79b3937da8ea42ad4b604bb69967a15da21dda219e82a5b71ccfa82c947f51f116f3a69ac2e1c67bc22 SHA512 eb292b74e4fdc167a7edaf9d0f3f8ebabd69eff14a18b860ecbe26241708875153dd43ba3bce41a94bd83892093cf8f41d3f7bc421fadaab8a88d9728cb67795
 AUX readahead-list-1.20060421.1016-gcc6.patch 674 BLAKE2B 5749541d931ec45679c3c43fc2afb0b625fa53e54c86f4da413774d6e2cdf8f94f9819e0f802fe27d2ec6bff8dffe368ca72952769d1d6596ae0958030625ebb SHA512 3b070f6ffe5c396c2535e0fb7cbe8ba3ed87dcada1cacc39e9a607298c8a9fa4af37dd0942733b3a6d9bdbf55f6d1ad3916da7ac25bcce3188ce29c76711bdc8
 DIST readahead-list-1.20060421.1016.tar.bz2 108337 BLAKE2B d806e5afd9ba5334522e90cae830496ba3316927a5b2f605834de4b6cd3cbf6a8fbf840e92069546bc526e65d0beac04bc8c6f6dbff5f2fdfc9f033b0f5a2682 SHA512 fa5644be139c37f9464823e20472a607d7ab754259c6545f83cc9679419bf643ee70aebd7aa4d496a8fb349048ba4836e2ac45ae727ade76156b5ad6e6889ec5
-EBUILD readahead-list-1.20060421.1016-r1.ebuild 1565 BLAKE2B 8522b43c247c289c5739aa3977aad26876f3c665839c4da35204c0f8881514ec1d72135a2c2ef85e3ac09f77b17af29535b3c47547f7f030b62741d7cb9b2944 SHA512 9665223202d788db47dea77364657df4608be446b4c8a9c6e81e971f6ec934fc7e497943dac2ce3ff25031f7d5e4c375e9db902f4d6964f7e252bc3a2b78d636
-EBUILD readahead-list-1.20060421.1016-r2.ebuild 1477 BLAKE2B c899f8847d2f9e8f2037c8a320703a19113e862cbdefaf58e358c3bb4e54568ef5fe7627671dde9f01202282f99021ddfb056843ee988a0cb51298697e640efa SHA512 4e84737d1017d57a6ca536bd1a2bcb5bc2385cd67ceafb524cd502fad5609d8a0e3bc83b27a05b73d6f397547150336a81b713434d1c34a875642136945fd417
-EBUILD readahead-list-1.20060421.1016-r3.ebuild 1474 BLAKE2B 46d8fbe7d8d3f84992ace61b7d14b4365de2e950d9f828cb93fcb05be000d10db4de6834ad0c9df756d4b7b7bdb88d701ab630f97bdd7514bd33c8201cbc37b2 SHA512 8abf829d9b5765f6b734ba58a066326f1b8b0a9a4249e2ddfc0179fe42f45a9269d5bd63b7b479c37db2c6cbf6c01bc1e3a21fe6c55d5025896eefbf6c640f3d
-EBUILD readahead-list-1.20060421.1016.ebuild 1616 BLAKE2B 78c96e72dbae0de52fe9cbdfb1618d66c1880ef6e0c8e050f3b176a1d1c07a505e8fd62e899296cf75d969e73946ebf780ce2194bc7c88fe5b635afe05ce714d SHA512 88d19739d2aa452464f19e95f312383744f927ace3716a4375cf6c08b34b736d3558a8dc80e6ecbbcdbbbdc4a0007f908b86ca6de7af6437aef56979329747da
+EBUILD readahead-list-1.20060421.1016-r3.ebuild 1486 BLAKE2B 281c4cad9f8db8def29563b2ea026dd7066acd12ab87b0427299cc2c019ab01eaef67a17826eeea77ba902f6156739520a64bbba9fb50c542fd39439b61974e3 SHA512 eed7fa282df5e9cd375a68486bae9e8f6a65491f11caf47a6a37c41ffae3f398606ab81fd839f3eed5eef395a29b883638ccc5b5f83e02251082b9629dd23c39
 MISC metadata.xml 407 BLAKE2B 4f8a789b9f98f2ad875b0f61daa025f394864a55f3f96f49cd9074e5309c78b22b88de04e9db875e7853bad393c9d37f656d17dcaaede73ec0cc1dc52b4c8c52 SHA512 a70ad465795004c9e3d4bfe6597597716d9618ed82a789121f78a69b259215757adba0e0eb66234c974d2f93681cffc9894c130ce96c9289e18aed13793aa67c
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r1.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r1.ebuild
deleted file mode 100644
index 5790a1d340e5..000000000000
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit base
-
-DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" )
-
-src_compile() {
-	econf --sbindir=/sbin || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# init scripts
-	#cd "${S}/contrib/init/gentoo/"
-	newinitd "${FILESDIR}"/init.d-readahead-list readahead-list
-	newinitd "${FILESDIR}"/init.d-readahead-list-early readahead-list-early
-	newconfd "${FILESDIR}"/conf.d-readahead-list readahead-list
-
-	# default config
-	insinto /etc/readahead-list
-	cd "${S}/contrib/data"
-	newins readahead.runlevel-default.list runlevel-default
-	newins readahead.runlevel-boot.list runlevel-boot
-	newins readahead._sbin_rc.list exec_sbin_rc
-
-	# docs
-	cd "${S}"
-	dodoc README
-	if use doc; then
-		docinto scripts
-		dodoc contrib/scripts/*
-	fi
-	# clean up a bit
-	find "${D}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{\} \;
-}
-
-pkg_postinst() {
-	einfo "You should add readahead-list to your runlevels:"
-	einfo "  rc-update add readahead-list-early boot"
-	einfo "  rc-update add readahead-list boot"
-	einfo "Also consider customizing the lists in /etc/readahead-list"
-	einfo "for maximum performance gain."
-}
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r2.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r2.ebuild
deleted file mode 100644
index 80b37f7a964a..000000000000
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-4.3.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-)
-
-src_configure() {
-	econf --sbindir=/sbin
-}
-
-src_install() {
-	default
-
-	# init scripts
-	#cd "${S}/contrib/init/gentoo/"
-	newinitd "${FILESDIR}"/init.d-readahead-list readahead-list
-	newinitd "${FILESDIR}"/init.d-readahead-list-early readahead-list-early
-	newconfd "${FILESDIR}"/conf.d-readahead-list readahead-list
-
-	# default config
-	insinto /etc/readahead-list
-	cd "${S}/contrib/data"
-	newins readahead.runlevel-default.list runlevel-default
-	newins readahead.runlevel-boot.list runlevel-boot
-	newins readahead._sbin_rc.list exec_sbin_rc
-
-	# docs
-	cd "${S}"
-	if use doc; then
-		docinto scripts
-		dodoc contrib/scripts/*
-	fi
-	# clean up a bit
-	find "${D}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{\} \;
-}
-
-pkg_postinst() {
-	einfo "You should add readahead-list to your runlevels:"
-	einfo "  rc-update add readahead-list-early boot"
-	einfo "  rc-update add readahead-list boot"
-	einfo "Also consider customizing the lists in /etc/readahead-list"
-	einfo "for maximum performance gain."
-}
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
index b7033eeced8b..2c963c97fec9 100644
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
+++ b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
+HOMEPAGE="https://github.com/robbat2/readahead-list"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016.ebuild
deleted file mode 100644
index 1e7b7b64fb1d..000000000000
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit base
-
-DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-# I'm not entirely certain about this
-# need to check if other libc variants provide readahead(2)
-RDEPEND=""
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" )
-
-src_compile() {
-	econf --sbindir=/sbin || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# init scripts
-	cd "${S}/contrib/init/gentoo/"
-	newinitd init.d-readahead-list readahead-list
-	newinitd init.d-readahead-list-early readahead-list-early
-	newconfd conf.d-readahead-list readahead-list
-
-	# default config
-	insinto /etc/readahead-list
-	cd "${S}/contrib/data"
-	newins readahead.runlevel-default.list runlevel-default
-	newins readahead.runlevel-boot.list runlevel-boot
-	newins readahead._sbin_rc.list exec_sbin_rc
-
-	# docs
-	cd "${S}"
-	dodoc README
-	if use doc; then
-		docinto scripts
-		dodoc contrib/scripts/*
-	fi
-	# clean up a bit
-	find "${D}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{} \;
-}
-
-pkg_postinst() {
-	einfo "You should add readahead-list to your runlevels:"
-	einfo "  rc-update add readahead-list-early boot"
-	einfo "  rc-update add readahead-list boot"
-	einfo "Also consider customizing the lists in /etc/readahead-list"
-	einfo "for maximum performance gain."
-}
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index f5a78f940d3c..7643de095fe9 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -3,6 +3,9 @@ DIST e2fsprogs-1.41.3.tar.gz 4365234 BLAKE2B 44875ed5890d6f7a690efc5148edc39b454
 DIST linux-2.6.27.tar.bz2 50355835 BLAKE2B 7f3a20b510e1127894871e7eabad13fd8b26888110a6cf0b64348667299ba3f7a8018995b0ed41d3a7bc32e802e0db2093e35ae4f889022d04fc911952140e0f SHA512 fcafcea4148e15ffacb57e4eef731d8a2655bba15c6445a84f7345579bd6b6b9a68ad1a44a58f78e78a619efd84ce79c63ce3de3931ae7857af647a06ac052e2
 DIST s390-tools-1.23.1.tar.bz2 625295 BLAKE2B 657ca9394468605ed26b9e4eb24239971076cd741837913109745598c25ffc4fc024c22af376f1da4f3236da3df31da93ccfdd6766e61dc3c004153913b0abca SHA512 c1f0fe79cfcbf6217e1aba74172e7644eee25f8886b70885e8558ad48342d6b41b35cefd398c3f5ff430d382ea6103b93ed8f666f0038d4f5abc3c3bc787d0eb
 DIST s390-tools-1.36.1.tar.bz2 827505 BLAKE2B 5774062699331c6d5958fef44f6cbb048e05aecc190c2519a29dc9c43b0d0d000d8be8183a447eb81b7affbf236edc21105bfe6a689e23b2f519feea0700b9f0 SHA512 83b3456bce8af0d5e1f6a1b96335809a21b676b2371ca101e5f588a18e0de65b8e15a9a973a7dcc2cad800341ecf5997e8230a68b9670751cdf1d6f8d59be22c
+DIST s390-tools-2.2.0.tar.gz 1047199 BLAKE2B d23cfb277d341b4fe73ca92eba0a7bf49420d3303737d871979a93814d1c0cb53884a6fae78453fe69d4a8a8e35923fe9bf2433a412578f8d7696c9defd8570a SHA512 f029b92f18f95b49e189a4f5ad78c02ee629e630a93a8bbfe6966030fe8aaf069e86582d77213d68b447300b73317e4dbcb228df5ff0795a2785f6735087ceab
 EBUILD s390-tools-1.23.1.ebuild 1513 BLAKE2B 54188774b4956580d9a44c39012eeb9a0d56f8a729c9fc764a39383b33fdb61967943d728befcb97b74e89e133df8ebf224f4e53cd97376f82f3616c52ada1d7 SHA512 244e154909692e5c910925364da070800e18785a28785882299bc545ffab1c1a68de4328119e1d71ed616bd8ea8eef101d60dd6ac5934baa871fdbb624ffa796
-EBUILD s390-tools-1.36.1.ebuild 1232 BLAKE2B e0c56f28b374361770ea7f59553a50f222f54bf0ab56ba5af68647684ba6ba0687dfd822e3e5572e5f589b9e3e361cdc1f792dfece665b6d89610474eb0393d2 SHA512 4f640a57f79ca19c5734478bc97c0894bc73b7adf2938c14a3a33723fc8e5088ff9a0e38360ea103ecef6846e4826b9451a5974b0a75d5a7aaab160bc19226a2
+EBUILD s390-tools-1.36.1-r1.ebuild 1383 BLAKE2B 11ea38013015a94b1ed796276dc667423406cb56fbcc01afed2320ad004893ed6964f4acfb0d37d3dd93d456b156305c808be875720592f3aab526e84f7d47da SHA512 40b6b7e50f68f57e044b54b9b4425433aab715267f2652426b037452f94af6a3636da64628681469878962c1340cfc2c3851fe37104aea83410810cec58b498c
+EBUILD s390-tools-1.36.1.ebuild 1231 BLAKE2B df788b16365ddb10b105490ae3f1a08774d44641db5e843188ca3f8432a3225af5811d7399e607cdc4d5fd0424da088cdb40bbd54815d938c2b93debafb8330c SHA512 bbe4770cdb572b7d515a8eb0bb90820bbe6f1e72ddf73bbb96a12d60cb2cbfd0fd28ef6089707ae4a62f0d6fb7c6b3e5d990a4f66fdff58e1625ba0b869e237d
+EBUILD s390-tools-2.2.0.ebuild 1238 BLAKE2B 00808526cc323eab063ddb459b15a249d6547afbd99749868d00651c3ce02a5c9fca989c5348c062656486ebd8dcef476ed187d36569c834ab15a78daef48fd8 SHA512 505e06e0021ced5049f99bc7e39112387f24dff3928d4d70ecf22bab0b0fbeb3a495b7beff1b7110de204e99ed5b1509988f0eb29eb3a1c1c6c5640086180caf
 MISC metadata.xml 795 BLAKE2B 27e39c453bd207d7cac8a38d5422735a0a581e7b72000452b98f406b00e2c2e7287abb2be992ada611f645b8f7a97c497d905278017b4862193475a34654c810 SHA512 23cd50f27b3b968621713e813ca1a822afccd90beb2f5641344ddc7abd2418d153d86309b690d0d1a84c51b47bc92e57a253a0bdeb34f22b5883a26035a53074
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild b/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild
new file mode 100644
index 000000000000..b77f1f4fe47d
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
+HOMEPAGE="http://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
+SRC_URI="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* s390"
+IUSE="fuse ncurses pfm snmp zlib"
+
+RDEPEND="fuse? ( sys-fs/fuse )
+	ncurses? ( sys-libs/ncurses:0= )
+	pfm? ( app-misc/pfm )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )
+	>=sys-apps/util-linux-2.30"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+
+src_configure() {
+	export MAKEOPTS+=" V=1"
+	export HAVE_DRACUT=0
+	export HAVE_FUSE=$(usex fuse 1 0)
+	export HAVE_NCURSES=$(usex ncurses 1 0)
+	export HAVE_SNMP=$(usex snmp 1 0)
+	export HAVE_PFM=$(usex pfm 1 0)
+	export HAVE_ZLIB=$(usex zlib 1 0)
+	tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
+}
+
+src_compile() {
+	emake \
+		AR="${AR}" \
+		HOSTCC="${BUILD_CC}" \
+		CC="${CC}" LINK="${CC}" \
+		CXX="${CXX}" LINKXX="${CXX}" \
+		LD="${LD}" \
+		NM="${NM}" \
+		OBJCOPY="${OBJCOPY}"
+}
+
+src_install() {
+	default
+	udev_dorules etc/udev/rules.d/*.rules
+
+	# The chmem tool has moved to util-linux.
+	rm "${ED}"/usr/sbin/{ch,ls}mem "${ED}"/usr/share/man/man8/{ch,ls}mem.8* || die
+}
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild b/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
index 5d8da04de42c..51d00f78707b 100644
--- a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~s390"
+KEYWORDS="-* s390"
 IUSE="fuse ncurses pfm snmp zlib"
 
 RDEPEND="fuse? ( sys-fs/fuse )
diff --git a/sys-apps/s390-tools/s390-tools-2.2.0.ebuild b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
new file mode 100644
index 000000000000..72f09e63dfbe
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
+HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
+SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~s390"
+IUSE="fuse ncurses pfm snmp zlib"
+
+RDEPEND="fuse? ( sys-fs/fuse:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	pfm? ( app-misc/pfm )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+
+src_configure() {
+	export MAKEOPTS+=" V=1"
+	export HAVE_DRACUT=0
+	export HAVE_FUSE=$(usex fuse 1 0)
+	export HAVE_NCURSES=$(usex ncurses 1 0)
+	export HAVE_SNMP=$(usex snmp 1 0)
+	export HAVE_PFM=$(usex pfm 1 0)
+	export HAVE_ZLIB=$(usex zlib 1 0)
+	tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
+}
+
+src_compile() {
+	emake \
+		AR="${AR}" \
+		HOSTCC="${BUILD_CC}" \
+		CC="${CC}" LINK="${CC}" \
+		CXX="${CXX}" LINKXX="${CXX}" \
+		LD="${LD}" \
+		NM="${NM}" \
+		OBJCOPY="${OBJCOPY}"
+}
+
+src_install() {
+	default
+	udev_dorules etc/udev/rules.d/*.rules
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 64603d229623..8791236d1160 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,6 +6,6 @@ AUX sandbox-2.11-symlinkat-renameat.patch 3418 BLAKE2B 4864dd5794abbf70d70f30949
 DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05ce80795986ff8e1f84f9320e21fda0c5ae092cce8e5a3dc1c0efa48e1ce69c21107e541d2c569e6369ccb5b0 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 EBUILD sandbox-2.10-r3.ebuild 2168 BLAKE2B fa95588691da010c6239e89a52e55f5d7b006276e269527319ef2628956f35719af65d918ef046fa6feb2a8c7d28531e49c218e0b26c3c41209138e114300fd6 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc
-EBUILD sandbox-2.10-r4.ebuild 2238 BLAKE2B 28ff4e0b5fa2b6fb47088ac943172ac49d9a217aa9c1136ebceddca81d86c6d3c6097098bc6a40f69d220f780c5fde02666bcbaea62bf22b1595f1f7351ab05d SHA512 b4a1f29d4af085b6c1dcae616ad32e321106626d07df836b6f1ace5dd374eca6a9ea098ca7f282d7bcec3ef416a01a395b75fe50658a73f41497fbdea9a76bb0
-EBUILD sandbox-2.12.ebuild 1950 BLAKE2B 931801781bc514826050efb1c57972ad7f92e2e020d852deed9264892f1f26e0946164474c4f5919d1e703304570b0283e765c190aca4e1010dabac3ccb51353 SHA512 f0d3e1707225171c280902e612a5109ed78703d4bcd658a827c61e48ffbbb71c3ed86d2a2ae00289d07e46b264b10fbf48a962cf8e35c4709046c9263a473da0
+EBUILD sandbox-2.10-r4.ebuild 2234 BLAKE2B 7ec0b2ea8c5aa220f6a99bbc7135b5f9ed0d57c119988d37a75a02b8f0797a68c6dd0ad1b90c45a69e7e941b61cbdac0705c53194dfdc61704155e0ae8675b2e SHA512 08ca4e1d4923b663483d097541020725a8f50efc36779519ccf591d4cedc55017d368b474da5b7d010cf15cc3814b5d31937e742b02a327bbb18b225d92cf78d
+EBUILD sandbox-2.12.ebuild 1949 BLAKE2B 72871c0b3ce7c45d1ea56a64ceaa020f668267eb43ae34bfa525b4f4db6aefe3a0fbee5afe72e6d330d54612d82171abd26c18f98beaaf6d14939bf5bbfa631f SHA512 7e85fd6df9846ba79513976d9de4c200ff6570255c79794c22b09dba4e0206e113bcbe885ced7b8c257d2fffc480f71ecf273d100e0b6e600dbaf28042d55142
 MISC metadata.xml 266 BLAKE2B f0eff1a6b8face69d2c99fb4c4426deb3800b2b0c4a009ead29e2c5898fa0650e8003c85961ba4c3303053ae9dd6707619d25d03a40e0919ff779c2f1f893316 SHA512 8dcc34d3a08407d6807bc5e30b23c6696dbfc63c19106338780d4e2a61be360e17faeb54af993c962f347ada5d24cb314de866506484b04de4c619d6a88787e3
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
index 4ced4cfb7790..4a5c4ddd52c6 100644
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-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
 
 #
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 6bea9b719117..0347d33d7d1d 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.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"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 6a10c9ac35cd..77bccda4b94a 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,5 +1,6 @@
+AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 EBUILD the_silver_searcher-2.0.0.ebuild 919 BLAKE2B 779ddb58c67006c8d8f70cc5d80e9061d7f22661d76e29b320d3fbe5b968865b56d3a0b61fe0ebd793823d6b6fcd80abc1aa488fd7f469c16da964e75830f85a SHA512 a8e46a1bea749feaa9f05560e89b7e88a0739a15f33391a1945f5232811703d71e1438ae68ed42e38208b92282fdb543f999edd756f2b0a7d993df8e7a7717ea
-EBUILD the_silver_searcher-2.1.0.ebuild 921 BLAKE2B c2956f22937b04a5383286a6c69c1078d0962d6a46cbae325eb53bb5dbfe74e1f243c11cf4917da3252a08e08d3c420db9ddab4cd0cca59e31b20439de706493 SHA512 93f159fe1c564b49c4bbb7ebfe7df4e4572a5219b3b091c71c6da671ca7000e4f49029eaad9918d928ab9bf877a3acbe22b89dae561d96046aa8ea14637728b6
+EBUILD the_silver_searcher-2.1.0.ebuild 984 BLAKE2B a43bdc7611c19136278e71dfa833f6e75fc2e49cee685bf6e8240157b39d2387880938524a1dc08cd4888ff7c4b2e8983d0e9d38af881bf94cbae5a37f93bb16 SHA512 83c2d295235764ca60430c6e05dcc584be6af4552691a6c87da1547f05422fc68093f6d8a0abb018202dc049921156b73ac3df09d4cb500accac60b5708fdc0d
 MISC metadata.xml 347 BLAKE2B cec1df10eb40daa911db4a3b082a3d1e5f67a63d4326092bc337a5b2300c89b41205db84a6daf54c72d6ff775166d385717039cee458076d4b483a8c0a5112fa SHA512 56848f01fba3974410effc1dbc30118c77bf97cf09fead70be94f7360dddb80d47005ebb3b3c7d5accb97b24db3a3f7735cf0f40d7af13dde58b78a4bef768b2
diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch
new file mode 100644
index 000000000000..21eb7118b204
--- /dev/null
+++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch
@@ -0,0 +1,491 @@
+From 24995eb239799e52ae09d47b7520d50a3b8b606c Mon Sep 17 00:00:00 2001
+From: Allen Wild <allenwild93@gmail.com>
+Date: Tue, 5 Sep 2017 19:48:49 -0400
+Subject: [PATCH] zfile: fix build when zlib and/or lzma are excluded
+
+Currently, zfile won't build if either zlib.h or lzma.h are missing
+
+  * Add several inline wrapper functions which check cookie->ctype and
+    call an inline zlib or lzma implementation function.
+    - This cleans up zfile_read at the expense of growing the file and
+      adding 2 layers of function calls. Everything is static and inline
+      so the compiler should be able to optimize sufficiently.
+  * Stub functions are #define'd for the unsupported compression method
+    (if applicable)
+  * Use an Automake conditional to only build zfile.c if either
+    zlib.h or lzma.h are available, define the symbol USE_FOPENCOOKIE if
+    this is the case and check it instead of HAVE_FOPENCOOKIE
+  * Replace tabs in zfile.c with spaces for consistency with the rest of
+    the codebase
+
+Fixes: #1147
+---
+ Makefile.am      |   6 +-
+ configure.ac     |   5 +
+ src/decompress.h |   2 +-
+ src/search.c     |   2 +-
+ src/zfile.c      | 301 ++++++++++++++++++++++++++++++++++++++++---------------
+ 5 files changed, 232 insertions(+), 84 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3931c3a7..4d85f54f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,9 +1,13 @@
+ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+ 
+ bin_PROGRAMS = ag
+-ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c src/zfile.c
++ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c
+ ag_LDADD = ${PCRE_LIBS} ${LZMA_LIBS} ${ZLIB_LIBS} $(PTHREAD_LIBS)
+ 
++if USE_FOPENCOOKIE
++ag_SOURCES += src/zfile.c src/zfile.h
++endif
++
+ dist_man_MANS = doc/ag.1
+ 
+ bashcompdir = $(pkgdatadir)/completions
+diff --git a/configure.ac b/configure.ac
+index 982cc3b2..5917ecc1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,6 +66,11 @@ AC_CHECK_MEMBER([struct dirent.d_namlen], [AC_DEFINE([HAVE_DIRENT_DNAMLEN], [],
+ 
+ AC_CHECK_FUNCS(fgetln fopencookie getline realpath strlcpy strndup vasprintf madvise posix_fadvise pthread_setaffinity_np pledge)
+ 
++# Only build zfile.c if we need it
++AM_CONDITIONAL([USE_FOPENCOOKIE], [(test "$ac_cv_func_fopencookie" = "yes") &&
++                                   (test "$ac_cv_header_zlib_h" = "yes" || test "$ac_cv_header_lzma_h" = "yes")])
++AM_COND_IF([USE_FOPENCOOKIE], [AC_DEFINE([USE_FOPENCOOKIE], [], [Use fopencookie streaming in zfile.c])])
++
+ AC_CONFIG_FILES([Makefile the_silver_searcher.spec])
+ AC_CONFIG_HEADERS([src/config.h])
+ 
+diff --git a/src/decompress.h b/src/decompress.h
+index 9c5592cf..d5c3d582 100644
+--- a/src/decompress.h
++++ b/src/decompress.h
+@@ -19,7 +19,7 @@ ag_compression_type is_zipped(const void *buf, const int buf_len);
+ 
+ void *decompress(const ag_compression_type zip_type, const void *buf, const int buf_len, const char *dir_full_path, int *new_buf_len);
+ 
+-#if HAVE_FOPENCOOKIE
++#ifdef USE_FOPENCOOKIE
+ FILE *decompress_open(int fd, const char *mode, ag_compression_type ctype);
+ #endif
+ 
+diff --git a/src/search.c b/src/search.c
+index 14e9d415..84d9423f 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -357,7 +357,7 @@ void search_file(const char *file_full_path) {
+     if (opts.search_zip_files) {
+         ag_compression_type zip_type = is_zipped(buf, f_len);
+         if (zip_type != AG_NO_COMPRESSION) {
+-#if HAVE_FOPENCOOKIE
++#ifdef USE_FOPENCOOKIE
+             log_debug("%s is a compressed file. stream searching", file_full_path);
+             fp = decompress_open(fd, "r", zip_type);
+             search_stream(fp, file_full_path);
+diff --git a/src/zfile.c b/src/zfile.c
+index e4b75662..74de37e6 100644
+--- a/src/zfile.c
++++ b/src/zfile.c
+@@ -33,10 +33,10 @@ typedef _off64_t off64_t;
+ 
+ #if HAVE_FOPENCOOKIE
+ 
+-#define min(a, b) ({				\
+-	__typeof (a) _a = (a);			\
+-	__typeof (b) _b = (b);			\
+-	_a < _b ? _a : _b; })
++#define min(a, b) ({                \
++    __typeof (a) _a = (a);          \
++    __typeof (b) _b = (b);          \
++    _a < _b ? _a : _b; })
+ 
+ static cookie_read_function_t zfile_read;
+ static cookie_seek_function_t zfile_seek;
+@@ -60,23 +60,217 @@ struct zfile {
+     ag_compression_type ctype;
+ 
+     union {
++#ifdef HAVE_ZLIB_H
+         z_stream gz;
++#endif
++#ifdef HAVE_LZMA_H
+         lzma_stream lzma;
++#endif
+     } stream;
+ 
+     uint8_t inbuf[32 * KB];
+     uint8_t outbuf[256 * KB];
+     bool eof;
++    bool eof_next;
+ };
+ 
+-#define CAVAIL_IN(c) ((c)->ctype == AG_GZIP ? (c)->stream.gz.avail_in : (c)->stream.lzma.avail_in)
+-#define CNEXT_OUT(c) ((c)->ctype == AG_GZIP ? (c)->stream.gz.next_out : (c)->stream.lzma.next_out)
++#ifdef HAVE_ZLIB_H
++/***************** zlib functions ********************************/
++static int zfile_zlib_cookie_init(struct zfile *cookie) {
++    int rc;
++
++    memset(&cookie->stream.gz, 0, sizeof(cookie->stream.gz));
++    rc = inflateInit2(&cookie->stream.gz, 32 + 15);
++    if (rc != Z_OK) {
++        log_err("Unable to initialize zlib: %s", zError(rc));
++        return EIO;
++    }
++    cookie->stream.gz.next_in = NULL;
++    cookie->stream.gz.avail_in = 0;
++    cookie->stream.gz.next_out = cookie->outbuf;
++    cookie->stream.gz.avail_out = sizeof cookie->outbuf;
++    return 0;
++}
++
++static inline size_t zfile_zlib_cavail_in(struct zfile *cookie) {
++    return (size_t)cookie->stream.gz.avail_in;
++}
++
++static inline uint8_t *zfile_zlib_cnext_out(struct zfile *cookie) {
++    return (uint8_t *)cookie->stream.gz.next_out;
++}
++
++static inline int zfile_zlib_is_stream_end(int ret) {
++    return ret == Z_STREAM_END;
++}
++
++static inline void zfile_zlib_set_next_in(struct zfile *cookie, size_t nb) {
++    cookie->stream.gz.avail_in = nb;
++    cookie->stream.gz.next_in = cookie->inbuf;
++}
++
++static inline void zfile_zlib_set_next_out(struct zfile *cookie) {
++    cookie->stream.gz.next_out = cookie->outbuf;
++    cookie->stream.gz.avail_out = sizeof(cookie->outbuf);
++}
++
++static inline int zfile_zlib_inflate(struct zfile *cookie) {
++    int ret = inflate(&cookie->stream.gz, Z_NO_FLUSH);
++    if (ret == Z_STREAM_END) {
++        cookie->eof_next = true;
++        return 0;
++    }
++    return ret == Z_OK ? 0 : -1;
++}
++
++#else
++/***************** zlib stubs ********************************/
++#define zfile_zlib_cookie_init(c) EINVAL
++#define zfile_zlib_cavail_in(c) 0
++#define zfile_zlib_cnext_out(c) 0
++#define zfile_zlib_is_stream_end(r) 1
++#define zfile_zlib_set_next_in(c, n) (void)0
++#define zfile_zlib_set_next_out(c) (void)0
++#define zfile_zlib_inflate(c) -1
++#endif
+ 
+-static int
+-zfile_cookie_init(struct zfile *cookie) {
+ #ifdef HAVE_LZMA_H
++/***************** lzma functions ********************************/
++static int zfile_lzma_cookie_init(struct zfile *cookie) {
+     lzma_ret lzrc;
++    cookie->stream.lzma = (lzma_stream)LZMA_STREAM_INIT;
++    lzrc = lzma_auto_decoder(&cookie->stream.lzma, -1, 0);
++    if (lzrc != LZMA_OK) {
++        log_err("Unable to initialize lzma_auto_decoder: %d", lzrc);
++        return EIO;
++    }
++    cookie->stream.lzma.next_in = NULL;
++    cookie->stream.lzma.avail_in = 0;
++    cookie->stream.lzma.next_out = cookie->outbuf;
++    cookie->stream.lzma.avail_out = sizeof(cookie->outbuf);
++    return 0;
++}
++
++static inline size_t zfile_lzma_cavail_in(struct zfile *cookie) {
++    return cookie->stream.lzma.avail_in;
++}
++
++static inline uint8_t *zfile_lzma_cnext_out(struct zfile *cookie) {
++    return cookie->stream.lzma.next_out;
++}
++
++static inline int zfile_lzma_is_stream_end(int ret) {
++    return (lzma_ret)ret == LZMA_STREAM_END;
++}
++
++static inline void zfile_lzma_set_next_in(struct zfile *cookie, size_t nb) {
++    cookie->stream.lzma.avail_in = nb;
++    cookie->stream.lzma.next_in = cookie->inbuf;
++}
++
++static inline void zfile_lzma_set_next_out(struct zfile *cookie) {
++    cookie->stream.lzma.next_out = cookie->outbuf;
++    cookie->stream.lzma.avail_out = sizeof(cookie->outbuf);
++}
++
++static inline int zfile_lzma_inflate(struct zfile *cookie) {
++    lzma_ret ret = lzma_code(&cookie->stream.lzma, LZMA_RUN);
++    if (ret == LZMA_STREAM_END) {
++        cookie->eof_next = true;
++        return 0;
++    }
++    return ret == LZMA_OK ? 0 : -1;
++}
++
++#else
++/***************** lzma stubs ********************************/
++#define zfile_lzma_cookie_init(c) EINVAL
++#define zfile_lzma_cavail_in(c) 0
++#define zfile_lzma_cnext_out(c) 0
++#define zfile_lzma_is_stream_end(r) 1
++#define zfile_lzma_set_next_in(c, n) (void)0
++#define zfile_lzma_set_next_out(c) (void)0
++#define zfile_lzma_inflate(c) -1
+ #endif
++
++static inline size_t zfile_cavail_in(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_cavail_in(cookie);
++            break;
++        case AG_XZ:
++            return zfile_lzma_cavail_in(cookie);
++            break;
++        default:
++            return 0;
++    }
++}
++
++static inline uint8_t *zfile_cnext_out(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_cnext_out(cookie);
++            break;
++        case AG_XZ:
++            return zfile_lzma_cnext_out(cookie);
++            break;
++        default:
++            return NULL;
++    }
++}
++
++static inline int zfile_is_stream_end(struct zfile *cookie, int ret) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_is_stream_end(ret);
++        case AG_XZ:
++            return zfile_lzma_is_stream_end(ret);
++        default:
++            return 1;
++    }
++}
++
++static inline void zfile_set_next_in(struct zfile *cookie, size_t nb) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            zfile_zlib_set_next_in(cookie, nb);
++            break;
++        case AG_XZ:
++            zfile_lzma_set_next_in(cookie, nb);
++            break;
++        default:
++            break;
++    }
++}
++
++static inline void zfile_set_next_out(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            zfile_zlib_set_next_out(cookie);
++            break;
++        case AG_XZ:
++            zfile_lzma_set_next_out(cookie);
++            break;
++        default:
++            break;
++    }
++}
++
++static inline int zfile_inflate(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_inflate(cookie);
++            break;
++        case AG_XZ:
++            return zfile_lzma_inflate(cookie);
++            break;
++        default:
++            return -1;
++    }
++}
++
++static int
++zfile_cookie_init(struct zfile *cookie) {
+     int rc;
+ 
+     assert(cookie->logic_offset == 0);
+@@ -85,39 +279,18 @@ zfile_cookie_init(struct zfile *cookie) {
+     cookie->actual_len = 0;
+ 
+     switch (cookie->ctype) {
+-#ifdef HAVE_ZLIB_H
+         case AG_GZIP:
+-            memset(&cookie->stream.gz, 0, sizeof cookie->stream.gz);
+-            rc = inflateInit2(&cookie->stream.gz, 32 + 15);
+-            if (rc != Z_OK) {
+-                log_err("Unable to initialize zlib: %s", zError(rc));
+-                return EIO;
+-            }
+-            cookie->stream.gz.next_in = NULL;
+-            cookie->stream.gz.avail_in = 0;
+-            cookie->stream.gz.next_out = cookie->outbuf;
+-            cookie->stream.gz.avail_out = sizeof cookie->outbuf;
++            rc = zfile_zlib_cookie_init(cookie);
+             break;
+-#endif
+-#ifdef HAVE_LZMA_H
+         case AG_XZ:
+-            cookie->stream.lzma = (lzma_stream)LZMA_STREAM_INIT;
+-            lzrc = lzma_auto_decoder(&cookie->stream.lzma, -1, 0);
+-            if (lzrc != LZMA_OK) {
+-                log_err("Unable to initialize lzma_auto_decoder: %d", lzrc);
+-                return EIO;
+-            }
+-            cookie->stream.lzma.next_in = NULL;
+-            cookie->stream.lzma.avail_in = 0;
+-            cookie->stream.lzma.next_out = cookie->outbuf;
+-            cookie->stream.lzma.avail_out = sizeof cookie->outbuf;
++            rc = zfile_lzma_cookie_init(cookie);
+             break;
+-#endif
+         default:
+             log_err("Unsupported compression type: %d", cookie->ctype);
+             return EINVAL;
+     }
+-
++    if (rc)
++        return rc;
+ 
+     cookie->outbuf_start = 0;
+     cookie->eof = false;
+@@ -165,10 +338,10 @@ decompress_open(int fd, const char *mode, ag_compression_type ctype) {
+         goto out;
+ 
+     /*
+-	 * No validation of compression type is done -- file is assumed to
+-	 * match input.  In Ag, the compression type is already detected, so
+-	 * that's ok.
+-	 */
++     * No validation of compression type is done -- file is assumed to
++     * match input.  In Ag, the compression type is already detected, so
++     * that's ok.
++     */
+     cookie = malloc(sizeof *cookie);
+     if (cookie == NULL) {
+         errno = ENOMEM;
+@@ -207,8 +380,6 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+     struct zfile *cookie = cookie_;
+     size_t nb, ignorebytes;
+     ssize_t total = 0;
+-    lzma_ret lzret;
+-    int ret;
+ 
+     assert(size <= SSIZE_MAX);
+ 
+@@ -218,9 +389,6 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+     if (cookie->eof)
+         return 0;
+ 
+-    ret = Z_OK;
+-    lzret = LZMA_OK;
+-
+     ignorebytes = cookie->logic_offset - cookie->decode_offset;
+     assert(ignorebytes == 0);
+ 
+@@ -228,9 +396,9 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+         size_t inflated;
+ 
+         /* Drain output buffer first */
+-        while (CNEXT_OUT(cookie) >
++        while (zfile_cnext_out(cookie) >
+                &cookie->outbuf[cookie->outbuf_start]) {
+-            size_t left = CNEXT_OUT(cookie) -
++            size_t left = zfile_cnext_out(cookie) -
+                           &cookie->outbuf[cookie->outbuf_start];
+             size_t ignoreskip = min(ignorebytes, left);
+             size_t toread;
+@@ -265,21 +433,13 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+         if (size == 0)
+             break;
+ 
+-        /*
+-		 * If we have not satisfied read, the output buffer must be
+-		 * empty.
+-		 */
+-        assert(cookie->stream.gz.next_out ==
+-               &cookie->outbuf[cookie->outbuf_start]);
+-
+-        if ((cookie->ctype == AG_XZ && lzret == LZMA_STREAM_END) ||
+-            (cookie->ctype == AG_GZIP && ret == Z_STREAM_END)) {
++        if (cookie->eof_next) {
+             cookie->eof = true;
+             break;
+         }
+ 
+         /* Read more input if empty */
+-        if (CAVAIL_IN(cookie) == 0) {
++        if (zfile_cavail_in(cookie) == 0) {
+             nb = fread(cookie->inbuf, 1, sizeof cookie->inbuf,
+                        cookie->in);
+             if (ferror(cookie->in)) {
+@@ -290,39 +450,18 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+                 warn("truncated file");
+                 exit(1);
+             }
+-            if (cookie->ctype == AG_XZ) {
+-                cookie->stream.lzma.avail_in = nb;
+-                cookie->stream.lzma.next_in = cookie->inbuf;
+-            } else {
+-                cookie->stream.gz.avail_in = nb;
+-                cookie->stream.gz.next_in = cookie->inbuf;
+-            }
++            zfile_set_next_in(cookie, nb);
+         }
+ 
+         /* Reset stream state to beginning of output buffer */
+-        if (cookie->ctype == AG_XZ) {
+-            cookie->stream.lzma.next_out = cookie->outbuf;
+-            cookie->stream.lzma.avail_out = sizeof cookie->outbuf;
+-        } else {
+-            cookie->stream.gz.next_out = cookie->outbuf;
+-            cookie->stream.gz.avail_out = sizeof cookie->outbuf;
+-        }
++        zfile_set_next_out(cookie);
+         cookie->outbuf_start = 0;
+ 
+-        if (cookie->ctype == AG_GZIP) {
+-            ret = inflate(&cookie->stream.gz, Z_NO_FLUSH);
+-            if (ret != Z_OK && ret != Z_STREAM_END) {
+-                log_err("Found mem/data error while decompressing zlib stream: %s", zError(ret));
+-                return -1;
+-            }
+-        } else {
+-            lzret = lzma_code(&cookie->stream.lzma, LZMA_RUN);
+-            if (lzret != LZMA_OK && lzret != LZMA_STREAM_END) {
+-                log_err("Found mem/data error while decompressing xz/lzma stream: %d", lzret);
+-                return -1;
+-            }
++        if (zfile_inflate(cookie)) {
++            log_err("Found mem/data error while decompressing stream");
++            return -1;
+         }
+-        inflated = CNEXT_OUT(cookie) - &cookie->outbuf[0];
++        inflated = zfile_cnext_out(cookie) - &cookie->outbuf[0];
+         cookie->actual_len += inflated;
+     } while (!ferror(cookie->in) && size > 0);
+ 
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index 3f4a2aae03c0..94366537bd77 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 
 DOCS="README.md"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch )
+
 src_prepare() {
 	sed '/^dist_bashcomp/d' -i Makefile.am || die
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 46cf94d1cebb..d5e0ec3c9487 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,7 +6,7 @@ AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
-EBUILD util-linux-2.30.2.ebuild 6077 BLAKE2B abd7234f5e2622b7a7d1489bd9f57fb3d33dce6556621cb8239ad8eb1260aafc4816cf878cbc5936893d50df263ff75073b79a49370ca9ef1b1dd9a8164c5332 SHA512 fdd4e1fdeef39a5cfdbe747a1e7bb2c35d4386efc8ed1264171156d85e00bc0465e9ec8b88a07e6cb7582659554ad98990f8bb728b581bfc41a3850121f1ce49
+EBUILD util-linux-2.30.2.ebuild 6073 BLAKE2B b6f3b9f6c73513e37f5971c3c995f523c086e8cfc33f18c032eea51d102cf2a67912b52ac7461f7407d50459709997972042c6249fbe3d38638de33686d97c9c SHA512 95efdfcee3b9e6dbae06024fd47bb3da4f316dfbc060f4e3e84f1ea227b1e316aa2e2141a2cf3c6ed4c627e2df6b104c1a6a6e45a4585fd22b527bc10a22367f
 EBUILD util-linux-2.31-r1.ebuild 6185 BLAKE2B 8aae4e20de31ab9161b78af51d8038a98f8ea4909277aa9a499b1aa47fe7c6821a965241a218d4ce166a462889c2e6375cda43e580922ac90ee805f196142ce6 SHA512 4bc749571b57a6720c7bbae2ca8b63d79ae8e2f46de686ff1978b35531d4945e1cab3afd61ec6b76718c31151e3838f06044e15b8bd7143c161a5f7860c74bca
 EBUILD util-linux-2.31.1.ebuild 6108 BLAKE2B 6c27812bdb0f88e254fb030dd85224788dd7f40704492d679fd11e26b50fbd7ea2b4ae8c85d960c79049f8e7254873326ca63bb40c2a3b78295bcd30264fff59 SHA512 6c98e8ef184d56fc383d9df07fac71763d106413ef053a158e993894ea25f1685eb57e0da94203afdd75868c15f184c9e307d5cfd5223ac3ec6c3a001b583466
 EBUILD util-linux-9999.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1
diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild
index d5d2a35f984e..941bf4695f5c 100644
--- a/sys-apps/util-linux/util-linux-2.30.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	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"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-13 06:19:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-13 06:19:51 +0000
commit	8be70107efbb417f839292165ee39d07a062046f (patch)
tree	013918887ec4a00f0cefdb4b4d1313cbc3054305 /sys-apps
parent	343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)