gentoo resync : 11.07.2019

14 files changed, 214 insertions, 117 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index a46da1a3d849..bb5cd05739f6 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 27e9f33e2c40..55a262430413 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -9,7 +9,11 @@ AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b3
 AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7
 AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab
 AUX bzip2-1.0.6-ubsan-error.patch 921 BLAKE2B a2d746725ed9e40f24ac7c83cdbea06884e0013121bad5a2c748975817293c8f300735d46c85e646e008a54d49d002331a86a31726bc7231451514e628ad4637 SHA512 871ad39056b5b5dba35d90f30e1753569241f1054a2564f115d65186232fd84c427c92199e88ba012b4a646d9f18469b3681ef2992ec028b1004f6b7e13a110d
+AUX bzip2-1.0.7-out-of-tree-build.patch 1999 BLAKE2B b1737d4d693a092819227d70b8ab762257481cf1b776ff21a5327f0a6f185ddc440f963f798e597a09bbb34b69b36a3d5a6b6971d835367f35696ef8ea83208f SHA512 db8e9214e21bc1ee28bab614f0f086fc5b58fe9ce22ceb9341ecc6411dac26fcb5f72d94f02c0520eb6ffb4ab12e98858f5000ce9982be7a38db48701828f91d
+AUX bzip2-1.0.7-saneso.patch 465 BLAKE2B 166abf5793c924e0501716e59feb42366b352670bda399e39141a1461048b30c05c89cf81092f84acd9d8b5ed8a45e018cb394a3d0d644e0012b4ec9d3609c62 SHA512 09d671a8bab59392b3e75529b3b09dc50c8270005885baa1e5fb956568528b662de2ed2bc54c6bb58e4eb532d6a0c01318fb348ea76447263f9873aee3992a32
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
+DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
 EBUILD bzip2-1.0.6-r11.ebuild 3158 BLAKE2B d1eb6c4e92bda0c1190373820b36a58b4eb1927717f6dd828a3867e616f02a9d725309dd239ad7346e6cc935f945bd32c6a83336b4fb5d7f774e1aaaa9a9e029 SHA512 d172d4d20fc6dbe7db700d165c5c75458c59154d255b40d0be0d5380fa88b606db82ddd88a87077521db0e4749bf0f005aa20870ce9722f06c71bdc8efef479a
+EBUILD bzip2-1.0.7.ebuild 3026 BLAKE2B 1158374c7d219ce05c77338550f12f41fac165d2b98736c203e2f59a1ca352298f9af47827fda0ee87704cddf2da1ee6d811198c876a0b8d56ab23c231412fc9 SHA512 e5aad0dbd1b96f8ab1b323ca1a8a278d9fa4f48103cb13efba2351d3fb546438a4c40932516872725267736bee91787aa48e430cdaa9efa9fd9214b29b7b756c
 EBUILD bzip2-9999.ebuild 1404 BLAKE2B 3e6093b7b44d8e5b9da46f9cffd8efa73e2118711d4e3f87dda2f21ed7ae8fed9d7260b027a4b0b78136350ce7e741bd785fecad7c25b1889537d50b6658af8f SHA512 ab9db8ef978fc43dc71406dc6f8991568770fc059dba34cf360d7fcb4a41fccc86b9c3b5323fa8b7f8ad130cbc9f1fcfa8212ff3fb9b79d63b5e426f4ef132a3
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild b/app-arch/bzip2/bzip2-1.0.7.ebuild
new file mode 100644
index 000000000000..b0538f6ddf11
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/"
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.7-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+	"${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.7-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a bz2
+
+		dobin bzip2recover
+		into /
+		dobin bzip2
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman *.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	local x
+	for x in bunzip2 bzcat bzip2recover ; do
+		dosym bzip2.1 /usr/share/man/man1/${x}.1
+	done
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+}
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
new file mode 100644
index 000000000000..977d9b3cd309
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
@@ -0,0 +1,76 @@
+--- bzip2-1.0.7/Makefile
++++ bzip2-1.0.7/Makefile
+@@ -54,7 +54,6 @@
+ 
+ check: test
+ test: bzip2
+-	@cat words1
+ 	./bzip2 -1  < sample1.ref > sample1.rb2
+ 	./bzip2 -2  < sample2.ref > sample2.rb2
+ 	./bzip2 -3  < sample3.ref > sample3.rb2
+@@ -67,7 +66,6 @@
+ 	cmp sample1.tst sample1.ref
+ 	cmp sample2.tst sample2.ref
+ 	cmp sample3.tst sample3.ref
+-	@cat words3
+ 
+ install: bzip2 bzip2recover
+ 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+@@ -113,25 +111,8 @@
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+-blocksort.o: blocksort.c
+-	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
+ 
+ 
+ distclean: clean
+--- bzip2-1.0.7/Makefile-libbz2_so
++++ bzip2-1.0.7/Makefile-libbz2_so
+@@ -36,24 +36,10 @@
+ 
+ all: $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.7 libbz2.so.1.0
++	ln -sf libbz2.so.1.0.7 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.7 libbz2.so.1.0 bzip2-shared
+ 
+-blocksort.o: blocksort.c
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
new file mode 100644
index 000000000000..5ab0cb52d050
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
@@ -0,0 +1,13 @@
+--- bzip2-1.0.7/Makefile-libbz2_so
++++ bzip2-1.0.7/Makefile-libbz2_so
+@@ -35,8 +35,8 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.7 libbz2.so.1.0
+ 
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index 258142a00160..a09dc468f0d7 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,4 +1,4 @@
 DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
-EBUILD cksfv-1.3.14-r1.ebuild 668 BLAKE2B ddc65d6dd570d4237d7be6131761cb9d8416b3a7e6cea52a379bdfd0ad966ac9c387afc80849c67260ac3a0069e48130f7ec6d8b652639c56dc72ae66554a492 SHA512 4dc7d991d90855bca204088004ac2a0d5303fcd19a78b85ad7f30caf727aca622d5322e7e2e28a76bfc96b42a5156bdf3d3b2435af94c6b515239e53c8fc9ef7
+EBUILD cksfv-1.3.14-r1.ebuild 663 BLAKE2B 4063ec9778a60dfa9d89207ce45020298fff54255246eab68e3f7785d220ecbd154806bd85de4a2fa1362dadc2a4d84707f78879f40fda84ca629d0612c9fb75 SHA512 f6af234743dad13fe5151ec95731209f75da32ac0f0dcdc196fe96aadf34f10635a4a075448c3449d26a07ad7451e458f2613684770834a5c430a8a128e7b93a
 EBUILD cksfv-1.3.14.ebuild 734 BLAKE2B cbfee7261d3c8eac8381a541df541c5fa663f02a743a442fbdda3f0014e42737c76256636628dfa1c168e6f76c7faebb1b0e4c6bca00e5309e6555507fefb6d2 SHA512 2793ae00e4cfd2cdca826fc581d9d0257df6d29d6d205960f780b9be6617d9af08b7ee48b309731d10d69f090ac801e538977581ef337b47be73308af3602298
 MISC metadata.xml 301 BLAKE2B 3e0945108754a3afcc9261293790159773b42004104ae4ae6d3275aa3245965298a4334d029c3821b62434e42eb8a4feef05ac40bed9703ab845001afda4553b SHA512 e6e2beb7e4c2d47fcc52fa57bff562229554d30ec41405d0ebe920bb442154e9aeb12b9974a97ac44c086a7e0510989e3a6c8a510163483bec9370ca88c52776
diff --git a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
index 4793e5b02741..47615468c282 100644
--- a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-linux ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 src_configure() {
 	# note: not an autoconf configure script
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index f3bc1f8cc135..67acff098810 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,5 +1,3 @@
-DIST engrampa-1.22.0.tar.xz 1358552 BLAKE2B 542bb963d232dd75eba6102926e2cf31b52cab16eb890039609cf6ec44e86a7d6bf49ee04da316bb46e49d9c012c1f100e4acb20541cb8f46e245946f83cbac8 SHA512 7b4c3b85184c1530ec72eba174ee571cc14490c88f5fef1232acd4197f1020107f5172d6d4271753f9f6fcfadcf049273095b3dfbcef6fdd25a51ad8d2e17382
 DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
-EBUILD engrampa-1.22.0.ebuild 1717 BLAKE2B 1b19d5b2a8a35909db0e38b59be3f5dd4afc87ac77800b946f1a91080f37c12e49f8843ec786f92e630adf727e7dbc6a68184f748f131eb9aefeae76efd0352a SHA512 640f9adac5ff1e040cb1e5bacb6ff9408bb8d5ab4b9db91c341090987ecb3bd6f19613314fb3bac69c113ef47f18b162401e26e8a1cd6ce69f5e8cf9be985caf
-EBUILD engrampa-1.22.1-r1.ebuild 1682 BLAKE2B 5c2a1be179d0100ab5d917f647e0859556234d427f36e8571b2e53db3e92508b69665758b490af57a8195bf4ad82d02616702ca9de3a537bce16a803a190ad22 SHA512 f16c1da4e62b05b9db27657134d75ce1ccb69346d2710043a43f89b1557b4cfab861524ae3163f90bde6bca675e6f734719d10d12efdbe0d66fc413af96513f5
+EBUILD engrampa-1.22.1-r1.ebuild 1680 BLAKE2B c4c11eb9ed21b405777c6957200bcf5cd9d1f6bf34f10a9c8133a4c89a7975674bd614f7d2829e180178542ed76cb0428b52907f65265919642ee3de3aa26936 SHA512 16356039e8f8b466896b418b9f804a0984d661bedc4643ab5d021c93783f4b4dca22d9571749165bece0e1a6392e763bca02f3d8d3862f7b16c60bd54cd3ff89
 MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
diff --git a/app-arch/engrampa/engrampa-1.22.0.ebuild b/app-arch/engrampa/engrampa-1.22.0.ebuild
deleted file mode 100644
index cfd188048c75..000000000000
--- a/app-arch/engrampa/engrampa-1.22.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/json-glib-0.14
-	virtual/libintl
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[X]
-	x11-libs/pango
-	caja? ( >=mate-base/caja-1.17.1 )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild b/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
index 63cc9bce008f..3a1520eee9ed 100644
--- a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index b872e8deb359..136395a7803a 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -2,5 +2,5 @@ AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801a
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
-EBUILD gcab-1.2.ebuild 1146 BLAKE2B 780c242be568f468d9f579a8a8b04840c7a6f62df8be764af914d98524e67f400aca758439e3f311bed727aecc69427591b0ca9659d7f9f9ddcef71984200d7a SHA512 64e636f147ebbb2512ca7b2fb3a3ae4e331e9bc8ef00f0195ed2367c8d53427f1953f61a4c8f076b650628a0404d905d5b8f7f3e6150e32a13d6ba0f91fab7af
+EBUILD gcab-1.2.ebuild 1145 BLAKE2B 302866d4b7b07a13c2738300648d9a3fa06f33ca44e984293b23923d7bc2a6f21ee82d9e589ecba94fba4d14efec0ac897bcadb1a0bda2df918de57f978856f7 SHA512 5b41f2787c730419aad15133e2d91b8698e0e2c49a51a7c1e023d207b40a316b8f8aadd8c17667a92cee2ea3f62ca73eb3c4f2a270d0bed81ea355faa9c9d09c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
index f1d354add986..d5ac8f9cb2c6 100644
--- a/app-arch/gcab/gcab-1.2.ebuild
+++ b/app-arch/gcab/gcab-1.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 3ab431afdc12..55aa7b9356e3 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,5 +1,3 @@
-DIST pigz-2.3.4.tar.gz 105412 BLAKE2B 821fac7cd0f113ea81b284c1df5d464c2a2bf8f88742ee432eb6fdc31d097983983f22280a52dda04c3f1735297af690bcebdfd70679560525a5c3731652695e SHA512 c0d5da6c5b2da50841aaf3958d5694edca0356d4bef211175e9f2f17e0c815e80b2e62bb39c7761c8f83fdaa84ca7373e130cdb0fa2c96f91c397556cbf7ba2a
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.3.4.ebuild 938 BLAKE2B 35f8bf034d0f338db9b7705dd3158d56c8127354c84656a6a8c23672a38cbbe7c1b694eb83ebcd0ae6e325c5e083df5fd5456e12618cccfb819726c6afafcfee SHA512 9e2f9345815bffe6c377e809e34ba21d25447b95960ddc0fd3637696471bf3590023810c6f7c6b47d0e72948fc3060ade539523df2ed8bd7e4bd58a3ef744ac3
 EBUILD pigz-2.4.ebuild 938 BLAKE2B f9c25221d2c94f624905cac3e7da6fededa08879e5c381f9184851cdadab327f782c2064bda6405da255738a8fe4f3ae6d644ff06926e2fe19cb6fc8420b315d SHA512 8ad324443df24c0166caf1a9e46f474e6452a41772dbc2525eec738122a0366b8c5f59865c989d4bf1549ce74144c029167768c68840bbb9e9adc7cbb500ead3
 MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe
diff --git a/app-arch/pigz/pigz-2.3.4.ebuild b/app-arch/pigz/pigz-2.3.4.ebuild
deleted file mode 100644
index 8ce1f35518a1..000000000000
--- a/app-arch/pigz/pigz-2.3.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="http://www.zlib.net/pigz/"
-SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}