8 files changed, 3 insertions, 306 deletions
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"