gentoo resync : 11.02.2018

30 files changed, 478 insertions, 26 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 090023d7ff05..41b672a55614 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 56734af4f647..9aed4b05cbc8 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,5 +1,5 @@
 AUX brotli-1.0.2-no-rpath.patch 865 BLAKE2B 2c9720427c9751586b36580be629d3820757055dfb07b37f4933eacaf78973e14a7a861b0e7eb43a1980e889ee7c6988926fae9c31af90f962f502f17be416f6 SHA512 5da97caa16a910aebd4ce85e0805809dd97b6f36cd71636c72f284e6550bcff1a5f614a902d5363c35be2b46e8986dc74beb93f3fc6158a29f719e49d68a83c0
 DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
-EBUILD brotli-1.0.2.ebuild 1426 BLAKE2B 8b2476b4742a60ac9508814e812aa673bd861a19b2d0067290849476533bf7f4053706fd2e62e9f8d7adcd5eae335f2316c0ecf1396f6cc45fcbfd5009c00b4a SHA512 8d5409ab70153c3fa4b8b08f6a288746c406f510aa176b0197cbd0168e2ee79786d3f183e717f2d29c8b3a56bac75d243fc9b9f62fa5be90fc0f377d4fc8dc81
+EBUILD brotli-1.0.2.ebuild 1424 BLAKE2B bb1270c890bcea3b59e80c6898dbbd83c27ae3c0d6840d9a2399e81861c74f417401ea6f6a572f0078e4d4427d7ebdf1ab7f9fdb8e89d8d08c5ce38b9b379cff SHA512 0f8eb2807a2413c745c2ee10479cc282e0b0d15aa7d2bbbd691c8ad296e6e909a93e013038c9aff07183c055ad002af721f2b295e5aabdf24c5ca3ff0556c4eb
 EBUILD brotli-9999.ebuild 1336 BLAKE2B 920c9159f284dcbf0246e52d28048aad22c4803c0950a101093afeabf45bc7b109216ac8bd54676a27ec579cfa49e4ed791cb944c7a9d4ce9e376e85f22cdebc SHA512 2686041468cf95c7dafa9571c6c4997f5ddc9440593e35f6d8526af7df8a2cd249af9e5b0ddf04a272cc8f6497db5de77c628641d2867e47cce6b099e3b187af
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.2.ebuild b/app-arch/brotli/brotli-1.0.2.ebuild
index 7c3f2752aa40..ea0a2daeddf8 100644
--- a/app-arch/brotli/brotli-1.0.2.ebuild
+++ b/app-arch/brotli/brotli-1.0.2.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
index 0f3e2177e5e3..2cc6a603d82e 100644
--- a/app-arch/deltarpm/Manifest
+++ b/app-arch/deltarpm/Manifest
@@ -1,3 +1,3 @@
 DIST deltarpm-3.6.tar.bz2 500420 BLAKE2B 650193ef0bff9b534a9ff60f4bd4d9b81533a62f70e95a2cca1b96cd73f7d8b374def3300b2b079aee4ea2a1a839a79c40fe2bcfbced111414047b8b701b4314 SHA512 0ef89d8d3e7c9d3d9da06542f293b434e42d95e18616aae1de95a66a77a5937142060ff405356869454cbcf8a7bb52f64c462641e52af0fad985105af07351d9
-EBUILD deltarpm-3.6.ebuild 1122 BLAKE2B 481a35c179f8ccc478877187393d8d9c96f67a6143d958a7d4318f00724a1cf6c136823495d01e88fa45dc58fa6146b83adb3fbbd1ee2ef7b75a9a57bcba8389 SHA512 6233e6ccdcb1cfca10c752a47a29dc2fa62d34e5b6b91f9cff9222393f99959c9ed961fe21e6622e535b2878a43737532df9c4ac350f0e87cbd114124e1cd65a
+EBUILD deltarpm-3.6.ebuild 1135 BLAKE2B 7bf1907f6f7d8b2140fe5714f354f8ce8329a204600b25064d272047d80822a93aa0acef38f3bbbd3e1701f3781e5f4ee1948a485f9e130fb65d445060b3f3b1 SHA512 f8e12db10cb3517c029099e5daedea8447de5bc4aa5a7843fa2e624bc50e179aef3814f46815a742b2f5e67674c28ad4c7cb61c720156b67e08e69f33ddc32ab
 MISC metadata.xml 486 BLAKE2B d8a27415f4df4637fa079d20452949fa3ec34dca25fc3fd243d1599deb42acf59a9c89703866e00ce8da24655e5ef1e8e159c34d8f7aaa09e5ca993fe8787705 SHA512 8a0639d669a83a3a33f58c2bcb0ef57a73e315a01353732fa70060d6a0d7de608d60010f42b9d18b8c9fef8d5c62d89d416a5192578842a0067227ee4917e246
diff --git a/app-arch/deltarpm/deltarpm-3.6.ebuild b/app-arch/deltarpm/deltarpm-3.6.ebuild
index 9b3d7f88baef..3a60c4ea7da0 100644
--- a/app-arch/deltarpm/deltarpm-3.6.ebuild
+++ b/app-arch/deltarpm/deltarpm-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit toolchain-funcs python-single-r1
 
 DESCRIPTION="tools to create and apply deltarpms"
-HOMEPAGE="http://gitorious.org/deltarpm/deltarpm"
+HOMEPAGE="https://github.com/rpm-software-management/deltarpm"
 SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${P}.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 7f243426a217..89e2cc803040 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -3,10 +3,10 @@ AUX engrampa-1.10.2-p7zip-15.14-compat.patch 1225 BLAKE2B b1aa1546aeed6bc3116d8a
 DIST engrampa-1.12.0.tar.xz 1380144 BLAKE2B 87c8a69d3706489f7f2dfc704212714976ba3bb24954d02b798700be4f5c98bada0eec0e22402f85e3ea4d7852ab6bbb523deeef411887c68f5b998871c72069 SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec
 DIST engrampa-1.14.1.tar.xz 1417444 BLAKE2B 95dd08ba2264fb2ba937be61522cf56da8363fdc4af21c18bd3d8a22609ab0c9a606bda5f16b2795ad6b0b7bd017bf1150a2e31f6c29d9c111362ca93ff0ed65 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763
 DIST engrampa-1.16.1.tar.xz 1432272 BLAKE2B 6181da44c6a80030c1ac856c017ba190bf91527e51c9d2eba38e267632360ad5497ee02d0a3ea00d73df4e6f507311e839e0d8d999b6d6561e298d784c3251ec SHA512 d61ee877b5e7ce0aacc46a8b786b1d074bc4d6870f453edf238d9b8fe3eecab750ce14f668c94bbceedec4a9b5bf16a828fff24edef227ae0108351adcfc73f6
-DIST engrampa-1.18.1.tar.xz 1427140 BLAKE2B 29bfa3a3480dfe20eed30fb6017119def521bb49798f08f0cdafa621a2f6922902cc1dd9b471d71a875d14a0620da0902ed6601c8d338dc1d8a73e3a397a32cf SHA512 9b39783f508a0582a2e77ea6a2cd3665b6054274bea8ad14f78ed37e20533e78554eca23fc171e090bd881468d630d5f644d687bee8bb282f5a106c80b1daf17
+DIST engrampa-1.18.3.tar.xz 1427036 BLAKE2B 816155b7e2a0583263959d77bb5079a3d69ade087cac39e8e9c2c77901d0bfcbdb63a87ec9ed7cf92d2e580ae810d3e46641d690d87c1af7db6f6dca6627dfbc SHA512 6a3872ed9ec1e9d2779842d30c352c5068608913f9261a875b707951a45ff3122df2f4a4ed4da10c4f8a4617cc1d7aae4635b3f1234052793c4a6baa765d80f8
 EBUILD engrampa-1.12.0-r1.ebuild 1943 BLAKE2B 98c5255e301058a3aa09fa54fbd93bfb6c1c70f9f468608eca2cd6cf0b1838bc52ea708b8de3f7347e1d3b970be8a30e7f28803f13678908372cefaede528a75 SHA512 624884bbbc2a2a7c9eaa9f84c4ab7189ed70079f26535c5945eb2c5a96543fdf249599805ac538f304e316ed882645a1b3592b5752b1ba05f6142b356b60eb8d
 EBUILD engrampa-1.12.0-r2.ebuild 1948 BLAKE2B 7563e099ccf74cb69a5bce96804750f8edbb293207910ee652b8cd80a40a0f603c42e128a90f11ea0b737e371ad39dc23106336671846851dac5ee22e22492dc SHA512 0de7123927b4b41fd04606a1b11649ae2ed1f9250bfe6dad32cb8138fcaed7c5271eb9aa30fc921c8134ebbb7f867b36d0b867520a3defa63d1d31e36bd20d44
 EBUILD engrampa-1.14.1-r1.ebuild 1934 BLAKE2B 0d3565cc92cfa229671efd0b8ebdcfa32db2f74b3e2282f2da1969483dd16645dd2e1c6446ad3388ff9d9b502373c25d94719af56a07dd4d48e20e44d5c81fa2 SHA512 48a85e45c15b8d21f9e11e992efcf0fe24f8b6fc3934e26fba77221a8bf568a1f185eb584171d3a16500ab35ba0bd15d4a7d83e2d4dc9030c0a76166ed2643ec
 EBUILD engrampa-1.16.1.ebuild 1774 BLAKE2B b239d80ccc155e40d733b9de4997e689c9a0650eebf58f4c0615c4bd19ea71e51944bf9312135e5cf87ebf45bcc7ef6d8063f8f03c1ccef169b0a392c2efd787 SHA512 975831c6e938ccf8ad5547639a10d7224d01fc4d0b7870878b48cf8cf3051c9dcf779f72aea393c1a2798fb6e818f5e0bd5d8408a773e8b2c64dfeea30534056
-EBUILD engrampa-1.18.1.ebuild 1755 BLAKE2B b741f70a2227e598afdd926a67b3ab4732d04ecfa15de0a3dd370e84df249e0513061bfe2177b771417aea4fa7bfe96af3474b1ddd87687c4e94374bd2f1c8db SHA512 3242a31d0136264618427a4ac7c403d7291a27a8ee357fe443a237859a4e445c3170668fa6e2ff2b8644fdae091010ef558f741885c28abb30819f5f126f41c9
+EBUILD engrampa-1.18.3.ebuild 1755 BLAKE2B b741f70a2227e598afdd926a67b3ab4732d04ecfa15de0a3dd370e84df249e0513061bfe2177b771417aea4fa7bfe96af3474b1ddd87687c4e94374bd2f1c8db SHA512 3242a31d0136264618427a4ac7c403d7291a27a8ee357fe443a237859a4e445c3170668fa6e2ff2b8644fdae091010ef558f741885c28abb30819f5f126f41c9
 MISC metadata.xml 763 BLAKE2B 7efc42df178dd52843a8f9c165d2c7a717fb05d24309dfcec6d7dbf61e8943b65f4a8febf2d58bfe29a81e0be37165f1b7345155d75e3e3d7676f625d679aea6 SHA512 fc5a05da5bf07067fc598b9849b068b497d3b9d107eddbe8d38bc15afb9b3df0e1071fae57e9c0a05b9813c03873581e66b0212cd126f14ccaddaccd85a57a96
diff --git a/app-arch/engrampa/engrampa-1.18.1.ebuild b/app-arch/engrampa/engrampa-1.18.3.ebuild
index b7680487a6d0..b7680487a6d0 100644
--- a/app-arch/engrampa/engrampa-1.18.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.18.3.ebuild
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 58b20e21c8b4..bbeda263cc7a 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +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 932 BLAKE2B f77a95039e5b1cb287fe4f65b66bbed84dd5f4831ac74ff9223a7676bd4cdf4b108f9a20e99aec0601f41fdba0c8860e0aa154233f4e64c36b84cad3479fbd65 SHA512 fcaee2a2b8c2530d5df5215166d4dd0eeaeba64f8a22230044f07b1ea1017a5b4e7288c50b29c6ec1e1587e934b404ad345449295851c02aeb6c853191cd1749
 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
new file mode 100644
index 000000000000..5de14060ae19
--- /dev/null
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use vala || myconf="VAPIGEN=no"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		${myconf}
+}
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index 414f569557bd..24238461571b 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -6,4 +6,4 @@ DIST innoextract-1.6.tar.gz 183380 BLAKE2B 581c0e28ececbabc8785f50472f312bc39c62
 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 751 BLAKE2B ad6a51d7f5e3d49045d00b7e0b286fb448c67ee98d5e2e491ae4e2ed0b60d1b65259bb88d3675c1f47545ff06ab118143aa249d9a0e29581486b15da95f95ce1 SHA512 354b5f01e2b7dc8612ce06bc50be11962839994bb3e350e6739e59e1b10dbd02c477276c54cd432de64e54ed9ca582a12f1b9a4d51ec05ec239e3a5b25c13a7b
-MISC metadata.xml 1078 BLAKE2B 16997cf55346015f3ec4b5354d364ec6847426d99ea999f8d03872e333d8eacde7b80e1b95ce8529b7366a3406898ff239cf50c3159e17e288e2e799368f6885 SHA512 d9c5a92d1d1a36ba89183a67f3bc0915e1a400e090907197e1acd5d810973de49e2dbfb8722c985a34a28fe39118b27334efa0df8855b8b90743572ac369a7ba
+MISC metadata.xml 1001 BLAKE2B f353f5588ff40c34f0bc3a8a6eb4b11505aa677ce6a7198826d3acd8e98b07014aeec33c7de1fcc4a14434bcc6f2f4f53cefcbf9f5c52702bd0b689ee2efd4f4 SHA512 34d8f877efcbe9ef7a3515feac72984a9fc90770bd3ec170b0e8ecf38d42efb809c03f35a18d58de48b4fe09fb776f57e8336ef359e45942db903466de93185c
diff --git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml
index 0fb506b40c37..65c171f5fd69 100644
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>daniel@constexpr.org</email>
 		<name>Daniel Scharrer</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
index 5c79c8c7894f..70a5c39bf8bb 100644
--- a/app-arch/ipkg-utils/Manifest
+++ b/app-arch/ipkg-utils/Manifest
@@ -4,4 +4,4 @@ AUX ipkg-utils-tar_call_fixes.patch 1500 BLAKE2B 602c2f2aa68411e966b966490a0c83f
 DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa
 EBUILD ipkg-utils-1.7.050831-r2.ebuild 1442 BLAKE2B 521b0a10e8412933f157879ac0dd93969c1e7a87be05ce81e0fef28146312267824f1c1f08d20422f8a4e1ac21fbf810f24b6ce0ddbfe11a87dfd102c50f32ab SHA512 a34676119df3073b7f0f3b53d852e7e9404adf99278205d052bc06a72a4f13a3eac95c2fafbd6c97e22f83b3217c7fc8efa3cd95f1fe7e6d64ddca3a28ef223c
 EBUILD ipkg-utils-1.7.050831-r3.ebuild 1417 BLAKE2B 3982d150af3b1d8aaa8e16f48b46acf2e818d44eefc143504c259db3d745cfb9678ff195548080538a1db910f26cf0660c24878df61f9a9dfa30cfb91b3a830c SHA512 50b8bf15728512dce830c09045543cafa434d39b001f996e57b624a24303225bdc060228b2068e570303f5addef4fcc3fc371340d684f854edec386b09f0254b
-MISC metadata.xml 517 BLAKE2B 0da60b3eca9e4258d8937133ab96c711b891748d5e29761723ea93850e28cb9e175081b94d2ebd56d0bae99d1412cff9beea40aff57a4bd060c5f82f2d6aa5b1 SHA512 afb20c89d817a0f8c27d022b6f5fc810f9747ca270d81cd9ce396a41d9edcff09ebe1cb987371f441b1666576f13dd9734030c96627fff5fe2bb8366fb48c4ba
+MISC metadata.xml 440 BLAKE2B f58f839dd54a3d68454f781aa5a2ccc2ec21a0418fa6de240f084568a4d8853ab191e4de2ed5d26761412109dd57564188aadc141f73646ae4ac93d31dad175f SHA512 ba8bf9b429d587c2fad985c311a8107a08d4362c161a72bc1243a8a14ba842d0c7ee7cc08a0278881a9d61a05702e3cf5817db34234e31761ad7e518d74d29de
diff --git a/app-arch/ipkg-utils/metadata.xml b/app-arch/ipkg-utils/metadata.xml
index 4ee7c3da409a..bbd0686ff3f8 100644
--- a/app-arch/ipkg-utils/metadata.xml
+++ b/app-arch/ipkg-utils/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>jnrowe@gmail.com</email>
 		<name>James Rowe</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index aa031b9ab305..f34ffc06b2c3 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,4 +1,7 @@
+AUX CVE-2017-17969.patch 804 BLAKE2B 1b3d12f6d81d3b3a934088020509435c07a8bfe5ab2003e7369aa9b775808711915b1a0ede48ab6b8b24f37b55f2b84eefff020c34ec171002d9d714bac96f57 SHA512 fb97f6cccedda5b53492afffd65e9933055ffb3dba1419799bb5bf069d066f1172424a7913e0661fbe5937d23c94c062499968ddd09b7310f5d2c8003274340a
+AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40
 AUX p7zip-16.02-darwin.patch 218 BLAKE2B 4e6b9f830ef9aff4d9db050163477a341353c4f16188ad2eeef3e248afabdc34d47d4c0708f174efa80e98906833b549b28d43af4585f2b1e34311e6f8c9944c SHA512 26ef30ce27fccdeae6388801e7a619225995c50394131ad5dd6fcf2236a40e92ad2d6dd2ea04c362fd660264decc6b616e5ee6ef83ff42c111e2b1a40f620c68
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 EBUILD p7zip-16.02-r1.ebuild 4498 BLAKE2B e1376067188375ef82b1703531d7c673a54ce6901bc3af814d2928ca503b23484572781d27ef9ee66d388cfc3344d2e960c602ebd0e034ea6ab685a87c6ff773 SHA512 9a0ec08e5013933c43234e38574ac95d81b75b58992c021a2ba2679fc6d00d1ec4b79985d4555189c774f22def0125fa8a5e1e66a67de1daf84d1ef94720e3dc
-MISC metadata.xml 435 BLAKE2B d5f4a262fb40714a31cb5bb1081103c0adac996ef2fbcb801d3d6bf06d2459c4b135ab036aa9fefb39cba8655c400e37fcc862dbc166ec71aeaa1fb2bbdff7b1 SHA512 3588bbc28ee0e54a059d88d35ce821596b0dd3b5c1f84490568a3f7d3f67f5ade02c301c699bdaaf4cb653df5d59441cb7383a18708cd15d64d97eb1f0847f1c
+EBUILD p7zip-16.02-r2.ebuild 4574 BLAKE2B fca0eae0627cd048be81a8735b7cb2cb9631fa0a490d13b9a69b11c942de2b549536f83f8b4acb5d81ea3f30e2d1a6895ea6eedbf3ccaa6b5dedc8a30c7b8aa4 SHA512 6849e8f2806b1544987dd000ec4f5c77552655257c55c35a81f84c2788237488fc7e8a366076a1472c7faa2688527ccd2463a2b31d22a2e397d162e432b00a2c
+MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/files/CVE-2017-17969.patch b/app-arch/p7zip/files/CVE-2017-17969.patch
new file mode 100644
index 000000000000..9a820af73067
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2017-17969.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <anarcat@debian.org>
+Date: Sun, 28 Jan 2018 21:19:50 +0100
+Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta
+
+---
+ CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
+index 80b7e67..4acdce5 100644
+--- a/CPP/7zip/Compress/ShrinkDecoder.cpp
++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
+@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+     {
+       _stack[i++] = _suffixes[cur];
+       cur = _parents[cur];
+-    }
++      if (i >= kNumItems)
++        break;
++     }
++
++    if (i >= kNumItems)
++      break;
+     
+     _stack[i++] = (Byte)cur;
+     lastChar2 = (Byte)cur;
diff --git a/app-arch/p7zip/files/CVE-2018-5996.patch b/app-arch/p7zip/files/CVE-2018-5996.patch
new file mode 100644
index 000000000000..6733bff91895
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2018-5996.patch
@@ -0,0 +1,221 @@
+From: Robert Luberda <robert@debian.org>
+Date: Sun, 28 Jan 2018 23:47:40 +0100
+Subject: CVE-2018-5996
+
+Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by
+applying a few changes from 7Zip 18.00-beta.
+
+Bug-Debian: https://bugs.debian.org/#888314
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++----
+ CPP/7zip/Compress/Rar1Decoder.h   |  1 +
+ CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++-
+ CPP/7zip/Compress/Rar2Decoder.h   |  1 +
+ CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++---
+ CPP/7zip/Compress/Rar3Decoder.h   |  2 ++
+ 6 files changed, 42 insertions(+), 8 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 1aaedcc..68030c7 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
++++ b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false) { }
++CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   InitData();
+   if (!m_IsSolid)
+   {
++    _errorMode = false;
+     InitStructures();
+     InitHuff();
+   }
++
++  if (_errorMode)
++    return S_FALSE;
++
+   if (m_UnpackSize > 0)
+   {
+     GetFlagsBuf();
+@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+     const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
+ {
+   try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
+-  catch(const CInBufferException &e) { return e.ErrorCode; }
+-  catch(const CLzOutWindowException &e) { return e.ErrorCode; }
+-  catch(...) { return S_FALSE; }
++  catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; }
++  catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; }
++  catch(...) { _errorMode = true; return S_FALSE; }
+ }
+ 
+ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
+index 630f089..01b606b 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.h
++++ b/CPP/7zip/Compress/Rar1Decoder.h
+@@ -39,6 +39,7 @@ public:
+ 
+   Int64 m_UnpackSize;
+   bool m_IsSolid;
++  bool _errorMode;
+ 
+   UInt32 ReadBits(int numBits);
+   HRESULT CopyBlock(UInt32 distance, UInt32 len);
+diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
+index b3f2b4b..0580c8d 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)
++  m_IsSolid(false),
++  m_TablesOK(false)
+ {
+ }
+ 
+@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB
+ 
+ bool CDecoder::ReadTables(void)
+ {
++  m_TablesOK = false;
++
+   Byte levelLevels[kLevelTableSize];
+   Byte newLevels[kMaxTableSize];
+   m_AudioMode = (ReadBits(1) == 1);
+@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void)
+   }
+   
+   memcpy(m_LastLevels, newLevels, kMaxTableSize);
++  m_TablesOK = true;
++
+   return true;
+ }
+ 
+@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+       return S_FALSE;
+   }
+ 
++  if (!m_TablesOK)
++    return S_FALSE;
++
+   UInt64 startPos = m_OutWindowStream.GetProcessedSize();
+   while (pos < unPackSize)
+   {
+diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
+index 3a0535c..0e9005f 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.h
++++ b/CPP/7zip/Compress/Rar2Decoder.h
+@@ -139,6 +139,7 @@ class CDecoder :
+ 
+   UInt64 m_PackSize;
+   bool m_IsSolid;
++  bool m_TablesOK;
+ 
+   void InitStructures();
+   UInt32 ReadBits(unsigned numBits);
+diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
+index 3bf2513..6cb8a6a 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)
++  m_IsSolid(false),
++  _errorMode(false)
+ {
+   Ppmd7_Construct(&_ppmd);
+ }
+@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
+     return InitPPM();
+   }
+ 
++  TablesRead = false;
++  TablesOK = false;
++
+   _lzMode = true;
+   PrevAlignBits = 0;
+   PrevAlignCount = 0;
+@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
+       }
+     }
+   }
++  if (InputEofError())
++    return S_FALSE;
++
+   TablesRead = true;
+ 
+   // original code has check here:
+@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
+   RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
+ 
+   memcpy(m_LastLevels, newLevels, kTablesSizesSum);
++
++  TablesOK = true;
++
+   return S_OK;
+ }
+ 
+@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+     PpmEscChar = 2;
+     PpmError = true;
+     InitFilters();
++    _errorMode = false;
+   }
++
++  if (_errorMode)
++    return S_FALSE;
++
+   if (!m_IsSolid || !TablesRead)
+   {
+     bool keepDecompressing;
+@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+     bool keepDecompressing;
+     if (_lzMode)
+     {
++      if (!TablesOK)
++        return S_FALSE;
+       RINOK(DecodeLZ(keepDecompressing))
+     }
+     else
+@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+     _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1;
+     return CodeReal(progress);
+   }
+-  catch(const CInBufferException &e)  { return e.ErrorCode; }
+-  catch(...) { return S_FALSE; }
++  catch(const CInBufferException &e)  { _errorMode = true; return e.ErrorCode; }
++  catch(...) { _errorMode = true; return S_FALSE; }
+   // CNewException is possible here. But probably CNewException is caused
+   // by error in data stream.
+ }
+diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
+index c130cec..2f72d7d 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.h
++++ b/CPP/7zip/Compress/Rar3Decoder.h
+@@ -192,6 +192,7 @@ class CDecoder:
+   UInt32 _lastFilter;
+ 
+   bool m_IsSolid;
++  bool _errorMode;
+ 
+   bool _lzMode;
+   bool _unsupportedFilter;
+@@ -200,6 +201,7 @@ class CDecoder:
+   UInt32 PrevAlignCount;
+ 
+   bool TablesRead;
++  bool TablesOK;
+ 
+   CPpmd7 _ppmd;
+   int PpmEscChar;
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index 686e0639c24c..17c1bda0021e 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
-    <description>maintainer</description>
   </maintainer>
   <use>
     <flag name="rar">Enable support for non-free rar decoder</flag>
diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild b/app-arch/p7zip/p7zip-16.02-r2.ebuild
new file mode 100644
index 000000000000..e6a89fe7a155
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -0,0 +1,163 @@
+# 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-2017-17969.patch
+	"${FILESDIR}"/CVE-2018-5996.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/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index b3ac623c43ee..b68caf9eb0ed 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -4,4 +4,4 @@ DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276
 EBUILD par2cmdline-0.7.3.ebuild 782 BLAKE2B e47827829b2b16d5c92913d1408fba4732a398e34fe5e6eb2735a9254919a3de757568ca02af751e17bab4b23eb4e3bb984169da9d96eee84be0d7b57f3d7e67 SHA512 ab03cd0dbac07acbdb43e2a0d681c6e73469ea137ff9bf1f9340f3c85d1823a3ad3e15312682bde3cec2f5f4eadb1605e1a91544e69c809d6f46814d3a4731e6
 EBUILD par2cmdline-0.7.4.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
 EBUILD par2cmdline-0.8.0.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
-MISC metadata.xml 475 BLAKE2B a472bad1f2d7abf1c1c36003086d6039793e84cbef80f92746b192a74978004d4c286d9b8136b9a25d4a2b9d008cf3bd30dc123a36bc83de3f9f7207353b0312 SHA512 3da9d56f2ad5a378af692de909764456ca128f3978153f51bb44e97fb897ccab693e01187b0282cad699842096dd02d37c23e0301eb5fefa167f06a3c21bc326
+MISC metadata.xml 425 BLAKE2B f0f51687772e2555fb17f45d60b41cf8350fb6598c35c544ee9e110e8dcfdf89288fb3fd506080f678a25d98e7dc1e8fdc891efbc81a5bad1ee8bdc89466e233 SHA512 9813ec014f97b8c9ead9021596d60d724e5f4427ed266ab430535b172cc50636d623d44648af1d05c532b38299aab49de91d03c6658a937ed724b161f629da8f
diff --git a/app-arch/par2cmdline/metadata.xml b/app-arch/par2cmdline/metadata.xml
index d46cfbf7604d..39157a67ffd1 100644
--- a/app-arch/par2cmdline/metadata.xml
+++ b/app-arch/par2cmdline/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>swegener@gentoo.org</email>
-    <description>Primary Maintainer</description>
   </maintainer>
   <maintainer type="person">
     <email>radhermit@gentoo.org</email>
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index c49835f12aee..54cc12620184 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -6,7 +6,7 @@ DIST pax-3.4-12.fc16.src.rpm 171016 BLAKE2B 94332a7cd24613c4488c1f00de3bcebeba9a
 DIST paxmirabilis-20160306.cpio.gz 147448 BLAKE2B b2a9bcfbb6d2007b8a4162b8d010c2a34f7ebc8595a8c20f6b8e973d85421a7f21f24d90b3d0228e5c9921b69dec1ef0ddcd4ee540f95072237255ecf309016d SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f
 DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
 EBUILD pax-20160306.ebuild 1423 BLAKE2B b53926a547d5969dfc9350ade35551912b8fd6c2498f67531a5102fbee0637662e69c115a7bceaf694aebc50769f9014de6d295aecef08c61f86aed7384932a3 SHA512 f1845f4921f165c8ba3130edd20fc3972c701caeec35fdbca0898faddc23c08c076a290a983786ff4e28f9ceb1fa1d5af3b230bad3701dfdc990720cc35e0cfc
-EBUILD pax-20161104.ebuild 1465 BLAKE2B 11f30cd858cda8fae6c83dd3a9e348573e264b36e3cfbb55dcaa7b827511836b115b986a9854ff15dce222469f882965076ec06cea7838d2a3426235044d37e3 SHA512 8ff16c279547707525d74e9d03c5b4757614b37afa39c33b315d3d05ce4ee37c2b63f26d9d32126a22681eb966cfb6752035b67f1596353bb345945a2ecda7cf
+EBUILD pax-20161104.ebuild 1461 BLAKE2B ff8746e81a13adda6e317607abd2f64dd3201a1ff31c36d0c62faf7841c891a5b38e371ff832b39ade7a6c75433333b45ec46f10d21b62753c977f4f19e03ff0 SHA512 68c7514f2a48ad165893b0eadf9b796f8dc5e3ad96f22493745bc1fe23a69a5e562ef361f7646a82f8fa25b1c4ac39021af4cae914ac059cb1d2bc3c91872928
 EBUILD pax-3.4.12.16-r1.ebuild 1115 BLAKE2B 6f7bf0b2542e19ff6384f974c91856236571ed8ef63f3ff08a66292c73893f853f9a04be1354625478d714a428d2d2e0ef18554499b6fe4dbd17aa739af7a0fe SHA512 e8c555c337a83262a42be1074ec25cc471e08b03217254bddb3d0953ba6ba1e1aa2ea3c741d88face59e026b1ba1e8ffaf2a06840ab72da249a475be1f5d7547
 EBUILD pax-3.4.12.16.ebuild 1008 BLAKE2B 4ef6727535ef6773796832fa9cfe05565b23f2335754396939c1c621d8984e53fd0395275f47f4d071203bbb7a6fa68603e00d096467883434e89370d0a2e517 SHA512 c08f62d99219a9e9bf991be56c1c425c1ba595e9413814f91e7357b9ea6337404922952a39f4da3202c5ef00ef5807e225b97ce7611b2cd6590c0e90685fc51a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
index da9f50e30b24..f922cdb014e4 100644
--- a/app-arch/pax/pax-20161104.ebuild
+++ b/app-arch/pax/pax-20161104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND="
 	dev-libs/libbsd
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index ba303f400a69..11f6e836cc4c 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -2,5 +2,5 @@ AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BL
 DIST snappy-1.1.3.tar.gz 1509026 BLAKE2B d8dbb6e92d1788f7b13e6e36aa0297cfcb28d664fb625d0798831ccd00de818675c224821359cc66f38f274da248725737510a85b01a36efe07aa4c9a8bcfda4 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
 EBUILD snappy-1.1.3-r1.ebuild 970 BLAKE2B f4794a69d78a43906d661c1e05a1810d8ec708e166b1c045ca7611b3800cd1694657a5b67b0b34155384edb28f1023e6c980d12fa963fb270f2378a7eec0bc98 SHA512 75c6fdc710845048e095963edbf50a7713cf919cabe45b5548487c27ad4e2278e06b79b3c56c16a529a82f65ef0eff8a11a3964b9f3a40b1a3293fcb4afdce29
-EBUILD snappy-1.1.7.ebuild 1925 BLAKE2B 9bbb86ffadec79eae7c06fc41490129e4094a1bd3969d551614ac9e5167889d01eb0cd9cc638cf2b151af1d4748f71865af8ad489028f85acf3da609f829aa60 SHA512 826c118d3bc8c41ff133ad707e6221aab0c422f6b6df6f642c71db3db7f6c40890ce66ad066b461bf595b2fec373e46babf7f6e1233ce0128d2637c75eb79d8c
+EBUILD snappy-1.1.7.ebuild 1924 BLAKE2B 4a2ec6de572cceee460e7637a7df9e82b8776efdc935584ab9d695c11526d611a965e83795362fccefbc4df4dda66e36c1f408ef28a03a493f777d349e4eaa23 SHA512 5ad62e05e30eba722bf439bacbacab4e27083ba528f4b167fb58b8b017b6f02481775b4efefb6ec3b01ad907edcf8fb409396e852f945256ae273ed23d2efb32
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index 45af409ab6ba..65991f0c81b4 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 # upstream killed static lib support with build system update
 # (and we have packages depending on the flag)
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index d478f09c69cb..3f1ac1812459 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,3 +1,3 @@
 DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
 EBUILD torrentzip-0.9.ebuild 545 BLAKE2B d611213e01e6fa3257de87fba67f97d8c58a00e5b465f4068c92dcaced997147995d5cb0829b051ce5d109e76f0f8091fa86868e31863afb03aa51bf47755e76 SHA512 e8529a17ef17a9907b32c91fa31bb743a2773ed4bff637fd0cce9f88e510e50e814fb779f96e93567b32485fa7cf2130bd32daac22219e4ffec61e83e89ee5bd
-MISC metadata.xml 798 BLAKE2B dd69b999f3908f7d0c038b521fc2377bf4af3a0b346a5a20224d67af8888039b1356b73bf125c6a9592d843c1a4f957ce3a3a955cd00499d8a2bbb0475606521 SHA512 fb7ec69525466e9e8d91f7c75255c76d27cabc564fd2302faa5dfb1f21cf44820ddab366e2a73cdce33325d59af56648d72eb31988e0fdc308d82593ead9c1d0
+MISC metadata.xml 721 BLAKE2B 3a3fff9bfc6d5ab338abecf42f6a742f6e46e00907bb4858c6c41144d46dc40612346a7421274d62b33d4e66f284049da348c5389627492550c2c853aa0e2c34 SHA512 3e9c20623abceddb37559d631e498012bdd080a9b63f29aed8503553e6db7dfc2bff44226f3615c56a9bcc4ddb1c15b2f322d9f77fc1dc1788e62b4b2ea4c2ae
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
index ddf78d96b55d..8c0252f5120a 100644
--- a/app-arch/torrentzip/metadata.xml
+++ b/app-arch/torrentzip/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>alex.miller@gmx.de</email>
 		<name>Alexander Miller</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-arch/unarj/Manifest b/app-arch/unarj/Manifest
index ab1d11f64299..9f1bb8868699 100644
--- a/app-arch/unarj/Manifest
+++ b/app-arch/unarj/Manifest
@@ -4,4 +4,4 @@ AUX unarj-2.65-gentoo-fbsd.patch 168 BLAKE2B db8ad647f7666cc2e0032b35f5cfc36d63a
 AUX unarj-2.65-sanitation.patch 2710 BLAKE2B 814acc285392cdc44d2f4151e2aa10b9664f3dfec0968028e6f6c20207586034182cbeab9dee8e8340fe52f1a2bd7bb4d1793714d2f6806889128d2bb200d0c6 SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755
 DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
 EBUILD unarj-2.65.ebuild 726 BLAKE2B 9d30c053d0671c7b804734afbea557a7f1c86213c3bce1d5d29b44371cb81408d45d52e0acadab67280e9cec5381c4a94fc227edabfa5585beedc3a9a68cf8d5 SHA512 171e05906682922bd79516ab32a628a6e7fbe3229b370cbe16c616d5ae29cd47eb04182712d55329d7c6d443d43d745a5cf5e58ea0d8a091f541a68c49b7561c
-MISC metadata.xml 515 BLAKE2B ef334f1e25735b01d99508a442cd6e2e1d499449bf52c0e408b0cbeec374f96dc388781228a6a63ef536a4751d8130e17aec005d4261234a52cd3e6d909cdf32 SHA512 72e4397504e316cca89b760d909cf151146f122e349283d4509f40036eee1272008ca8cfa2f2dc4b4204ecd450e6135f9ca1ffd8670aef6cda29d0865a61907e
+MISC metadata.xml 438 BLAKE2B f481e5ad2c0786e15e1f0c2aa835fd356d239f84ad59319f8330538466576c342f3c10a7c04b646ce3474d04e8fa52d592368ea2958cd03c60d514e178cfb049 SHA512 507f17fa799964dd8c11492327b7077f9a2e667aefe2c9249a05df95f8f0a7a1c4ffd1735a2f9292f999c0914ba901f7f3a534c626c72eb69dff04a0f5ca22a6
diff --git a/app-arch/unarj/metadata.xml b/app-arch/unarj/metadata.xml
index 8f032a3fd115..e8c216b62618 100644
--- a/app-arch/unarj/metadata.xml
+++ b/app-arch/unarj/metadata.xml
@@ -4,7 +4,6 @@
 <maintainer type="person">
   <email>nitro@legroom.net</email>
   <name>Jared B.</name>
-  <description>Proxied maintainer; set to assignee in all bugs</description>
 </maintainer>
 <maintainer type="project">
   <email>proxy-maint@gentoo.org</email>
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index 7c00e696b8e6..7e45da71ba5d 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -3,4 +3,4 @@ DIST zopfli-1.0.0_p20140705.tar.gz 125759 BLAKE2B 5bc052de7f8189605ec4e155c35413
 DIST zopfli-1.0.1.tar.gz 128178 BLAKE2B dfc410508c0566ba6ec948c2ed17b5ffa45338834c08991b5f2954b06b598f01a9c2cdba6526f324bd477e89e0ddb1ab86d4c2498ffe4cc573ba434b610fec14 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430
 EBUILD zopfli-1.0.0_p20140705.ebuild 677 BLAKE2B 9ab00361713213e8f01da29b9ace8e1761d70f08a2b7a35535848d4303f0309571852f54aac7b83193c8a323ec13d5e3fd2211416ac91187c6e62b9fa26c7ee1 SHA512 2ed577374b97e3bae087491a10b88d0967930a5de22663bf489844a0577f743bb6562d08b21c1df05396c82c5af0c16f843fde738a5eff37135cc8b2051b615c
 EBUILD zopfli-1.0.1-r2.ebuild 922 BLAKE2B f0ad60d9dd445277d41ef91cd28f329f6cb3d4297cf5cc42c89f27a0595778ff2e83e6050e3dd545796cbeac46756ffc8e279949b6c5cdc7bc8dd49d0ffda622 SHA512 acabf1c21f7d8f4c02fa5f6569f8bfdc1b4b5303a480bde95b762a84c04e7f67aba16761f358c65d14bfc9735e3157788b1317dc2e2b8b1352acbb92aa4a4d33
-MISC metadata.xml 665 BLAKE2B 6ae13f9092e7f7c54f214e15cfe05b7a5571d862820515ef6534a19c917002149cdde1d3e30f04c92590927c2424a4eb58a458106f56c36954379ca57d448e4e SHA512 edd29a89c8492a2582f69bb0102b33f509830ac861961965aa9a1c280413bd01145baed1ef08428055a82fc27b4cf17c99de4353b1d2f457c74dfe20879838ac
+MISC metadata.xml 586 BLAKE2B 2545e2cc7e0f4737299f1e11472488e2a26f60c06fbca8ada9945ee4e4abb8a9ea9d4902367ed669ba74b82fac5a2da67b90517a2add19266fb73a634008c835 SHA512 9850711c420050ca6d7ffaff59c492a1a8ee606b541fb422f3e5f6f400540a2e9408a836b625ce645e0f327772c4613c95d9f4cdf20cf6b38eefdfd0b921cc0d
diff --git a/app-arch/zopfli/metadata.xml b/app-arch/zopfli/metadata.xml
index 634b54aec83c..77292e2a3309 100644
--- a/app-arch/zopfli/metadata.xml
+++ b/app-arch/zopfli/metadata.xml
@@ -4,7 +4,6 @@
   <maintainer type="person">
     <email>alex_y_xu@yahoo.ca</email>
     <name>Alex Xu</name>
-    <description>Proxied maintainer; set to assignee in all bugs</description>
   </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>