gentoo resync : 02.01.2018

24 files changed, 9 insertions, 837 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 891ae388cf8f..3591920d131a 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 78a93b972636..1a16296d475c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,9 +1,6 @@
-AUX CVE-2017-5601.patch 979 BLAKE2B 4ecf3f2dfa52f5d5efcce3807072dda9cf4a1f680743a0bea5859bef4480dff05155f98cc68f16c81a9ba11ec5190b0f7ea5b9ab19b7670a5cd14516aeab7fb7 SHA512 a2c8507698166b3d4bbd197323a15cb82d53a647f2d0c74e17e9b229e4f1fd44c3f0468b674c0dfb693ddad7fc7c5cc4f00fbce1e607d0c02fb90d59cc9e09a0
 AUX libarchive-3.3.1-libressl.patch 825 BLAKE2B 63babd383dce64f836a84db3c336c865d1740f30df45838a7cba178499f110aae1883dc52189694ce52f8c7966dbe1af043a8043586a2476395168935713c3e7 SHA512 2418a281562ee5f0e4f54ca181c68265f6b72a80786d17f45547222a3fde83597a17d88075e5f9c5d52a2688d8890006f592a129ddc634397a9160d16724a12c
-DIST libarchive-3.2.2.tar.gz 5458241 BLAKE2B 99a3f01e780a3cac1142645887f31fc4d68c9a60a3539c259745274ea612373b41a7e93d95c27739c87c6050a0304ff069a0f1435fdbf0a13d47935209547c20 SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7
 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.2.2-r1.ebuild 3429 BLAKE2B eacd04939285d3354a28150396a3f8e70c65b1492869a592e04bb9c3d3f2cc007c38689490c9105887a3b7ac2943a747d908682e48397d736101ef4fae43135a SHA512 0b3e1059ff5b1118934591f2a8c9c00c36c4104c72eddc9d831a66e6ce0254db04513c05e3856e53b27e5ba422b6e5ded6238da56f9d9c23f66dfa7f4907feef
 EBUILD libarchive-3.3.1.ebuild 3300 BLAKE2B 10bce3600696bbcafbb17267ab7139958d0b810acbbfb56e476e873a138770ff5b5b96216387e97a3281f06df01ec67fdd573ea6351ca9a46344c33c1d1d881c SHA512 3c8bd5989c8b6f5554f98e35243a88b3d132779c59bd9d74ee77c7971dba7784345d4c3da2c1294d57384d8034a3461bf5e794a5c15060115bd1451bd7cd879b
 EBUILD libarchive-3.3.2.ebuild 3314 BLAKE2B b864f34e27ee57395cce46578d23880c64b0544f0661b34c50b36fa7138d92b221835e643420279950154c0642118c6e042fea8b7b6c38fd990d094e37c99db3 SHA512 465cedc1ad9b10c83a8a218af0b4fc50207dbf9593a25bb0292781a8b7f141950496b1909ce355174020a97c63b88322c41806f9215765b7a8e5fa6743bbb5e2
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/files/CVE-2017-5601.patch b/app-arch/libarchive/files/CVE-2017-5601.patch
deleted file mode 100644
index 4ba85ff9072f..000000000000
--- a/app-arch/libarchive/files/CVE-2017-5601.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Thu, 19 Jan 2017 22:00:18 +0100
-Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
- Fixes a heap buffer overflow reported in Secunia SA74169
-
----
- libarchive/archive_read_support_format_lha.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
-index 52a5531..d77a7c2 100644
---- a/libarchive/archive_read_support_format_lha.c
-+++ b/libarchive/archive_read_support_format_lha.c
-@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
- 	/* Get a real compressed file size. */
- 	lha->compsize -= extdsize - 2;
- 
-+	if (lha->compsize < 0)
-+		goto invalid;	/* Invalid compressed file size */
-+
- 	if (sum_calculated != headersum) {
- 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- 		    "LHa header sum error");
diff --git a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
deleted file mode 100644
index 34485b16533b..000000000000
--- a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://www.libarchive.org/"
-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 ~amd64-fbsd ~sparc-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="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-5601.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=()
-	myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-	)
-	if multilib_is_native_abi ; then myconf+=(
-		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-	); else myconf+=(
-		--disable-bsdcat
-		--disable-bsdcpio
-		--disable-bsdtar
-	); fi
-
-	# We disable lzmadec because we support the newer liblzma from xz-utils
-	# and not liblzmadec with this version.
-	myconf+=(
-		--without-lzmadec
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 0ac2a679de0f..067ab6d781d7 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,16 +1,8 @@
-AUX lz4-0_p106-cflags.patch 630 BLAKE2B fbd20433d111a49a2a3c407805732e03d80cfe6e9488afeb2b315bde165b2d78cb69c1d05fde500aedb6c9bbd3ac4e9af6302a7b0ad624b27577656be22efe5b SHA512 0c7cc51229fe20ee0c5e5cb3d933f924750fe3aaa0e97ac78f1f74e4810bf4d9d431990cf12992f25f29dfaffb9dc66b42f3ab6d49147ff881a5cbe49990a89d
-AUX lz4-0_p106-install-to-bindir.patch 2141 BLAKE2B 16d098c3664a0aa69aa2db6be68176fa167adb3bc79c8c2645813f7c693d30b68a3ae7a9dc68cee6c245a0b5a1520fc0ffe7a7d1115f85ebfe2521bb19623f01 SHA512 853be770173b46188c4f293f13c263053fd3837c23e959b2d19e36c5d3c8c04798b619224fe02b20f414494baf4db4235b7c223ce665b9b90f14a655c8303f8c
-AUX lz4-0_p131-static-libs.patch 1515 BLAKE2B bfdfe4a82bb1ea8bf1d8025f9a65441a5d047347a41ad47437c64e78854549b2c148841dd2cc4db1acf37f6eed6fb446dde1c5d12301cc803efe9cd6facfe0ca SHA512 caa55637529c3b723d95965eb1c3ece4551abac6bbaa16cd8c6eae05a41e8be2cde9d67c2099d47a4d62f4e9edeeaf87e532e11fce94bfea953132b5bd7a4732
-DIST lz4-0_p106.tar.xz 129352 BLAKE2B f66467bbb3dc20e0220b3bd6bba793232900c4a4022085f42597b9108696edbb68d29f59896dceb0d42ff123815f978b32c23eed9fcecfccf2ef87b4642fe5ea SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6
 DIST lz4-1.7.5.tar.gz 208019 BLAKE2B a3d79d622eb0be2447cc6b0459bd81ae22b44ebe536ebd34b1c394bf1ff560c9b53e3f9203d5c94d046101a48d9b1ea7db74c39875d0a67b3a5f71d9633aa3b7 SHA512 b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295
 DIST lz4-1.8.0.tar.gz 222840 BLAKE2B 0b33f920f59a5ec9576051baa9ba887b320d424f8f64e1a752124371797d3f8bf2dbf13ee2e7268ef363d70697b8358e7ad627489c6843c61bdba004df80c5ec SHA512 aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535
-DIST lz4-r120.tar.gz 161950 BLAKE2B 59bbcfa30ac0c74ad0388a78ffbdd6c33a69754654365ce525e7f3b2c24a3e8770a9489cdc295d7d5deb70fcb427ecb270af2787b192bb1152cbb19dc14e0d64 SHA512 8b27c57737ba4c2c8e4f00f7ce13f6edc91f74885bad66dd521dfe85d427e0fd78a300896d599bb8642a34fba78446daf207d1b2fd8e91543d4c093e53694e86
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
-EBUILD lz4-0_p106-r1.ebuild 1271 BLAKE2B 9c7e2a9718593c5ed7d0ed0f1681cec1400904e8795fd68863a3fad86ab59c2d9d6d60495bab4c6bc1d82aff76700cf1149534c70686934a9ee9b40b47c592f3 SHA512 7bfd1129e14b73a28c8970c3ec93a9fa81725e89ceb6fd65f31e0a6885acb260d76fc8185a1e44d66861d83335eaa3ba8dbbb52e0a3668b9114b72e5f9ff597b
-EBUILD lz4-0_p120.ebuild 1179 BLAKE2B 3074e462f6d7b181a42f3996a233dba231341b1d5e128bc4ed69d05e5ffbe77779cfb5a29ef8de55b6b22c49be4897c3f75a01e7d4dfe02e5b456034a0490491 SHA512 fc9390f7feea6763cb8f75713154b01f3e2b97acf0d0964d3c38644ee38d97bd46a474780254fb44315c0561f2191cfa2bb86387e9e2704afc989480726888db
-EBUILD lz4-0_p131-r1.ebuild 1665 BLAKE2B f7f810df830254d1f40c33efc76ae52eaca493dea9f65c28bb7d45b6c15c38623c7711185e080db6f074fbc30ed8a579ed4d67ca7af02927c468323b609c1e74 SHA512 f146c7c9202873973b676e197141618439a4b20253715284a0a2cbf0ee3193e65cc80157a5da152277b21fb188e89be1704dbf176e2035d0c39e7c2814bd6d73
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
-EBUILD lz4-1.8.0.ebuild 1056 BLAKE2B 588c968ca0e400a3f48fdcab09da5daf17325ddae88f569fc435155c0a88195acf6c537269770daf63a87c85854d420dd38b16981fb85e74a8635529767c3c4a SHA512 86c066c80879f0eb335aafa5c5c86d081bb96e3c68f07d644ad2ee124fb82c978dcd01a73f6232ca453a929f58235ec92e1b4a2b56680aab6d34699011f32736
+EBUILD lz4-1.8.0.ebuild 1052 BLAKE2B be63c9aa301361c6430c57b9499dc202e81929a298480ee1fbba185f9006c5e134569d42bff62b906e27d1e5ba905ccb40a5005a3a411df0a3b3f7dac61a8722 SHA512 a9b240f98944d91c0fc8dcfe998398b5ec3017d9a49a985975e7950df456e35fd75bada3e01b921e4ee456c2683bd29f8c010564fb8fb2e907179b3c091288d4
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
diff --git a/app-arch/lz4/files/lz4-0_p106-cflags.patch b/app-arch/lz4/files/lz4-0_p106-cflags.patch
deleted file mode 100644
index 6fc0fbb47dd8..000000000000
--- a/app-arch/lz4/files/lz4-0_p106-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/cmake/pack/CMakeLists.txt
-+++ b/cmake/pack/CMakeLists.txt
-@@ -36,7 +36,7 @@
- ADD_DEFINITIONS("-Wundef")

- ADD_DEFINITIONS("-Wcast-align")

- ADD_DEFINITIONS("-Wno-implicit-function-declaration")

--ADD_DEFINITIONS("-O3 -march=native -std=c99")

-+ADD_DEFINITIONS("-std=c99")

- INCLUDE_DIRECTORIES (${SRC_DIR})

- 

- 

---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -99,7 +99,7 @@
- ADD_DEFINITIONS("-Wundef")

- ADD_DEFINITIONS("-Wcast-align")

- ADD_DEFINITIONS("-Wno-implicit-function-declaration")

--ADD_DEFINITIONS("-Os -march=native -std=c99")

-+ADD_DEFINITIONS("-std=c99")

- INCLUDE_DIRECTORIES (${SRC_DIR})

- 

- 

diff --git a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch b/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
deleted file mode 100644
index 521b1bfc58d2..000000000000
--- a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 496c076..ce3fab1 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -41,11 +41,11 @@ endif()
- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")

-     message(STATUS "Build 64bit executable binary")

-     add_executable(lz4c64 ${LZ4_SRCS})

--    install(TARGETS lz4c64 RUNTIME DESTINATION "./")

-+    install(TARGETS lz4c64 RUNTIME DESTINATION "bin/")

-     if(NOT BUILD_SHARED_LIBS)

-         message(STATUS "Build 32bit executable binary")

-         add_executable(lz4c32 ${LZ4_SRCS})

--        install(TARGETS lz4c32 RUNTIME DESTINATION "./")

-+        install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")

- 

-         SET_TARGET_PROPERTIES(lz4c32 PROPERTIES

-             COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")

-@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- else()

-     message(STATUS "Build 32bit executable binary")

-     add_executable(lz4c32 ${LZ4_SRCS})

--    install(TARGETS lz4c32 RUNTIME DESTINATION "./")

-+    install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")

- endif()

- 

- if(BUILD_SHARED_LIBS)

-diff --git a/cmake/pack/CMakeLists.txt b/cmake/pack/CMakeLists.txt
-index a9b0557..e85416e 100644
---- a/cmake/pack/CMakeLists.txt
-+++ b/cmake/pack/CMakeLists.txt
-@@ -48,16 +48,16 @@ set(FUZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzz
- # EXECUTABLES FOR 32 Bit and 64 versions

- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")

- 	add_executable(lz4c32 ${LZ4_SRCS})

--	install(TARGETS lz4c32 RUNTIME DESTINATION "./")

-+	install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")

- SET_TARGET_PROPERTIES(lz4c32 PROPERTIES

- 	COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32")

- endif()

- 

- add_executable(lz4c ${LZ4_SRCS})

--install(TARGETS lz4c RUNTIME DESTINATION "./")

-+install(TARGETS lz4c RUNTIME DESTINATION "bin/")

- 

- add_executable(fuzzer ${FUZZER_SRCS})

--install(TARGETS fuzzer RUNTIME DESTINATION "./")

-+install(TARGETS fuzzer RUNTIME DESTINATION "bin/")

- 

- #target_link_libraries(lz4 ${LZ4_SRCS_LIB})

- ####################### CPACK PACKAGING ###################

diff --git a/app-arch/lz4/files/lz4-0_p131-static-libs.patch b/app-arch/lz4/files/lz4-0_p131-static-libs.patch
deleted file mode 100644
index f8c5c2de1e83..000000000000
--- a/app-arch/lz4/files/lz4-0_p131-static-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-fix from upstream
-
-From 43b631223b2d0425a0970876974074934f89c450 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 22 Sep 2016 23:59:02 -0400
-Subject: [PATCH] add a flag to disable static libs
-
----
- lib/Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index b5352a0cb372..27b35c41b693 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -40,6 +40,8 @@
- LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
- LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
- 
-+BUILD_STATIC:= yes
-+
- DESTDIR?=
- PREFIX ?= /usr/local
- CFLAGS ?= -O3
-@@ -71,9 +72,11 @@
- all: liblz4
- 
- liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c
-+ifeq ($(BUILD_STATIC),yes)
- 	@echo compiling static library
- 	@$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
- 	@$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o
-+endif
- 	@echo compiling dynamic library $(LIBVER)
- 	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
- 	@echo creating versioned links
-@@ -104,7 +107,9 @@
- 	@cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
- 	@cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
- 	@cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ifeq ($(BUILD_STATIC),yes)
- 	@install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
-+endif
- 	@install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
- 	@install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
- 	@install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
--- 
-2.9.0
-
diff --git a/app-arch/lz4/lz4-0_p106-r1.ebuild b/app-arch/lz4/lz4-0_p106-r1.ebuild
deleted file mode 100644
index af0720e31f37..000000000000
--- a/app-arch/lz4/lz4-0_p106-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-CMAKE_USE_DIR="${S}/cmake"
-
-if [ ${PV} == "9999" ] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://lz4.googlecode.com/svn/trunk/"
-	ESVN_PROJECT="lz4-read-only"
-else
-	SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [ ${PV} == "9999" ]
-	then
-		subversion_src_prepare
-	else
-		epatch "${FILESDIR}/${P}-install-to-bindir.patch"
-		epatch "${FILESDIR}/${P}-cflags.patch"
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(-DBUILD_SHARED_LIBS=ON)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodir /usr
-	dodir "/usr/$(get_libdir)"
-	ln -s "$(get_libdir)" "${ED}usr/lib" || \
-		die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)"
-
-	cmake-utils_src_install
-
-	rm "${ED}usr/lib"
-
-	if [ -f "${ED}usr/bin/lz4c64" ]
-	then
-		dosym lz4c64 /usr/bin/lz4c
-	else
-		dosym lz4c32 /usr/bin/lz4c
-	fi
-}
diff --git a/app-arch/lz4/lz4-0_p120.ebuild b/app-arch/lz4/lz4-0_p120.ebuild
deleted file mode 100644
index 85a4e4542a82..000000000000
--- a/app-arch/lz4/lz4-0_p120.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
-	EGIT_BRANCH=dev
-else
-	MY_PV="r${PV##0_p}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-IUSE="test valgrind"
-
-DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
-
-src_prepare() {
-	if ! use valgrind; then
-		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC AR
-	# we must not use the 'all' target since it builds test programs
-	# & extra -m32 executables
-	emake
-	emake -C programs
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-arch/lz4/lz4-0_p131-r1.ebuild b/app-arch/lz4/lz4-0_p131-r1.ebuild
deleted file mode 100644
index 47e496da8698..000000000000
--- a/app-arch/lz4/lz4-0_p131-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
-	EGIT_BRANCH=dev
-else
-	MY_PV="r${PV##0_p}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# Upstream has trouble keeping ABI stable, so please test new versions
-# with abi-compliance-checker and update the subslot every time ABI
-# changes. This is the least we can do to keep things sane.
-SLOT="0/r131"
-IUSE="static-libs test valgrind"
-
-DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
-
-src_prepare() {
-	if ! use valgrind; then
-		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
-	fi
-	epatch "${FILESDIR}"/${PN}-0_p131-static-libs.patch
-	multilib_copy_sources
-}
-
-lmake() {
-	emake \
-		BUILD_STATIC=$(usex static-libs) \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-		"$@"
-}
-
-multilib_src_compile() {
-	tc-export CC AR
-	# we must not use the 'all' target since it builds test programs
-	# & extra -m32 executables
-	lmake -C lib liblz4 liblz4.pc
-	lmake -C programs lz4 lz4c
-	# work around lack of proper target dependencies
-	touch lib/liblz4
-}
-
-multilib_src_test() {
-	lmake -j1 test
-}
-
-multilib_src_install() {
-	lmake install DESTDIR="${D}"
-}
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
index 17840895424d..c44da5e07a39 100644
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index a8fa92882d66..265a0e70f69e 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,11 +1,6 @@
-AUX snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch 3562 BLAKE2B b4534d9969957e7ba42ca8d0d02c7605164a0ffad0b401adf77cb7b10ee09ef7bbbd20ee7bc67a45b9487456e6993685f2b44a99a5560be2dd11fc99c4beb579 SHA512 8d97bca1ec972e3b0727d5d2705cf1a499a62de478c653fba39deac5da5bc8c67f29cb83eaaa95ba08681e1c12f507d25bb6f903e6daf1da776ec017065c139d
-AUX snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch 1451 BLAKE2B 23ddc92164301a0e79aba0d2e5b930e0e9de5db4d69e2e566d2d64bf656ff471435b8448dfeb9ef2c22e7165d91d3a5d1831b81f3758dc962452ff498d5551b3 SHA512 2ad8647f89ff59ff96a24c7ab5067292d58269b7413e18c9b5165cfced8526abbf2d008f19bb18288a78a9a4f479790899648b1ef55df318eacae64d33fe417b
-AUX snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1123 BLAKE2B 62e89ab3f7e9f0e8aaaf5dc6f85beb4f753e53eaf75566a263e382cd649daef15f23ec9d539debffcdbd2dc44c63a73b335d221e7f074bd0aea55806a906d30d SHA512 05265f5af9edbb69c518c4cd5260f6ef0c318292fb7d93556ab710d35d143a9d9d212b1f70b3f8e0fa6310b178f6e65bb07c370f33d7203a48a1101b660753bf
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BLAKE2B e9181a6a89bd62c3433c71008d182fcbdd2960e29542539f9ef5a48eff15347968a8a1a2d362633056f27df0a5ea84a5a721afcc375335295cb7c0cdd9267790 SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4
 DIST snappy-1.1.3.tar.gz 1509026 BLAKE2B d8dbb6e92d1788f7b13e6e36aa0297cfcb28d664fb625d0798831ccd00de818675c224821359cc66f38f274da248725737510a85b01a36efe07aa4c9a8bcfda4 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf
-DIST snappy-1.1.6.tar.gz 1128388 BLAKE2B e02380dae96b00a485ce7584ea3018311b039a622c928bdeff67f7233b9e001800c7c5755e389f85023bfac960e480db6b6f9615de2af81cb0353385930b2c30 SHA512 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf
 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.6.ebuild 2112 BLAKE2B b7223cc1b5408fac7bc5b3a4d5eccd608d8ae8fff812abbcd5f21a6efd29ca5dad14c3d073c056f15dd8207df4aa4772fe06c601a45605508d8676985e0709ae SHA512 7762d015200dce6310f3a46ff18b0b3f46825592bdb1af053a00386ecf6194586bde76c7ca823fc1b6c6b9ccc7c74c36514c7457d544d33836e26b2ca66722cd
-EBUILD snappy-1.1.7.ebuild 1930 BLAKE2B 83becea5bd607f345141a003720fd0a6df6c99443a86396e76bf556a1751dcce4a8aa57696eeed94047709d16ffb9fbe70a6e4fde1f14900544a38465f7de075 SHA512 2f6578ebf0fe9feeaf518811c4c7fba6fae70d27af0926d98027b61bde1891c0cea41e513f2750d7124a745eaab60968fc74850676db5b4d1d73eaf304154ada
+EBUILD snappy-1.1.7.ebuild 1926 BLAKE2B 0bd32400602038e843f93689f84bf2c98fa663cf1dbb9df654a48afda082248fe8dfaa411855d1289a9f26aae44ec8f418ebdaca37d83cd572387d90e9bc0052 SHA512 8672e96d9a80d388891892dbfe5e46240826f5ab33dce96f3dedbd752c64a5be341a689435840132b3b28275df6590d56e7746638a6d158dd4af2e18ea0c2cb4
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
deleted file mode 100644
index b83bc93465af..000000000000
--- a/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 7507c5fcadc53894b128f3b9fc4b073d15564704 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 29 Jun 2017 11:12:44 +0200
-Subject: [PATCH 1/3] cmake: Use GNUInstallDirs to provide configurable &
- correct install dirs
-
-Use the GNUInstallDirs CMake module to provide a standard set of
-variables to control install paths. Otherwise, the package is
-incorrectly installed into 'lib' (instead of 'lib64') on 64-bit systems.
-While this could be solved via providing custom variables for each
-directory, it is simpler to reuse what's already in CMake.
----
- CMakeLists.txt              | 21 +++++++++------------
- cmake/SnappyConfig.cmake.in |  8 ++++----
- 2 files changed, 13 insertions(+), 16 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de52666..1ca77c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists)
- INCLUDE(CheckCXXSourceCompiles)
- INCLUDE(TestBigEndian)
- INCLUDE(CMakePackageConfigHelpers)
-+INCLUDE(GNUInstallDirs)
- 
- TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN)
- IF (WORDS_BIG_ENDIAN)
-@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h
-         snappy-c.h
-         snappy-sinksource.h
-         ${Snappy_BINARY_DIR}/snappy-stubs-public.h
--        DESTINATION include)
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- INSTALL(TARGETS snappy
-         EXPORT SnappyTargets
--        RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib)
--INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION lib/cmake/Snappy)
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
- 
- SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
-                       SOVERSION ${PROJECT_VERSION_MAJOR})
- 
--SET(INCLUDE_INSTALL_DIR include)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(BINARY_INSTALL_DIR bin)
--
- CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
-         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
--        INSTALL_DESTINATION lib/Snappy/cmake
--        PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR BINARY_INSTALL_DIR
-+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
-+        PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
-         )
- 
- WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
-         COMPATIBILITY SameMajorVersion)
- INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
-         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
--        DESTINATION lib/cmake)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- 
- ENABLE_TESTING()
- 
-diff --git a/cmake/SnappyConfig.cmake.in b/cmake/SnappyConfig.cmake.in
-index 5e604fe..d47656b 100644
---- a/cmake/SnappyConfig.cmake.in
-+++ b/cmake/SnappyConfig.cmake.in
-@@ -2,8 +2,8 @@ set(SNAPPY_VERSION @SNAPPY_MAJOR@.@SNAPPY_MINOR@.@SNAPPY_PATCHLEVEL@)
- 
- @PACKAGE_INIT@
- 
--set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
--set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
--set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_BINARY_INSTALL_DIR@")
-+set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
-+set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
-+set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_CMAKE_INSTALL_BINDIR@")
- 
--check_required_components(SNAPPY)
-\ No newline at end of file
-+check_required_components(SNAPPY)
--- 
-2.13.2
-
diff --git a/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
deleted file mode 100644
index 0b7faa08772b..000000000000
--- a/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e801bd3553dc4e49e19a031ce4007620c35764f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 29 Jun 2017 11:14:37 +0200
-Subject: [PATCH 2/3] cmake: Correct & unify CMake install path
-
-The CMake file is using 'lib/cmake/Snappy', 'lib/Snappy/cmake'
-and 'lib/cmake' inconsistently. Replace all of them with a single
-'lib/cmake/Snappy' that matches most of standard CMake packages.
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ca77c1..3d1a304 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,7 +113,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
- 
- CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
-         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
--        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
-+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy
-         PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
-         )
- 
-@@ -121,7 +121,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
-         COMPATIBILITY SameMajorVersion)
- INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
-         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
--        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
- 
- ENABLE_TESTING()
- 
--- 
-2.13.2
-
diff --git a/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
deleted file mode 100644
index b1b8a2cd5e97..000000000000
--- a/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 93d30c53e28759c9dbe82535821f3b1df29e5767 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 29 Jun 2017 10:01:37 +0200
-Subject: [PATCH 3/3] cmake: Add missing linking to GTEST_LIBRARIES
-
-Since the snappy_unittest target uses gtest routines (when available),
-it needs to link to gtest explicitly. Otherwise, the build fails due
-to unavailable gtest symbols.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d1a304..9f2cc23 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -144,7 +144,7 @@ ENDIF (HAVE_LIBQUICKLZ)
- ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc)
- TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H)
- TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS}
--                      ${GFLAGS_LIBRARIES})
-+                      ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES})
- TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR}
-                            ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS})
- 
--- 
-2.13.2
-
diff --git a/app-arch/snappy/snappy-1.1.6.ebuild b/app-arch/snappy/snappy-1.1.6.ebuild
deleted file mode 100644
index 2556b836d776..000000000000
--- a/app-arch/snappy/snappy-1.1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="A high-speed compression/decompression library by Google"
-HOMEPAGE="https://github.com/google/snappy"
-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 ~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)
-REQUIRED_USE="!static-libs"
-
-# all test dependencies are optional:
-# - gflags-2.2 is supposedly needed for command-line option parsing
-# but it's a huge hack and does not work,
-# - gtest probably gives nicer output,
-# - compression libraries are used for benchmarks which we do not run.
-DEPEND="test? ( dev-cpp/gtest )"
-
-# AUTHORS is useless, ChangeLog is stale
-DOCS=( format_description.txt framing_format.txt NEWS README.md )
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
-		"${FILESDIR}"/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
-		"${FILESDIR}"/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
-	)
-
-	# command-line option parsing does not work at all, so just force
-	# it off
-	sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	# TODO: would be nice to make unittest build conditional
-	# but it is not a priority right now
-	local mycmakeargs=(
-		# use gtest for tests only
-		-DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test')
-		# gflags does not work anyway
-		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
-
-		# we do not want to run benchmarks, and those are only used
-		# for benchmarks
-		-DHAVE_LIBZ=NO
-		-DHAVE_LIBLZO2=NO
-		-DHAVE_LIBLZF=NO
-		-DHAVE_LIBQUICKLZ=NO
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# run tests directly to get verbose output
-	cd "${S}" || die
-	"${BUILD_DIR}"/snappy-unittest || die
-}
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index eea333450b70..b56e491c71da 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/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/unzip/Manifest b/app-arch/unzip/Manifest
index 83ad225696cd..febecf2e648f 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,6 +5,6 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2613 BLAKE2B ac9a9686e2b289f25f1f369b16a3befa42b69af753d8379912c7bd71dc156352a047b376950ff8fd6d7c097bd6a6dfcca050fc334cf5b8884f866dfcdc8ceb6f SHA512 542c7a263336f5e1b1e82a0f2c2e822f9895584a18ebf3e4f40fa0f720964b1ebfea4f8709d372965c41e368789bdcafe5128b7547af90251bb5e876856f63cf
+EBUILD unzip-6.0_p21-r2.ebuild 2609 BLAKE2B 5d13ddb0dc77f1406008067a8770d1c303edaf6759c2a88ec1f66f2450777a5e1212f01daddf436e2eec5b0b94742adab7265ece60a187b5f424fd5d64acf504 SHA512 f444813b642ea887c04faf61f95cbc65e81c4677a6544f45bf4da14da9e0063145e7c69d4e3e4a86639ff16c7537601ce92a9f2d412c834aac030e452b20c9be
 EBUILD unzip-6.0_p21.ebuild 2539 BLAKE2B 10ad8ccadfbd15b18449b61c3e3ed2c73d428ed85595e0065f2e397a4821221fd6dcb20be3c6d41b13c99f6b20de57fda263eabab2b842204e09ecde1f729d56 SHA512 df4efaf0e18777f9ffacc1e72100b33c60a35f535f15934fd9b1a5c5d287a3dd1fe9ab0442ca03fb316b7a792ab737bc130cae75116cb5b8adf7d825fceebdd5
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index bdc9d03e2786..9a6c5e1fb7cd 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.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"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 1142490accab..90a5c6b3faad 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -8,11 +8,7 @@ AUX zip-3.0-natspec.patch 6800 BLAKE2B 6363c941894d7de7611392ea3e883ad724093bf6f
 AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c14316992898c8f3451336a7f526d8283a57fff841c5b990374b0cea163723a25522f5ecd194b294e39bf137d4 SHA512 89a99e694fa2ad289ecc93a514e7b408e4b9e01778e622b2c2928d98181de3823446e91085f401e3478afce1ccbf8775fb227c1908144889dd0106c2d7029b83
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
-DIST zip232.tar.gz 807180 BLAKE2B d2dac8024df8f04eff26ea5a9d74bae6a7bdf3ccc5d6d8d74bbe3c35d79d85c87eae9ca941072164ed305794f3ea596e124b657314f2475138109c12a6d5dd2f SHA512 706646115440597f361b77569ef0301a72c4c990ace5053d4c3b730f20ba0f08af2a8c4fe27c4df5808649cad52d477a6e36e731e82057d6b426a3983836fde2
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-2.32-r1.ebuild 1085 BLAKE2B 64461869e6ffe73bf9ca789b744884619a94b992ee6ede8eba5daba90af6f0a22c0c6db2d194e746c3467ad40109e7d786180ccc980288795a77f5c5bc576a2e SHA512 28d8c49581ef41c537131643d5ef5a1b5229f181455cbcc9e84513a3784e48a65e51fdfb2c1e8ef0de6e6932f12d383c53f6a91f4599d4f3afd234d4df1d9e46
-EBUILD zip-3.0-r1.ebuild 1378 BLAKE2B eb04b9924d1f5a84d5a7f051cfe44b028da07dc42975d2bc1ed29ebded5746d9cc377567d2e32ac7a89b305fbc17261e736abee90a5f8ea1768f67c1b4921b08 SHA512 a3bd7c975178c44f0530f14361a7112ae1c1662e0914fc0252c591951b7e0a25f4ab498f263d0fee4fa916fa26d8fff59262cd05a45f52d12fef1f009b53ebc3
 EBUILD zip-3.0-r2.ebuild 1620 BLAKE2B 373efeea47d7a536cd94d2451b0010de2305dae6f9b53030e25376d818a1601eac9d5a067f8d7b59edeb76c9d813d29caa8cb77e9557debf5214b328d3d2e5fc SHA512 05f7dc22394c58b22435bad6c7de359ad994ccc1665ddae55a556f9f9dff6e14136a1115532b70ccb1809c3cf4b0eba14d3aadd26a3323a0b53ff3b5b2510b14
 EBUILD zip-3.0-r3.ebuild 1720 BLAKE2B 58973350277d37f4c13aaa19e300f2bdcbf1417f66878b2b83cb76cf2cd07e8b149c1dab5608fdf452a66416c728a6af3fbf1968b4869a21c03c8f8fa62699b7 SHA512 1910a94dc81acd0533d91b161a21b1270b4898708cdbb20bd9cf728add15456c23ba9f9b820e181beac7e77650c8cbabfabc1fc12993da281c9960884179cdf7
-EBUILD zip-3.0.ebuild 1379 BLAKE2B add774d5410a6c6daf87b413d80e5b6b1421fbfd5eaa687afb0f229222c922c9a91f4c4ba5a5fb897915bf1f95bd3a26ec843e75268a6578c00e7b7b72c076bd SHA512 c2954826d1e990097adcad8bc9925a5143b2e6eafea21bcf9e60c962af5db3eddfd607730ae9129dad1f8eaebfc9b5828b1e2f193e0a468a1b699bcd7d4fe712
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/zip-2.32-r1.ebuild b/app-arch/zip/zip-2.32-r1.ebuild
deleted file mode 100644
index 7d5eb0a73215..000000000000
--- a/app-arch/zip/zip-2.32-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="crypt"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/zip-2.3-unix_configure-pic.patch
-	epatch "${FILESDIR}"/${PN}-2.31-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-2.32-build.patch
-}
-
-src_compile() {
-	tc-export CC CPP
-	use crypt || append-flags -DNO_CRYPT
-	append-lfs-flags
-	emake -f unix/Makefile generic || die
-}
-
-src_install() {
-	dobin zip zipnote zipsplit || die
-	doman man/zip.1
-	dosym zip.1 /usr/share/man/man1/zipnote.1
-	dosym zip.1 /usr/share/man/man1/zipsplit.1
-	if use crypt ; then
-		dobin zipcloak || die
-		dosym zip.1 /usr/share/man/man1/zipcloak.1
-	fi
-	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-arch/zip/zip-3.0-r1.ebuild b/app-arch/zip/zip-3.0-r1.ebuild
deleted file mode 100644
index 739f4b6aafdf..000000000000
--- a/app-arch/zip/zip-3.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
-IUSE="bzip2 crypt natspec unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-3.0-build.patch
-	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
-}
-
-src_compile() {
-	use bzip2 || append-flags -DNO_BZIP2_SUPPORT
-	use crypt || append-flags -DNO_CRYPT
-	use unicode || append-flags -DNO_UNICODE_SUPPORT
-	emake \
-		CC="$(tc-getCC)" \
-		LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \
-		-f unix/Makefile generic \
-		|| die
-}
-
-src_install() {
-	dobin zip zipnote zipsplit || die
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak || die
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-arch/zip/zip-3.0.ebuild b/app-arch/zip/zip-3.0.ebuild
deleted file mode 100644
index 24708dc83140..000000000000
--- a/app-arch/zip/zip-3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 crypt unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-3.0-build.patch
-}
-
-src_compile() {
-	use bzip2 || append-flags -DNO_BZIP2_SUPPORT
-	use crypt || append-flags -DNO_CRYPT
-	use unicode || append-flags -DNO_UNICODE_SUPPORT
-	emake \
-		CC="$(tc-getCC)" \
-		LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \
-		-f unix/Makefile generic \
-		|| die
-}
-
-src_install() {
-	dobin zip zipnote zipsplit || die
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak || die
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}