gentoo resync : 30.06.2018

33 files changed, 649 insertions, 146 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7dcb06d8753e..5bb79301d7d4 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bloscpack/Manifest b/app-arch/bloscpack/Manifest
index 274dd6d26cc2..2324230db5d3 100644
--- a/app-arch/bloscpack/Manifest
+++ b/app-arch/bloscpack/Manifest
@@ -1,7 +1,7 @@
 DIST bloscpack-0.11.0.tar.gz 89839 BLAKE2B 466a0290e9ed95f2a77320ead61014b68a3f5869aebb90ea15d3b35e6de7bd1080a0c12521fe56673ee5297509208a7e9cf43604a0045bb16c506799c67d5a0a SHA512 68e6c05a4404fbb2554acc0a5a93500c5fe3eab4d91621ba0ffc290383873509d38fbb5b9c5733640a2cc58bf3c508067a411ba16e563dbd4e485f3036a5ebc7
 DIST bloscpack-0.5.0.tar.gz 45171 BLAKE2B 1f4c2e7dc4acdde4735a59adf8cf874df74802b86e201f84fac51aaa15103d2407dad4e2ab348136d7ef8ac6899f136651305522089a5cd044cc2780280a61d1 SHA512 3a3ab351e9ab77409b8f5774c4ede533e2393bf49065d52cb60018268f448d1cef5ba2b24d0d25ec86298f6ff55bbb9075af3b302558a0e2e7343344b002b8d1
 DIST bloscpack-0.6.0.tar.gz 60571 BLAKE2B 1896cc65b605de1457153fd15075fa6774d74b40294a947dda0707adf2177f5a056d84f43f71bf15bd677a8252e661b622deb6a98a050b38d3a7870d203f9523 SHA512 cd0b6e67d90fb8e320bfd5ddb41ee5d437543826f85931eb4cf3abbcb5eb6bc9581db88c2454b82b333ce2555f18670100f8df018299ce621eccd2e7c9e7d099
-EBUILD bloscpack-0.11.0.ebuild 755 BLAKE2B 6c6591dc405fc31393f80e5d6625ab32c1246fa65e6646db4313afebca3c3d48f3e5370fa0b158c68dc15787eac7c5840693e3c594141d0a2e6d6bb78f26a241 SHA512 27aa34360f4b7b69cd4a41564645b252fc9da305246c6e567678354f97ea61e391c5e2de35051645eda8b46589f8454f931b6d28cf22782928ded04f25b47e74
+EBUILD bloscpack-0.11.0.ebuild 757 BLAKE2B 085f5d5402333ae397fb9f56e9bc4d4d89497bf5e253935fa71e31c3d1e73c3e4cb4ed0501325fda0586cbdf9341e922eea7f9f6c64b613a32a9f56cc325667a SHA512 fa58d066ce1de9541d23aca7a1d5d39706b7ad6c54c500ec646eaa0fd26f69e840709e21dbc12fbe7209ce5bc7114f51fc7bd41f2a29cb95a991282376f9fc47
 EBUILD bloscpack-0.5.0.ebuild 548 BLAKE2B f0796bd61d97176ba70ca3eb9c59bfe11b4820ccd0a33c43163389b067020cea332f799ed8347594a0b1a0d08ceab3b0a7b24a527c6243e9ac8d6dd5a2b20c3c SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e
 EBUILD bloscpack-0.6.0.ebuild 548 BLAKE2B f0796bd61d97176ba70ca3eb9c59bfe11b4820ccd0a33c43163389b067020cea332f799ed8347594a0b1a0d08ceab3b0a7b24a527c6243e9ac8d6dd5a2b20c3c SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e
 MISC metadata.xml 640 BLAKE2B ff3e980929e8a53610569e417c36c263316db560f53accfb4ded08767943145e21932c1efae243fe43641c941ee490ed1beec1bdcd66d2f7d52e398a96ce1d8e SHA512 82a640c36ad2ed771345c93c35da111589b7c57ffb9074e6da062c7ca84ae9fd76f9f5978abeb75362c8145fc1625ca0bb3f9fd8957688e75dfbb5cef6568c4f
diff --git a/app-arch/bloscpack/bloscpack-0.11.0.ebuild b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
index e19782373426..c46a70eca3a1 100644
--- a/app-arch/bloscpack/bloscpack-0.11.0.ebuild
+++ b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index f803d02d2f34..82569652e237 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,9 +2,11 @@ AUX brotli-1.0.2-no-rpath.patch 865 BLAKE2B 2c9720427c9751586b36580be629d3820757
 DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
 DIST brotli-1.0.3.tar.gz 23815300 BLAKE2B 9569267782a8159d290e0f1b524a985144d1ae68a45a732443aca973dd0407c50249ce62389848d97cbc33eba3062ba471064570418c36158b97935ae4b7fb73 SHA512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c
 DIST brotli-1.0.4.tar.gz 23819000 BLAKE2B 5c0a7ed2cb7e15722c2f08dbaaaa5e74f10a03b95961d77db285fac437a489158cf8f7d43a55fac75eb5423951286accf0285e3e3471e34e35868a69dbf42f16 SHA512 7d41ad37ca0755ba9e08e7355fb031e24a53a5f6d44ff827adee6d9712765af02142cb463ef558f92449ce3b73e559cffb52315a329ab702f4c46927f993b616
+DIST brotli-1.0.5.tar.gz 23825684 BLAKE2B b179f75f3e452bdd3fabbd74d9172bc0a00f797e7facf7a9061e5e81c52148297ea7dd8ab9954c3f596f59e2a96cb22ef057c4c02b1bba4ecf10db7b70e0711d SHA512 703cad94c7f250133d2cfe222f3183612c7649b184bba218907b805f423568046d42695f33acf7da95daf684be118c9d631cfa5706e5a195b611c716db4c839a
 EBUILD brotli-1.0.2.ebuild 1440 BLAKE2B 5c9bff9a21dd9aa71846f75615d5d0aaea5ec7ecbfe0b746e3b2acfa366d1a6ce5e0c0bf138371be86281b85162f049ddfad648caeb917b5be53f672c20817dc SHA512 c006f254c8485a49e12ee13d5cfdad25ebe9535446f3f0f335dce5b8ccd887b41d598365796f80f758bc3522677dc6c9e8c2e54f5ce4c9aa10416916a34b9a9b
 EBUILD brotli-1.0.3-r1.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
 EBUILD brotli-1.0.3.ebuild 1398 BLAKE2B 7cce4fc14efb56d134eea51714e12c1dde687a5d57daa2d27a94d39358a26633dfb0a380872bc9a32e32c4d772fa8602eacd5f857c85f4dd5e096c4783b63e93 SHA512 8210643e246c6172946577112adb0bd721f2a4810461db192ec2b2e2bb7ca917b5dde061ce760aedfc7d908a5944ec4dc89ace253adf79b0337b0bb2b0f2cbef
 EBUILD brotli-1.0.4.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
+EBUILD brotli-1.0.5.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
 EBUILD brotli-9999.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.5.ebuild b/app-arch/brotli/brotli-1.0.5.ebuild
new file mode 100644
index 000000000000..e06daa440b9b
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.5.ebuild
@@ -0,0 +1,66 @@
+# 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 cmake-utils distutils-r1 eapi7-ver
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 2000d33333c9..5bc92764178b 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -9,5 +9,5 @@ AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e
 AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 EBUILD bzip2-1.0.6-r8.ebuild 3016 BLAKE2B 1f48f0161c93dabc18beeab6f064b5ec44b901ca474525c3159c7859cafe3fd6207bafeb7254e763c5a9261f9d4b59271af564771d9201c00ecc408928154388 SHA512 b969bde987920cd44a90c4b89efc90f35f71c988852e0c623c38b461d8ec5ab9e969963aaf7b2177e5dad1fa4d0e0da7c61092527a5aebf2a6d17d5d6949bc85
-EBUILD bzip2-1.0.6-r9.ebuild 3053 BLAKE2B babdf40663b57d837da73eaeec42144711438c7694aab858a82c50413e8870b74f1a251faa9498c77d17d9b90480af90be1f26e4038e6fc2ef9e79471ddf9480 SHA512 051c7fbdec793da7a6efa730d61ec612a857902bffe46cd4bda4298d1452c48d94fec01756bdc415d920577038d1f4f1e72a353c0ec538aa4170556a6df4c98b
+EBUILD bzip2-1.0.6-r9.ebuild 3050 BLAKE2B fae48013f5b10e6dc5601cae339ee1f5fc9e23432eb4a007e2d14558443992a0df3bf24b575597d00e1caac6d2463b1bbb61c84f70888dbe7258794f30610a6e SHA512 04a09cb18999d5b6cc5736ca51ebc74acf4f146a804990aad92540b0be42edf88098e4cb2f405d5b6803064f44b5febfd1a8b66829f6e26941287d2fed9451d8
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index b31d059865f4..5200b0c3413e 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 4a95c047aaae..3b67db47ba0a 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,5 +1,5 @@
 DIST gcab-0.7.tar.xz 332248 BLAKE2B ef9c03b86c0e73b94286ff30dcc41c031a91dad0b124b601adda3ccaf5ae5924c4ea4408dcc52960b641e799e1c31e8ae882a205a3707c7a5dfa796036a00dbf SHA512 db8c0b4ee2bc75b8bb540b4fe0e9304782b9848b3ab0ba3077638d13cdec652f6178206ec6474af036fba90e952ef0052dd9d19be9eb72bae97d98f8f18a0c02
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 EBUILD gcab-0.7.ebuild 941 BLAKE2B c84ecf6ad2a57bf19225046f239d0c185b80325476f6f55e68182bad2bd2b5f07c59ce0df83d959ff569da40fd5850b0d09375d6f082a88760794f79c4e6bb76 SHA512 e7cd50ae66c96e9d671ea9fe72074c7b0d0031efaa2819ec6629079de12abde02e12e13117f22d728cf642e653a5a4be974173fdff599c3aa7eb75442c32e729
-EBUILD gcab-0.8.ebuild 926 BLAKE2B 7467dec1b6fdb52b165008b10e4a2ac239c3bc28ce784552bc29d8b6dced65c2fbc9a818472946f2b540af291892574b25aa4250985f8dfd75ddf692c1239ec7 SHA512 da9e26b3146c2b46051ffedf0753b90b1a39276cc93ba51b3de8a2ecd16698564f878daceef2c30d7bd1d07163ae4092348b36fe890f5c891cd1ce8df7f6bbbb
+EBUILD gcab-0.8.ebuild 925 BLAKE2B ad3ddff0f2f53775305347a17622ff4f2375a2453903b4b908bf1b513f5436521b4f7e0cc7eeca81263a5e6e51e21a5ce27f38a361f20c5125bdaf0f66f17880 SHA512 d2b401d6597417b7e8b0beb93cfb72111add5abd8eed8333592e2889b8c9c34020de3add4622e6c9f0902f7279e1fb536fbec7133fab4dcd99347bbc962e1270
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
index 77ff088306e0..b7d1e756bed8 100644
--- a/app-arch/gcab/gcab-0.8.ebuild
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index 8cbeee0bae73..0ef0058d4867 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -6,6 +6,6 @@ DIST innoextract-1.6.tar.gz 183380 BLAKE2B 581c0e28ececbabc8785f50472f312bc39c62
 DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4
 EBUILD innoextract-1.4.ebuild 1757 BLAKE2B c06338ed2fa73dedfc4951b1a4d9bdbc79355607bcbb66c096031ea93213b9ad0b4b98044fd569a41ca5efe7fa75ee374cbed3ce6c04e04663aa807114a21ea7 SHA512 3ce6e89741ba21d99ae51b5af825f4792f75bff55bf3e44392ec1cf9ffb1e83e7c5a588efde0e87b7aff72e1d5e0b96fd4779da66884dd46f42288229e0dbc05
 EBUILD innoextract-1.5.ebuild 812 BLAKE2B 4d1d78f6410035084dff4ce7f998cd783555ff4424ef9378fc418b3cc44d0220c69ca2a983656146d2a22ba2ee613ba12b038a9bab2d6c629b8f410d4c795c29 SHA512 6ca3e1d8b725d9f67b49f7b9c7556052aff007a7dcd25219d161b87b017b74c11700a4c3761c240db679c8ae8d73d23aee786b128f2707e74a350b6c93b3d244
-EBUILD innoextract-1.6.ebuild 750 BLAKE2B a3d978b881da07d4f422802e671f3162a8c8271e2ac720754879bddaaffb7b897dc3c14d6a9e16da0cd819df8a6b2249472c1c5842f041cea809fa4a7cc8254b SHA512 f90674017b6f234c44f63a132df255537d8dc04b656e99f70d07e7e71d07e7fb914587226ddd8263bf625a58210e03853707a408ac09a908dc9c123f224072c9
+EBUILD innoextract-1.6.ebuild 749 BLAKE2B 4b959791b3ed667c0d017f209fd7b0e65d088ab7ca880e9aedc802a3e9cbe44a7b232823578578d540eb23a937a8f2c19465c1036154800d5fb5ac97db5328b2 SHA512 991a70217b350cd81ca3b026425ede051213c804f4032b4ea1b0fe3ad05e9273d705f7d55b3154fe856de2ff56f529e148ce7931215b80fac8299976aa7e37bb
 EBUILD innoextract-1.7.ebuild 733 BLAKE2B f118d601e3de781b5d0a7c881057366776bd62630bdc456c44e55e1537b7a59da58f0e50af6e2097bf99ec65065043308255fe69139d473ae1ad9dcc49c24b4d SHA512 6bad9d6afa092d21a3bc29e89adc6f81046103501e90e0a45999aa9339c59e770c89bb500096b4204bc15f0c84d29d5dc7b985c79fe37b49c6fb73f764afb724
 MISC metadata.xml 1001 BLAKE2B f353f5588ff40c34f0bc3a8a6eb4b11505aa677ce6a7198826d3acd8e98b07014aeec33c7de1fcc4a14434bcc6f2f4f53cefcbf9f5c52702bd0b689ee2efd4f4 SHA512 34d8f877efcbe9ef7a3515feac72984a9fc90770bd3ec170b0e8ecf38d42efb809c03f35a18d58de48b4fe09fb776f57e8336ef359e45942db903466de93185c
diff --git a/app-arch/innoextract/innoextract-1.6.ebuild b/app-arch/innoextract/innoextract-1.6.ebuild
index 29e0e3b7e89e..509f67a4b24c 100644
--- a/app-arch/innoextract/innoextract-1.6.ebuild
+++ b/app-arch/innoextract/innoextract-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +iconv +lzma"
 
 RDEPEND="
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 0012ecf1701a..a71577786344 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -2,6 +2,6 @@ AUX libarchive-3.3.1-libressl.patch 1069 BLAKE2B 0fb6c7c3d85b620387e76e6e2fb7b78
 AUX libarchive-3.3.2-libressl.patch 1105 BLAKE2B 9b62a5b4029b8c0fd97d4c5012fac9a7dd25655e3b0d8adbcb839f05c1999eb77b902ef476841af8eb8b9de76ce9bad893d065084121434f06717d5f4db93b29 SHA512 ffcc66414f72ee2262544f4d59ca2d0b83ba2eca4f58261ec4694f5cd5d5d7975d9626a1f9ad8a1047d3e656d4dc98dd28d991ef3e6311959d8bf797ad6bc936
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
-EBUILD libarchive-3.3.1.ebuild 3422 BLAKE2B a22e236feb74e439b4eedab79813daebda1e39515ef943d5d34d2b20175fd1c443cfab11ff48f0bfcfadd3563297dbe4209e85b9a236cf753f8bfe8f037f2928 SHA512 a0a518a04f80992d5be71f637e90fda490444f0830d05621a914b78fda80fe7f17a9673c6059476394c5089bb79abc75e6d0cb92f6706bd0f0985bee74fbae3d
+EBUILD libarchive-3.3.1.ebuild 3421 BLAKE2B 58a7875a34993cd05f6c3dd944dbd984f659931fc41a088a718c5d5f0237a7494295ad7e48aeef783905a61ea3c3c55e2617bed6994cdf3f97aa73e1306f2261 SHA512 45dcf64451b3325ab3a99a37d5e3fa23222fcc681a1e12ae9104ffc86544298b91b282328615af2da832d79d6680484ff81c1de2bec9868ef47b27864c006a67
 EBUILD libarchive-3.3.2.ebuild 3492 BLAKE2B 62da4fbace1866bb6949a0b3d611a2a5b8375c734a650ecc05229014e58290d2c4b9182b8fb573de040823bc8ab9547d2c5983c7f60099de70470187e1bd27f0 SHA512 8a2ec5bf5324f73df45481fcba3a3f20a730ec96e7db2dedd1479156ea9524d78af1105893f9b3c65e1f0d9debe6e8139d984f18b355e7c86288b0a73098f68e
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
index 7df8e69150bd..23c5543689d1 100644
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~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="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
 
 RDEPEND="
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index aadfc30a5cb2..a92a9bfcab90 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,5 +1,5 @@
 DIST lzip-1.18.tar.gz 95569 BLAKE2B e6cf5babeb8c95c42761227759fae4f383d9534206275204439a67ad1974d2fe5edfb33eb7d3cbb4030cda3ef9db982147d877a0425aaa6cdf736dd8d3f7d2ac SHA512 cf24756bd657ef48f48304be94bf5c6c18baf7dc4fce276e79c3abeab4c4f801e901ccfb12841fa4b2402e687aeb95f2e537695442f53c45f7cb9081c3062674
 DIST lzip-1.20.tar.gz 103426 BLAKE2B 1d72b2132e9ceb67339a10bfdb728be2e5057df571306c698fb06b97c8fc310ce6cceca1a9fd6470fe34f4f6c3b63ee28d791d293418ffe302c84219cb92d35d SHA512 0349b4c6c0b41e601b7ee381c3254d741397beb3ef9354c08162f346f131f4f48f6613ee0a610cdc6d827530df634f884ecfeee35215b10045a40fee76f8e938
 EBUILD lzip-1.18.ebuild 864 BLAKE2B 893170d6440606f9c9310970b10ba86dc41b86c6ea749e4d81deb65a272ae5685e2f3c80756b153424d4c138e5c5f317fa5a7d9f58e987c49a72d30b80909eaa SHA512 c8e2bf28b978df131b36a4249937f6f2d105e30629bde8cae4e6d8d478b3db45bab5209701284f8b248af06a977f0537d26a08216f131d775428eb38fc33162b
-EBUILD lzip-1.20.ebuild 868 BLAKE2B 1a295f94e682dba062313e5558779a9d2ddee9960dc0b82eee82e891bd318bc53627b10ab80e643d12870f9bf9ebcd88613db6a5c9259e754828ede4c6820127 SHA512 b624e4ce8a94fe4d1a484a87bdad05daf9b734381fb67f2a7e66b907a9e0fe6093f6ce8da0c256746f5230c3d70aabbcddbab867da98dab3531af082527e471f
+EBUILD lzip-1.20.ebuild 866 BLAKE2B 0ce510e6c173c11fab7e166e2a78228f148540cd1eac87e0523a1637521103013e545964d49c53343fb612cd83ea8f4610eefac3ddb292ef424ac41de6a915a6 SHA512 a007c8f34d4ff74f0183a110b87136933e5d8f0e258c20f365ac1831b710645ec5a3477aacdbac87b5a50bbf8a60730abc2fc5f694a7f93566a7bda75300bbd4
 MISC metadata.xml 357 BLAKE2B baa377044f421ed8bc913a5bbdc72e49e026bf0529190f07aa2d0081208870453f140af7ce3d3a97121b563891b4a4b36196db233a3fdb6a98b6eee34af9e9ba SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9
diff --git a/app-arch/lzip/lzip-1.20.ebuild b/app-arch/lzip/lzip-1.20.ebuild
index 926bf3315d23..2c28cfcb6e2b 100644
--- a/app-arch/lzip/lzip-1.20.ebuild
+++ b/app-arch/lzip/lzip-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.savannah.gnu.org/releases-noredirect/${PN}/${P/_/-}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 591c24df6e43..7368a6e1f0d0 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,9 +1,11 @@
 AUX CVE-2016-9296.patch 495 BLAKE2B 34aad92d8a22b05119242e57effb85648acaa0c0b89a68c8ff03faa8c455ba4e95185732c2f26a462728d872f268d4a716cb14a703c05a1cb157c23dcc24cb86 SHA512 7a7fddf4122c3f5d4632640149a94c285a18515f38510388709c2fb9ecd450f9f34ae2e5fe4926c1c68507567b0affa2c8e9194c732673171dd5ee625192b194
 AUX CVE-2017-17969.patch 804 BLAKE2B 1b3d12f6d81d3b3a934088020509435c07a8bfe5ab2003e7369aa9b775808711915b1a0ede48ab6b8b24f37b55f2b84eefff020c34ec171002d9d714bac96f57 SHA512 fb97f6cccedda5b53492afffd65e9933055ffb3dba1419799bb5bf069d066f1172424a7913e0661fbe5937d23c94c062499968ddd09b7310f5d2c8003274340a
+AUX CVE-2018-10115.patch 8946 BLAKE2B 21fc8367ec1c811119bd43b5ca8ac1399748d4fe0c4a9c2cc98b9c3d48a806ccb8416905f18c2b740fd76dad0f9f469c2105d8a7986c11eb123caf48b6c0d31e SHA512 757d0f50ccce2a21dce81f165a9f408a71ea53c226ef29b4d3843f30b2fc518d06cd784e2de644904813cd16a87f24387c5cc35c2499b1df9d86377057be032a
 AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40
 AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 EBUILD p7zip-16.02-r1.ebuild 4498 BLAKE2B e1376067188375ef82b1703531d7c673a54ce6901bc3af814d2928ca503b23484572781d27ef9ee66d388cfc3344d2e960c602ebd0e034ea6ab685a87c6ff773 SHA512 9a0ec08e5013933c43234e38574ac95d81b75b58992c021a2ba2679fc6d00d1ec4b79985d4555189c774f22def0125fa8a5e1e66a67de1daf84d1ef94720e3dc
 EBUILD p7zip-16.02-r2.ebuild 4570 BLAKE2B e7c7fb4cca8cf565f148bf4f5df1a50844046aadd606efdd21c3881cc789d38bb3bf826d51f327e0dcde98fe5db1e8e1c4701106e34f5576b404b1fc2894ed1e SHA512 6b2163edc9019c921b2d6a5d31cea6c08ec4a1ce985429238c86d370a00830c2c5b5c1a3625359acad43f79509a18d3ed38ceb401a1e85ba5a2332638c76042d
-EBUILD p7zip-16.02-r3.ebuild 4613 BLAKE2B 3cf1cb66ca0d3880ec44d57bf1c7586837368bc5fd762000a07873b8ef193ebdf5405856b17597cd85929afe804d16779c813764a80f07016e1f623eef1b3d52 SHA512 d8057408316ae76db82a7144b1dcc88f0dd52d66461443e441a73edf5b365076419f46047342e73d6b3b1b2c192b66410785492d7aa9bafa094772c16f381d6e
+EBUILD p7zip-16.02-r3.ebuild 4612 BLAKE2B 5ffec132c9eff5a07cb22d529b6095db9e1e7531b29d88e1a028a2eb6e4f144dda094786036ead0327c5b3a6c8559de4812a8a039e0555d3b00ac04d213ceb4e SHA512 0dc4e93f7d5b046c66a2d94965995c29ed168d5a0796fdc6931e1161d7a685dd2255d4df71bc697869fb7e033ee952393d369814aa570ab125f14fdd59402442
+EBUILD p7zip-16.02-r4.ebuild 4648 BLAKE2B 56f5172fcd26e24b73d5d4663740e670622d70fc906114a85564864741cc11523d950cfae40fc6dd7245d994539fc3e6c7369e9266cfc023c5e6ae2426dbabab SHA512 273015c03776e31860e703b437b9cb78a492e3a7e41283451d96e75e6a82a2a510ae00186023a27e7d408672c1f454202831c0b63ffe865f2490308dd0522077
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/files/CVE-2018-10115.patch b/app-arch/p7zip/files/CVE-2018-10115.patch
new file mode 100644
index 000000000000..7d9c4bf81f00
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2018-10115.patch
@@ -0,0 +1,311 @@
+From: Robert Luberda <robert@debian.org>
+Date: Tue, 29 May 2018 23:59:09 +0200
+Subject: Fix CVE-2018-10115
+
+Apply "patch" taken from https://landave.io/files/patch_7zip_CVE-2018-10115.txt
+
+
+Bugs-Debian: https://bugs.debian.org/897674
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 16 +++++++++++-----
+ CPP/7zip/Compress/Rar1Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar2Decoder.cpp | 17 +++++++++++++----
+ CPP/7zip/Compress/Rar2Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar3Decoder.cpp | 19 +++++++++++++++----
+ CPP/7zip/Compress/Rar3Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar5Decoder.cpp |  8 ++++++++
+ CPP/7zip/Compress/Rar5Decoder.h   |  1 +
+ 8 files changed, 54 insertions(+), 16 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 68030c7..8c890c8 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
++++ b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
++CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -345,7 +345,7 @@ void CDecoder::GetFlagsBuf()
+ 
+ void CDecoder::InitData()
+ {
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
+     AvrPlc = 0x3500;
+@@ -391,6 +391,11 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+     return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++    return S_FALSE;
++
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+     return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -398,13 +403,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+ 
+   m_UnpackSize = (Int64)*outSize;
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++  m_OutWindowStream.Init(_isSolid);
+   m_InBitStream.SetStream(inStream);
+   m_InBitStream.Init();
+ 
+   // CCoderReleaser coderReleaser(this);
+   InitData();
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     _errorMode = false;
+     InitStructures();
+@@ -475,6 +480,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   }
+   if (m_UnpackSize < 0)
+     return S_FALSE;
++  _solidAllowed = true;
+   return m_OutWindowStream.Flush();
+ }
+ 
+@@ -491,7 +497,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
+index 01b606b..8abb3a3 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.h
++++ b/CPP/7zip/Compress/Rar1Decoder.h
+@@ -38,7 +38,8 @@ public:
+   UInt32 LastLength;
+ 
+   Int64 m_UnpackSize;
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool _errorMode;
+ 
+   UInt32 ReadBits(int numBits);
+diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
+index 0580c8d..be8d842 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
++++ b/CPP/7zip/Compress/Rar2Decoder.cpp
+@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
+ static const UInt32 kWindowReservSize = (1 << 22) + 256;
+ 
+ CDecoder::CDecoder():
+-  m_IsSolid(false),
++  _isSolid(false),
++  _solidAllowed(false),
+   m_TablesOK(false)
+ {
+ }
+@@ -320,6 +321,10 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+     return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++    return S_FALSE;
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+     return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -330,12 +335,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   UInt64 pos = 0, unPackSize = *outSize;
+   
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++  m_OutWindowStream.Init(_isSolid);
+   m_InBitStream.SetStream(inStream);
+   m_InBitStream.Init();
+ 
+   // CCoderReleaser coderReleaser(this);
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     InitStructures();
+     if (unPackSize == 0)
+@@ -343,6 +348,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+       if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
+         if (!ReadTables())
+           return S_FALSE;
++      _solidAllowed = true;
+       return S_OK;
+     }
+     if (!ReadTables())
+@@ -386,6 +392,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+ 
+   if (!ReadLastTables())
+     return S_FALSE;
++
++  _solidAllowed = true;
++
+   return m_OutWindowStream.Flush();
+ }
+ 
+@@ -402,7 +411,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
+index 0e9005f..370bce2 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.h
++++ b/CPP/7zip/Compress/Rar2Decoder.h
+@@ -138,7 +138,8 @@ class CDecoder :
+   Byte m_LastLevels[kMaxTableSize];
+ 
+   UInt64 m_PackSize;
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool m_TablesOK;
+ 
+   void InitStructures();
+diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
+index 6cb8a6a..7b85833 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.cpp
++++ b/CPP/7zip/Compress/Rar3Decoder.cpp
+@@ -92,7 +92,8 @@ CDecoder::CDecoder():
+   _writtenFileSize(0),
+   _vmData(0),
+   _vmCode(0),
+-  m_IsSolid(false),
++  _isSolid(false),
++  _solidAllowed(false),
+   _errorMode(false)
+ {
+   Ppmd7_Construct(&_ppmd);
+@@ -821,7 +822,7 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+ {
+   _writtenFileSize = 0;
+   _unsupportedFilter = false;
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     _lzSize = 0;
+     _winPos = 0;
+@@ -840,12 +841,15 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+   if (_errorMode)
+     return S_FALSE;
+ 
+-  if (!m_IsSolid || !TablesRead)
++  if (!_isSolid || !TablesRead)
+   {
+     bool keepDecompressing;
+     RINOK(ReadTables(keepDecompressing));
+     if (!keepDecompressing)
++    {
++      _solidAllowed = true;
+       return S_OK;
++    }
+   }
+ 
+   for (;;)
+@@ -870,6 +874,9 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+     if (!keepDecompressing)
+       break;
+   }
++
++  _solidAllowed = true;
++
+   RINOK(WriteBuf());
+   UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize();
+   RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
+@@ -890,6 +897,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+     if (!inSize)
+       return E_INVALIDARG;
+ 
++    if (_isSolid && !_solidAllowed)
++      return S_FALSE;
++    _solidAllowed = false;
++
+     if (!_vmData)
+     {
+       _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax);
+@@ -928,7 +939,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
+index 2f72d7d..32c8943 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.h
++++ b/CPP/7zip/Compress/Rar3Decoder.h
+@@ -191,7 +191,8 @@ class CDecoder:
+   CRecordVector<CTempFilter *>  _tempFilters;
+   UInt32 _lastFilter;
+ 
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool _errorMode;
+ 
+   bool _lzMode;
+diff --git a/CPP/7zip/Compress/Rar5Decoder.cpp b/CPP/7zip/Compress/Rar5Decoder.cpp
+index dc8830f..a826d5a 100644
+--- a/CPP/7zip/Compress/Rar5Decoder.cpp
++++ b/CPP/7zip/Compress/Rar5Decoder.cpp
+@@ -72,6 +72,7 @@ CDecoder::CDecoder():
+     _writtenFileSize(0),
+     _dictSizeLog(0),
+     _isSolid(false),
++    _solidAllowed(false),
+     _wasInit(false),
+     _inputBuf(NULL)
+ {
+@@ -801,7 +802,10 @@ HRESULT CDecoder::CodeReal()
+   */
+ 
+   if (res == S_OK)
++  {
++    _solidAllowed = true;
+     res = res2;
++  }
+      
+   if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize)
+     return S_FALSE;
+@@ -821,6 +825,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+ {
+   try
+   {
++    if (_isSolid && !_solidAllowed)
++      return S_FALSE;
++    _solidAllowed = false;
++
+     if (_dictSizeLog >= sizeof(size_t) * 8)
+       return E_NOTIMPL;
+ 
+diff --git a/CPP/7zip/Compress/Rar5Decoder.h b/CPP/7zip/Compress/Rar5Decoder.h
+index b0a4dd1..3db5018 100644
+--- a/CPP/7zip/Compress/Rar5Decoder.h
++++ b/CPP/7zip/Compress/Rar5Decoder.h
+@@ -271,6 +271,7 @@ class CDecoder:
+   Byte _dictSizeLog;
+   bool _tableWasFilled;
+   bool _isSolid;
++  bool _solidAllowed;
+   bool _wasInit;
+ 
+   UInt32 _reps[kNumReps];
diff --git a/app-arch/p7zip/p7zip-16.02-r3.ebuild b/app-arch/p7zip/p7zip-16.02-r3.ebuild
index 394b319ac40e..5cfee1244337 100644
--- a/app-arch/p7zip/p7zip-16.02-r3.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild b/app-arch/p7zip/p7zip-16.02-r4.ebuild
new file mode 100644
index 000000000000..1963c263c147
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+DOCS=( ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/CVE-2016-9296.patch
+	"${FILESDIR}"/CVE-2017-17969.patch
+	"${FILESDIR}"/CVE-2018-5996.patch
+	"${FILESDIR}"/CVE-2018-10115.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e 's:-pipe::g' \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+#		emake -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+#		doexe bin/7z{G,FM}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/Lang
+		doins -r DOC/MANUAL
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kservices5/ServiceMenus
+			doins GUI/kde4/*.desktop
+			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
+			for item in "${ED}"usr/share/kservices5/ServiceMenus/*.desktop; do
+				item="$(basename ${item})"
+				dosym "/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
+			done
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+
+	if use doc; then
+		dodoc DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index d1ac496b400d..9333353e6ed5 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,3 +1,3 @@
 DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
-EBUILD patool-1.12.ebuild 438 BLAKE2B 6c3c73f62558f83931627708c2685652a902f529484d3832895801ac02775fe7e870d32ad84386ee06d5c13b4d7b35e04bbd54c97fdf4941cfe9f26a87b58a2c SHA512 f3ed7ca96220448ec17507624c6ac6edd5294fc8a0729b8bcdc9f663aca95ec54ff9694e827343eff5c51e6b80b01dfb146be47ffa4b6880e4bbcd933f482ced
+EBUILD patool-1.12.ebuild 440 BLAKE2B c20b8218e91411288339c1b48c1166680aa151998de785168545a75623caf1296adc2cbe61538f8d3111a2f85f81e0ba242a8955a5c0444874586a02df62dfd7 SHA512 12655ad8a3730151d392acef7a1585a90355357935e96499139355cf1fd25229cd1ca58ee08c47e47588f43510f317da78c389721912d9b9a72fe98fbd8d660b
 MISC metadata.xml 455 BLAKE2B 7e079e454e413cbafeb93e91a28ae913348ef108667e76e5cb5e4f63106e43fb8d55cdc6549f110af324acfa1d280e2d483bdc7f648f0bbffbba0c361adc1272 SHA512 d6d0b1c1a2704fbf8949295fe2a4e3f527bbd9b4cf509f3d6da756cf358fb123afc717b87a7cc463c90246fc597bef8394d4a70f1bee68b0c58f8ce99178201b
diff --git a/app-arch/patool/patool-1.12.ebuild b/app-arch/patool/patool-1.12.ebuild
index e85af20eba83..49aba770e2b7 100644
--- a/app-arch/patool/patool-1.12.ebuild
+++ b/app-arch/patool/patool-1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index e160290c99d5..970fc09fea9f 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,13 +1,9 @@
 DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
-DIST rarlinux-5.6.0_beta4_p20180513.tar.gz 551835 BLAKE2B cc6161b784d2191d4036e755a74b9706bbf021568926281380e75612310f8e6c3c31554809a4efb4e75dd2790b0a2eea2c467f76666a0c0dd7ec067225d57718 SHA512 36a80de1178b2409a46b81cb8c852931c9cb400dcc7c67c8322072947617a805f7bf721585200d1d22588c109d3109da478a6a9c9530aa7c23420c8960336f32
-DIST rarlinux-5.6.0_beta5_p20180604.tar.gz 552421 BLAKE2B 3c298e432a54efd61569a21fb4c430eac927846f95ed14bf7caa3b893e328ce175e1ba8a5908a0058380fea9a7cfd8b40c959ce87f3a831fcce717cbc3cd80b0 SHA512 9d2b4ed0b904e60ff744f3c5b0fbacb35fa879be8029f7aacecd0b1eb4499b9b7ed9fb0511fe756d90c46f7c288ceb348330f5d8d5f0843c9aae3bfdf76b472d
+DIST rarlinux-5.6.0_p20180624.tar.gz 552245 BLAKE2B 9988b67d545df89bb7087c2bbec5a6fc47d99f6fd8a97e3581f135dc829a43e5c044248e95f60f7cd29370a0955a3c4c8a6667bfcead17301dc0f45ddae0057f SHA512 a0baba489c9268bc25c814c94747c117de66599f91da875b0e0b8233c24910f0e831f8b407f7a9bd8d709da6bdea4ef50306ce456ea5089f893619b8ee5b780f
 DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
-DIST rarlinux-x64-5.6.0_beta4_p20180513.tar.gz 541066 BLAKE2B 7026b8650b85bd8df8b6a1fd7511305fbfceb21fa705e7bb81b0a7b60074464754a8d00cc6a6efc207ed4741547e11459b6a03e74bec9bdfcfa410f216fb753b SHA512 72a027d8cd7c05e1627772a91744883fe43968e9a0ceb627c2f16f7ac62a4e0a11e67a40247e064d16445b18bf1f666acac2111cb63ae3192ed9cbe71a552b85
-DIST rarlinux-x64-5.6.0_beta5_p20180604.tar.gz 541805 BLAKE2B 8296d17fbdd2216fd65787ae561d4a10443fb2d838faeea7a7fbe272787a5cec259581d71cab06cc59c3e147f7fb07e4e0839620c78313da74b7cbdec29afae1 SHA512 3869f9cdb7f458c26e2f54c76b4ddb6d9bc4bc1bc74b54481787a4de2656d033231257c1f9b6e010787fcd3a6dd39de6e162ceeaf890708d3c9d725f5b933609
+DIST rarlinux-x64-5.6.0_p20180624.tar.gz 541604 BLAKE2B 2fd865af38db47c556341bb2482ee9af83857bc196e08f9b47d5a0f8ccae708931c09dcca2115866d37c03b77f7548da87cf2e778f003e9a432634b9ae378aae SHA512 e8427d12016d4298d1e3ca3dc32f367e2b7a407572e48c665eaec796c3538d50349760b5691bc6d58256a5470dc0c6637740fcdc6e8a9bd420193fae16e209eb
 DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
-DIST winrar-x64-5.6.0_beta4_p20180513.exe 3184768 BLAKE2B cc1ed21de598ac696ecf14bceeb4bb3050d83042c226f8ccd1c5195fbb43bbbb8dea614ccffda23297bafccd767b9eb64a71b1449cb8449347134137e2f3a199 SHA512 a405ef876f5385f28fcbb6964d7fbb5efb4f35686e27fe67574dd36a3e043e492757c0bc274b8b419e0b519fba175c191c536e2b1fb9caac11843b893ea6f642
-DIST winrar-x64-5.6.0_beta5_p20180604.exe 3183568 BLAKE2B 39c9fa431acc093c416c9bd980d0555ea77bf5f0412fd5a988c941a667538e7d4c76049dfe1793e9106a8a07189075461b48a0a8e5c6b90ca2a83a4642e5d1fb SHA512 7ec9bd69e027a9d5510932cbd79898c67a1484f040c334760bc160f4bd275390439a5ec00a224fc472fd85014b2c6417e45a817c65cf03c774be83c7cdf99d17
-EBUILD rar-5.5.0_p20170811.ebuild 2281 BLAKE2B 936018068fa7ea883561da7ce0a3919b54c6ee8ab3d67522cf072be3627baa01bd2872b84f3a8b25100a4e76a165270e81281cc93730969d9688d61b97f64347 SHA512 aa68c6bc07bca69dc599dfd7553bdcd23f884fcf353ea6ceecd1c0822f799016d2958eb75bcbe937c10352bf1aab7d60bd8b6f6934244fd842d01da749f6dd28
-EBUILD rar-5.6.0_beta4_p20180513.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
-EBUILD rar-5.6.0_beta5_p20180604.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
+DIST winrar-x64-5.6.0_p20180624.exe 3180248 BLAKE2B 3ddbef82e2ecee7960c5d282de905a2d4d279c3ebae9ceb9e5b72a822d352a80d189a76514a414840ea5ad8002d718435757c860a0935134b6eba01b70e0f444 SHA512 61896901b580476d4c12d40d42eef725de270beb0b01526e7d5d4e02847a7b67b0380f0a365e92eafe2a2303d60945146457d43430aace51c9a443a8b1ceef48
+EBUILD rar-5.5.0_p20170811.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
+EBUILD rar-5.6.0_p20180624.ebuild 2279 BLAKE2B ad6b6a2875119d5125fd8b59be5a2c6bb839938542f2cb8c8e7f5544678964e45bd81b9ecf7399a9593e8c3daa54e3f19d6b073bbea3f5ca3ccaef9b5820984f SHA512 393e1805fb47027e6f12b41a435984288816001ec6ef03a71ac482bdf816106bbea89e4dcfe81c529cb3ad17b4db9dc39f14d95e2968c654a15294d14bc337b6
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.5.0_p20170811.ebuild b/app-arch/rar/rar-5.5.0_p20170811.ebuild
index 05ff5abaad7c..763345d655c2 100644
--- a/app-arch/rar/rar-5.5.0_p20170811.ebuild
+++ b/app-arch/rar/rar-5.5.0_p20170811.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="RAR compressor/uncompressor"
-HOMEPAGE="http://www.rarsoft.com/"
+HOMEPAGE="https://rarlab.com/"
 URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
 URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
 URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
diff --git a/app-arch/rar/rar-5.6.0_beta5_p20180604.ebuild b/app-arch/rar/rar-5.6.0_beta5_p20180604.ebuild
deleted file mode 100644
index 182140ef84a4..000000000000
--- a/app-arch/rar/rar-5.6.0_beta5_p20180604.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="http://www.rarsoft.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
-URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
-SRC_URI="x86? ( ${URI_x86} )
-	amd64? ( ${URI_amd64} )
-	all_sfx? (
-		${URI_x86}
-		${URI_amd64}
-		${URI_w64}
-	)"
-
-LICENSE="RAR BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
-
-DEPEND="all_sfx? ( app-arch/unrar )"
-RDEPEND="sys-libs/glibc"
-
-S="${WORKDIR}/${PN}"
-
-QA_FLAGS_IGNORED="opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-	opt/rar/unrar
-	opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	rm -f "${S}"/license.txt
-
-	if use all_sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar || die
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar || die
-	dosym ../rar/unrar /opt/bin/unrar || die
-
-	insinto /opt/rar
-	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
-	else
-		doins default.sfx || die
-	fi
-	doins rarfiles.lst || die
-	dodoc *.txt
-}
diff --git a/app-arch/rar/rar-5.6.0_beta4_p20180513.ebuild b/app-arch/rar/rar-5.6.0_p20180624.ebuild
index 182140ef84a4..dd4bfdcacc81 100644
--- a/app-arch/rar/rar-5.6.0_beta4_p20180513.ebuild
+++ b/app-arch/rar/rar-5.6.0_p20180624.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="http://www.rarsoft.com/"
+HOMEPAGE="https://rarlab.com/"
 URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
 URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
 URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index a2ada2d0d16c..a80231ab460c 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -6,5 +6,5 @@ DIST rpm-4.12.0.1.tar.bz2 4129093 BLAKE2B 85addde70d031f179566771350f5907311cf61
 DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
 EBUILD rpm-4.11.0.1.ebuild 2739 BLAKE2B 80664cf24466365a81eb4774a49a146327367b20c26fabc11c872ad8c4c22079235ae9dc0ece0956478668fcf47caca1215fe77674f7f06e778eea7003502ef6 SHA512 ecade45798b73e1a573edac06b60dbe0d0e2d4915a13beb41bbdfdc2596e208899bf6b7a36ad1144d65ebf1c186889c6f9928575ff7f5f14516deb5687b2d83a
 EBUILD rpm-4.12.0.1.ebuild 2894 BLAKE2B cf3ba401cf5c1b327c9911416926e849e52841bbc1ab937eaea44949a68ce91bc609ad2c6cf241d57f93b948ded48753cd888cadb3ff21a78fcc5b8586e9c355 SHA512 cf4c78083f32a3f54d732261d284e6a8ea4b7f5d6ff5150ff398627929b8329913a188e629fb930c7c042e4391725ce83546ec030a8d47095eb8065bc202d9f2
-EBUILD rpm-4.14.1.ebuild 3243 BLAKE2B 467cee9bbf70e22b25548097537ba0655ff2fef66d3c69f3431638a665cb043517da72cdf39ab302dc008ec25675d2bba80a7712212f8e43adb67222c5a9d8f5 SHA512 743d697ad7aeb859c8c58d258401cbffa72b413493d71bf0b571ed6b13c8714fb2759183441e9b9489395e0aa7d2288d7a8d8ba0524a6aaf163e1874b065cdf7
+EBUILD rpm-4.14.1.ebuild 3241 BLAKE2B ed85da4e03df08d40872e442254c08ea31912fab2d310df0dc8e05c469d79243ac995885858b588d09482985db8074f359864e0c1abab8722d5ca7f0d1a6c500 SHA512 13d9fc0c01fb9785cfb65b9cc57767f3ec0a3e9866621547fe93fa2d5692ba940e087c1335cb0a84b8892d97657cb7e32c7f755290c0bb552476a6adba454d0f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
index 67e9960ddf4e..7794743413b0 100644
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index cff22462bdcf..4d0c6255c40b 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -8,5 +8,5 @@ DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf0155113
 DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8
 EBUILD tar-1.29-r1.ebuild 2157 BLAKE2B 4a1e4e3cbbc34cf71f41b5ce9e1f7b8b65a9413fdc3e08bb97f09eb64a4f72b8952461fef59d7b6beca00350ea0b7718d2a4d99d3f9a8a830479d1e194f44641 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b
 EBUILD tar-1.29-r3.ebuild 2227 BLAKE2B 50afab4df588f55fdab5d3cfd4258d3c65192ee0cc7079527a05fcbee0a2ec50e3875302a241faa351edc41e5f77351382ecd3e291037eec11115d4c729aebde SHA512 270db39d7490c4829fb11cb680b39e75963bb065fe3ebdf78ab024300dae27f78e18453dc76c029a6cdfc4af9511074322aaafc3e89910e63e976065d92867a3
-EBUILD tar-1.30.ebuild 2207 BLAKE2B 98c6fa3728d922c5e97767728dd76ef5875f7af9577aee9bfa700a25db2ace1e521defb996d79f5edfea16e3a0c796b3d9971b58f637b248d7c2698d8b0ea8f8 SHA512 51be80e8662cfcb429c9c24335058cc9adc4b73b78c745d2785a996630635f526081e7ba642532d496842abf29d91b19d85da083edb500f9d26bedd1725d546b
+EBUILD tar-1.30.ebuild 2202 BLAKE2B e7f354491528fc1e28a26568c3d8b678cfa27f78c0db8ed2fba2d709f7326aa3e8ea0de31d5097471aff85ab76e052ba5ca22d8c5f3785674c441ea372269cd8 SHA512 50cc612f9b4829847a24176c3236335d3bbbb6b3dd81875b35e6d4d78934cdec655bee42957e39733225d87ab6462710ef8ce95b6c155304e07dfa11d6bb4c8e
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.30.ebuild b/app-arch/tar/tar-1.30.ebuild
index a2e73cd2c85e..cfb2a95a563f 100644
--- a/app-arch/tar/tar-1.30.ebuild
+++ b/app-arch/tar/tar-1.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 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="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 07e7af85410d..618acc1e1567 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,9 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
 DIST unrar-5.6.3.tar.gz 225788 BLAKE2B 8baf99ef85052a395fe0f2daed41803587e7d839949488eb3430e3d3a3dbca30ef894530d5ef40757f7ea2ffdfb2d493e8e13d7322e65885cf03f8fa0859b804 SHA512 cd3c97d357242a91917cdd9ee6898527829bff73dd187e58d7490d0d0ed5ffd8f8db651ce63d4bd8307c6a085fa95d72faa7b0cf1348bba191086136232a98fc
 DIST unrar-5.6.4.tar.gz 225849 BLAKE2B 56257ab9482841a1a27e5afd5b00b19e7319eef250168f08826e3cb63eefa063ece8198133d8439fca8d8905d303715751e24ed36a5018f03982c03cda27a53b SHA512 0ff55a82f8593c59c9773ffa7dec00386b762c504a08497bc1a50de5502c52e1c1d1043cb8ba353291aa61a3ebc9f5f0a21d313d89639f400e5fc45f01d62cca
+DIST unrar-5.6.5.tar.gz 226296 BLAKE2B c35dfdc10976ee2a7827f9386021f79af6712ae3a6641e83934ef7223e1202c46c59e12d2b78abe230c3f929f2228fe8c0664f05275b905ea06806a02cd685aa SHA512 984340935671913b4d2a765db5c4edc0d08d859fc43f3ae0e97e681c4ea302a51808fefa8c11c3aeecad1c2681541f363c5051813d978b5b14959c2e55f71281
 EBUILD unrar-5.5.8.ebuild 1862 BLAKE2B 0b70c50aac539ba810e1764dc0baf9e7eb69a049d48f3eae43e8cc4d1754b3b728ae1a4d8903f8e7a95f0f9429394e85766a34b20b4a54f1355fab7eba64eb86 SHA512 9fc24eb6ed0aa9b333eb6369c529acc062ea89ac95a943b7b7553f69dd0767eadd7e1a6af13a34b62e4717d8996f010c9f6af997b44df134cce4770c48f32fd3
 EBUILD unrar-5.6.3.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
 EBUILD unrar-5.6.4.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
+EBUILD unrar-5.6.5.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.6.5.ebuild b/app-arch/unrar/unrar-5.6.5.ebuild
new file mode 100644
index 000000000000..78288603ed4f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+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=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-arch/vimball/Manifest b/app-arch/vimball/Manifest
index 682950f3299c..fa1d11e654b3 100644
--- a/app-arch/vimball/Manifest
+++ b/app-arch/vimball/Manifest
@@ -1,4 +1,4 @@
 DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
-EBUILD vimball-0.5.1.ebuild 654 BLAKE2B 5df7b3239cd06eb05803a9a1d424ba1b2ad9f029bfaad7da9d2a095016407436411b6330186a52db56e6e4f8fede18989e9f6cad8a4b1eb083b44755c974f0b5 SHA512 b5ba733eb02fcf5bcf1e38db66bb63515d80b85ac9dc1b5d4275dd321452db2f078891b86887917ffe94bad99b1a02c352c8f93a8d5493ae9bf09ae56eb61b94
+EBUILD vimball-0.5.1.ebuild 658 BLAKE2B ac4d3538759811de18516547558cc950907734f465abbbf43ee5335fc84174e69a8bf50213dea74f71ac72e73f0471d984643f805877f32666fc29d23c52d8cc SHA512 418b0ba38bc2f613c5ac8b6b008a9f07c0a55964fe106cc762b1937aae25792cea238eb49b729ee970dd27c0f84813b08b67dd3c25c1bc8f8f53a0cf02787738
 EBUILD vimball-9999.ebuild 658 BLAKE2B 64f54e6db0d0966ecffb54867ba699172f4da2f45418b30bbe44ac3880ee9e6d6eda1afc2912a393e2a35443f75d6c63196351594554ea6c69d0282e8202f723 SHA512 8b35615ce1cddeefb6b84c68d1dcc308e525883203d0fd08a5aef40f76578ae0b7ddbbb7b69f2f84cc542a1bf6fc9b2ee4d0b60596d0630f57d31054e83bc5c5
 MISC metadata.xml 385 BLAKE2B 5fa1db1263983a5d57031cb72bf9e2b7074faf2134bea6a8cc02d67f9e48ce198c2a8d4a478029d9e3303555c9d248f96e83e6e8071ea7b055f90bb25d38402c SHA512 7086cce11a9a20d93dd24741e060d289c90bbc3c20d5102452d4c987597921b00195badd68d916a64b03faa5dae1fa4adb68654bce5c70c2e1cfa5d8417b33c3
diff --git a/app-arch/vimball/vimball-0.5.1.ebuild b/app-arch/vimball/vimball-0.5.1.ebuild
index 9cdd63e021ad..9876af4ce01e 100644
--- a/app-arch/vimball/vimball-0.5.1.ebuild
+++ b/app-arch/vimball/vimball-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then