gentoo resync : 16.06.2018

32 files changed, 739 insertions, 110 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 76462010034c..fa8d0cbe41e8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 5a455949ad4b..b896a4f23694 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,7 +5,7 @@ DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
 DIST dbus-1.12.8.tar.gz 2071751 BLAKE2B 9ba26d48f34b4d328335917bbc40d5f4423a48f90b0436783a8d6d290bc8b99c54aa31d23efaf52ef90748d53e68b7c0e3ddce0f4ce26ea5369acbd57d726b84 SHA512 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3
-EBUILD dbus-1.10.18.ebuild 7378 BLAKE2B d258aceeb402a50f56a971ed97e5789b15f9c2c32b64adf0570e67fd78911813e7c3f7de8c41f43e326b120561ee27b179aed6424a7db2e438067e8a1b1233d5 SHA512 e2a689defcb78cb6fec98ec393af42c8e1b71f7ad2afe1c9fc2d039ffb7b0b3684ea13ed06f1127567dbb8b6621c0da259334070ef1e22982d75a3c9ade491eb
+EBUILD dbus-1.10.18.ebuild 7377 BLAKE2B f52e7c26449cd69956b0c23288b620d17ba1c5f916ff47762045ae793761a8883366fd80c5648b147aa1195d5c7acba1743ae01f0c69d025329ea87cbb1b8ebc SHA512 4e1be287542458b080f67e442a47fad1bc2dd8fab0d28d90c516703a4b4a42f7161b06af7dc990913f3a2fb6edb874c620a7cd745f4186555dcf5e407c2c5a61
 EBUILD dbus-1.10.24.ebuild 7385 BLAKE2B 5061ed488e5da35a5c82c1ac023671916fb5a6e68b9fb7eed26d4b74264d4c2e9e04a56a0b64c39d926a078f7e8ba1fa4d9c90fd37a42169f14b455b6c2632cc SHA512 9a39c78efa3ad1b198c0a2c95b39a761fcb1868226dffcf4fb5eb0f14a4412a62e55c0703e35f0ab7de5e14ee0ed9b70e09c46a12cc3282b7e8d30b86c825f5a
 EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 EBUILD dbus-1.12.8.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild
index 3a57a0a8f3ff..5845b8649188 100644
--- a/sys-apps/dbus/dbus-1.10.18.ebuild
+++ b/sys-apps/dbus/dbus-1.10.18.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
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 RESTRICT="test"
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 46b7cd51f717..8b35b2acfaad 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -3,6 +3,7 @@ DIST diffutils-3.3.tar.xz 1197832 BLAKE2B 8819e84f6d1d9ae30dccba01934ba506fd9e20
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 EBUILD diffutils-3.3.ebuild 1437 BLAKE2B c2fc69bfbfa2dfd0953b9f1cb80a4a7a4980740dbc5cbba631e3311e4ee548fcbee51c3c191709b890a90e8f46409689c217762a64cbdef672383bcca23c4aff SHA512 d0f286f68b667e5049bd0713336308f43f6fd75353e285d9753a2f1d43a94e218beca55a6df58d834dacc968c672d64e0daa0229c3654da4239da57c99004bcf
-EBUILD diffutils-3.5.ebuild 1250 BLAKE2B ee2af68ab02655eb85ddc6afa4ed7a7ac8c45d618738f53cf41067440333dba8b2197d101253688081f27e81388af445119fdea9b5185b67fe14071250c05983 SHA512 50a51b0a9bf659004ce150eefcb3b969494fffe87e7f48365a3df0e54b5b960efa228a6ab3e3766aabc63ff3ae39c91eba7da00665a0567f2c0252d0c62ef5b1
+EBUILD diffutils-3.5.ebuild 1247 BLAKE2B 49832f42580e2660ec1d772997044d9634549008507213efb82085d83bedc3b0ee41520bc32f470d0015983226ea8fa00e80cbbaaa015f41c2822bffb6c12dd3 SHA512 f3a2ae443bd782fd4c2079ee0817771ee1b07ff8b45c86012de2440895accf9248719c966b253e7df7a1162926dd1a62b584abc2e53325b997f755db1ce768ef
+EBUILD diffutils-3.6-r1.ebuild 1262 BLAKE2B 84ddcf13a502dea3e94ef2a3b3cc0fccad1314d058d8f3f4776c8c1f7afdf03b523c0dbb9cad4f7c6ca5e8d85bb2fe166b8ca9259b4f7cb68b13f13d1168af6a SHA512 7b044025f77a91eab38517943c6cecadb2da6309001cde7160e113d39a37af62c1a3373b9ea4d8925301bb6d179f1653a647129932e431ec5ae28a2c2d2cca13
 EBUILD diffutils-3.6.ebuild 1166 BLAKE2B d4c28e6a0eab8b9c66fa6c07199c4ee6d7b862e0c4fdee27dc2bac56e8bb3a0ba87e7ca91605f12bacd9b3bc2695cb4987523465003009bfb20674dc10ffdd89 SHA512 2ac74317252603d3da51aa5a038ad3da40c77ac94a53bea59e82e93c66a64a7dff87c10beb8ba469e83c016f57cbf8fd23d5b08a87d92939947547916387bd9a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index 12510de9dd81..5a731d693b20 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
new file mode 100644
index 000000000000..ab2624456bf7
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/"
+SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
+	mirror://gnu-alpha/diffutils/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+DEPEND="app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Disable automagic dependency over libsigsegv; see bug #312351.
+	export ac_cv_libsigsegv=no
+
+	# required for >=glibc-2.26, bug #653914
+	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
+
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# explicitly allow parallel testing
+	emake check
+}
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 6ec19c027551..9b19dd09f0f8 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,5 +1,5 @@
 DIST fakechroot_2.17.2.orig.tar.gz 463307 BLAKE2B c13e0bb649dc4ecafed1d1f7aa487659631bfae94b2fdc91aee8b23910954e46a74ba6f3d50107a9a282b9e7cb21bf4edb372257adaf157f43c4055738ddce49 SHA512 bcdcf8e77aae46b567acddb80e6817a118c7ef250ba7b6962982e60a6a5e3b8c1eeef950dc33335f31466c3f53ab6b7260bc64a1da9c4b156a44d811ef8cccd0
 DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
 EBUILD fakechroot-2.17.2.ebuild 588 BLAKE2B 1aec510a554865e5db274a48268fa533ff59e9ad0a5f09832472cf744bb5acea273fe4fa034a2bc8848f63913c2fee9c00873dcbf289d05b04a817ad9f12ec2e SHA512 c0ce568bcc8c33cc217f39caa1f23a0d0ffca332da3bf8f453a01ac2ba649b2ad772b96b1dfa2f164a880781585905be51a71f95f1027525cda5ba8be5c01902
-EBUILD fakechroot-2.19.ebuild 583 BLAKE2B 1da49d7a61540dc4460f7b6b1c449870648c09eb78f3921e6c30bd0113c7ce1fe0505ae4b2c307f9b56b319d578ba25672a7d46f13d4d533aa25e6bd61fb0f60 SHA512 a7ece4464ec8f3f3584bcd172f078647c7b614d174bf0e81dcb9cbd3bba0ba1caa8eb1354267e12655cf8cda265a79909e43d00481074ac03c4523e42e422c4a
+EBUILD fakechroot-2.19.ebuild 600 BLAKE2B 179d2856ab8c47c96d9e631687d93b2b3f9faaff2f909d0bd3e85cc83f461e585e8e706f575079af351a8fac0ca4d37f5c9741ac70408314a8224ec56da44502 SHA512 6aa29b0cd72f33de0a5b602bd953eff30be823a11c28dd1bbf3fe100944407da729a5a0f520dc55546a868a3b7d50f881827dcd116878c3058f37a6df1303b50
 MISC metadata.xml 345 BLAKE2B 3471b0985dec02f4065149b788a8edb64d5a90741719c02bb4c87dffc27ee6f61f4d231df83e716382f36d2220e7cb7a4797cd3960db955761ee4852c76b80e6 SHA512 940ab52cf3ad5ef13f24f093fcc41e4c39dc9cd484eaf0dc0bb0d29306cbab474044cc72898ddaf49604a63032d7a089e2f308c9ea94e79c6a16c27970aba08c
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
index 4a89ac3de3c6..7bbdde0ffba7 100644
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4727518b6fd0..a246a22a9319 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,8 @@
+AUX file-5.33-CVE-2018-10360.patch 538 BLAKE2B 78c6006285e3ba254cc2dcb1196fe95217d1ccda46b3f652cbc99c9750b74a47ddbed33f01ef01e7f8c58205dd4c1f9669cb982e08679dd0b45214915883fb75 SHA512 7f6fd05fe29081039c57d22f5122364bf6ccfe869745f1306ceff13e876cb88e03263d2f11558ccbffebe227bcb9c2c6872d1fdb9b2823d16b001f6598f25c6f
 DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
 DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
 EBUILD file-5.32-r1.ebuild 3011 BLAKE2B 2ee0d868685cea29a4941fe9f7f2c215b015f455f0cbf735df8926c8edf275f2de1ccc950853e4cf8021d2c03f314512da4ee254fa5abcc08a65661820666e45 SHA512 78c9afc3203a567f009cb88e823a4a644c23397178926db44148ebd82ee3337899b756a2da4bb2633f158910a73594eebfb80457f9566c723f41544a70851ff3
 EBUILD file-5.33-r1.ebuild 3068 BLAKE2B a2211f853b5a9457e4f514f996d186679532c82ba99b7b8111d9ef842fac2f6e228521976326550a743a41b108a9a712dafb08f4d509bfaf5d2aac10f8763ba9 SHA512 f6b5750df767de41bf0cbbfcc63984476816fc84f637f7f1e9bb2137b4df35f000ee4bbd61cb327aa45e151de493cc4b77a94b24a14544bee06d131d2ca13422
+EBUILD file-5.33-r2.ebuild 3117 BLAKE2B 6323b0e9bf96cc05efc9f1844a78f8ae0d71efbf22c815a03b5560dd44efbd3f987e6eec6221fc46fe52f47eab9de09cc97b4a80c6e16eec27c8a41c3bcbc150 SHA512 266f721aa0924e57c9457659b88359964d0841a0703ea73fc41a8e795be093fd27181c149f2e166263710c02601468828bdb923d86214492d1d2977380712bf9
 EBUILD file-9999.ebuild 3141 BLAKE2B 89cee448db824b8746f088e25ae2e4e1ac6951a13b5ea925283f4395b683203a90406caa523be5e96238666b0f000288f8d46f5f867074d6e55351e703b40ff9 SHA512 733e1e18d808031be18afe662079a7f130f2cb61e6c071c00ca202d7938ea9577dbdafb99fc6d534ba84f485c1b8de645e67e1d92c1dfeb0caf645ff863857a3
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.33-r2.ebuild b/sys-apps/file/file-5.33-r2.ebuild
new file mode 100644
index 000000000000..6d923ebf535e
--- /dev/null
+++ b/sys-apps/file/file-5.33-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+PATCHES=( "${FILESDIR}"/${P}-CVE-2018-10360.patch )
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README{,.python} || die
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-libseccomp
+		--enable-fsect-man5
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE=${S} \
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		econf --disable-shared --disable-libseccomp
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	prune_libtool_files
+}
diff --git a/sys-apps/file/files/file-5.33-CVE-2018-10360.patch b/sys-apps/file/files/file-5.33-CVE-2018-10360.patch
new file mode 100644
index 000000000000..a489846b10f8
--- /dev/null
+++ b/sys-apps/file/files/file-5.33-CVE-2018-10360.patch
@@ -0,0 +1,18 @@
+Avoid reading past the end of buffer
+
+CVE-2018-10360
+
+https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22
+
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
+ 
+ 				cname = (unsigned char *)
+ 				    &nbuf[doff + prpsoffsets(i)];
+-				for (cp = cname; *cp && isprint(*cp); cp++)
++				for (cp = cname; cp < nbuf + size && *cp
++				    && isprint(*cp); cp++)
+ 					continue;
+ 				/*
+ 				 * Linux apparently appends a space at the end
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 20cb807d6562..af17edb78a3e 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -8,5 +8,5 @@ EBUILD flashrom-0.9.7.ebuild 3394 BLAKE2B f95bbed798bb7a86c962c32cf2b09b47474415
 EBUILD flashrom-0.9.8.ebuild 4129 BLAKE2B 40113bd2aae43ad066b0e3f3da25e2164bb94250047d8cc360402af983f6dd4ad8de5a0c285fccce776c301fd659e5e3dd49d36fa9f550726ea631f7ea7c71a5 SHA512 2fa5038683700dbe446a386f93c37afcb6f089396b4f6e17526de58ca840cb3c908808335988a6d84ebe44868d92d47dfba6bcc7b62a0cfc1ba8568f4258770f
 EBUILD flashrom-0.9.9.ebuild 4247 BLAKE2B 14c4b35866d6f45924b20f625152bad859c853ae651d0704e1ec267f420ca6a29013fc67b6b8cfe6ae42cd86d23d68420e914f4a77c383724055470b387507db SHA512 4a8591b141a7c3964e814e4b47f0cc3f1f4810ef0526b640846668f3a54a7b69354f4ac02e937842042e3e6cefa112e711d6ad22d2742b1711125c451c6968b1
 EBUILD flashrom-1.0.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
-EBUILD flashrom-9999.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
-MISC metadata.xml 4482 BLAKE2B 69683fa8e9f2193f52a7b548cf6c811f2d01e18acdcc57edbc12fdfca8cf4110a65c3c204ee1d323d3e1529ec169381c92c923dc0d6a637ab745d0c49cc80942 SHA512 f9161a35b798faccd83029720b0780e4edae9c2127d5226f7e8933a55dcba3a38e9f7e215555325a9178f931478ea43d93353c40bafcfdaa813666cfb7589ba8
+EBUILD flashrom-9999.ebuild 4157 BLAKE2B 96c421bb2fc4d94c8c8159c9274bb5ac4e9effb604ea1224c7f52b6418f07ddb89348468af99042b648af61b8b6044f3e2c173aa506057c75f8d32bc0e5c8b8e SHA512 87020f0701717ddacc8c6db549718a6c9f7adebc23488a0bbfd56952a5cdf3b156fc5e4929f416b0822aafab51952a7f7441dfe7ef9b3e0b4bee7b476ccff681
+MISC metadata.xml 4561 BLAKE2B c2498b2fbaffd1c1afe85cbca55a04e1d79e96c3a460ca4445d9c3386dc4208dfc342a620b8a896c772540ea39b63b1cb701e1863d9db106f51e5f1b61dec600 SHA512 1907479d6aa1930dc7eaab630e828e6746cf11f99f04b45cdaaf153beafd276dea0104ce07ea538ae7bfee36565c0772fad6a7af135a361e20cbdab9cbd28e5c
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 45893e146faf..0c9d952b2f7f 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -22,9 +22,10 @@ SLOT="0"
 # by some other spi programmers.
 IUSE_PROGRAMMERS="
 atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
-+ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
-+nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
-+pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
++ft2232_spi +gfxnvidia +internal +it8212 +linux_mtd +linux_spi mstarddc_spi
++nic3com +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek
++ogp_spi +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog
++usbblaster_spi"
 IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
 
 LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index da48fc6a1025..ddb50695a2b7 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -28,6 +28,7 @@
 		<flag name="internal">Enable internal/onboard support</flag>
 		<flag name="internal_dmi">Enable internal DMI decoding rather than use <pkg>sys-apps/dmidecode</pkg></flag>
 		<flag name="it8212">Support for ITE IT8212F ATA/RAID controllers</flag>
+		<flag name="linux_mtd">Enable support for Linux mtd SPI flash devices</flag>
 		<flag name="linux_spi">Enable support for Linux userspace spidev interface</flag>
 		<flag name="mstarddc_spi">Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays</flag>
 		<flag name="nic3com">Enable 3Com NIC programmer</flag>
diff --git a/sys-apps/hponcfg/Manifest b/sys-apps/hponcfg/Manifest
index 3458d787c324..2a2d033b291b 100644
--- a/sys-apps/hponcfg/Manifest
+++ b/sys-apps/hponcfg/Manifest
@@ -1,4 +1,6 @@
 DIST hponcfg-4.6.0-0.i386.rpm 39344 BLAKE2B a1fb8c4237eae8caa90086b49dd89ad641c77663e0c98f82ec97724564437837223ea3acd15136aaf6c575e35923f2e804766c51179771aead9800ecae424cd1 SHA512 534e2d656349e34c539755d807456a671363640ca8dd6853787dbf7f2a594acb88478b59b2e21ca07b8c6f118f6ad3c2e0eb1ec072484db6a8fb707bd593e0e7
 DIST hponcfg-4.6.0-0.x86_64.rpm 44121 BLAKE2B 5fb073a0789380527066087a14e1806bd98a7ee76da18facbc578b0aff397a73df8a3236c22939bda4e8af19e3b6a03670947998c666fdd9b8e390a77be6d9e3 SHA512 830abe6816295fa7e0888e0848d707ab41510a9ea6dc17d01fd5de2fa56faf49af43ef6698aa379ac8baa6ab729262e77e209b90103ce67d45bf6f0b2d4df142
+DIST hponcfg-5.2.0-0.x86_64.rpm 59714 BLAKE2B dc78b47824195f8ec9b0d7537390b45984c949ecddabcfedfd9b04634d670633eb65d09b31d90fb17968b1e63541c9cb6384da73c117b5b045635f50a106ba39 SHA512 cc5ac7062d6b4e76c49be470d11697cf65dece225505c1f0cc8749b43ee34632a931a076d0f7ff2b021a79f2bf269d59a72f5153bf32cd2d0f5c6a9e0ad570cb
 EBUILD hponcfg-4.6.0.0.ebuild 1214 BLAKE2B 81641e95bcf8eaae323e8a465bfbd524aaf544fa13b4535a83c8d69e8c484f5d74c97028e43481833b301002af8128fbbf4dd4f67c1882240a93a1ae2cdad04f SHA512 bbf4e33582cab5cbe33339537e9e66f2c6c7185f8447d25d51e08e3f873225d7252d019acfc7f17d78d932b283bf7f6af2a1912d952746921405daa02e69231b
+EBUILD hponcfg-5.2.0.0.ebuild 986 BLAKE2B ff2ad4fb5811e71537dd338effe1de0fde4ab5a98578659fdf2b18785d3937c31d589b13cd4cef8725efc0e7cfb9315aabca7ee248d7f088756670932046ee90 SHA512 62ed9c972c8be58a819c599029e7bd3e22fe7d72720ed08335c16a20e1edb0992476984030403f280e711757fa6b9e3c3e3ba667072cf0c6dfa808e48b2b3a7b
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild b/sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild
new file mode 100644
index 000000000000..d7eab2b4e3c2
--- /dev/null
+++ b/sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils rpm versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="HP Lights-Out Online Configuration Utility (HPONCFG)"
+HOMEPAGE="http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29"
+SRC_URI="amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/${PN}-${MY_PV}.x86_64.rpm )"
+
+LICENSE="hpe"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )"
+
+S="${WORKDIR}"
+
+QA_PRESTRIPPED="/usr/sbin/hponcfg /usr/li.*/libcpqc.*"
+QA_PREBUILT="/usr/sbin/hponcfg"
+
+src_install() {
+	dosbin sbin/hponcfg
+
+	# When bumping, verify SONAME (scanelf -S libhponcfg64.so)!
+	newlib.so "${S}"/usr/lib64/libhponcfg64.so libcpqci64.so.3
+	dosym libcpqci64.so.3 /usr/$(get_libdir)/libhponcfg64.so
+
+	dodoc "${S}"/usr/share/doc/hponcfg/*
+
+	pax-mark m "${D}"usr/sbin/hponcfg
+}
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index f3e7d31f058d..16f344d81c9d 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,12 +1,10 @@
+AUX ipmitool-1.8.18-openssl-1.1.patch 3838 BLAKE2B 4664bdf8c5ec0f40389f9773043cec0821b5a6e031f7d5cd6be7cd5195f45e9bb5fff5ed9da1d01ca5b510601be8054763236f65b180891b65db8b7ffa68ff0a SHA512 361d52bb966a8dfaa3592d8ca2f0e7083030b81b1ed84667d5bb1c68671a810802e2d4e77808fa9d44e45a04f74998cc6c6ac5182a169f175adc328636073418
 AUX ipmitool-1.8.9-ipmievd.confd 518 BLAKE2B 98d9a8e5de576242e81aa7dbfcfde7063b25448c5a50780d4e70410c1fba4adcca81abfcd48ea1a5cf5a55006c59678bc112bb86422571b82a0fb8c517f3292f SHA512 6253f218b22fc98768d3a26aec60da8b80229f3f4e2137cf6b34cefb465a420400e451fb07e6f3f626d88904644e4e2bddd280e01bf6d6cacd06cf6b59f20fe4
 AUX ipmitool-1.8.9-ipmievd.initd 584 BLAKE2B 6632466d88006f6623ae81722b2f2726ede5b99141f794829c1cff5808bbb2851e29858beb96b40061de019be08f8179d90f8008b74221cd058a34586b3f5680 SHA512 5d42774486a0edaf1dcece16fbad0cca531a91559ba8dd4259f05787e1964fbfec4d11c9427dbe8cb46ba0cc1a447120bfa82254aac4850d9acc632834daa669
-DIST ipmitool-1.8.14.tar.gz 917886 BLAKE2B 6b6753f1320f38f6dc302607113d586ef42176b50ec5b71415b7d8c00f7363bee137103058653e081dec0cd686e88a832bef653874e5e13b00b21ab3c03a7db2 SHA512 1376a0d4209e4622f9b0e27d3f3d67d552be936ded92e4e894d2b04871717a585075b54bbb9b91d62b58483ee9b94b5c64e2ecdfcef3c3f818fa6f035fb34216
 DIST ipmitool-1.8.17.tar.gz 976189 BLAKE2B 62ca530b2a9fdc0e8071d02b7f903530f223bdf07d75278eb9dafeb167b9ec347b0fbf199e2e7cf8f258463abfc8887c8b9b4df80509758ae8588ca73bbaf68a SHA512 929cf0087d3d712caf845eb62771aa96d034c2222170850b0d8bfdbb41d0b0aee05c14aa48e82368f4494606781c6639ada348fd086907c21b817d95dd36a3f6
 DIST ipmitool-1.8.18.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d70f22fd17f11ba6147595b07ef52059ac8ab6775afa0ad956355eefbf3e2b0300cf87bb373d2f82b585de807412d SHA512 274d424fff079f7628c0f9fe06580937cb9717c809a71b2f5ef97266c6b6c89983b662fbb1f090e2f94861f1799677c8fc6536013828a8a5e6cb239af53e45ab
-DIST ipmitool_1.8.14-4.debian.tar.xz 16452 BLAKE2B a0a036a6ee6c2c7c450fe5400892db66b2525b895277dfdff633877306257ac7f6a684a39eb3f50ab46d7239d61612e29742e70ec924eb28b76d2e8408d49df5 SHA512 f7b464d9167e2c92b9536fee1e0cb66da11f6cdc6f86d7adb3ad5c239f3c1850663ddfd9571561502904daff52b3a57b633c389de697da42e7bfafe8c67a60a9
 DIST ipmitool_1.8.17-1.debian.tar.xz 18252 BLAKE2B 6219d81b6b54354e8e412850fc1ee673e2dead153076d55c67fad0518e7230642934a52ba0abea29d8b1f47eb7beef10cbe25a7b8a4df158d4b44b1f1e229f4d SHA512 e1133262020e8fabe47e7aa308956078bc9fb3bb7033413230f1cf76aca1d4733bac64e52039365f24fe54a1bf8e271071bdaa1722720fca62f1c9e8888777a8
 DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef
-EBUILD ipmitool-1.8.14-r1.ebuild 2436 BLAKE2B 2829543abb0f54aac58f754f8e9de2268c5d100509b53bf86b40aadbe5f8e5d43286a0fe477f1a30b9b7c65c7c79265a08b304f134298923d01b1cf57777d2c1 SHA512 ef4b9f236a6426482b3133d32dcdb31beb1ae7a32e0abc867c91e1509069186e9c35b62c764939b063fea7e27818568f6f30e72f4b10416660c708de2f8930df
 EBUILD ipmitool-1.8.17-r1.ebuild 2443 BLAKE2B 4204805a6f363de5f658168821d8293b20ec61f68447c31c3448c28701e6246bc0cff63a78acbe655bb0ae529a637dda89b917b2f9a949ed43630f248990c97c SHA512 8824e25c00e9b9406fddec2caa638fabbcc1a1d8207a7784e2b6bf7d8c59bc6a668edeaf199a3a347d4be2e046b4efc5ab5198c242fdf9395ee825d6e2df8f2d
-EBUILD ipmitool-1.8.18-r1.ebuild 2518 BLAKE2B e06321a6e8321ceba81c3cfb82b451b507518f8412d97814d2970b33ea899fb91586736a398b4f98041a419f70125b66cb80061a62a6ead01b5274244c01e7e4 SHA512 e3be9bbc0426f973fa1efad262791066ef369b742b7e135be2cbeded53b71ca318bf561dc19566be8494d6099bfeab136d943a13cc764e07d60bef0af9f282f2
+EBUILD ipmitool-1.8.18-r1.ebuild 2569 BLAKE2B 58352bf57941a9044b897f57802b7e565f284842783d3225a5cce0a4d0a282420cc847a7f1e06e97c73aa426063d106281b8b98cf7e131cce0e920419b8fce56 SHA512 adea900dc23c6fafcfe12b9de5029a4a596a0295291da439cf045a07c421cb98b520616fb87ed0da6641840cc32866acaf900f862f4875a60c46bdca93ac2ef8
 MISC metadata.xml 570 BLAKE2B 2211290e4ac3a12d1a05528925d3c69534073c2624023244ed263aa312de28e5cfd76ff284870777508fd6818fcde18f9d740f9499cc5819078aaa84f46fd07a SHA512 16820cee9cff78b0137cbfcd179cdf78a503c583e8ca3e2ebf13094e21419770eb94205371b61c74c2e75f351d95ed74e6eaf060d748554c6602552ffa9151b8
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-openssl-1.1.patch b/sys-apps/ipmitool/files/ipmitool-1.8.18-openssl-1.1.patch
new file mode 100644
index 000000000000..9e5a876f00a3
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.18-openssl-1.1.patch
@@ -0,0 +1,145 @@
+Taken from various upstream commits:
+
+https://github.com/ipmitool/ipmitool/commit/b57487e360916ab3eaa50aa6d021c73b6337a4a0
+https://github.com/ipmitool/ipmitool/commit/77fe5635037ebaf411cae46cf5045ca819b5c145
+https://github.com/ipmitool/ipmitool/commit/f004b4b7197fc83e7d47ec8cbcaefffa9a922717
+https://github.com/ipmitool/ipmitool/commit/f004b4b7197fc83e7d47ec8cbcaefffa9a922717
+
+--- ipmitool-1.8.18/src/plugins/lanplus/lanplus_crypt_impl.c
++++ ipmitool-1.8.18/src/plugins/lanplus/lanplus_crypt_impl.c
+@@ -164,11 +164,7 @@
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+-	
++	EVP_CIPHER_CTX *ctx = NULL;
+ 
+ 	*bytes_written = 0;
+ 
+@@ -182,6 +178,14 @@
+ 		printbuf(input, input_length, "encrypting this data");
+ 	}
+ 
++	ctx = EVP_CIPHER_CTX_new();
++	if (ctx == NULL) {
++		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
++		return;
++	}
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 	/*
+ 	 * The default implementation adds a whole block of padding if the input
+@@ -191,28 +195,28 @@
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+-		return;
+ 	}
+ 	else
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
++			/* Error */
+ 			*bytes_written = 0;
+-			return; /* Error */
+ 		}
+ 		else
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
+ 		}
+ 	}
++	/* performs cleanup and free */
++	EVP_CIPHER_CTX_free(ctx);
+ }
+ 
+ 
+@@ -239,11 +243,7 @@
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+-
++	EVP_CIPHER_CTX *ctx = NULL;
+ 
+ 	if (verbose >= 5)
+ 	{
+@@ -252,12 +252,20 @@
+ 		printbuf(input, input_length, "decrypting this data");
+ 	}
+ 
+-
+ 	*bytes_written = 0;
+ 
+ 	if (input_length == 0)
+ 		return;
+ 
++	ctx = EVP_CIPHER_CTX_new();
++	if (ctx == NULL) {
++		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
++		return;
++	}
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
++
+ 	/*
+ 	 * The default implementation adds a whole block of padding if the input
+ 	 * data is perfectly aligned.  We would like to keep that from happening.
+@@ -266,33 +274,33 @@
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+ 		*bytes_written = 0;
+-		return;
+ 	}
+ 	else
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
++			/* Error */
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+ 			lprintf(LOG_DEBUG, "the ERR error %s", buffer);
+ 			lprintf(LOG_DEBUG, "ERROR: decrypt final failed");
+ 			*bytes_written = 0;
+-			return; /* Error */
+ 		}
+ 		else
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
+ 		}
+ 	}
++	/* performs cleanup and free */
++	EVP_CIPHER_CTX_free(ctx);
+ 
+ 	if (verbose >= 5)
+ 	{
diff --git a/sys-apps/ipmitool/ipmitool-1.8.14-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.14-r1.ebuild
deleted file mode 100644
index fa7af5d6aa1f..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.14-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Utility for controlling IPMI enabled devices."
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="4.debian"
-DEBIAN_P="${P/-/_}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz"
-#IUSE="freeipmi openipmi status"
-IUSE="openipmi static"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc x86"
-LICENSE="BSD"
-
-RDEPEND="dev-libs/openssl
-	sys-libs/readline"
-DEPEND="${RDEPEND}
-		openipmi? ( sys-libs/openipmi )
-		virtual/os-headers"
-		#freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-src_prepare() {
-	[ -d "${S}"/debian ] && mv "${S}"/debian{,.package}
-	ln -s "${WORKDIR}"/debian "${S}"
-	for p in $(cat debian/patches/series) ; do
-		epatch debian/patches/$p
-	done
-}
-
-src_configure() {
-	# - LIPMI and BMC are the Solaris libs
-	# - OpenIPMI is unconditionally enabled in the configure as there is compat
-	# code that is used if the library itself is not available
-	# FreeIPMI does build now, but is disabled until the other arches keyword it
-	#	`use_enable freeipmi intf-free` \
-	# --enable-ipmievd is now unconditional
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--enable-intf-lanplus \
-		--enable-intf-open \
-		--enable-intf-serial \
-		--disable-intf-bmc \
-		--disable-intf-dummy \
-		--disable-intf-free \
-		--disable-intf-imb \
-		--disable-intf-lipmi \
-		--disable-internal-md5 \
-		--with-kerneldir=/usr --bindir=/usr/sbin \
-		|| die "econf failed"
-	# Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
-	# include the below file to define some things.
-	echo "#include <asm/byteorder.h>" >>config.h
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PACKAGE="${PF}" install || die "emake install failed"
-
-	into /usr
-	dosbin contrib/bmclanconf
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-
-	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
-	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
-	# TODO: init script for contrib/bmc-snmp-proxy
-	# TODO: contrib/exchange-bmc-os-info
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
index 62f5859016f1..6c26d8e0980c 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18-r1.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
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 # ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
 # but it doesn't actually need either.
 
+PATCHES=(
+	"${FILESDIR}"/${P}-openssl-1.1.patch
+)
+
 src_prepare() {
 	default
 	[ -d "${S}"/debian ] && mv "${S}"/debian{,.package}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 43834cc14012..654684e32033 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -15,6 +15,7 @@ DIST iproute2-4.13.0.tar.xz 670340 BLAKE2B 379072c0865e8960b46065454e9bdf3a9cb7a
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b SHA512 bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc
 DIST iproute2-4.16.0.tar.xz 661336 BLAKE2B 4efb08c88a60b1bbbeef807c0731e610032bfb11d022562c1df052d324eb43cb25b9523f49730d22a3f92eb06bd5037c70d8ed0b58276a0cf0854a0f82800b64 SHA512 a8fbc92665a8d4ca6ee1e894bfb27373cf6b16dac9e2ab3831e418fcc9b895acc7d6fc64efa0b0e37b3affd4ef8eacf4dae5715536138d6a05c65ad49a2becad
+DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
 DIST iproute2-4.5.0.tar.xz 554500 BLAKE2B b64933bd0bf572796705ce2559b1c6cf7faf2f9ac11e1a94a09a428b0039216df8b2ce72a9783e84825a12baaa08526f724d385c6c7e5f6a0d86c3d1662ab822 SHA512 d12be24cf7a1102be8e449d1e95fa67b784d505e98fcf2f18caedf0136fb378dc439f74a75bc0d6ef5b2893e5ca1968e122054404c1f4d1a212aeb0fba1c5860
 DIST iproute2-4.6.0.tar.xz 570960 BLAKE2B e49dc56615490aa7d7cec20830b2866c3e00b08a25ab92bf94d30cc1d7e60e5f10982aa379502a0e5279748c9504e67603f0b947376b6d2991838516b55ef4c9 SHA512 1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f
@@ -29,7 +30,7 @@ EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2
 EBUILD iproute2-4.14.1-r4.ebuild 4275 BLAKE2B d8d6a43be5eb593ab7107bff4126cda9f41fff88ccb72fd4d3aee7464457739732b2e3a161114302f7e1d9ff18a5b3c7d73a92ed523254ff4857584bc2baa109 SHA512 ae5db8ad15d20df0ec18e2703d43be081189366f535ff700d83da449eed8c120df869a6d2873e817e07bd2920eea46387bda0866ccce0b48d0e7a71e8faa8752
 EBUILD iproute2-4.15.0.ebuild 4214 BLAKE2B 391db4082541f9f23fef2386194590da5dec77a8dfcaf43b0335d0e6a7ae6417a8515ec206ad8557660c33ff7a31ff6b14dff303d6499a5c3576516a870cd6c4 SHA512 a04301fe1dba7903c6043612e5321bd6b231b7913d67973a80abfa228156c9919c8b959248d4f092776603877fc3661001b529f8ca032a0a996ac93425139d75
 EBUILD iproute2-4.16.0-r1.ebuild 4265 BLAKE2B cd5455979f5ef67dd6b91af2b78d421a03acaa3bcbd08d3a60c84e05d9ec1499efc54919aafc2e620cfc9b4658e3f609ab7eb501f85f8d977e86571ca4ef4bee SHA512 72adb54a708c5a69e6d29c13b20a0da1c63a4b3d7a2402ae55fc5ca072f752101440862dcf14c16f26fa99a8cd9c5239044284253daf07099633a84ebaa38ae7
-EBUILD iproute2-4.16.0.ebuild 4214 BLAKE2B 4c6a9d68cb27d3b41e8da00e1fc25c083c5277706186414d407c9000b4343dfaad8913ee640e9060b1e9acda5ed43fa642631ab3b2bf8c3a956ed1ae68cebd0f SHA512 30839985403cbda2401bccfb822d394590508836e0e780bf321f64235f372819225afbbd4dcf4ec3d05992435408ebcaba401bb7c7f2872f5e474bb2b3566f5b
+EBUILD iproute2-4.17.0.ebuild 4214 BLAKE2B 4c6a9d68cb27d3b41e8da00e1fc25c083c5277706186414d407c9000b4343dfaad8913ee640e9060b1e9acda5ed43fa642631ab3b2bf8c3a956ed1ae68cebd0f SHA512 30839985403cbda2401bccfb822d394590508836e0e780bf321f64235f372819225afbbd4dcf4ec3d05992435408ebcaba401bb7c7f2872f5e474bb2b3566f5b
 EBUILD iproute2-4.4.0.ebuild 3883 BLAKE2B 40d441c04e746f197263fa22f5b7bdd3302daa94896103311773feae8c68b193ee9d8c46659aaced6525f1af1bde444f1c6963e4807c7123f795fee530dccd1b SHA512 a751a4d91b63dea7cf43ec0532bffb795291d7ec9c04f762691e4e6cad9e47ce24895f315cc3ccfc11c30cfee94e66f855c477c3f95850f7c546dfd6675ad9eb
 EBUILD iproute2-4.5.0.ebuild 3896 BLAKE2B 62738f5a8439d8c49f87bfd3bdcdb4601b02afecafc31da35051bb1f01ffd718a6b76a988fefc72c44a539208402049547b832124a35c4fa294a345e091f1ae3 SHA512 558ed555bd666879f6657fa3a7d00af632a3d65be1200bcb8667e59f1138bcf08e6078cbe5ce090ce19d2782874f0a828fc1e058478e64c610a8bc9d661262de
 EBUILD iproute2-4.6.0.ebuild 4006 BLAKE2B f3cb914997a4a7ffd2f28757a694666aff565665e93b6893d572b6d683d2b890606df003eba7f6ac0e49be64e95b6ec8202ed3ad161771e81e5ccfe0ab8bfa29 SHA512 d542905bccd4927d55d72bca8622e455527ef8866d4ba33844d595b1e40d7412ff90c09f362744e86657edab1231ec4d55d037a6dd5ce35109f2b536b23f2674
diff --git a/sys-apps/iproute2/iproute2-4.16.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
index 7d284f1e5446..7d284f1e5446 100644
--- a/sys-apps/iproute2/iproute2-4.16.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.0.ebuild
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index f476bfd0fb5e..a83341f3433b 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -7,7 +7,7 @@ AUX memtest86+-2.01-hardcoded_cc.patch 1209 BLAKE2B f948d50e940b3f6e5b311187e748
 AUX memtest86+-4.00-hardcoded_cc.patch 1217 BLAKE2B 08575ef86b9c838da59d9cef6064165351717d52f23cf0c4d8b7e5706aae31b6ea686c799598135480c88af154078eb37eb90e3994e0ead3488b18e56f21a30e SHA512 d362b4f57209d6437c48f079b5820449badd88ee5efee3e83417cdfdf249804d17ccea6cb5ac7b4047e95466bbb50ad1c6725b3d0e51845ea3a32309965ac1a8
 AUX memtest86+-4.20-hardcoded_cc.patch 1222 BLAKE2B 603879ad2f1a6dc7bd2d603c59fa60f924d651cae9d5d6ec8083811f300945014eb6fade69f834fef42b071954bfbcb175303b971a70e5f253a9febb15680ef0 SHA512 ae15a6505af65ed176464f30f3beeb78a62799fb4f945e2003598fdbfcf54b75cd859afd868e9a1e9e4cab729411f072bf0a40bd296b9d770f6de140de14c7f1
 AUX memtest86+-5.01-gcc-473.patch 1308 BLAKE2B 7796745ddc5a11ea14958d762201873e7d8ab645aaee9c96804c6f0e94bb8b341a4db2d1434ad9b7365f486c097b8ab4cdcaff01114344abd5a288c456fba722 SHA512 94427ae0b78c9e24a8f4db6285a04ec468d17b6b4bb26550abb006a9fa37b52c871cb4cfb0fb2489e373b0ea9748106938f7fb4ad0f31968e151e37294199a55
-AUX memtest86+-5.01-hardcoded_cc.patch 484 BLAKE2B e0bab7d26559366a1648b9799c16608122cb425b21c986d4f10d99d861eec5e6453241c806ffa3de5ad321bfbfdff248600f081af9469af41f125d4f940ea3bb SHA512 a7008dcc1136283cdfc0dd5e17b0c4c5816d2799d50fa7c63e14b258f0ce34031ec782e199b826a0cc909464ab1f5aaf651ede6681ddac7d5ca416b8412106be
+AUX memtest86+-5.01-hardcoded_cc.patch 488 BLAKE2B ad978b2c1a15dfefc1f56953be62d7943953351b3c291a392cffecaca2757e4aba46961570077761fa2796a81b4d1d5b8341527245fe9beb52f9c135efe7c713 SHA512 ccd348f253aece4530051c54f94d1ca3185cdf98df928807fed5ab6be8632828d53049b3829a6f147103ed05a5a482a8e273cec17bd1d539d06cb56a3fa53721
 AUX memtest86+-5.01-io-extern-inline.patch 1183 BLAKE2B 2d86cec1bca2fd3f1f71fd0a1a704447e356d77aa0e84ed7da199daaeea89d3abe7cae3b222a99d8f36f45846a8a779f3955cba6a59d64cc103908916b5edcb9 SHA512 c307d268d2e3fc0c4517f627eea0c53679cb6f76cba06bb822beb2b6121e0ce0bdbe59539ff5fe716f0fd0083fa987d8a44d2999b888ccc05f8d3d9d693ded0b
 AUX memtest86+-5.01-no-C-headers.patch 1078 BLAKE2B 6e0fdb66ed5f411e73f8d6908edb7ef561427c735d3fc4416dd1ae47c41ae73e93c123827b078f4d6070eecd98ecb177d6eaae0b11b6e380c4020c68ae711c33 SHA512 8720da16f03e7ea511b1b26ff19f105737e698f9604cd87256b5a3703a7347b0334c1e0ec9ef3b7aafa2a8bca1de6d6deeb865a1de343cc5c3ccd13663fa796e
 AUX memtest86+-5.01-no-clean.patch 603 BLAKE2B cb00ec1f702c7fd1697c48599ba7113bc0e9b72be6ef810f6e2e212587b39fb8563f5b3abc8f0cb82197d3a4d790e5df22c5bab5a77215645c8b41d327471541 SHA512 39b86324428be68192f66a767d33b53e15cffb0f96857dfb4b0e96f0ba2e52953cfd2079a6891a31e73d529e33632122c40e03f227d2203a6ff25dc03f23a056
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
index f140a7fc6605..21b51c5b7fff 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-02-01 01:08:33.000000000 +0300
-+++ Makefile	2015-02-01 01:10:17.624757244 +0300
+--- a/Makefile.orig	2015-02-01 01:08:33.000000000 +0300
++++ b/Makefile	2015-02-01 01:10:17.624757244 +0300
 @@ -9,11 +9,10 @@
  #
  FDISK=/dev/fd0
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 62502eb9e431..7671d57f5992 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -4,8 +4,10 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
 DIST openrc-0.36.tar.gz 240179 BLAKE2B 1361d22782d6063e7fce61a98ef1e1f754d0208ec58de02ae60a0950531d248ac6e65e1ed45b412c89288103f6848b24aa51dd66232aa46e7900b339cac21a57 SHA512 f4730489e595a9ac4477c2b410e034b4eea2b8111c12c2695916aa04102020f8c84cb24220d3aa552709898035aa196e2fd48cba9b12a71dff1f5c2b03c3d424
+DIST openrc-0.37.tar.gz 240928 BLAKE2B b802260a3bd71e6d8e6d54b21007024481d42a4f179eff824a39fb91f5b1cd4f7a2fd52d9e7f23b1077965b57d319a99a5b39b8cd2d7f66dfe272b4497d53a22 SHA512 16235774ad28a66308dd1ea00238b4025a4d26c9c0bb6cdb032f28d00479520c4c5fdb349f82d33a535eee3d491d0349b5871b15cae30ef296ec476883965b83
 EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
 EBUILD openrc-0.35.5.ebuild 10049 BLAKE2B 20a347eb789266d9462c49509ba62b26963a982a4f586a91ff073cafdf4b0dbacaab9bcbe47a36a86b33228c34adc9117a42a9e4f4f2aa0226993e0b50da05b1 SHA512 8a54f2c6c96766d03d69a0460635fb29f064edda9a96baa27b9057f2e7406f87f397001169148fb874df0555826589c4aa23d5f78d58df1861872ce8762548e9
 EBUILD openrc-0.36.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
+EBUILD openrc-0.37.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
 EBUILD openrc-9999.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.37.ebuild b/sys-apps/openrc/openrc-0.37.ebuild
new file mode 100644
index 000000000000..18aa6cade207
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.37.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	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 ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index e4f44574d294..e9b48acc2981 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -3,6 +3,6 @@ AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab1
 AUX pcscd-init.7 408 BLAKE2B 15ba28f80cc0f44598a553bced62bf8972b698bf8c02a715531ffbb0724915004e47e2779fefa6349adccfdc7d32e8880f8d6d82ea98178e8556b9453c31019d SHA512 e4dac959dbea3d418a3e4012788a3cc7b8aeea295f56f1c3e2f0a599cf469d302f3eaadf05cd0b3c7929a583f8d0b6756177ebe2c497c404b70e9aed7fb7d003
 DIST pcsc-lite-1.8.22.tar.bz2 751724 BLAKE2B d11ca9588449ea8508550b60aad2d2bb6a140c02a86287f6d972ced97fdc8a5db80d542624cbaebdda564192217186c79c30b046cb7d6f6c7a450d91c0f1c9fb SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025
 DIST pcsc-lite-1.8.23.tar.bz2 749922 BLAKE2B 62c7fb931735bf5fba55e75141a3e4216a126c56ae47833168b154abacd3294dba4afc47b74814a474ca9e52c7ca62a532a0e6ae9fb88b635592e8c545f68e76 SHA512 fef9f40376660bc9de938608cfdbf12ca764be1ebb59c7a1065cb74a21ecc7333f86add25028bd47ec55b2227a9e2d15e1afcb6d0aeb510636d2aadef254bec4
-EBUILD pcsc-lite-1.8.22.ebuild 3113 BLAKE2B f99ef19bef77a212ad46e425088864391764a7ba9203353a4db1547fa67c1dd08784de841f62ea3da7b902b3f3a344996656caf182bcadc0bb2b699fd14c8af0 SHA512 1901510e684d820c94c685306921d82c5e8c7c69c87ee7626e89aefbcdf15057cb26ad28ca218a1dbb9bded85cdb9aed12662ad95042fa37ab0ee71150027439
+EBUILD pcsc-lite-1.8.22.ebuild 3112 BLAKE2B c1d106f3b4f16ced53101f297682baff29474e2eccb04bce34c7b11b094696f0899dae6fee3de59f5ffc61f2900cd25f41719a7393a03aaa741a86b8e36e6ab5 SHA512 e34b879d3e806c22d3d337cfbd100063f2464f127edba5afc312787ffdb58db16d6e54f637ef550335190f1b33781bf4daa01c87a2c34ff924745741169e445c
 EBUILD pcsc-lite-1.8.23.ebuild 3183 BLAKE2B 24e0c7ed8e3c16a54b4e31d63c8a1c4484a63dd98dc946491e50f6d3a99a750197e3e501407dec5e3e36392ce6c53b834ae0b5f3bc2f3ad26b5a09b9a3a70f6e SHA512 786f364687a8968f72f4e24c138e8431fef52b5519ab1b633a9d0e7319590c3f176338eeddabb4feb49e0bdcdd574ee750be3469fc9730720e038c1d07d140c2
 MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
index e2d647e8c507..4d2ab52863b3 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 999a77df3827..7f923fd26c2c 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -16,5 +16,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2110 BLAKE2B 3e6f928478d0737dc74be8cf08cd182f020b07f99ab878ca1c3aeeb5776c9a494b20a94db8536b15f67320a8f425d07c621361e7664ac40d31b4c648b5024a47 SHA512 e5b7f51fe7ce2914131a6455c7fe9c474b0530532819c81e01861edbeec654d3de08c7c35182596fe75ab1646a8979955e51c958c8ad98f9d9bc78b5d0cc9e5c
+EBUILD ucspi-tcp-0.88-r18.ebuild 2109 BLAKE2B 0a8059efe88e7f3ae8328675642af6594e2515b69df01b2a7295721efa42b6507b455dc04c8e061ba7bc1f0fde016de18884088e3507fedb7f6f4a825ffd9ba2 SHA512 da755a746ccf903099a6c890b4ecc84cd8735e5b8a8996f0347fb1fba17a21e60e406aa680cd2c13919130c7a6328018837f378974e4a30113b36898bea80dbd
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 9a8f270cbd05..4f421968ef5d 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 65626f540787..c0e57ac90163 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -4,4 +4,4 @@ DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a
 EBUILD usbredir-0.7.1_p20170503.ebuild 996 BLAKE2B b743ec7ce7ee9e83f86ebae0ed31745444a4c701d89203390d88d03d18cb33c4ff5d6ff51b64a7dfc1927c1e4ca132f06948296ce9bc3e00c34ddb1682849041 SHA512 da61996a7b818587a554a64ed7b33e0f559aa7276c1661e9553077e2626bdf631e481513cac279e384e74c9ead57bab0fcaf11aca05d633a85f3c4562516a3b8
 EBUILD usbredir-0.7.1_p20180211.ebuild 1010 BLAKE2B 379448555106c33a62086e6bed08935761053e6341b902c4add5b10cdc56c84ce0d55b6fe2f180b39ff25e352f9397561041032e20f2a9d6672828a3c8c91e01 SHA512 ff2d5c0707db228b8a44349b2720982e7d1ac8d3150ad0cf884a3ae924286a566c796e38d6edb9004f2146a56bc188f7844506c43b32e3242f805d2a60ae9673
 EBUILD usbredir-9999.ebuild 847 BLAKE2B 089a31dd3b8628c701d2abbe2e06983c4a2fa493b60bb2faae379a0ec03bf2afdeca8f6787273558ce35bd97b07e3b3602817e8ff061f1b983371d5d4f2c73c2 SHA512 0bc8c6c3c8a04797975bc187c397d3395fc341527cf5e7cd5bd35ee4afcc42f0e76f1432bce8dfc9a45330847c53dd3c9adf97909005adc2a44dcd384a25f2d7
-MISC metadata.xml 361 BLAKE2B 58ee743a25bff089895528495050dbde3fb7acafac2653762d5eca42fb085e644df689eba522d31d2168e703b04e5748b8907d9df88950cd38de523360dc1883 SHA512 3cf32d1610947c8e1fe9acdcce071a5b5d7ac6711c7d81f0c87f31e7e2d07b13a012312f1380e30c54c95f7371963cde9c76052914b6582507ce964621673cd6
+MISC metadata.xml 381 BLAKE2B 63160ad268e74a23031e19d54e171504f751e2337e6dc059215942052518e09e945796ec6522828eee63fc872be396f9f47f85a8b1ad970904f764e7e5a222a7 SHA512 a4363c96453be6c53dff19c47739440d00f03b7994a2c993f9be0608f2a1b7a4ac8e9178a4784a74dd51b97cd0de37cf0aad209041f2b03c65864b2798f9684a
diff --git a/sys-apps/usbredir/metadata.xml b/sys-apps/usbredir/metadata.xml
index 7034c12b3ed5..65b0e68bfe66 100644
--- a/sys-apps/usbredir/metadata.xml
+++ b/sys-apps/usbredir/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <maintainer type="project">
-	<email>qemu@gentoo.org</email>
-	<name>Gentoo QEMU Project</name>
+	<email>virtualization@gentoo.org</email>
+	<name>Gentoo Virtualization Project</name>
 </maintainer>
 </pkgmetadata>