gentoo resync : 29.05.2018

19 files changed, 10 insertions, 296 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3daec37c8f56..1d420d1a61ee 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index e4e1af069326..4d6673ca702c 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,8 +1,3 @@
-AUX advancecomp-1.13-bzip2-compile-plz-k-thx.diff 3555 BLAKE2B 13c47c770d360ce889db53abca909b06fc6b2b64fd49782a4518540a5a55fd9fbdec2ea6a1d28cf88eb883efe815428c2277aa757923525ef9bf589012a406d2 SHA512 b23595378f58c918b207964fb723508f551517919c5fae797620ef2c77b6c1d19fdc76a7dc8212ffdea4696af2908e701648f89ea03dc9a43e085d3d7c5861f8
-DIST advancecomp-1.15.tar.gz 259340 BLAKE2B 64be369b56962b8612d46190a1ee2ccd3d3cae32867891a2dcec6fc24c1ea76c41fb3eb3980d1e43d642011d43250ad49a75f98ba4cb86f8e511c130ab2678a4 SHA512 18d6abb4c739c16e340bad2e87f89b545d0ecb660897a109a038b2a236bab6ce3d3b3ad572839fb4ce7981c5f150d8ed2447654291a8d808bbb85e70152e47ba
-DIST advancecomp-1.23.tar.gz 1288937 BLAKE2B 48044f8e896e29ec41518f50daee50bd10e43d474a966f3a9d5ff1c567fb21366f09b1b7ead51323ec5a959fceafd4df247e469c4ba015ad3cfdb9b2f187bfdd SHA512 2218d8677787d3f72434e2d5dd3f6b21f69de7042c7533ad29625522adedd56d765e70e4749bbfac14973b9b2bb6958db2900e62b26e5242106caf760cbc2236
 DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
-EBUILD advancecomp-1.15.ebuild 919 BLAKE2B 765d9dc15ce846b70c0d29548b65343f8a47ebe8757e1881b38dba191aa1afeaaf7f1b975147e086712a5290031fda36b8400ac793dbec942a4aba1948c32060 SHA512 a4ef58fbf394c95cd311a27195480b7f054c46c8890ae7ecd3527969ebe8a060ef2081c1820ce8761796c9768e76d741ff3783aa98032b6587c98c51b2a382e1
-EBUILD advancecomp-1.23.ebuild 916 BLAKE2B 203186b5cfad20b2df8ea1ae4608b7b2290f3a6d2868581a6b3c373fffbe073266e84253e71a4d5db4afa9c1fd53affd74f285df385d5e247b26a4a63db377fa SHA512 0d103571a0f9d4d5d4a6144401e86e9e48dd293a9c4767250e7fa845b0da917e032340930edb4bc70b895ef5015f3f154dd20644c154dd55b9cbfd550fb70593
-EBUILD advancecomp-2.0.ebuild 915 BLAKE2B 451c776fe4e417379ce26cbe1ec9f46bb26489178bee833249c26864dcc64131dfa42142c015926521323da3a4ac39c2ba8390c706e3ea6b982d189efe01f086 SHA512 90e5805a3f37c7e7d480d34ba565fea28af048dac3f7e1749e6f027d1e671ae718628936e25ab8696f64862094c83349710e748ed25aadc738db23eca2842eb5
+EBUILD advancecomp-2.0.ebuild 914 BLAKE2B 93d773556cd4ca17e0ccf8acc4c5cb789841168d7ea67740ac585e4560e8e51d68664af2b97b17858f090a7f8962c44bebb65753a8ec497f0b1c4d550852a0b8 SHA512 49fe538efb6bcf76c29ff4532a6d8059e546f592b62abe872b6558bbd9f5f0f433a480276edc18441b638fb2bf1da4ccba191e60cb56d197c04c40f9c5e9f3f7
 MISC metadata.xml 521 BLAKE2B 84acb45e5f88abc50bd2e45d1b03a98b62623c52a7ba5fe1a6b54cb6f481c6328418d23920b55fb570c633223a115a36b1c89992f95b9673c9986a449c1765be SHA512 48bd30d199f5dae792a18e564454c3bf6707767a15a752aaaa28e2f8507e0824ccc348a9478531d03db839176742f00beabc95f532540ded145b734d2f4b3c45
diff --git a/app-arch/advancecomp/advancecomp-1.15.ebuild b/app-arch/advancecomp/advancecomp-1.15.ebuild
deleted file mode 100644
index ec5089773317..000000000000
--- a/app-arch/advancecomp/advancecomp-1.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="png mng"
-
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test" #282441
-
-src_prepare() {
-	# bzip2 support wont compile, here's a quick patch.
-	epatch "${FILESDIR}"/${PN}-1.13-bzip2-compile-plz-k-thx.diff
-}
-
-src_configure() {
-	econf --enable-bzip2
-}
-
-src_install() {
-	dobin advdef advzip
-
-	if use png; then
-		dobin advpng
-		doman doc/advpng.1
-	fi
-
-	if use mng; then
-		dobin advmng
-		doman doc/advmng.1
-	fi
-
-	dodoc HISTORY AUTHORS README
-	doman doc/advdef.1 doc/advzip.1
-}
diff --git a/app-arch/advancecomp/advancecomp-1.23.ebuild b/app-arch/advancecomp/advancecomp-1.23.ebuild
deleted file mode 100644
index da4307230c37..000000000000
--- a/app-arch/advancecomp/advancecomp-1.23.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="http://www.advancemame.it/comp-readme.html"
-SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="mng png test"
-
-RDEPEND="app-arch/bzip2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-#	test? ( dev-util/valgrind )
-#   test? ( app-text/tofrodos )
-
-RESTRICT="test" #282441, #523212
-
-src_configure() {
-	econf --enable-bzip2 \
-		$(use_enable test valgrind)
-}
-
-src_install() {
-	dobin advdef advzip
-
-	if use png; then
-		dobin advpng
-		doman doc/advpng.1
-	fi
-
-	if use mng; then
-		dobin advmng
-		doman doc/advmng.1
-	fi
-
-	dodoc HISTORY AUTHORS README
-	doman doc/advdef.1 doc/advzip.1
-}
diff --git a/app-arch/advancecomp/advancecomp-2.0.ebuild b/app-arch/advancecomp/advancecomp-2.0.ebuild
index 02c4e4276dc0..1e620391529f 100644
--- a/app-arch/advancecomp/advancecomp-2.0.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="mng png test"
 
 RDEPEND="app-arch/bzip2
diff --git a/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
deleted file mode 100644
index f20bba3373a2..000000000000
--- a/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- advancecomp-1.13.orig/compress.cc	2004-12-16 23:19:17.779774920 -0200
-+++ advancecomp-1.13/compress.cc	2004-12-16 23:36:05.356599960 -0200
-@@ -181,16 +181,17 @@
- }
- 
- #if USE_BZIP2
--bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor)
-+
-+bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor)
- {
--	return BZ2_bzBuffToBuffCompress(out_data, &out_size, const_cast<unsigned char*>(in_data), in_size, blocksize, 0, workfactor) == BZ_OK;
-+	return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
- }
- 
--bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size)
-+bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size)
- {
- 	unsigned size = out_size;
- 
--	if (BZ2_bzBuffToBuffDecompress(out_data, &size, const_cast<unsigned char*>(in_data), in_size, 0, 0)!=BZ_OK)
-+	if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast< char*>(in_data),in_size,0,0)!=BZ_OK)
- 		return false;
- 
- 	if (size != out_size)
---- advancecomp-1.13.orig/compress.h	2004-12-16 23:19:17.778775072 -0200
-+++ advancecomp-1.13/compress.h	2004-12-16 23:37:00.178265800 -0200
-@@ -37,8 +37,8 @@
- bool decompress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
- bool compress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
- 
--bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
--bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor);
-+bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size);
-+bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor);
- 
- bool decompress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
- bool compress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
---- advancecomp-1.13.orig/stamp-h1	1969-12-31 21:00:00.000000000 -0300
-+++ advancecomp-1.13/stamp-h1	2004-12-16 23:37:46.906162080 -0200
-@@ -0,0 +1 @@
-+timestamp for config.h
---- advancecomp-1.13.orig/zipsh.cc	2004-12-16 23:19:17.779774920 -0200
-+++ advancecomp-1.13/zipsh.cc	2004-12-16 23:39:30.099474312 -0200
-@@ -39,7 +39,7 @@
- 		}
- #ifdef USE_BZIP2
- 	} else if (info.compression_method == ZIP_METHOD_BZIP2) {
--		if (!decompress_bzip2(data, compressed_size_get(), uncompressed_data, uncompressed_size_get())) {
-+		if (!decompress_bzip2((char *)data,compressed_size_get(),(char *)uncompressed_data,uncompressed_size_get())) {
- 			throw error_invalid() << "Invalid compressed data on file " << name_get();
- 		}
- #endif
-@@ -247,7 +247,7 @@
- 			c1_met = ZIP_METHOD_BZIP2;
- 			c1_fla = 0;
- 
--			if (!compress_bzip2(uncompressed_data, uncompressed_size_get(), c1_data, c1_size, bzip2_level, bzip2_workfactor)) {
-+			if (!compress_bzip2((char *)uncompressed_data,uncompressed_size_get(),(char *)c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
- 				data_free(c1_data);
- 				c1_data = 0;
- 			}
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 5d0fe480127e..6a6b5f4fa23f 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 3058 BLAKE2B 84ef512a98f1829fc0fae2e6559ebb599c6531ba9a2ab202ed99a9c54ef6afb6c25f08335c9457934e4ae005224644c51a5d741bcefef14abcad92d4ab222a60 SHA512 38b452d940339af54541f23bfc2c36ce3e5b01f665acf76cbf158edbfc5aacec8e7e3c0940879d30e0979101b0af2dc12d944871034f87870e9e843d61fd60f3
+EBUILD bzip2-1.0.6-r9.ebuild 3056 BLAKE2B ce425ea462b37fbb88bd08591aba63f9195daab430269c11d5934ca35c99f4b69e18a586cf0c343df28f32d8081058a36340cbadd627b148798541243039730f SHA512 94b7c75c13db416b9ae1cff5355649d466ed9ecb0a1cf1f1ad8b949d50fd2202c0baf9d2e9d680fd4c411b6a9c1ec5cbf42c58c8f2c13fd510722c13b0907763
 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 69a0d6fe4773..0423546bb503 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/lzip/Manifest b/app-arch/lzip/Manifest
index a6fefdfcab7a..068d6086cd5a 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 873 BLAKE2B 6483d21d1cda57070f0ee9b6fb062f1bcd88e1a93875f646bf1aca15676026efb35c0f762d9e7d39dbadd4fa61434aa726c22c24558a0ab247eb10c0bc944011 SHA512 a1bbfaad0ff360e7def91de8054c972312285ddf90ba87d4734ba04e9a68c4b730978cc9dbc42de2e322f7ecc943c2804fed61e53eaf6e435f2223e0f192a07e
+EBUILD lzip-1.20.ebuild 871 BLAKE2B b4030b939158e49f954404e703886a80e4b5f71fa6bdc055ecf98a8aeb14b0d5059ac5e32a9459f218e34dc49b37b5f4b1dcc91de5d4488b27c8d8c2fea3cdd3 SHA512 d62d352129c64a1c5ddfe5451a80e63ffac6c06c45b20a38192367bbc23f385bd2ccce29d8fb4172bab2ad8edd0a2b61b894cef7487b80bc1014485f5fc6abf8
 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 51eba18e851f..2114c9092504 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/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index a306e7d56599..31a4bfb00db6 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,5 +1,5 @@
 DIST lziprecover-1.17.tar.gz 75941 BLAKE2B 7b9e464ceac83571516a879a4809029219e05de43268d6febc0d1a9f5e86c869489dde2af87992d1d7d1bb8755f68f0f9d001f0cdd8971679acf54bea1568f52 SHA512 409a3634ef15238f8c87e6e69ecf0cf83c48274cff6c54a901a4f80bdc3d475b6bf03215cfee762ac64ca41b3e8a805ab620ceaaa1bec7fc22ffafad049b5f0f
 DIST lziprecover-1.20.tar.gz 102574 BLAKE2B 2b8a1d30d9094655d14978d935755083e4ce1168565745cd412cc56d110261a34afc335882e0e74edc7c87843f24698f6834395056381dbb170b229b68be4da8 SHA512 cb036869bc2bccd6ee56793ced03a4ce8556e6da1e2840934f12f2b9e1d9a9362c66c40483c061e7c3f817e739e4ed6488bd964b03c031b7c26cc99c2ee24867
 EBUILD lziprecover-1.17.ebuild 655 BLAKE2B cf7c042eeb532d477b001826e82979c4e9c8c9a0b1e5db50f5b6064fe0697ba8bbce7226ddacbf7797478771668a8ebf7acafa66def5a1db7af22036da2defa0 SHA512 0bdfe46c55ad1416c454091b228b39130e7cedb624a3d08eb6a05309f219304874628fd6874464a8832dcda7fc7c607c98374ba7700eaa7d15a543e4d60a504e
-EBUILD lziprecover-1.20.ebuild 727 BLAKE2B 49dc33e8f35307f2dedc2ca5bd59b749f004de686ea05d410f93398d70f39a36260dcda02e3ed749ad5b7db7ba0d47e524b1649037371853c0e3ff2ef356c061 SHA512 14e94ec502fd2bec72f321c2a6d02b9f00a4419437427eae29f325137b51c01d56a475faf865a6d7cc6a3f54a50943bbd9387de3f42bf8dbf60e50adb4506dcb
+EBUILD lziprecover-1.20.ebuild 726 BLAKE2B 3108417be15a0cec75fb21ccf25d62e765c47c409b522c08954109d7a7dc8026b7403fc566c09492c5fe67060b5e4378f47af0b4a28f313a8cb1fdbb333959e5 SHA512 cb94b2471348a33cd72b06ff062ca8695aa23f936da7f099154fe2775b47706ded03356313f180c0441815aa3ab54336e59e001ed919287eede066bf59a96ac7
 MISC metadata.xml 2674 BLAKE2B 470d5c221311328b1620bc51fb5ccb6393f04e9a1d0367fcef04579061b9d88ac5bb131e050eb2cd3e2a8608db58586cf49bef3e58ca320d93398aba7579799b SHA512 c39f9d4478cdc3e5865567f5e6560e4fa34f014aa6538ca47a1dddf51f1d5549f8edcee34dda36e691bd28b734a8df4c04ff0a94d68c16caccc22e57c35a7823
diff --git a/app-arch/lziprecover/lziprecover-1.20.ebuild b/app-arch/lziprecover/lziprecover-1.20.ebuild
index e861188313cb..e1fdc7160bc1 100644
--- a/app-arch/lziprecover/lziprecover-1.20.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz
 	http://download.savannah.gnu.org/releases-noredirect/lzip/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${P/_/-}"
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 3dbdb5f637cc..f6868b4e393b 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -1,7 +1,5 @@
 AUX lzop-1.03-gcc6.patch 1127 BLAKE2B be965a34bf43e8c7c0d92f245de3fd0d1cf73fbfd92572eed3075c45a2cfb388d30e6ad5063d5993ae9b6851c8c4c053e3960ae77971488b60f87e37d5e7a4e3 SHA512 9d93d728bd3c1c53ecb63ab3a47c9457105a2ce768fd1c1823ab237d2027532945fcaf845b5dbeb6ce5e04bf08d4bb1cf5d35f196f30fc8de1b68ab495391d40
 AUX lzop-1.03-x32.patch 1345 BLAKE2B ebb5cc35e7fda1578805729268bfe7ba11d102e806473889e5fe2e8de86baa0123c2d488555ad7b310a84693fb5ae4aeebb16a4e44cb1bffc0b5230c16e3bb41 SHA512 fb479d430cfdde965d0758057044566ed55411af8e79026fa7fc1dbaee61bb3b440229a527f2ecf619be21dd379e05ae01014fe0afb29c9e74e1361ed917033f
-DIST lzop-1.03.tar.gz 370775 BLAKE2B c3932c18e13dee788ad405e8241e2366497fae66a7966131baf1880c10974839df12456f6986d975929f7e6005a5dce9887a8af0a2415ec7700ce5b68cf1e100 SHA512 a7a46793e060690f7da3e9dcae8e19f9c3633b84bc6e4a9a7fbf7791361fc7795e00f1d820978b20df8731c165b37244f11203a2936640688e4ade0cc2f5f3d7
 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
-EBUILD lzop-1.03.ebuild 986 BLAKE2B 9865dcc38b15ee7e5847070c9236b638a8c060a29fabfa4584cd6584b7a35b74146fd6508e363d940e70cca68129d8874ea1e2aa1786265278451fd6d6260d9f SHA512 b03d4165485a39768547b2104a7d116b8e14691dcf6acf72a5b4b48ab340d548a917663af992d042c182cb3dbf0d70f47aff8ba9650e154bdb21a2fdbc44c96f
 EBUILD lzop-1.04.ebuild 972 BLAKE2B ed9c89cfee1baf3a225b58ec785cf952f1b8d8c660bd43d8041783d3d0b1f39c2f3d62f7c23ba24083230859aceeb6f7eb5d3dc0a4d47401f6ae7907a9ed5d61 SHA512 539462862596468abd73792d9b91dc0f6987fc7be013169e6a73b1ba3b39d2e43187612378e632e935785ce1092b08f94043b007c973620a72bea507172b935c
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzop/lzop-1.03.ebuild b/app-arch/lzop/lzop-1.03.ebuild
deleted file mode 100644
index ad00dfc6053c..000000000000
--- a/app-arch/lzop/lzop-1.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Utility for fast (even real-time) compression/decompression"
-HOMEPAGE="http://www.lzop.org/"
-SRC_URI="http://www.lzop.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/lzo-2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-x32.patch #575450
-	"${FILESDIR}"/${P}-gcc6.patch #594472
-)
-
-HTML_DOCS=( doc/lzop.html )
-
-src_test() {
-	einfo "compressing config.status to test"
-	src/lzop config.status || die 'compression failed'
-	ls -la config.status{,.lzo}
-	src/lzop -t config.status.lzo || die 'lzo test failed'
-	src/lzop -dc config.status.lzo | diff config.status - || die 'decompression generated differences from original'
-}
-
-src_install() {
-	default
-	dodoc doc/lzop.{txt,ps}
-}
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
index a4299c333960..a35d6b223189 100644
--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@@ -1,7 +1,4 @@
 AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 BLAKE2B 9d060bc629bfbd669f0effde2d31d7571ad71041a49a66da003c49a383fc119013a3aeac5c39c1ebfce0e9c0642d5c394d823cf9837b31c1d4172818ff403111 SHA512 c5e683398572889e4c09d3dfccf8847566421be5e3a56d086217ebbb70c17c4ca23c124cfe5d146e7e5b71e0ecce914575c1c50bdbc8438d3f00a6282790edca
 DIST unp_2.0~pre7+nmu1.tar.bz2 17537 BLAKE2B 7ef6cfcc524daf95c7cd9dc41ba690cb8db1b1983cd45709c8764591af36d6d00631975bfef0359ac633aae1c11b73efe827e367931f73fe7c5fcc8832b0fe84 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362
-DIST unp_2.0~pre7.tar.bz2 14492 BLAKE2B 5155aa3a63ba9aaad981c42ea88602b97c08416384d166979f35a1ddec592b7cfbf4f002a500de0f21a374732f1a5aec85e69bcbb915ca7936edd67f04875898 SHA512 b90238a3e359d45e4b0ec3e5559a682fce3a7a37f74dd5419b005bb7bd3e3e5be03dde2e5d40d1671c0274ff1d795560fa238a572fe6cf3ab12f17dd1e2bcd1d
-EBUILD unp-2.0_pre7.ebuild 907 BLAKE2B 35828af309a0b824d5e90244c1673b3a60ac1deb85135a5727349364969ed3d75b1b24a03febce0b5811cb92fbb91928ca4a245bd71e62715e05497fa47161b2 SHA512 22c61e13cefc72e3b048bd1a9d4cf1736c1970f3896eb5a801df93e0da48d6d54faa17e4ff1879e63cc4e3a7e69e44e3519f0ba5f90bf14ec70cac85525c0d7b
 EBUILD unp-2.0_pre7_p1-r1.ebuild 1230 BLAKE2B 9f89106a462a6e5ac713f7a5b31e8cbd394318642f8e11f73f10d64e1654705045c2c382d96bd59f24656ba09f66a469b84fa1179945dff36a92aa9714c38fb0 SHA512 afeb1d792d4a30a9b4db076080d44c201bd85217350f211db0ea22db428070a73cd7473b225b9461128bb652d3fdb14742a09ebba202a7e740ef7fcaabca434b
-EBUILD unp-2.0_pre7_p1.ebuild 1028 BLAKE2B bb3893a4d7513454e34c6c3d11d53790e25d57bf7af309ce8a1215ddae861b49637df86318281cd3e12f2f1d1f4d78c5da3dd79fbcf11bcf93c983ab59004120 SHA512 5095690f96dbc6a3fe47bf550863ee3b795b14ed9b9e6f3594ea5ae7ac2ef93774f0d30277a9eb2f0e9ba53ca0ca9e4c481dd462cd5de52fb178d3156af02901
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-arch/unp/unp-2.0_pre7.ebuild b/app-arch/unp/unp-2.0_pre7.ebuild
deleted file mode 100644
index 17f3ea399609..000000000000
--- a/app-arch/unp/unp-2.0_pre7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${PV/_/$'\x7e'}.tar.bz2"
-S="${WORKDIR}/${PN}-${PV/_/$'\x7e'}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_compile() {
-	if use nls; then
-		cd po
-		emake
-	fi
-}
-
-src_install() {
-	dobin unp || die "dobin failed"
-	dosym unp /usr/bin/ucat
-	doman debian/unp.1 || die "doman failed"
-	dodoc debian/changelog debian/README.Debian
-	dobashcomp bash_completion.d/unp
-
-	if use nls; then
-		cd po
-		emake DESTDIR="${D}" install
-	fi
-}
diff --git a/app-arch/unp/unp-2.0_pre7_p1.ebuild b/app-arch/unp/unp-2.0_pre7_p1.ebuild
deleted file mode 100644
index 3c2f98f8f9cf..000000000000
--- a/app-arch/unp/unp-2.0_pre7_p1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
-TEMP_PV="${PV/_pre/$'\x7e'pre}"
-MY_PV="${TEMP_PV/_p/+nmu}"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-remove-deprecated-have.diff"
-}
-
-src_compile() {
-	if use nls; then
-		cd po
-		emake
-	fi
-}
-
-src_install() {
-	dobin unp || die "dobin failed"
-	dosym unp /usr/bin/ucat
-	doman debian/unp.1 || die "doman failed"
-	dodoc debian/changelog debian/README.Debian
-	dobashcomp bash_completion.d/unp
-
-	if use nls; then
-		cd po
-		emake DESTDIR="${D}" install
-	fi
-}
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index baa1de19b192..81a01614d559 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,5 +1,5 @@
 DIST xarchiver-0.5.4.12.tar.gz 1074764 BLAKE2B 65d8968a470f7ea607fcbb1e2ff3b6c54ff8e521df1ca0cd29d3b7fc7b84d2ad5e2b9987bfb482979c7099d62287c463317d524cadc4a03d6b80ae61d28bfcc2 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554
 DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849
 EBUILD xarchiver-0.5.4.12.ebuild 1320 BLAKE2B 1f9b40a82529f4764fc56a123a6176bc4b65633cab5fc5710ae76b3b102b88c5cfe20d8f46f69447cce2324a3819a52641e504a528327fada0c476ae8036291f SHA512 848307a17c6aa0aefdf1eff7a516173f4f77fd774950ca03708251f70acea85ff3556f7d69af63f242afa126b356faf10960087d22dd1f37ca970a9c35d97a46
-EBUILD xarchiver-0.5.4.13.ebuild 1322 BLAKE2B c040d424546b06e6985e44491f5355cc0c20d3a1ca89e53599d8de818ebd3b4a6ccf3b967b9127a782386acd3840b739e7027c5c7b464a75b07ced9dbc6e8627 SHA512 9bc89f9c0eb6fabedc08790f584423b55259514a81bd0657edb8acc4250a6743098a24a60aeb8b94e76435c35f6eeca0995df3f858f75f39dcffddd03da5b920
+EBUILD xarchiver-0.5.4.13.ebuild 1321 BLAKE2B 6f2287f0b02cc48a03e865c30558b288fad1276b6b8db3c9e2c84c885cf8b54f6c9335eb0cdec5d80d8eadd26ba4db62328d156e417332c768f3b4329637e5b9 SHA512 aac2eabd10d1767b8c809f7ba7dc50ec43b293af97aeafbe1124a5469f4d2e1b773e039a09a8d5a7af2c07504acdd6f1a9f88c7613ad1986f7ec5840ad91a56b
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
index 74c583291f43..5c60b01c508e 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2:=