gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-arch
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
648 files changed, 14902 insertions, 2008 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 45682521cce6..2ee9ed149ba9 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp-2.0 b/app-arch/advancecomp-2.0
deleted file mode 100644
index 899eb7ee2f2d..000000000000
--- a/app-arch/advancecomp-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/bzip2 sys-libs/zlib
-DESCRIPTION=Recompress ZIP, PNG and MNG, considerably improving compression
-EAPI=6
-HOMEPAGE=http://www.advancemame.it/comp-readme.html
-IUSE=mng png test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=GPL-3 LGPL-2
-RDEPEND=app-arch/bzip2 sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/amadvance/advancecomp/releases/download/v2.0/advancecomp-2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b411806d057931a037d56b57bb969ed0
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
new file mode 100644
index 000000000000..4d6673ca702c
--- /dev/null
+++ b/app-arch/advancecomp/Manifest
@@ -0,0 +1,3 @@
+DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
+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-2.0.ebuild b/app-arch/advancecomp/advancecomp-2.0.ebuild
new file mode 100644
index 000000000000..1e620391529f
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 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/metadata.xml b/app-arch/advancecomp/metadata.xml
new file mode 100644
index 000000000000..df2737613e88
--- /dev/null
+++ b/app-arch/advancecomp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription lang="en">
+		AdvanceCOMP is a set of recompression utilities for .PNG, .MNG, .ZIP
+		and .GZ files
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">advancemame</remote-id>
+		<remote-id type="github">amadvance/advancecomp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/afio-2.5.1-r1 b/app-arch/afio-2.5.1-r1
deleted file mode 100644
index 8ab5332b0842..000000000000
--- a/app-arch/afio-2.5.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Afio creates cpio-format archives.
-EAPI=6
-HOMEPAGE=http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio
-KEYWORDS=alpha amd64 ~hppa ppc sparc x86
-LICENSE=Artistic LGPL-2
-SLOT=0
-SRC_URI=http://members.chello.nl/k.holtman/afio-2.5.1.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=60c82ce77936067d0a3991bd29483a7b
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
new file mode 100644
index 000000000000..e7070037ae8c
--- /dev/null
+++ b/app-arch/afio/Manifest
@@ -0,0 +1,4 @@
+AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
+DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
+EBUILD afio-2.5.1-r1.ebuild 687 BLAKE2B 8c2a97cccf64764bffcb2bc2f48f427f31d66b8a866629ec0e37f96196799bdf818c4afbd631a3d7caed2025d6a98b5897598b0f1afed133113e11d1453d4208 SHA512 f7a87a25cb38074faee92f6a6952b7060d73dd2311c7792f459b45419a995490a8686666525576c0a53300a003d51142fc50295ef105841369c2657cdd07c77e
+MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
diff --git a/app-arch/afio/afio-2.5.1-r1.ebuild b/app-arch/afio/afio-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..3f2b5791d5fe
--- /dev/null
+++ b/app-arch/afio/afio-2.5.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Afio creates cpio-format archives."
+HOMEPAGE="http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio"
+SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	dodoc ANNOUNCE-* HISTORY README SCRIPTS
+
+	local i
+	for i in {1..4}; do
+		docinto "script${i}"
+		dodoc -r "script${i}"/.
+	done
+}
diff --git a/app-arch/afio/files/afio-2.5.1-fix-build-system.patch b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch
new file mode 100644
index 000000000000..5f3e8355c1a2
--- /dev/null
+++ b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -71,15 +71,12 @@
+ MW=
+ #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
+ 
+-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
+-
+-CC=gcc
+-
+-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
+-LDFLAGS =
++CC ?= gcc
++CFLAGS += -Wall -Wstrict-prototypes
++CPPFLAGS += ${LARGEFILEFLAGS} ${2} ${3} ${6} ${8} ${c} ${d} ${e2} ${f} ${g}
+ 
+ afio : afio.o compfile.o exten.o match.o $M
+-	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ clean:
+ 	rm -f *.o afio 
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
new file mode 100644
index 000000000000..1d91069b9e13
--- /dev/null
+++ b/app-arch/afio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		Afio makes cpio-format archives. It deals somewhat gracefully
+		with input data corruption, supports multi-volume archives during interactive
+		operation, and can make compressed archives that are much safer than compressed
+		tar or cpio archives. Afio is best used as an 'archive engine' in a backup
+		script.
+	</longdescription>
+	<upstream>
+		<remote-id type="freshmeat">afio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/alien-8.95 b/app-arch/alien-8.95
deleted file mode 100644
index 361cc9bf83f2..000000000000
--- a/app-arch/alien-8.95
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats
-EAPI=5
-HOMEPAGE=http://kitenet.net/programs/alien
-IUSE=+bzip2
-KEYWORDS=alpha amd64 hppa ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=754eca5a4b524ab2c8b3443fd810f53e
diff --git a/app-arch/alien-8.95-r1 b/app-arch/alien-8.95-r1
deleted file mode 100644
index d2411e05fd63..000000000000
--- a/app-arch/alien-8.95-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=
-DESCRIPTION=Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats
-EAPI=6
-HOMEPAGE=http://kitenet.net/programs/alien
-IUSE=+bzip2
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=312d7a4e74cb81380e657b8be441a014
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
new file mode 100644
index 000000000000..9a434c405e40
--- /dev/null
+++ b/app-arch/alien/Manifest
@@ -0,0 +1,5 @@
+AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
+DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
+EBUILD alien-8.95-r1.ebuild 764 BLAKE2B 283f36f16148748575029629aae5bf8ac0cd67f5461bf4ca663ed0f4a6b5216a309e88d16f17f9a0b67072f031cfc3defa390e3539db7ecdb78c9569a4b62fc1 SHA512 a6c188dc13fd2773f88837172f42de118971927fc585708d0f06d14317583cf76e1ee14ed0fdd25fd9b112b46243f6685785012a59b6b1b92ab7cf28ae920a22
+EBUILD alien-8.95.ebuild 697 BLAKE2B c642f99017920dab03230135924cca52f059cf0722adaefebd50de977e805fd6185730f35f613d687d6d9706044021f8301de0d3873c16130185c18b2a9cdac6 SHA512 0b95e1e9168c109d4398191a78fc8946f5f93b91dd4c16a6f15d8dc9c8e92979315b82f92e8ec79c9adeada792bd094cbcae0dc76b1c0e91c37cacc20839e894
+MISC metadata.xml 299 BLAKE2B f0c85fbabcb5ea8dd194f3560a66469354932c2df8a09aacfa26eb980bf1b301ff1d59e5c5196e4014fc637b7f78361ab031930409509c4529a08e78c8d540b6 SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b
diff --git a/app-arch/alien/alien-8.95-r1.ebuild b/app-arch/alien/alien-8.95-r1.ebuild
new file mode 100644
index 000000000000..c088b5dc1813
--- /dev/null
+++ b/app-arch/alien/alien-8.95-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+bzip2"
+
+RDEPEND="
+	app-arch/rpm
+	app-arch/dpkg
+	dev-util/debhelper
+	>=app-arch/tar-1.14.91
+	bzip2? (
+		app-arch/bzip2
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-tar-extensions.patch" )
+
+src_prepare() {
+	default
+	sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
+		-i "${S}"/Makefile.PL || die "sed failed"
+}
diff --git a/app-arch/alien/alien-8.95.ebuild b/app-arch/alien/alien-8.95.ebuild
new file mode 100644
index 000000000000..e692f8eac638
--- /dev/null
+++ b/app-arch/alien/alien-8.95.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 x86"
+IUSE="+bzip2"
+
+RDEPEND="
+	app-arch/rpm
+	app-arch/dpkg
+	dev-util/debhelper
+	>=app-arch/tar-1.14.91
+	bzip2? (
+		app-arch/bzip2
+	)"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
+		-i "${S}"/Makefile.PL || die "sed failed."
+}
diff --git a/app-arch/alien/files/alien-8.95-tar-extensions.patch b/app-arch/alien/files/alien-8.95-tar-extensions.patch
new file mode 100644
index 000000000000..4709fcc1c4f8
--- /dev/null
+++ b/app-arch/alien/files/alien-8.95-tar-extensions.patch
@@ -0,0 +1,25 @@
+From 01aabf053ea28308df87272cca79e645a9268fd7 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Fri, 1 Sep 2017 02:20:37 -0500
+Subject: [PATCH] add more tar extensions
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ Alien/Package/Tgz.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Alien/Package/Tgz.pm b/Alien/Package/Tgz.pm
+index 7ab6e8b..65a3d2d 100644
+--- a/Alien/Package/Tgz.pm
++++ b/Alien/Package/Tgz.pm
+@@ -11,7 +11,7 @@ use strict;
+ use base qw(Alien::Package);
+ use Cwd qw(abs_path);
+ 
+-my $tarext=qr/\.(?:tgz|tar(?:\.(?:gz|Z|z|bz|bz2))?|taz)$/;
++my $tarext=qr/\.(?:taz|tar(?:\.(?:bz|bz2|gz|Z|z|))?|tb2|tbz|tbz2|tZ|xpak)$/;
+ 
+ =head1 DESCRIPTION
+ 
+-- 
+2.14.0
diff --git a/app-arch/alien/metadata.xml b/app-arch/alien/metadata.xml
new file mode 100644
index 000000000000..7bd44913f487
--- /dev/null
+++ b/app-arch/alien/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lordvan@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/arc-5.21p b/app-arch/arc-5.21p
deleted file mode 100644
index 59788d160866..000000000000
--- a/app-arch/arc-5.21p
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Create & extract files from DOS .ARC files
-EAPI=6
-HOMEPAGE=http://arc.sourceforge.net
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/arc/arc-5.21p.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9045719f32cb0791dc53114a9076ec67
diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
new file mode 100644
index 000000000000..e627c3859a22
--- /dev/null
+++ b/app-arch/arc/Manifest
@@ -0,0 +1,6 @@
+AUX arc-5.21m-darwin.patch 268 BLAKE2B f353d9a5cfecb4c434cc65303190523fdc0a8af159c0e2d8ae6b13d19597611a12a55a983723b0b54f2fde737d6a1538c7757dc4cb2aaf8a6014d4e4a05a836e SHA512 1250a494f793d899286989f6715a504f22b651f60019149ad1b4b4d423ad2d59fc948bdd317e773ea99bb4f52f79771450a9e69263c994c7cda79bd3bec5e94f
+AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685ce23fde54f6e77c34e41ab52b29db52b29883d6772f735773e04209506ff61f36909d895595a34afe35ace7aec9d SHA512 6cf269ca19d5000deec43bcf7e766d28aefa53219c5af8f65429e80f4a8b8ec557199d73cb380665b4d14517118ac567a001edcee1514691901d8192109923c0
+AUX arc-5.21o-interix.patch 341 BLAKE2B b37abfafd5d0de28ddcf0f8c5392e2e9ea6921e5a8ebfe7d0fee836fb91513964f25bd60e65f8791f642b106b614c933d607af101408872f715f93a6d89f9d5f SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8
+DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
+EBUILD arc-5.21p.ebuild 845 BLAKE2B c3fdb7752cfccd76653e7ed12fc8ccffc41bfb53d2102b646f54d60dc4608e07be997449a694b54445d25a0b0620cd56694f6b4e5a1d554467633db3893a1008 SHA512 c17f89ba7b4155aa00c0c2f3ea23249148047a312153822b5ce33f34f0e91c8afbf2f52d09369bd2366047ce6508d475b3ca9c985b069f3b1d029f2575583594
+MISC metadata.xml 356 BLAKE2B 8f18c0ad0004f2b5a4ad4d35cb420a709bdeaaba374491c58e19ceadc06b6bccdb54419cb4c93985498e9b99b33417d2cecfe26db6228cc500a407e172124f2f SHA512 22f42b35b8c8ad43bac261820902eb8fc9835c2ed1a96e75a56fc97e0732060e6354e9485458f928177f201f7f6ebd9e75c7cae9a1cff4b376b997d3c3f20d18
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
new file mode 100644
index 000000000000..21daa1b15601
--- /dev/null
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Create & extract files from DOS .ARC files"
+HOMEPAGE="http://arc.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.21m-darwin.patch
+	"${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch
+	"${FILESDIR}"/${PN}-5.21o-interix.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i Makefile \
+		-e 's/CFLAGS = $(OPT) $(SYSTEM)/CFLAGS += $(SYSTEM)/' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPT="${LDFLAGS}"
+}
+
+src_install() {
+	dobin arc marc
+	doman arc.1
+	dodoc Arc521.doc Arcinfo Changelog Readme
+}
diff --git a/app-arch/arc/files/arc-5.21m-darwin.patch b/app-arch/arc/files/arc-5.21m-darwin.patch
new file mode 100644
index 000000000000..fb1eb5ea2598
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21m-darwin.patch
@@ -0,0 +1,11 @@
+--- arc-5.21m/tmclock.c
++++ arc-5.21m/tmclock.c
+@@ -14,7 +14,7 @@
+ /* Julian day number of the Unix* clock's origin, 01 Jan 1970. */
+ #define JD1970 2440587L
+ #define	CENTURY	19
+-#if	BSD
++#if	BSD || defined(__MACH_O__)
+ #include <sys/time.h>
+ #else
+ #include <time.h>
diff --git a/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch
new file mode 100644
index 000000000000..f2762f74b9d2
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch
@@ -0,0 +1,12 @@
+--- a/tmclock.c
++++ b/tmclock.c
+@@ -18,8 +18,10 @@
+ #include <sys/time.h>
+ #else
+ #include <time.h>
++#ifdef timezone
+ extern long	timezone;	/* should be in <time.h>, but isn't on Sun */
+ #endif
++#endif
+ 
+ long	tzone;
+\ No newline at end of file
diff --git a/app-arch/arc/files/arc-5.21o-interix.patch b/app-arch/arc/files/arc-5.21o-interix.patch
new file mode 100644
index 000000000000..f95aee85e37d
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21o-interix.patch
@@ -0,0 +1,12 @@
+diff -ru arc-5.21o.orig/arcdos.c arc-5.21o/arcdos.c
+--- arc-5.21o.orig/arcdos.c	2008-03-30 15:44:53 +0200
++++ arc-5.21o/arcdos.c	2008-03-30 15:45:51 +0200
+@@ -30,7 +30,7 @@
+ #if	UNIX
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#if	BSD
++#if	BSD || defined(__INTERIX)
+ #include <sys/time.h>
+ #else	
+ #include <time.h>		/* Sys V. Bleah. */
diff --git a/app-arch/arc/metadata.xml b/app-arch/arc/metadata.xml
new file mode 100644
index 000000000000..2909b64a9606
--- /dev/null
+++ b/app-arch/arc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>A program that is able to create and extract files form the DOS .ARC file</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">arc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/arj-3.10.22-r5 b/app-arch/arj-3.10.22-r5
deleted file mode 100644
index 3c46386c0bc0..000000000000
--- a/app-arch/arj-3.10.22-r5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utility for opening arj archives
-EAPI=5
-HOMEPAGE=http://arj.sourceforge.net
-KEYWORDS=amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-13.debian.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b3a6a0d2dfdab27a1f668a84ebcda30
diff --git a/app-arch/arj-3.10.22-r7 b/app-arch/arj-3.10.22-r7
deleted file mode 100644
index 2210970c4d68..000000000000
--- a/app-arch/arj-3.10.22-r7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utility for opening arj archives
-EAPI=6
-HOMEPAGE=http://arj.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-15.debian.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e3845fcce802213c97ba3d846a59e884
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
new file mode 100644
index 000000000000..a09eb01d3468
--- /dev/null
+++ b/app-arch/arj/Manifest
@@ -0,0 +1,10 @@
+AUX arj-3.10.22-darwin.patch 825 BLAKE2B 31e35f148ec8c655345283f3d4ed70ef105ad6e2720dc621aa134eeaa919cd0c74e2eb3377b38d13f58ca65f805162d23ae3b13ee74ae6aab64f55a05bc22143 SHA512 55dab1fb23a51c810f1875677e4741b1e3164551042976951a186e8bc7ab5e96069c4effcc86670d2aee37910cec7ff88ddae09854f65456e0bdc460563a9de1
+AUX arj-3.10.22-glibc2.10.patch 515 BLAKE2B e2459e41d185647dfe1a176e5d710ed4ff1661ae99c3f7154d589c4a0cab46515a526f850d51ffe1393c92f0c70f61c077aa6b82ab8bbd0226cde75853bdc330 SHA512 b72221d751c37ce3d9a2c1493dc34bcb987ce7090e0a16c249beef57e172d947cd007191f8c329bbe71dc88f39a732bc9c53e55df60937097eb18396a77476aa
+AUX arj-3.10.22-implicit-declarations.patch 833 BLAKE2B 7162e7851dca555a1d904642efd836c113085fd9a0ee58170a8c7a1b3de0c73655b0da3a55149b2dcb5dd586fd771d06dd718b428eba9a5c798f5b8f149df0ab SHA512 c4655473d39d8d1fc3014fdc501c6e3d712ac86105d1b00ca2a2dcaf7e78bdaf590c8715c00e189c7b851f8d23b078e17b25ccf41ad26b694e9428405494264b
+AUX arj-3.10.22-interix.patch 1257 BLAKE2B 167249b08e73a1114f58781d732288397ba18030c00b3c0df99f5610946569de63fa5d5c2dcf6840cbc7785cc0f22948361ab5d21da6692fb0915a925f308804 SHA512 0ed64bd6d37dcca43651b32623881aaf94525c8dde82515f03ef748a642945366fe2da732aed7ac7c1f6165a6b03fd3b50f078afc135546704d06179d99227cd
+DIST arj_3.10.22-13.debian.tar.xz 15904 BLAKE2B c70a27a8a0a00526d40346ded93f17ee207c81034b0940a196f73b0f40507ba2511e0d4bb9d9a18c342fde93f41c58064c13e45b1b0409a3e156a5b4ddfba81f SHA512 670f9fb69f1f4363a4d277151bc99286de024764a99ca5276e9f46d560718a906657ec6e2898290f57fbf1007c9190959d38de14ecd1d3205fb26323eff6795d
+DIST arj_3.10.22-15.debian.tar.xz 16756 BLAKE2B f9bf45f103cf3f76867006bdbd61f6c5e04d75d9543e99e01304b285b8858034c60f38ea76bc8cdc502b44a8515fb7a04fd9d2f3d07f9ea19e1c5d3a4d448eff SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688
+DIST arj_3.10.22.orig.tar.gz 431467 BLAKE2B e40409b9f88a1a7e56de4200b464c3dc420659fa3991bf904ca86bbdb428fc8d17f095b9eabf3170712458ef2136e96545810201cc6755c15e45d4ae9a5e3a03 SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
+EBUILD arj-3.10.22-r5.ebuild 1238 BLAKE2B e5cd5a3b226969309f70928aa3bde3734da71736d25ce7a0ffa96235971e1d40b15efd87cdef232d79025d33cb465f4c823bbc7f9d8c43cf01031553b0859607 SHA512 83445b8b7137fec38fd62cc534c94f69fd10463953396f35dd64070e7e7fabaf41405a8570743061d2a986c6c837daed23979f2468be84fd2329858b80dfaa66
+EBUILD arj-3.10.22-r7.ebuild 1217 BLAKE2B 112e979a5a92775ed4692e8ee0769077045887a4e5967e90bd9f4fe0d195713f41a81824d81bde389797504d897bbb7aff5e3bbde84303236d2c1fcc17b98728 SHA512 d21c7c20de99ce0b1101edaecb820d82ecd03d3d2f737713262e2f37f4203d589980853ca2b4713f8c09562be899ae6b68147ac8f41ad49f4a99b1e92ca49f48
+MISC metadata.xml 240 BLAKE2B 1ec9da3b56dc6e923ce8cab2787b77c19b522e9e0e2048a56e8fff8c5d008b0e5e2e6fbe39f0633d1a3c945526dd66b0160d535ada00ceac5ab93b2f61576626 SHA512 64457fffc601ed1e5d4a9154d0fc977a489cc0f2dae35b4da56c78deb66e42e1f9ad33364e13472c33fba0769ee8908bf256a9568c448d3bc895a6a2e2aaffca
diff --git a/app-arch/arj/arj-3.10.22-r5.ebuild b/app-arch/arj/arj-3.10.22-r5.ebuild
new file mode 100644
index 000000000000..c4d1e2b58a0e
--- /dev/null
+++ b/app-arch/arj/arj-3.10.22-r5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib toolchain-funcs
+
+PATCH_LEVEL=13
+
+DESCRIPTION="Utility for opening arj archives"
+HOMEPAGE="http://arj.sourceforge.net"
+SRC_URI="mirror://debian/pool/main/a/arj/${P/-/_}.orig.tar.gz
+	mirror://debian/pool/main/a/arj/${P/-/_}-${PATCH_LEVEL}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-implicit-declarations.patch \
+		"${FILESDIR}/${P}-glibc2.10.patch"
+
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}"/debian/patches
+
+	epatch "${FILESDIR}"/${P}-darwin.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
+
+	cd gnu
+	eautoconf
+}
+
+src_configure() {
+	cd gnu || die
+	CFLAGS="${CFLAGS} -Wall" econf
+}
+
+src_compile() {
+	sed -i -e '/stripgcc/d' GNUmakefile || die "sed failed."
+
+	ARJLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	emake CC=$(tc-getCC) libdir="${ARJLIBDIR}" \
+		ADD_LDFLAGS="${LDFLAGS}" \
+		pkglibdir="${ARJLIBDIR}" all
+}
+
+src_install() {
+	emake pkglibdir="${ARJLIBDIR}" DESTDIR="${D}" install
+
+	dodoc doc/rev_hist.txt
+}
diff --git a/app-arch/arj/arj-3.10.22-r7.ebuild b/app-arch/arj/arj-3.10.22-r7.ebuild
new file mode 100644
index 000000000000..c69298f293b6
--- /dev/null
+++ b/app-arch/arj/arj-3.10.22-r7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+PATCH_LEVEL=15
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Utility for opening arj archives"
+HOMEPAGE="http://arj.sourceforge.net/"
+SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/a/arj/${MY_P}-${PATCH_LEVEL}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-implicit-declarations.patch"
+	"${FILESDIR}/${P}-glibc2.10.patch"
+	"${WORKDIR}"/debian/patches/
+	"${FILESDIR}/${P}-darwin.patch"
+	"${FILESDIR}/${P}-interix.patch"
+)
+
+DOCS=(
+	doc/compile.txt
+	doc/debug.txt
+	doc/glossary.txt
+	doc/rev_hist.txt
+	doc/xlation.txt
+)
+
+src_prepare() {
+	default
+	cd gnu || die 'failed to change to the "gnu" directory'
+	echo -n "" > stripgcc.lnk || die "failed to disable stripgcc.lnk"
+
+	# This gets rid of the QA warning, but should be fixed upstream...
+	mv configure.{in,ac} || die 'failed to move configure.in to configure.ac'
+
+	eautoreconf
+}
+
+src_configure() {
+	cd gnu || die 'failed to change to the "gnu" directory'
+	econf
+}
diff --git a/app-arch/arj/files/arj-3.10.22-darwin.patch b/app-arch/arj/files/arj-3.10.22-darwin.patch
new file mode 100644
index 000000000000..a09c30d3126d
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-darwin.patch
@@ -0,0 +1,41 @@
+--- arj-3.10.22/environ.c
++++ arj-3.10.22/environ.c
+@@ -58,7 +58,7 @@
+   #include <sys/ioctl.h>
+   #include <sys/statfs.h>
+   #include <sys/statvfs.h>
+- #elif defined(__FreeBSD__)||defined(__NetBSD__)
++ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__)
+   #include <sys/param.h>
+   #include <sys/mount.h>
+  #elif defined(__QNXNTO__)
+--- arj-3.10.22/gnu/configure.in
++++ arj-3.10.22/gnu/configure.in
+@@ -62,6 +62,11 @@
+         DLL_FLAGS="-shared -export-dynamic"
+         LD_STRIP="gnu/stripgcc.lnk"
+ 	;;
++*darwin*)
++	# not ELF
++	DLL_EXT=".dylib"
++	DLL_FLAGS=""
++	;;
+ interix3*)
+ 	# not ELF
+ 	DLL_FLAGS="-shared"
+--- arj-3.10.22/arjcrypt.c
++++ arj-3.10.22/arjcrypt.c
+@@ -329,6 +329,13 @@
+ }
+ #endif
+ 
++#if defined(__APPLE__)
++int main()
++{
++ return(0);
++}
++#endif
++
+ /* External entry */
+ 
+ #if TARGET==DOS
diff --git a/app-arch/arj/files/arj-3.10.22-glibc2.10.patch b/app-arch/arj/files/arj-3.10.22-glibc2.10.patch
new file mode 100644
index 000000000000..4de45e1ea568
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-glibc2.10.patch
@@ -0,0 +1,12 @@
+diff -ruN arj-3.10.22.orig/fardata.c arj-3.10.22/fardata.c
+--- arj-3.10.22.orig/fardata.c	2004-04-17 04:39:42.000000000 -0700
++++ arj-3.10.22/fardata.c	2009-05-27 19:21:42.000000000 -0700
+@@ -13,7 +13,7 @@
+ /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp
+    correctly */
+ #if SFX_LEVEL>=ARJ
+- #define CUSTOM_PRINTF
++/* #define CUSTOM_PRINTF */
+  #define CHUNK_SIZE               512    /* Size of the output block */
+  #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */
+ #endif
diff --git a/app-arch/arj/files/arj-3.10.22-implicit-declarations.patch b/app-arch/arj/files/arj-3.10.22-implicit-declarations.patch
new file mode 100644
index 000000000000..a23429e7bd99
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-implicit-declarations.patch
@@ -0,0 +1,33 @@
+diff -up arj-3.10.22/environ.c~ arj-3.10.22/environ.c
+--- arj-3.10.22/environ.c~	2008-03-31 15:19:36.000000000 +0200
++++ arj-3.10.22/environ.c	2008-03-31 15:19:36.000000000 +0200
+@@ -12,6 +12,8 @@
+ #include <conio.h>
+ #include <io.h>
+ #include <process.h>
++#else
++#include <sys/wait.h>
+ #endif
+ 
+ #include <fcntl.h>
+diff -up arj-3.10.22/arjsfx.c~ arj-3.10.22/arjsfx.c
+--- arj-3.10.22/arjsfx.c~	2008-03-31 15:17:45.000000000 +0200
++++ arj-3.10.22/arjsfx.c	2008-03-31 15:17:45.000000000 +0200
+@@ -5,6 +5,7 @@
+  *
+  */
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <signal.h>
+ 
+diff -up arj-3.10.22/arj.c~ arj-3.10.22/arj.c
+--- arj-3.10.22/arj.c~	2008-03-31 15:17:14.000000000 +0200
++++ arj-3.10.22/arj.c	2008-03-31 15:17:14.000000000 +0200
+@@ -5,6 +5,7 @@
+  *
+  */
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <signal.h>
+\ No newline at end of file
diff --git a/app-arch/arj/files/arj-3.10.22-interix.patch b/app-arch/arj/files/arj-3.10.22-interix.patch
new file mode 100644
index 000000000000..8294f1e96bb4
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-interix.patch
@@ -0,0 +1,45 @@
+diff -ru arj-3.10.22.orig/environ.c arj-3.10.22/environ.c
+--- arj-3.10.22.orig/environ.c	2008-03-30 16:51:40 +0200
++++ arj-3.10.22/environ.c	2008-03-30 16:50:16 +0200
+@@ -61,7 +61,7 @@
+  #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__)
+   #include <sys/param.h>
+   #include <sys/mount.h>
+- #elif defined(__QNXNTO__)
++ #elif defined(__QNXNTO__) || defined(__INTERIX)
+   #include <sys/statvfs.h>
+  #else
+   #include <sys/statfs.h>
+@@ -2286,7 +2286,7 @@
+   else
+    return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
+  #elif TARGET==UNIX
+-  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
++  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)
+    struct statvfs vfs;
+ 
+    if(statvfs(name, &vfs)==-1)
+@@ -3802,7 +3802,9 @@
+  #elif TARGET==WIN32
+   return(0);
+  #elif TARGET==UNIX
++ #ifndef __INTERIX
+   sync();
++ #endif
+   return(0);
+  #endif
+ }
+diff -ru arj-3.10.22.orig/gnu/configure.in arj-3.10.22/gnu/configure.in
+--- arj-3.10.22.orig/gnu/configure.in	2008-03-30 16:51:40 +0200
++++ arj-3.10.22/gnu/configure.in	2008-03-30 16:41:37 +0200
+@@ -67,8 +67,9 @@
+ 	DLL_EXT=".dylib"
+ 	DLL_FLAGS=""
+ 	;;
+-interix3*)
++interix*)
+ 	# not ELF
++	DYN_LIBS="-ldl"
+ 	DLL_FLAGS="-shared"
+ 	DLL_CFLAGS=""
+ 	;;
diff --git a/app-arch/arj/metadata.xml b/app-arch/arj/metadata.xml
new file mode 100644
index 000000000000..cb9416dc0bb7
--- /dev/null
+++ b/app-arch/arj/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">arj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/atool-0.39.0 b/app-arch/atool-0.39.0
deleted file mode 100644
index 4a7863f844ca..000000000000
--- a/app-arch/atool-0.39.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-lang/perl
-DESCRIPTION=a script for managing file archives of various types
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/atool/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !app-text/adiff
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz
-_md5_=448cac8fa5386b65d6dff39b477c13a1
diff --git a/app-arch/atool/Manifest b/app-arch/atool/Manifest
new file mode 100644
index 000000000000..60726dae5d07
--- /dev/null
+++ b/app-arch/atool/Manifest
@@ -0,0 +1,3 @@
+DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
+EBUILD atool-0.39.0.ebuild 410 BLAKE2B 3002ec5ec84f7ae99fcfc57542e9b5aff2861828d89f7197113660574424bc9a0818a94ad2876a29656c32d8ecb5ce62a9a9c4b76a25e22073a8e6347f0e9be8 SHA512 630c0dfb9ae06fefa5271a00e0d23ab029d9fce70b82f7958f046165095d598b9d8687af81efa94e69fdee8d3600d00f8b04ce73eaf873ab84ec91be75e90319
+MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-arch/atool/atool-0.39.0.ebuild b/app-arch/atool/atool-0.39.0.ebuild
new file mode 100644
index 000000000000..52a379d421a1
--- /dev/null
+++ b/app-arch/atool/atool-0.39.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="a script for managing file archives of various types"
+HOMEPAGE="http://www.nongnu.org/atool/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!app-text/adiff"
diff --git a/app-arch/atool/metadata.xml b/app-arch/atool/metadata.xml
new file mode 100644
index 000000000000..78e64a5cf1ad
--- /dev/null
+++ b/app-arch/atool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/bloscpack-0.11.0 b/app-arch/bloscpack-0.11.0
deleted file mode 100644
index 0e1387d98958..000000000000
--- a/app-arch/bloscpack-0.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Command line interface for Blosc compression
-EAPI=6
-HOMEPAGE=https://github.com/Blosc/bloscpack
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.11.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a204c30bc9635426c8f48f7e07a342ab
diff --git a/app-arch/bloscpack-0.5.0 b/app-arch/bloscpack-0.5.0
deleted file mode 100644
index 3bffb428dae6..000000000000
--- a/app-arch/bloscpack-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/blosc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Command line interface for Blosc compression
-EAPI=5
-HOMEPAGE=https://github.com/Blosc/bloscpack
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d179c8184da68e30074cc7e5bfb3d48
diff --git a/app-arch/bloscpack-0.6.0 b/app-arch/bloscpack-0.6.0
deleted file mode 100644
index 4a95e40758ca..000000000000
--- a/app-arch/bloscpack-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/blosc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Command line interface for Blosc compression
-EAPI=5
-HOMEPAGE=https://github.com/Blosc/bloscpack
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d179c8184da68e30074cc7e5bfb3d48
diff --git a/app-arch/bloscpack/Manifest b/app-arch/bloscpack/Manifest
new file mode 100644
index 000000000000..2324230db5d3
--- /dev/null
+++ b/app-arch/bloscpack/Manifest
@@ -0,0 +1,7 @@
+DIST bloscpack-0.11.0.tar.gz 89839 BLAKE2B 466a0290e9ed95f2a77320ead61014b68a3f5869aebb90ea15d3b35e6de7bd1080a0c12521fe56673ee5297509208a7e9cf43604a0045bb16c506799c67d5a0a SHA512 68e6c05a4404fbb2554acc0a5a93500c5fe3eab4d91621ba0ffc290383873509d38fbb5b9c5733640a2cc58bf3c508067a411ba16e563dbd4e485f3036a5ebc7
+DIST bloscpack-0.5.0.tar.gz 45171 BLAKE2B 1f4c2e7dc4acdde4735a59adf8cf874df74802b86e201f84fac51aaa15103d2407dad4e2ab348136d7ef8ac6899f136651305522089a5cd044cc2780280a61d1 SHA512 3a3ab351e9ab77409b8f5774c4ede533e2393bf49065d52cb60018268f448d1cef5ba2b24d0d25ec86298f6ff55bbb9075af3b302558a0e2e7343344b002b8d1
+DIST bloscpack-0.6.0.tar.gz 60571 BLAKE2B 1896cc65b605de1457153fd15075fa6774d74b40294a947dda0707adf2177f5a056d84f43f71bf15bd677a8252e661b622deb6a98a050b38d3a7870d203f9523 SHA512 cd0b6e67d90fb8e320bfd5ddb41ee5d437543826f85931eb4cf3abbcb5eb6bc9581db88c2454b82b333ce2555f18670100f8df018299ce621eccd2e7c9e7d099
+EBUILD bloscpack-0.11.0.ebuild 757 BLAKE2B 085f5d5402333ae397fb9f56e9bc4d4d89497bf5e253935fa71e31c3d1e73c3e4cb4ed0501325fda0586cbdf9341e922eea7f9f6c64b613a32a9f56cc325667a SHA512 fa58d066ce1de9541d23aca7a1d5d39706b7ad6c54c500ec646eaa0fd26f69e840709e21dbc12fbe7209ce5bc7114f51fc7bd41f2a29cb95a991282376f9fc47
+EBUILD bloscpack-0.5.0.ebuild 548 BLAKE2B f0796bd61d97176ba70ca3eb9c59bfe11b4820ccd0a33c43163389b067020cea332f799ed8347594a0b1a0d08ceab3b0a7b24a527c6243e9ac8d6dd5a2b20c3c SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e
+EBUILD bloscpack-0.6.0.ebuild 548 BLAKE2B f0796bd61d97176ba70ca3eb9c59bfe11b4820ccd0a33c43163389b067020cea332f799ed8347594a0b1a0d08ceab3b0a7b24a527c6243e9ac8d6dd5a2b20c3c SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e
+MISC metadata.xml 640 BLAKE2B ff3e980929e8a53610569e417c36c263316db560f53accfb4ded08767943145e21932c1efae243fe43641c941ee490ed1beec1bdcd66d2f7d52e398a96ce1d8e SHA512 82a640c36ad2ed771345c93c35da111589b7c57ffb9074e6da062c7ca84ae9fd76f9f5978abeb75362c8145fc1625ca0bb3f9fd8957688e75dfbb5cef6568c4f
diff --git a/app-arch/bloscpack/bloscpack-0.11.0.ebuild b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
new file mode 100644
index 000000000000..c46a70eca3a1
--- /dev/null
+++ b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Blosc compression"
+HOMEPAGE="https://github.com/Blosc/bloscpack"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+python_test() {
+	PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
+}
diff --git a/app-arch/bloscpack/bloscpack-0.5.0.ebuild b/app-arch/bloscpack/bloscpack-0.5.0.ebuild
new file mode 100644
index 000000000000..ce7024ff02b8
--- /dev/null
+++ b/app-arch/bloscpack/bloscpack-0.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Blosc compression"
+HOMEPAGE="https://github.com/Blosc/bloscpack"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-arch/bloscpack/bloscpack-0.6.0.ebuild b/app-arch/bloscpack/bloscpack-0.6.0.ebuild
new file mode 100644
index 000000000000..ce7024ff02b8
--- /dev/null
+++ b/app-arch/bloscpack/bloscpack-0.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Blosc compression"
+HOMEPAGE="https://github.com/Blosc/bloscpack"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-arch/bloscpack/metadata.xml b/app-arch/bloscpack/metadata.xml
new file mode 100644
index 000000000000..5e17ecfaa28c
--- /dev/null
+++ b/app-arch/bloscpack/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Command line interface to and serialization format for Blosc, a high
+    performance, multi-threaded, blocking and shuffling compressor. Uses
+    python-blosc bindings to interface with blosc.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">bloscpack</remote-id>
+    <remote-id type="github">Blosc/bloscpack</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/brotli-1.0.2 b/app-arch/brotli-1.0.2
deleted file mode 100644
index 82e59450e73a..000000000000
--- a/app-arch/brotli-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/1.0.2
-SRC_URI=https://github.com/google/brotli/archive/v1.0.2.tar.gz -> brotli-1.0.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a910d6ad7465012d9f8a5aba42cfaab1
diff --git a/app-arch/brotli-1.0.3 b/app-arch/brotli-1.0.3
deleted file mode 100644
index 2c69d7f784d0..000000000000
--- a/app-arch/brotli-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/1.0.3
-SRC_URI=https://github.com/google/brotli/archive/v1.0.3.tar.gz -> brotli-1.0.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=04c6e0f543b86e44ae8f25e41659cd7c
diff --git a/app-arch/brotli-1.0.3-r1 b/app-arch/brotli-1.0.3-r1
deleted file mode 100644
index 7f44841e4ff0..000000000000
--- a/app-arch/brotli-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/1
-SRC_URI=https://github.com/google/brotli/archive/v1.0.3.tar.gz -> brotli-1.0.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84070b5cd6862953d8734fe2f2cd3d43
diff --git a/app-arch/brotli-1.0.4 b/app-arch/brotli-1.0.4
deleted file mode 100644
index 0ce38dd6b88b..000000000000
--- a/app-arch/brotli-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/1
-SRC_URI=https://github.com/google/brotli/archive/v1.0.4.tar.gz -> brotli-1.0.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84070b5cd6862953d8734fe2f2cd3d43
diff --git a/app-arch/brotli-1.0.5 b/app-arch/brotli-1.0.5
deleted file mode 100644
index c54b853034ff..000000000000
--- a/app-arch/brotli-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/1
-SRC_URI=https://github.com/google/brotli/archive/v1.0.5.tar.gz -> brotli-1.0.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84070b5cd6862953d8734fe2f2cd3d43
diff --git a/app-arch/brotli-9999 b/app-arch/brotli-9999
deleted file mode 100644
index 48f63da9b6dc..000000000000
--- a/app-arch/brotli-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84070b5cd6862953d8734fe2f2cd3d43
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
new file mode 100644
index 000000000000..82569652e237
--- /dev/null
+++ b/app-arch/brotli/Manifest
@@ -0,0 +1,12 @@
+AUX brotli-1.0.2-no-rpath.patch 865 BLAKE2B 2c9720427c9751586b36580be629d3820757055dfb07b37f4933eacaf78973e14a7a861b0e7eb43a1980e889ee7c6988926fae9c31af90f962f502f17be416f6 SHA512 5da97caa16a910aebd4ce85e0805809dd97b6f36cd71636c72f284e6550bcff1a5f614a902d5363c35be2b46e8986dc74beb93f3fc6158a29f719e49d68a83c0
+DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
+DIST brotli-1.0.3.tar.gz 23815300 BLAKE2B 9569267782a8159d290e0f1b524a985144d1ae68a45a732443aca973dd0407c50249ce62389848d97cbc33eba3062ba471064570418c36158b97935ae4b7fb73 SHA512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c
+DIST brotli-1.0.4.tar.gz 23819000 BLAKE2B 5c0a7ed2cb7e15722c2f08dbaaaa5e74f10a03b95961d77db285fac437a489158cf8f7d43a55fac75eb5423951286accf0285e3e3471e34e35868a69dbf42f16 SHA512 7d41ad37ca0755ba9e08e7355fb031e24a53a5f6d44ff827adee6d9712765af02142cb463ef558f92449ce3b73e559cffb52315a329ab702f4c46927f993b616
+DIST brotli-1.0.5.tar.gz 23825684 BLAKE2B b179f75f3e452bdd3fabbd74d9172bc0a00f797e7facf7a9061e5e81c52148297ea7dd8ab9954c3f596f59e2a96cb22ef057c4c02b1bba4ecf10db7b70e0711d SHA512 703cad94c7f250133d2cfe222f3183612c7649b184bba218907b805f423568046d42695f33acf7da95daf684be118c9d631cfa5706e5a195b611c716db4c839a
+EBUILD brotli-1.0.2.ebuild 1440 BLAKE2B 5c9bff9a21dd9aa71846f75615d5d0aaea5ec7ecbfe0b746e3b2acfa366d1a6ce5e0c0bf138371be86281b85162f049ddfad648caeb917b5be53f672c20817dc SHA512 c006f254c8485a49e12ee13d5cfdad25ebe9535446f3f0f335dce5b8ccd887b41d598365796f80f758bc3522677dc6c9e8c2e54f5ce4c9aa10416916a34b9a9b
+EBUILD brotli-1.0.3-r1.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
+EBUILD brotli-1.0.3.ebuild 1398 BLAKE2B 7cce4fc14efb56d134eea51714e12c1dde687a5d57daa2d27a94d39358a26633dfb0a380872bc9a32e32c4d772fa8602eacd5f857c85f4dd5e096c4783b63e93 SHA512 8210643e246c6172946577112adb0bd721f2a4810461db192ec2b2e2bb7ca917b5dde061ce760aedfc7d908a5944ec4dc89ace253adf79b0337b0bb2b0f2cbef
+EBUILD brotli-1.0.4.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
+EBUILD brotli-1.0.5.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
+EBUILD brotli-9999.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
+MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.2.ebuild b/app-arch/brotli/brotli-1.0.2.ebuild
new file mode 100644
index 000000000000..7b2b044f75b5
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/${PV}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-1.0.3-r1.ebuild b/app-arch/brotli/brotli-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..e06daa440b9b
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1 eapi7-ver
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-1.0.3.ebuild b/app-arch/brotli/brotli-1.0.3.ebuild
new file mode 100644
index 000000000000..f437159d3521
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/${PV}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-1.0.4.ebuild b/app-arch/brotli/brotli-1.0.4.ebuild
new file mode 100644
index 000000000000..e06daa440b9b
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1 eapi7-ver
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-1.0.5.ebuild b/app-arch/brotli/brotli-1.0.5.ebuild
new file mode 100644
index 000000000000..e06daa440b9b
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1 eapi7-ver
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
new file mode 100644
index 000000000000..e06daa440b9b
--- /dev/null
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1 eapi7-ver
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
new file mode 100644
index 000000000000..779b5e66bd98
--- /dev/null
+++ b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac55f6b3..2dc7232c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE)
+ 
+ include(GNUInstallDirs)
+ 
+-# When building shared libraries it is important to set the correct rpath.
+-# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH
+-set(CMAKE_SKIP_BUILD_RPATH FALSE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+-if ("${isSystemDir}" STREQUAL "-1")
+-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
+-endif()
+-
+ # Parse version information from common/version.h. Normally we would
+ # define these values here and write them out to configuration file(s)
+ # (i.e., config.h), but in this case we parse them from
diff --git a/app-arch/brotli/metadata.xml b/app-arch/brotli/metadata.xml
new file mode 100644
index 000000000000..f2d6ceadef4d
--- /dev/null
+++ b/app-arch/brotli/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <longdescription>
+    Brotli is a generic-purpose lossless compression algorithm that
+    compresses data using a combination of a modern variant of the
+    LZ77 algorithm, Huffman coding and 2nd order context modeling,
+    with a hight compression ratio. It is similar in speed with
+    deflate but offers denser compression.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">google/brotli</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/bsdsfv-1.18-r2 b/app-arch/bsdsfv-1.18-r2
deleted file mode 100644
index 3630d66bad99..000000000000
--- a/app-arch/bsdsfv-1.18-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=all-in-one SFV checksum utility
-EAPI=6
-HOMEPAGE=http://bsdsfv.sourceforge.net/
-KEYWORDS=amd64 arm ~hppa ~m68k ppc ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/bsdsfv/bsdsfv-1.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c7a10cd78e8fd6e33fb88c48dca93ba4
diff --git a/app-arch/bsdsfv/Manifest b/app-arch/bsdsfv/Manifest
new file mode 100644
index 000000000000..a491a5f4b0da
--- /dev/null
+++ b/app-arch/bsdsfv/Manifest
@@ -0,0 +1,4 @@
+AUX bsdsfv-1.18-64bit.patch 2388 BLAKE2B 377975f51f211c90cb9f7571c4b6e437cb75a536238aa703321efcc6ddd13e19b9649468eb8c5aaa23f5ad982148fe92bdb65fb8ef40023d7a4375133810d6c8 SHA512 5831956791b03972b1fdd3199687b10e7a55d562e815f94b863fb75a549eec14b85488bb0a9c9e5d2fb3241a95846f710dd5b19547ce33c425da756c685c18a5
+DIST bsdsfv-1.18.tar.gz 13301 BLAKE2B 663ae589e67455dbea968aeedaed74ed8f267fdb9790417da3d61aec9b3f50a5d87857c5e0f39a359d8b20ebd0bf706c5b775bf61c617669c479460ae8e2ff60 SHA512 f2742cfc5c56c915aff7534eb07025394c57bebf74d6505dc1d7e814e5ca098b474a718ae1c2aeb993cf95dd55fc792c56f9ac80344d112738da2f20157647e6
+EBUILD bsdsfv-1.18-r2.ebuild 582 BLAKE2B abe3c1765ca5dbc8c0996ce4be024f5dde3be36d45a7f9f12d429cf15980815ba663fd4d2a1b21f22f26cdd337f8612d24ec0368a5ce0adccdf9ab6b7138fe87 SHA512 bde8f6f8622c1d7e0ce9091a880b6294ea0f5ec9220378cae97477009eb71c5e033b70b5917fcb5e2641b8eda833c977939a0af40f00e2e824e47cac38bba388
+MISC metadata.xml 282 BLAKE2B 85a3c7f911e18e6a016a1f4a8f79cb25a92b2694a5600cd4af94982babeb156ed4976e2ba5884de772931bcf88133a82d0d00e2a195505f1efaea2316723488b SHA512 49b0ecc9bdba3c6b9a5fb98b41f0a1b4f2f17a9d2eda12c7bfd26d90552237106dec26ba5ae159b4b3e9a1e06e6e0d62be934fa2c01e36df95fc11be8b2506e4
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
new file mode 100644
index 000000000000..f41cfb584790
--- /dev/null
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="all-in-one SFV checksum utility"
+HOMEPAGE="http://bsdsfv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}"/${P}-64bit.patch )
+
+src_compile() {
+	emake STRIP=true CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin bsdsfv
+	dodoc README MANUAL
+}
diff --git a/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch b/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch
new file mode 100644
index 000000000000..d55b42d01b86
--- /dev/null
+++ b/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch
@@ -0,0 +1,83 @@
+Index: bsdsfv/bsdsfv.c
+===================================================================
+--- bsdsfv.orig/bsdsfv.c
++++ bsdsfv/bsdsfv.c
+@@ -59,10 +59,10 @@ typedef struct sfvtable {
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <dirent.h>
++#include <inttypes.h>
+ 
+-
+-long
+-UpdateCRC(unsigned long CRC, const char *buffer, long count)
++int32_t
++UpdateCRC(uint32_t CRC, const char *buffer, int32_t count)
+ {
+ 	/*
+ 	 * Note: if you want to know how CRC32-checking works, I
+@@ -70,7 +70,7 @@ UpdateCRC(unsigned long CRC, const char 
+ 	 * There is not much you can change in this function, so
+ 	 * if you need a CRC32-check yourself, feel free to rip.
+ 	 */
+-	unsigned long CRCTABLE[] = {
++	uint32_t CRCTABLE[] = {
+ 		0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+ 		    0x706af48f,
+ 		0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e,
+@@ -175,13 +175,13 @@ UpdateCRC(unsigned long CRC, const char 
+ 
+ 
+ 
+-long
++int32_t
+ GetFileCRC(char *filename)
+ {
+-	unsigned long crc = 0xffffffff;
++	uint32_t crc = 0xffffffff;
+ 	FILE *f;
+-	long totalread = 0;
+-	long localread;
++	int32_t totalread = 0;
++	int32_t localread;
+ 
+ 	/*
+ 	 * Note: different buffer sizes may result in noticable 
+@@ -306,7 +306,7 @@ main(int argc, char *argv[])
+ 	FILE *missingfile;
+ 	DIR *dirp;
+ 	struct dirent *dp;
+-	long mycrc;
++	int32_t mycrc;
+ 	int cnt;
+ 	int dothisone;
+ 	char cfname[FNAMELEN];
+@@ -487,8 +487,8 @@ main(int argc, char *argv[])
+ 				printf("Adding file: %s ... ", cfname);
+ 				fflush(stdout);
+ 				mycrc = GetFileCRC(cfname);
+-				printf("CRC = 0x%08lX\n", mycrc);
+-				sprintf(sfvline, "%s %08lX", cfname, mycrc);
++				printf("CRC = 0x%08" PRIX32 "\n", mycrc);
++				sprintf(sfvline, "%s %08" PRIX32, cfname, mycrc);
+ 
+ 				// uncomment next 2 lines to 
+ 				// convert filename to upper case, for whatever reason
+@@ -516,7 +516,7 @@ main(int argc, char *argv[])
+ 			printf("Testing %s ... ", cfname);
+ 			fflush(stdout);
+ 			mycrc = GetFileCRC(cfname);
+-			printf("local = 0x%08lX, listed = ", mycrc);
++			printf("local = 0x%08" PRIX32 ", listed = ", mycrc);
+ 			fflush(stdout);
+ 
+ 			sfvfile = fopen(sfvname, "rt");
+@@ -675,7 +675,7 @@ main(int argc, char *argv[])
+ 
+ 					mycrc = GetFileCRC(dp->d_name);
+ 
+-					printf("local = 0x%08lX ... ", mycrc);
++					printf("local = 0x%08" PRIX32 " ... ", mycrc);
+ 
+ 					if (mycrc == sfvTable[cnt].crc) {
+ 						printf("OK\n");
diff --git a/app-arch/bsdsfv/metadata.xml b/app-arch/bsdsfv/metadata.xml
new file mode 100644
index 000000000000..869fcb41c15f
--- /dev/null
+++ b/app-arch/bsdsfv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>A all in one SFV utility.</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">bsdsfv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/bzip2-1.0.6-r8 b/app-arch/bzip2-1.0.6-r8
deleted file mode 100644
index 2e196f93de6e..000000000000
--- a/app-arch/bzip2-1.0.6-r8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
-EAPI=5
-HOMEPAGE=http://www.bzip.org/
-IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BZIP2
-SLOT=0/1
-SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5b295870353ab5307eabd75bb03e42d
diff --git a/app-arch/bzip2-1.0.6-r9 b/app-arch/bzip2-1.0.6-r9
deleted file mode 100644
index 3c6201374e4c..000000000000
--- a/app-arch/bzip2-1.0.6-r9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
-EAPI=6
-HOMEPAGE=http://www.bzip.org/
-IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BZIP2
-SLOT=0/1
-SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8a46587966a6bc15509b9a7b157ff0a9
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
new file mode 100644
index 000000000000..5bc92764178b
--- /dev/null
+++ b/app-arch/bzip2/Manifest
@@ -0,0 +1,13 @@
+AUX bzip2-1.0.3-no-test.patch 165 BLAKE2B 48f0f9393d1f7e6f56c93ecc53e80ea7507b7ac921e0d459082c9ac51eb98f9e89233c12975c2346b1c7e424e505116df881b1e57207a7ef325e0c55e2ce90ce SHA512 c6064aada01b9eebdaf5350bcc0f9b52dcc03fa8b5e361d5cb09260de0d301c190e406c5daa0edfb808bc2cb5061a4cd5361f920741024b750fa8e7570715e95
+AUX bzip2-1.0.4-POSIX-shell.patch 676 BLAKE2B f6ba04224ad924979221924dc81398455404a18b36754bc104ec67c4aa44e15512e51b84f5247f4737b1e242b5aa1497c76ebfd5cefa05d3ed4cfb2ee53c1781 SHA512 66e02e9422ecee1ae6e8e007eba95581313fcfa5703fa648470ff8975b5453e3d5323a4acf6264658612a6a2972e5c74cce061ce749e51d5e74769d068e4b365
+AUX bzip2-1.0.4-makefile-CFLAGS.patch 577 BLAKE2B adc265fbd71745e1f688c85386e48389c15569263861efa3aaa76a0328d71724fda22a23e95234cc13c90c95536b21e776bebffa79433d4f42e82d44c88588a7 SHA512 031780e77710619eb8c91350885a602b1cc1768e3776e46313a9535df6d8eb9502fa99624d81e5eccdebfaf97786148c3cd10fb2faed69c5a2ba24158915c0cd
+AUX bzip2-1.0.4-man-links.patch 402 BLAKE2B 9a3cabc0e3964f75408445d7a2d94422ffa38e22d0869e4f97b252ef2947173ab9a504f0c1cd82fc7479494038f899f4a2429e39729d6f3d80e570ca8ef97797 SHA512 91abd3af9ffb339cbf85e28cc65b9193d8799d81281320d4709e234f3f40483b390fd9517ad3a8aab8d240f011786df8f17e9240104a43d1292bca983c1c22cc
+AUX bzip2-1.0.6-CVE-2016-3189.patch 594 BLAKE2B b4a9f6e0267637d1f815e1b8cdbddfdd5e54fcc05cbd2f31c7e64494626b7531f2bb2b5ae8b288ce0ca116abc131235dbf31f32411b58b91e156a136adbc7ad1 SHA512 0b1d5814b93397c588c9b22a7bba57e2a7360ec30a781ca3c9236781089fb8e9f0393a9fd93c880517d084f54712b631302cffa4af81a91dff791717645ec81b
+AUX bzip2-1.0.6-mingw.patch 556 BLAKE2B 1885f5fe9a895e365606fd48d616553a23aa40d381ee87de8f725ed39b936e778ab517d00807a3a84120802d23fc5b54df48b3d33bebb18c7f9ba1c9afa961cc SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8
+AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b352984e1037bbfa86857d90836994f306ddc375353c36a0afad15c58ad84021f1180bcdd10002c0ce546acc9426a68d263570b SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e
+AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7
+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 3050 BLAKE2B fae48013f5b10e6dc5601cae339ee1f5fc9e23432eb4a007e2d14558443992a0df3bf24b575597d00e1caac6d2463b1bbb61c84f70888dbe7258794f30610a6e SHA512 04a09cb18999d5b6cc5736ca51ebc74acf4f146a804990aad92540b0be42edf88098e4cb2f405d5b6803064f44b5febfd1a8b66829f6e26941287d2fed9451d8
+MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
new file mode 100644
index 000000000000..167f56e9bfd2
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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=5
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+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"
+IUSE="static static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.6-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.6-out-of-tree-build.patch
+	"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# - 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 -sf libbz2.so.${PV} libbz2.so
+	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
+
+	dodoc README* CHANGES manual.pdf
+	dohtml manual.html
+
+	# 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/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
new file mode 100644
index 000000000000..5200b0c3413e
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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=6
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+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"
+IUSE="static static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.6-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.6-out-of-tree-build.patch
+	"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
+)
+
+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.3-no-test.patch b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
new file mode 100644
index 000000000000..9e554f79515f
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
@@ -0,0 +1,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,5 +23,5 @@
+       bzlib.o
+ 
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover
+ 
+ bzip2: libbz2.a bzip2.o
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
new file mode 100644
index 000000000000..74f8df000b1a
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
@@ -0,0 +1,21 @@
+bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those
+with calls to sed so POSIX shells work
+
+http://bugs.gentoo.org/193365
+
+--- a/bzgrep
++++ b/bzgrep
+@@ -63,10 +63,9 @@
+     bzip2 -cdfq "$i" | $grep $opt "$pat"
+     r=$?
+   else
+-    j=${i//\\/\\\\}
+-    j=${j//|/\\|}
+-    j=${j//&/\\&}
+-    j=`printf "%s" "$j" | tr '\n' ' '`
++    # the backslashes here are doubled up as we have to escape each one for the
++    # shell and then escape each one for the sed expression
++    j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '`
+     bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
+     r=$?
+   fi
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
new file mode 100644
index 000000000000..04bd0d9abda7
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -0,0 +1,25 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,10 +18,9 @@
+ CC=gcc
+ AR=ar
+ RANLIB=ranlib
+-LDFLAGS=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS)
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -24,7 +24,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
new file mode 100644
index 000000000000..deaa981adccb
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/172986
+
+--- a/Makefile
++++ b/Makefile
+@@ -85,4 +85,7 @@
+ 	cp -f bzip2.1 $(PREFIX)/share/man/man1
+ 	chmod a+r $(PREFIX)/share/man/man1/bzip2.1
++	ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
++	ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
++	ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
+ 	cp -f bzlib.h $(PREFIX)/include
+ 	chmod a+r $(PREFIX)/include/bzlib.h
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
new file mode 100644
index 000000000000..b031c808fef3
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Backport
+https://bugzilla.suse.com/attachment.cgi?id=681334
+
+CVE: CVE-2016-3189
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+Index: bzip2-1.0.6/bzip2recover.c
+===================================================================
+--- a/bzip2recover.c
++++ b/bzip2recover.c
+@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
+             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
+             bsPutUInt32 ( bsWr, blockCRC );
+             bsClose ( bsWr );
++            outFile = NULL;
+          }
+          if (wrBlock >= rbCtr) break;
+          wrBlock++;
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch
new file mode 100644
index 000000000000..51469ca4c96e
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch
@@ -0,0 +1,27 @@
+make it build for mingw targets
+
+https://bugs.gentoo.org/393573
+
+--- a/bzip2.c
++++ b/bzip2.c
+@@ -129,7 +129,7 @@
+ #if BZ_LCCWIN32
+ #   include <io.h>
+ #   include <fcntl.h>
+-#   include <sys\stat.h>
++#   include <sys/stat.h>
+ 
+ #   define NORETURN       /**/
+ #   define PATH_SEP       '\\'
+--- a/bzlib.h
++++ b/bzlib.h
+@@ -81,6 +81,9 @@ typedef
+       /* windows.h define small to char */
+ #      undef small
+ #   endif
++#   ifndef WINAPI
++#   define WINAPI
++#   endif
+ #   ifdef BZ_EXPORT
+ #   define BZ_API(func) WINAPI func
+ #   define BZ_EXTERN extern
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
new file mode 100644
index 000000000000..806339ebb6b4
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
@@ -0,0 +1,79 @@
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,6 @@ libbz2.a: $(OBJS)
+ 
+ check: test
+ test: bzip2
+-	@cat words1
+ 	./bzip2 -1  < sample1.ref > sample1.rb2
+ 	./bzip2 -2  < sample2.ref > sample2.rb2
+ 	./bzip2 -3  < sample3.ref > sample3.rb2
+@@ -66,7 +65,6 @@ test: bzip2
+ 	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
+@@ -115,25 +113,8 @@ clean:
+ 	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
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -36,9 +36,7 @@ OBJS= blocksort.o  \
+ 
+ all: $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++	ln -sf libbz2.so.1.0.6 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+@@ -43,17 +43,5 @@ all: $(OBJS)
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 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.6-progress.patch b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch
new file mode 100644
index 000000000000..8369597714b5
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch
@@ -0,0 +1,163 @@
+Ripped from Mandrake
+
+http://bugs.gentoo.org/82192
+
+--- a/bzip2.1
++++ b/bzip2.1
+@@ -235,6 +235,10 @@
+ Suppress non-essential warning messages.  Messages pertaining to
+ I/O errors and other critical events will not be suppressed.
+ .TP
++.B \-p \-\-show\-progress
++Show percentage of input\-file done and while compressing show the percentage
++of the original file the new file is.
++.TP
+ .B \-v --verbose
+ Verbose mode -- show the compression ratio for each file processed.
+ Further \-v's increase the verbosity level, spewing out lots of
+--- a/bzip2.c
++++ b/bzip2.c
+@@ -145,6 +145,7 @@
+ #include <signal.h>
+ #include <math.h>
+ #include <errno.h>
++#include <time.h>
+ #include <ctype.h>
+ #include "bzlib.h"
+ 
+@@ -301,6 +302,7 @@
+ Char    progNameReally[FILE_NAME_LEN];
+ FILE    *outputHandleJustInCase;
+ Int32   workFactor;
++Char    showProgress;
+ 
+ static void    panic                 ( Char* )   NORETURN;
+ static void    ioError               ( void )    NORETURN;
+@@ -425,6 +427,12 @@
+    UInt32  nbytes_in_lo32, nbytes_in_hi32;
+    UInt32  nbytes_out_lo32, nbytes_out_hi32;
+    Int32   bzerr, bzerr_dummy, ret;
++   double  fileSize = 0; /* initialized to make the compiler stop crying */
++                         /* double because big files might otherwhise give
++                          * overflows. not long long since not all compilers
++                          * support that one
++                          */
++   time_t  startTime, currentTime;
+ 
+    SET_BINARY_MODE(stream);
+    SET_BINARY_MODE(zStream);
+@@ -432,12 +440,21 @@
+    if (ferror(stream)) goto errhandler_io;
+    if (ferror(zStream)) goto errhandler_io;
+ 
++   if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) {
++      (void)fseek(stream, 0, SEEK_END);
++      fileSize = ftello(stream);
++      rewind(stream);
++      if (verbosity >= 1)
++         fprintf(stderr, "Input-file size: %ld\n", (long)fileSize);
++   }
++
+    bzf = BZ2_bzWriteOpen ( &bzerr, zStream, 
+                            blockSize100k, verbosity, workFactor );   
+    if (bzerr != BZ_OK) goto errhandler;
+ 
+    if (verbosity >= 2) fprintf ( stderr, "\n" );
+ 
++   time(&startTime);
+    while (True) {
+ 
+       if (myfeof(stream)) break;
+@@ -446,6 +463,22 @@
+       if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf );
+       if (bzerr != BZ_OK) goto errhandler;
+ 
++      if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) {
++         time(&currentTime);
++
++         if ((currentTime - startTime) > 1) { /* show progress every 2 seconds */
++            double curInPos = ftello(stream);
++            double curOutPos = ftello(zStream);
++
++            startTime = currentTime;
++
++            fprintf(stderr, "%.2f%% done", (curInPos * 100.0) / fileSize);
++            if (srcMode == SM_F2F)
++               fprintf(stderr, ", new size: %.2f%%", (curOutPos * 100.0) / curInPos);
++
++            fprintf(stderr, "    \r");
++         }
++      }
+    }
+ 
+    BZ2_bzWriteClose64 ( &bzerr, bzf, 0, 
+@@ -526,6 +559,8 @@
+    UChar   unused[BZ_MAX_UNUSED];
+    Int32   nUnused;
+    UChar*  unusedTmp;
++   double  fileSize = 0; /* initialized to make the compiler stop crying */
++   time_t  startTime, currentTime;
+ 
+    nUnused = 0;
+    streamNo = 0;
+@@ -533,9 +568,19 @@
+    SET_BINARY_MODE(stream);
+    SET_BINARY_MODE(zStream);
+ 
++   if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) {
++      off_t dummy = ftello(zStream);
++      (void)fseeko(zStream, 0, SEEK_END);
++      fileSize = ftello(zStream);
++      (void)fseeko(zStream, dummy, SEEK_SET);
++      if (verbosity >= 1)
++         fprintf(stderr, "Input-file size: %ld\n", (long)fileSize);
++   }
++
+    if (ferror(stream)) goto errhandler_io;
+    if (ferror(zStream)) goto errhandler_io;
+ 
++   time(&startTime);
+    while (True) {
+ 
+       bzf = BZ2_bzReadOpen ( 
+@@ -551,6 +596,16 @@
+          if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread > 0)
+             fwrite ( obuf, sizeof(UChar), nread, stream );
+          if (ferror(stream)) goto errhandler_io;
++
++         if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) {
++            time(&currentTime);
++            if ((currentTime - startTime) >= 2) {
++               double curInPos = ftello(zStream);
++               startTime = currentTime;
++
++               fprintf(stderr, "%.2f%% done\r", (curInPos * 100.0) / fileSize);
++            }
++         }
+       }
+       if (bzerr != BZ_STREAM_END) goto errhandler;
+ 
+@@ -1872,6 +1927,7 @@
+    deleteOutputOnInterrupt = False;
+    exitValue               = 0;
+    i = j = 0; /* avoid bogus warning from egcs-1.1.X */
++   showProgress            = False;
+ 
+    /*-- Set up signal handlers for mem access errors --*/
+    signal (SIGSEGV, mySIGSEGVorSIGBUScatcher);
+@@ -1949,6 +2005,7 @@
+                case 'k': keepInputFiles   = True; break;
+                case 's': smallMode        = True; break;
+                case 'q': noisy            = False; break;
++               case 'p': showProgress     = True; break;
+                case '1': blockSize100k    = 1; break;
+                case '2': blockSize100k    = 2; break;
+                case '3': blockSize100k    = 3; break;
+@@ -1985,6 +2042,7 @@
+       if (ISFLAG("--keep"))              keepInputFiles   = True;    else
+       if (ISFLAG("--small"))             smallMode        = True;    else
+       if (ISFLAG("--quiet"))             noisy            = False;   else
++      if (ISFLAG("--show-progress"))     showProgress     = True;    else
+       if (ISFLAG("--version"))           license();                  else
+       if (ISFLAG("--license"))           license();                  else
+       if (ISFLAG("--exponential"))       workFactor = 1;             else 
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
new file mode 100644
index 000000000000..52ea791ce34a
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
@@ -0,0 +1,13 @@
+--- a/Makefile-libbz2_so
++++ b/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.6 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.6 libbz2.so.1.0
+ 
diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
new file mode 100644
index 000000000000..83d6d32d00a6
--- /dev/null
+++ b/app-arch/bzip2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+  <remote-id type="cpe">cpe:/a:bzip:bzip2</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-arch/cabextract-1.6 b/app-arch/cabextract-1.6
deleted file mode 100644
index ba8d8b2bfd63..000000000000
--- a/app-arch/cabextract-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Extracts files from Microsoft cabinet archive files
-EAPI=5
-HOMEPAGE=https://www.cabextract.org.uk/
-IUSE=extras
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=extras? ( dev-lang/perl )
-SLOT=0
-SRC_URI=https://www.cabextract.org.uk/cabextract-1.6.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f08407c3fc3d662f342a1bdfdc822e27
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
new file mode 100644
index 000000000000..5ca119f1fde3
--- /dev/null
+++ b/app-arch/cabextract/Manifest
@@ -0,0 +1,3 @@
+DIST cabextract-1.6.tar.gz 241731 BLAKE2B 49a94b1b0d8a6c9f61cd51280a035e3fedb8d7a2d097b132bc56114c6003a558647a7f8c47b8d08fcac1999e68bea5303adb2b03c8e6dd010995e8b0c6dcd442 SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8
+EBUILD cabextract-1.6.ebuild 1115 BLAKE2B d6898fc1ef97920e8c7a54d3f79963a59f93b90b0c432f3cf088efaa202a4eb37b1385cdae1c2f91b97f3252938216f55192851291824c33c79ec02df6f7a08e SHA512 10c82fad424f0e5093816ebab945c37e88180618431be7b1068c847534ceb83e3e9ee0379862ec3dc312b65b01cfc2954d3300dd98d36455421d6814840df534
+MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.6.ebuild b/app-arch/cabextract/cabextract-1.6.ebuild
new file mode 100644
index 000000000000..da02381ab494
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
+HOMEPAGE="https://www.cabextract.org.uk/"
+SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="extras"
+
+RDEPEND="extras? ( dev-lang/perl )"
+
+src_prepare() {
+	# the code attempts to set up a fnmatch replacement, but then fails to code
+	# it properly leading to undefined references to rpl_fnmatch().  This may be
+	# removed in the future if building still works by setting "yes" to "no".
+	export ac_cv_func_fnmatch_works=yes
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic
+	dohtml doc/wince_cab_format.html
+	if use extras; then
+		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
+	fi
+}
diff --git a/app-arch/cabextract/metadata.xml b/app-arch/cabextract/metadata.xml
new file mode 100644
index 000000000000..181a78d0cb21
--- /dev/null
+++ b/app-arch/cabextract/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
+  <use>
+    <flag name="extras">Install experimental extra tools: wince_info and
+      wince_rename for examining and processing Windows CE installation cabinet
+      header files; cabinfo for examining the structure of a cab file.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/app-arch/cfv-1.18.3-r1 b/app-arch/cfv-1.18.3-r1
deleted file mode 100644
index c2746d86da46..000000000000
--- a/app-arch/cfv-1.18.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Utility to test and create .sfv, .csv, .crc and md5sum files
-EAPI=5
-HOMEPAGE=http://cfv.sourceforge.net/
-IUSE=bittorrent python_targets_python2_7
-KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/python-fchksum[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] bittorrent? ( net-p2p/bittornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/cfv/cfv-1.18.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37346309d0f0d9a4342f90d5ad8240ec
diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest
new file mode 100644
index 000000000000..85ba8c3edd3c
--- /dev/null
+++ b/app-arch/cfv/Manifest
@@ -0,0 +1,3 @@
+DIST cfv-1.18.3.tar.gz 68030 BLAKE2B 72372ebf7fa2d72a68b20cc0bf82823e973de5e8acacdcded85f50ad0e2f3e867c6924828b0a4ee42663e623d0d6d2e55b3f4b94addd83a703e4502edb1dda35 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71
+EBUILD cfv-1.18.3-r1.ebuild 755 BLAKE2B ce83067a0e8d6b00912f732055b8b0620943e7e33cd4ac00bbac8b41067a2702ff53453a72c2b105dd9634f49413f3ce0d870765a2480c453514cf4674c95d3d SHA512 49bc02ea03ffbb88f468baf359352578eacd7694f8eaa1410a342fa9ea056f9a6d22b5c93ec1da995731a98a2a5fd33b80f967e8f5ef0e8ed33eeb8b1be9218b
+MISC metadata.xml 581 BLAKE2B bc30bbb35470c1ab89641e3da14813f964ff2e4d2aeb6f37abd4bba0e4b5e5288b21637927fb0a8c04066653a09a66d00d3fcbd67a65d4b18e59cd1c31eefa1d SHA512 ac57bc554978a1f62b0ecef157853b66a00aa7098be0f5e42e01e5cf9546a8aec259dca9037d6698defea3e2e265ef7827e9e9cc73db98d6584896a3755b9d56
diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild
new file mode 100644
index 000000000000..f15261510f0a
--- /dev/null
+++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Utility to test and create .sfv, .csv, .crc and md5sum files"
+HOMEPAGE="http://cfv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bittorrent"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	dev-python/python-fchksum[${PYTHON_USEDEP}]
+	bittorrent? ( net-p2p/bittornado[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	python_fix_shebang cfv
+	dobin cfv
+	doman cfv.1
+	dodoc README Changelog
+}
diff --git a/app-arch/cfv/metadata.xml b/app-arch/cfv/metadata.xml
new file mode 100644
index 000000000000..f4989687fc0b
--- /dev/null
+++ b/app-arch/cfv/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		cfv is a utility to both test and create .sfv, .csv, .crc,
+		.md5(sfv-like), md5sum, bsd md5, sha1sum, and .torrent files. These
+		files are commonly used to ensure the correct retrieval or storage of
+		data.
+	</longdescription>
+	<use>
+		<flag name="bittorrent">Enable support for checking .torrent files</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">cfv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/cksfv-1.3.14 b/app-arch/cksfv-1.3.14
deleted file mode 100644
index f42b1efc64c2..000000000000
--- a/app-arch/cksfv-1.3.14
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=SFV checksum utility (simple file verification)
-EAPI=4
-HOMEPAGE=http://zakalwe.fi/~shd/foss/cksfv/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=76f72d83ae47e837767ad42ac9905de6
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
new file mode 100644
index 000000000000..16521b152c8f
--- /dev/null
+++ b/app-arch/cksfv/Manifest
@@ -0,0 +1,3 @@
+DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
+EBUILD cksfv-1.3.14.ebuild 736 BLAKE2B d9315553463deae70daeb89612dd006328bdb7f7b629f2ba2a959685c3d1271bd95cea14df2a8c1ddc0af18694f2a9aed85bb2878fc7519c75806abbf79bcc30 SHA512 c5320fab648755b5c2d5bf553f771109f88b8923f5c9b62ed0054ba4b3daad43a9a2c275cc5139f689ccaa65a9be98164135c5dba6e6966ce28f1cd46c67f451
+MISC metadata.xml 301 BLAKE2B 3e0945108754a3afcc9261293790159773b42004104ae4ae6d3275aa3245965298a4334d029c3821b62434e42eb8a4feef05ac40bed9703ab845001afda4553b SHA512 e6e2beb7e4c2d47fcc52fa57bff562229554d30ec41405d0ebe920bb442154e9aeb12b9974a97ac44c086a7e0510989e3a6c8a510163483bec9370ca88c52776
diff --git a/app-arch/cksfv/cksfv-1.3.14.ebuild b/app-arch/cksfv/cksfv-1.3.14.ebuild
new file mode 100644
index 000000000000..52041fde4aa9
--- /dev/null
+++ b/app-arch/cksfv/cksfv-1.3.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="SFV checksum utility (simple file verification)"
+HOMEPAGE="http://zakalwe.fi/~shd/foss/cksfv/"
+SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_configure() {
+	# note: not an autoconf configure script
+	./configure \
+		--compiler="$(tc-getCC)" \
+		--prefix="${EPREFIX}"/usr \
+		--package-prefix="${D}" \
+		--bindir="${EPREFIX}"/usr/bin \
+		--mandir="${EPREFIX}"/usr/share/man || die
+}
+
+src_install() {
+	emake install
+	dodoc ChangeLog README TODO
+}
diff --git a/app-arch/cksfv/metadata.xml b/app-arch/cksfv/metadata.xml
new file mode 100644
index 000000000000..d776c6cd250b
--- /dev/null
+++ b/app-arch/cksfv/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>A Simple file verification tool to ensure that the files you recieve are the same as the originals.</longdescription>
+</pkgmetadata>
diff --git a/app-arch/cpio-2.12-r1 b/app-arch/cpio-2.12-r1
deleted file mode 100644
index f490e2918214..000000000000
--- a/app-arch/cpio-2.12-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare
-DESCRIPTION=A file archival tool which can also read and write tar files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
-IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/cpio/cpio-2.12.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad3e257af08003a343662bc727bba9e6
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
new file mode 100644
index 000000000000..159d35489e08
--- /dev/null
+++ b/app-arch/cpio/Manifest
@@ -0,0 +1,5 @@
+AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa8971ca8beee6eb04b6ad3974c0d2770ac23669839b348013974ee827affb7b943d4dfa1be8d29b0b77c8ebea5e01791df SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a
+AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
+DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
+EBUILD cpio-2.12-r1.ebuild 870 BLAKE2B a86550e4b94d3f69a47389a56187a469aaba96528030d9d0794f281849aacb99bfeaaa77aa0e67fe628c6eefbb7af20b862728b330fddcb8640403daad0712e7 SHA512 b18f461cea53f0ea28ca50da48449cc6670e2ddac21b6939caf07af304730727a7835245be73454639c149ad502fe704851c156fbf97311a19510efe00d7f397
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
new file mode 100644
index 000000000000..a6b79426ec7e
--- /dev/null
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A file archival tool which can also read and write tar files"
+HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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="nls"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--bindir="${EPREFIX}"/bin \
+		--with-rmt="${EPREFIX}"/usr/sbin/rmt
+}
diff --git a/app-arch/cpio/files/cpio-2.12-name-overflow.patch b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
new file mode 100644
index 000000000000..f85246884c39
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/572428
+https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00002.html
+http://seclists.org/oss-sec/2016/q1/136
+
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -1385,6 +1385,8 @@
+ 	  break;
+ 	}
+ 
++      if (file_hdr.c_namesize <= 1)
++	file_hdr.c_name = xrealloc (file_hdr.c_name, 2);
+       cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
+ 			      false);
+       
diff --git a/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch
new file mode 100644
index 000000000000..c7fc7f95b47e
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch
@@ -0,0 +1,11 @@
+--- cpio-2.12/src/cpiohdr.h
++++ cpio-2.12/src/cpiohdr.h
+@@ -25,6 +25,8 @@
+ 
+ # ifdef HAVE_ATTRIB_PACKED
+ #  define ATTRIB_PACKED __attribute__((packed))
++# else
++#  define ATTRIB_PACKED
+ # endif
+ 
+ # ifdef HAVE_PRAGMA_PACK
diff --git a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-arch/cpio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/createrepo-0.10.4 b/app-arch/createrepo-0.10.4
deleted file mode 100644
index c66a5cbd7e2e..000000000000
--- a/app-arch/createrepo-0.10.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Creates a common rpm-metadata repository
-EAPI=6
-HOMEPAGE=http://createrepo.baseurl.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/urlgrabber-2.9.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-arch/rpm-4.1.1[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-arch/deltarpm-3.6_pre20110223[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyliblzma[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/yum-3.4.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.10.4.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c2070affbc154f9ebc5e7619e9533528
diff --git a/app-arch/createrepo/Manifest b/app-arch/createrepo/Manifest
new file mode 100644
index 000000000000..785094bd77e2
--- /dev/null
+++ b/app-arch/createrepo/Manifest
@@ -0,0 +1,4 @@
+AUX createrepo-0.10.3-ten-changelog-limit.patch 525 BLAKE2B 6e79c87e8865bab43721fd4cb79b79b5549642cc33f83dc245eeff5dbbba79f5244ab20f7e88903a7bad35d96a3c976999e0e69b57e19f90411685d6da4c0f6d SHA512 3ff54907d22680c5e617fa43b3954f533d66cf6f00a67e628ee4e6828871fce71cf200a562e8557a33e66cba09e9b76c12aec4c1dc7e7bc31589add9c71a1516
+DIST createrepo-0.10.4.tar.gz 71186 BLAKE2B ddd15305c6861e9872bf55683035c311a22aea062d27ba4e06bbe4e09598c85fbbaf4b874cbbd1e4c521610a7faa4097a7062ac52752ab2916c14ffca70a817d SHA512 28858d7d886e1132d001bb1bd847657502eb132133e39a4d19a4c8a080728c6b6f344283bc6ee21ce8def5b7980cbca7ed78299adeb71ce1012751268f6740ec
+EBUILD createrepo-0.10.4.ebuild 1165 BLAKE2B a7b3e4e5adb25d135a516f79780870ec907d8eb654bbd64e40cccb54096ced0c120f932d34199e4dfa9ec8bcb918b4192759115970f152c5b611e03d2e8e3046 SHA512 5ec521bea3c40a4d572848b17204f2db0e831e00b5eda695320578c1d6d972d9ef585e6cf0583aa4d3245189a0809812f948006e2aaed87106e8fc15ddcb6e36
+MISC metadata.xml 241 BLAKE2B da02aaf50e60432544b6c8832b7711764b2aa8b5d296dd64f19208832042de36daabc30c8310468cc604013b69c0cc3817f4a14aadd0dad4142c6bf68d4cb767 SHA512 d0c9844a236b2be2bb08d8aecf429dca028b0199db4c5c26c5a9cc2d9e13e21214ae110deb2b0d56e1caeae4ba0367effacbb542890e599bf4ebc6ffb4a369d8
diff --git a/app-arch/createrepo/createrepo-0.10.4.ebuild b/app-arch/createrepo/createrepo-0.10.4.ebuild
new file mode 100644
index 000000000000..55076a14eb95
--- /dev/null
+++ b/app-arch/createrepo/createrepo-0.10.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml'
+
+inherit python-single-r1 bash-completion-r1
+
+DESCRIPTION="Creates a common rpm-metadata repository"
+HOMEPAGE="http://createrepo.baseurl.org/"
+SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/urlgrabber-2.9.0[${PYTHON_USEDEP}]
+	>=app-arch/rpm-4.1.1[python,${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	>=app-arch/deltarpm-3.6_pre20110223[python,${PYTHON_USEDEP}]
+	dev-python/pyliblzma[${PYTHON_USEDEP}]
+	>=sys-apps/yum-3.4.3
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.3-ten-changelog-limit.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	python_export PYTHON_SITEDIR
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${ED}" \
+		PYTHON=true \
+		compdir="$(get_bashcompdir)" \
+		PKGDIR="${PYTHON_SITEDIR}/${PN}"
+	einstalldocs
+	python_fix_shebang "${ED}"
+	python_optimize
+	python_optimize "${ED}/usr/share/createrepo"
+}
diff --git a/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch b/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch
new file mode 100644
index 000000000000..e6de1e11002f
--- /dev/null
+++ b/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch
@@ -0,0 +1,11 @@
+--- a/createrepo/__init__.py	2011-01-26 12:14:30.000000000 -0500
++++ b/createrepo/__init__.py	2011-01-26 12:34:17.291441719 -0500
+@@ -96,7 +96,7 @@
+         self.mdtimestamp = 0
+         self.directory = None
+         self.directories = []
+-        self.changelog_limit = None # needs to be an int or None
++        self.changelog_limit = 10 # needs to be an int or None
+         self.unique_md_filenames = True
+         self.additional_metadata = {} # dict of 'type':'filename'
+         self.revision = str(int(time.time()))
diff --git a/app-arch/createrepo/metadata.xml b/app-arch/createrepo/metadata.xml
new file mode 100644
index 000000000000..cf9a9e94265f
--- /dev/null
+++ b/app-arch/createrepo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>alonbl@gentoo.org</email>
+	<name>Alon Bar-Lev</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/deb2targz-1-r2 b/app-arch/deb2targz-1-r2
deleted file mode 100644
index f949c16a8e09..000000000000
--- a/app-arch/deb2targz-1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Convert a .deb file to a .tar.gz archive
-EAPI=4
-HOMEPAGE=http://www.miketaylor.org.uk/tech/deb/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.miketaylor.org.uk/tech/deb/deb2targz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbfe109a7b31d53bbf636e43f8200c26
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
new file mode 100644
index 000000000000..5f609004b9d2
--- /dev/null
+++ b/app-arch/deb2targz/Manifest
@@ -0,0 +1,4 @@
+AUX deb2targz-any-data.patch 598 BLAKE2B a6cb5accd666ab7dc8475164a687909dbf289fe402d8cc787256f720c11ac7c749cc3b16c8d4edb2ecef85ed1bb7671872038464acb91b6482e91c0845e5c282 SHA512 e3ed1a570204049db4d484fd6b5a2a0099bf12071bb03a9aae6ff34fdccb2c9923f239ce2a68929fdf62c3ee3dc164da313c31750a8eb984dfec3f7bfc85a406
+DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
+EBUILD deb2targz-1-r2.ebuild 646 BLAKE2B 4bbad5f015e86c02b923ae39fbbe51eb6c04c95b5977dae1de48faffcb698c611401cfebad4d06b13aec7ea8acb365254fa26267be0c60e6a103634d17797d0b SHA512 496a8acfabeff21f0f0e14dba5242d23f1cd1820c7b0bc2ebb2cce8ac5ab12582a9d1dfd75966f2ca915303064ff06962e4b48da89bc2b7ff4101fca0e2dee2b
+MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r2.ebuild b/app-arch/deb2targz/deb2targz-1-r2.ebuild
new file mode 100644
index 000000000000..521a65f9698c
--- /dev/null
+++ b/app-arch/deb2targz/deb2targz-1-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit base
+
+DESCRIPTION="Convert a .deb file to a .tar.gz archive"
+HOMEPAGE="http://www.miketaylor.org.uk/tech/deb/"
+SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl"
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}/${PN}-any-data.patch" )
+
+src_unpack() {
+	cp "${DISTDIR}/${PN}" "${S}"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-arch/deb2targz/files/deb2targz-any-data.patch b/app-arch/deb2targz/files/deb2targz-any-data.patch
new file mode 100644
index 000000000000..c8c42308ce1c
--- /dev/null
+++ b/app-arch/deb2targz/files/deb2targz-any-data.patch
@@ -0,0 +1,17 @@
+Support any/all compression formats for data.tar
+--- deb2targz
++++ deb2targz
+@@ -47,10 +47,11 @@
+ 	($header, $data) = ($data =~ /(.*?)\n(.*)/s);
+ 	my($name, $num1, $num2, $num3, $num4, $len) = split /\s+/, $header;
+ 	#print "header='$header'\n\tname='$name', len=$len\n";
+-	if ($name eq "data.tar.gz") {
++	if ($name =~ /^data\.tar(.*)$/) {
+ 	    # Found it
++	    my $ext = $1;
+ 	    $data = substr($data, 0, $len);
+-	    $filename =~ s/\.deb$/.tar.gz/;
++	    $filename =~ s/\.deb$/.tar$ext/;
+ 	    my $fh = new IO::File(">$filename")
+ 		or die "can't write '$filename': $!";
+ 	    print $fh $data;
diff --git a/app-arch/deb2targz/metadata.xml b/app-arch/deb2targz/metadata.xml
new file mode 100644
index 000000000000..c10b09fa8f36
--- /dev/null
+++ b/app-arch/deb2targz/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-arch/deltarpm-3.6 b/app-arch/deltarpm-3.6
deleted file mode 100644
index 8714c7d4c73a..000000000000
--- a/app-arch/deltarpm-3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-DESCRIPTION=tools to create and apply deltarpms
-EAPI=6
-HOMEPAGE=https://github.com/rpm-software-management/deltarpm
-IUSE=python system-zlib python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/deltarpm/deltarpm-3.6.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/deltarpm-3.6.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=05db05a05301db5e7227e85091c2ff37
diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
new file mode 100644
index 000000000000..2cc6a603d82e
--- /dev/null
+++ b/app-arch/deltarpm/Manifest
@@ -0,0 +1,3 @@
+DIST deltarpm-3.6.tar.bz2 500420 BLAKE2B 650193ef0bff9b534a9ff60f4bd4d9b81533a62f70e95a2cca1b96cd73f7d8b374def3300b2b079aee4ea2a1a839a79c40fe2bcfbced111414047b8b701b4314 SHA512 0ef89d8d3e7c9d3d9da06542f293b434e42d95e18616aae1de95a66a77a5937142060ff405356869454cbcf8a7bb52f64c462641e52af0fad985105af07351d9
+EBUILD deltarpm-3.6.ebuild 1135 BLAKE2B 7bf1907f6f7d8b2140fe5714f354f8ce8329a204600b25064d272047d80822a93aa0acef38f3bbbd3e1701f3781e5f4ee1948a485f9e130fb65d445060b3f3b1 SHA512 f8e12db10cb3517c029099e5daedea8447de5bc4aa5a7843fa2e624bc50e179aef3814f46815a742b2f5e67674c28ad4c7cb61c720156b67e08e69f33ddc32ab
+MISC metadata.xml 486 BLAKE2B d8a27415f4df4637fa079d20452949fa3ec34dca25fc3fd243d1599deb42acf59a9c89703866e00ce8da24655e5ef1e8e159c34d8f7aaa09e5ca993fe8787705 SHA512 8a0639d669a83a3a33f58c2bcb0ef57a73e315a01353732fa70060d6a0d7de608d60010f42b9d18b8c9fef8d5c62d89d416a5192578842a0067227ee4917e246
diff --git a/app-arch/deltarpm/deltarpm-3.6.ebuild b/app-arch/deltarpm/deltarpm-3.6.ebuild
new file mode 100644
index 000000000000..3a60c4ea7da0
--- /dev/null
+++ b/app-arch/deltarpm/deltarpm-3.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs python-single-r1
+
+DESCRIPTION="tools to create and apply deltarpms"
+HOMEPAGE="https://github.com/rpm-software-management/deltarpm"
+SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${P}.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python system-zlib"
+
+RDEPEND="sys-libs/zlib
+	app-arch/xz-utils
+	app-arch/bzip2
+	<app-arch/rpm-5
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	MAKE_EXTRA_FLAGS=(
+		-j1
+		prefix=/usr
+		mandir=/usr/share/man
+		PYTHONS=$(use python && echo python)
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		CC="$(tc-getCC)"
+	)
+	use system-zlib && MAKE_EXTRA_FLAGS+=(
+		zlibbundled=
+		zlibcppflags=
+		zlibldflags=-lz
+	)
+}
+
+src_compile() {
+	emake "${MAKE_EXTRA_FLAGS[@]}" all $(use python && echo python)
+}
+
+src_install() {
+	emake "${MAKE_EXTRA_FLAGS[@]}" DESTDIR="${ED}" install
+	python_optimize
+}
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
new file mode 100644
index 000000000000..8845ef2eb6c2
--- /dev/null
+++ b/app-arch/deltarpm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+      <email>alonbl@gentoo.org</email>
+      <name>Alon Bar-Lev</name>
+  </maintainer>
+  <longdescription>A tool to create and apply deltarpms.</longdescription>
+  <use>
+    <flag name="system-zlib">
+      Use system
+      <pkg>sys-libs/zlib</pkg>.
+      Do not enable features of rsync friendly.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/app-arch/dpkg-1.19.0.5 b/app-arch/dpkg-1.19.0.5
deleted file mode 100644
index 68232945e01f..000000000000
--- a/app-arch/dpkg-1.19.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Package maintenance system for Debian
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/dpkg
-IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.0.5.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5383480fbe9e702cfeeaab877ed6167c
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
new file mode 100644
index 000000000000..bf11fd113626
--- /dev/null
+++ b/app-arch/dpkg/Manifest
@@ -0,0 +1,6 @@
+AUX dpkg-1.18.12-dpkg_buildpackage-test.patch 215 BLAKE2B 9890d9f9bf0f2229f73d5639f1118fe32426485a6056c43cb4f443c3fa143a915c4a84ac6f484d2a1a1ad813344b9765d809b6e18cdc35191aca2151783e00a0 SHA512 c31aa285a9d896ea313ce7d04a959767811019781fb747714630d91b56c631557ea64716e6c0ff20f6f60da67ff8c143cc8697d7b482a2e387ca4712908d9154
+AUX dpkg-1.18.12-flags.patch 416 BLAKE2B c7fe40b28793420afa0b895585cc14a675f9be68784beef7965fe6e971f6b2d6ecaa7c8bae51bb9f774c9517a618bff85b723052360224952cbdd2b74759b42e SHA512 6c86e8519ab4a05a2c15a658f41c0da14429c4fba0fcd364426afce7db03cd886a69de3f04f167d0f7b6d36a05252455864c11b14f58baab0a4536249331369c
+AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919fbc3ee5e2837540f91cf80229e669a6fe24d6de1c4bd1c1debdc34a0c04a2bbc6a21eb964032f24526986678eb1b14 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae
+DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
+EBUILD dpkg-1.19.0.5.ebuild 1845 BLAKE2B b6320665601e48f808499ad616aec40b0c7be70673561120eb963065e87a05f1f2e8e0f1fccedcd80fdcc98ff7239a07e7f9ee75396288058521099af94189f6 SHA512 54b06dd32e8a95fffb89a3f8e160d4156002fa51d02fb8648966eadfdc9e43d999dfb6d42c4eabc68f4b8c64b73c171221c1de3154b06e1ce180739a35e66f13
+MISC metadata.xml 339 BLAKE2B e4de06c58c3013dcb9ca8065c85811113f04df7c75283e405ea8670c8323eda1488d662b8281a4afed93795ee038ec6c4a4b5eb08316d4472913e08a67a03060 SHA512 c3fbabc925c3e99f26c6441cdea9626dc93520f2a8d3c5e45bfa7e51d42095295624f0f82377240f0c11580a9eccc5b5b15bf149ce6cfa36960e52f8c77aa61b
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
new file mode 100644
index 000000000000..c269dcbcc850
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
+
+RDEPEND="
+	>=dev-lang/perl-5.14.2:=
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+)
+
+src_prepare() {
+	use nls && strip-linguas -i po
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 libbz2) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux libselinux) \
+		$(use_with zlib libz) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-silent-rules \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var \
+		--without-libmd
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
+	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
+
+	prune_libtool_files
+}
diff --git a/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch b/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch
new file mode 100644
index 000000000000..e9716758d41b
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch
@@ -0,0 +1,10 @@
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -238,7 +238,6 @@
+ 	t/Dpkg_Source_Package.t \
+ 	t/Dpkg_Dist_Files.t \
+ 	t/dpkg_source.t \
+-	t/dpkg_buildpackage.t \
+ 	t/merge_changelogs.t \
+ 	t/mk.t \
+ 	$(nil)
diff --git a/app-arch/dpkg/files/dpkg-1.18.12-flags.patch b/app-arch/dpkg/files/dpkg-1.18.12-flags.patch
new file mode 100644
index 000000000000..bee7dd729941
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.18.12-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -182,8 +182,6 @@
+ # Checks for the build machinery.
+ AC_DEFINE([LIBDPKG_VOLATILE_API], [1], [Acknowledge the volatility of the API.])
+ DPKG_COMPILER_WARNINGS
+-DPKG_COMPILER_OPTIMIZATIONS
+-DPKG_LINKER_OPTIMIZATIONS
+ DPKG_ARCHITECTURE
+ AC_DEFINE([PACKAGE_RELEASE], [PACKAGE_VERSION " (" ARCHITECTURE ")"],
+   [Define the project release information, version and architecture])
diff --git a/app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch b/app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch
new file mode 100644
index 000000000000..69802da67092
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch
@@ -0,0 +1,28 @@
+--- a/scripts/Dpkg/Compression.pm
++++ b/scripts/Dpkg/Compression.pm
+@@ -81,20 +81,12 @@
+ };
+ 
+ #
+-# XXX: The gzip package in Debian at some point acquired a Debian-specific
+-# --rsyncable option via a vendor patch. Which is not present in most of the
+-# major distributions, dpkg downstream systems, nor gzip upstream, who have
+-# stated they will most probably not accept it because people should be using
+-# pigz instead.
++# If gzip supports --rsyncable (version >=1.7 or the Debian patched variant),
++# we use it. Sadly a non-compliant gzip will not complain about the argument
++# when it does not understand it, so we can only print out the usage and infer
++# --rsyncable support from that.
+ #
+-# This option should have never been accepted in dpkg, ever. But removing it
+-# now would probably cause demands for tarring and feathering. In addition
+-# we cannot use the Dpkg::Vendor logic because that would cause circular
+-# module dependencies. The whole affair is pretty disgusting really.
+-#
+-# Check the perl Config to discern Debian and hopefully derivatives too.
+-#
+-if ($Config{cf_by} eq 'Debian Project') {
++if (system("gzip --help 2>&1 | grep -q -- --rsyncable") == 0) {
+     push @{$COMP->{gzip}->{comp_prog}}, '--rsyncable';
+ }
+ 
diff --git a/app-arch/dpkg/metadata.xml b/app-arch/dpkg/metadata.xml
new file mode 100644
index 000000000000..029c83c94699
--- /dev/null
+++ b/app-arch/dpkg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>deb-tools@gentoo.org</email>
+<name>Gentoo Debian Tools Project</name>
+</maintainer>
+<use>
+<flag name="update-alternatives">Install update-alternatives</flag>
+</use>
+</pkgmetadata>
diff --git a/app-arch/duff-0.5.2 b/app-arch/duff-0.5.2
deleted file mode 100644
index da91f120c961..000000000000
--- a/app-arch/duff-0.5.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Command-line utility for quickly finding duplicates in a given set of files
-EAPI=5
-HOMEPAGE=http://duff.sourceforge.net/
-KEYWORDS=~x86 ~amd64
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=mirror://sourceforge/duff/duff-0.5.2.tar.bz2
-_md5_=6a01a4067b3e9d19e9b3a5041ff619b3
diff --git a/app-arch/duff/Manifest b/app-arch/duff/Manifest
new file mode 100644
index 000000000000..10a89a742e26
--- /dev/null
+++ b/app-arch/duff/Manifest
@@ -0,0 +1,3 @@
+DIST duff-0.5.2.tar.bz2 174545 BLAKE2B 1e2b75a4999333f062a8b25c750f35e785038a5d3ec0264112352fae20af25b8990727287f446d7523c699701b963fdca658241288bd0e79b27751e3be3c4ea3 SHA512 5f64c28ab86523dd4dffaf26dac67d10bea71bd5cf7b4eaa3dfa27309cf8e7cf37a74ee62b5f3df3cb0114a847711b3147a083cbdd72ab8e4b5f9a45c908f333
+EBUILD duff-0.5.2.ebuild 504 BLAKE2B ad8cbb8792abc836acc24a373ee203fa06f75ad58986287533143e9a7864b95d5da76a68cd2356e9d3e640e4cbf5f1f56c6b32e00e48d426db4a3d6ea802ff8f SHA512 08c7e4819ee8975fd5a5e65176356d822630384d711bf7b7ee9350231d7170c1b13badf2218c44a9111288c87d952a1af102253084b1110e6fe88f1742bed577
+MISC metadata.xml 300 BLAKE2B d478e17714747688bca890580e4b0332e301bde95ffd03939e979a3e5a80b6f721b175686b69f6e9add4105ca3953f2905085a62dc0b7be1dfbedcb9f4c537cf SHA512 ef8d27bfa12bb1eb3a821a400c6fc897b5e387d0b99b4c4d5d03d472ca9ad3ed02a13657a9cd627cdd87a01fb7b709640238c223fb7123d5781dae7e48e9fa2e
diff --git a/app-arch/duff/duff-0.5.2.ebuild b/app-arch/duff/duff-0.5.2.ebuild
new file mode 100644
index 000000000000..40a5c0d9cd75
--- /dev/null
+++ b/app-arch/duff/duff-0.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Command-line utility for quickly finding duplicates in a given set of files"
+HOMEPAGE="http://duff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Failed emake install"
+	dodoc AUTHORS ChangeLog HACKING NEWS README* TODO
+}
diff --git a/app-arch/duff/metadata.xml b/app-arch/duff/metadata.xml
new file mode 100644
index 000000000000..cd5e6341af23
--- /dev/null
+++ b/app-arch/duff/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">duff</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/dump-0.4.46 b/app-arch/dump-0.4.46
deleted file mode 100644
index 4d928051f419..000000000000
--- a/app-arch/dump-0.4.46
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=sys-fs/e2fsprogs-1.27:= >=sys-libs/e2fsprogs-libs-1.27:= sys-apps/util-linux bzip2? ( >=app-arch/bzip2-1.0.2:= ) zlib? ( >=sys-libs/zlib-1.1.4:= ) lzo? ( dev-libs/lzo:2= ) sqlite? ( dev-db/sqlite:3= ) ermt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) readline? ( sys-libs/readline:0= sys-libs/ncurses:= static? ( sys-libs/ncurses:=[static-libs] ) ) virtual/pkgconfig virtual/os-headers
-DESCRIPTION=Dump/restore ext2fs backup utilities
-EAPI=5
-HOMEPAGE=http://dump.sourceforge.net/
-IUSE=bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=sys-fs/e2fsprogs-1.27:= >=sys-libs/e2fsprogs-libs-1.27:= sys-apps/util-linux bzip2? ( >=app-arch/bzip2-1.0.2:= ) zlib? ( >=sys-libs/zlib-1.1.4:= ) lzo? ( dev-libs/lzo:2= ) sqlite? ( dev-db/sqlite:3= ) ermt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) readline? ( sys-libs/readline:0= sys-libs/ncurses:= static? ( sys-libs/ncurses:=[static-libs] ) )
-REQUIRED_USE=ermt? ( ssl ) ssl? ( zlib ) test? ( sqlite? ( uuid ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/dump/dump-0.4b46.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7de37ba7a386490a0bcf23bf3b48adea
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
new file mode 100644
index 000000000000..9db1c61ad7a7
--- /dev/null
+++ b/app-arch/dump/Manifest
@@ -0,0 +1,3 @@
+DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
+EBUILD dump-0.4.46.ebuild 2113 BLAKE2B 431fd8ae0fa1c3b28015f27687c28f43a8d6fcb205c97a99f3d4ee1e96d3da7683456f02e4683b85c202848ddcc9efdaac85b63f31e0a4ad5fbf2d430465a8b5 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90
+MISC metadata.xml 542 BLAKE2B beff8763f8b3848f9592dbf200cb547e9c416e7d675b4e9015f20b417861523949916da4a6a38553abf7fdf5fc839841870f74258becb4e8dbbcbca9c564e328 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d
diff --git a/app-arch/dump/dump-0.4.46.ebuild b/app-arch/dump/dump-0.4.46.ebuild
new file mode 100644
index 000000000000..90a9eac37dea
--- /dev/null
+++ b/app-arch/dump/dump-0.4.46.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit versionator
+
+MY_P="${PN}-$(replace_version_separator 2 b)"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Dump/restore ext2fs backup utilities"
+HOMEPAGE="http://dump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+# We keep uuid USE flag default dsiabled for this version. Don't forget
+# to default enable it for later versions as this is the upstream default.
+IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
+REQUIRED_USE="
+	ermt? ( ssl )
+	ssl? ( zlib )
+	test? ( sqlite? ( uuid ) )
+"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.27:=
+	>=sys-libs/e2fsprogs-libs-1.27:=
+	sys-apps/util-linux
+	bzip2? ( >=app-arch/bzip2-1.0.2:= )
+	zlib? ( >=sys-libs/zlib-1.1.4:= )
+	lzo? ( dev-libs/lzo:2= )
+	sqlite? ( dev-db/sqlite:3= )
+	ermt? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	readline? (
+		sys-libs/readline:0=
+		sys-libs/ncurses:=
+		static? ( sys-libs/ncurses:=[static-libs] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	virtual/os-headers"
+
+src_configure() {
+	local myeconfargs=(
+		--with-dumpdatespath=/etc/dumpdates
+		--with-rmtpath='$(sbindir)/rmt'
+		--enable-blkid
+		$(use_enable bzip2)
+		$(use_enable debug)
+		$(use_enable ermt)
+		$(use_enable lzo)
+		$(use_enable readline)
+		$(use_enable selinux)
+		$(use_enable sqlite)
+		$(use_enable ssl)
+		$(use_enable static static-progs)
+		$(use_enable uuid)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/sbin/{,dump-}rmt || die
+	mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
+	use ermt && newsbin rmt/ermt dump-ermt
+
+	dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
+		ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
+	fi
+}
diff --git a/app-arch/dump/metadata.xml b/app-arch/dump/metadata.xml
new file mode 100644
index 000000000000..4fdf0bb0b67b
--- /dev/null
+++ b/app-arch/dump/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
+		A utility to help backup and restore files on a harddrive.
+	</longdescription>
+	<use>
+		<flag name="ermt">encrypted rmt support</flag>
+		<flag name="uuid">Enable UUID support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">dump</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/engrampa-1.12.0-r1 b/app-arch/engrampa-1.12.0-r1
deleted file mode 100644
index 633b82c36362..000000000000
--- a/app-arch/engrampa-1.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja gtk3 magic packagekit
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/engrampa-1.12.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=25e2fd6a3d2307ef6d0dd6277ae01eba
diff --git a/app-arch/engrampa-1.12.0-r2 b/app-arch/engrampa-1.12.0-r2
deleted file mode 100644
index 9a1d47dd1d6c..000000000000
--- a/app-arch/engrampa-1.12.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja gtk3 magic packagekit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/engrampa-1.12.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71862b8de1d9f50f6b385fc061f66559
diff --git a/app-arch/engrampa-1.14.1-r1 b/app-arch/engrampa-1.14.1-r1
deleted file mode 100644
index 33e3fa4bde30..000000000000
--- a/app-arch/engrampa-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja gtk3 magic packagekit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/engrampa-1.14.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1375e3e772ad81644b99734c533f883d
diff --git a/app-arch/engrampa-1.16.1 b/app-arch/engrampa-1.16.1
deleted file mode 100644
index b973d49b673e..000000000000
--- a/app-arch/engrampa-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja magic packagekit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/engrampa-1.16.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc04cab3fb60ef8c8a85e7edf20be506
diff --git a/app-arch/engrampa-1.18.3 b/app-arch/engrampa-1.18.3
deleted file mode 100644
index 0341a2f52231..000000000000
--- a/app-arch/engrampa-1.18.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.17.1 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja magic packagekit
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.17.1 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/engrampa-1.18.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e215b2e2c386fa15810719fd43bba72
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
new file mode 100644
index 000000000000..89e2cc803040
--- /dev/null
+++ b/app-arch/engrampa/Manifest
@@ -0,0 +1,12 @@
+AUX engrampa-1.10.2-p7zip-15.09-compat.patch 851 BLAKE2B 50734ebd04df0f3a277408a9051612b7691e4b52a82d1851fb3cbda23b9308ae1868d15d7ce2b9b4ea9576bbd11bd0b7c71852bef5165a8dc09504ffbb674a40 SHA512 a6c11311b15647713a93ec20c52d228cb828ac15767b7dbc2ae1cffef50b73d06ff5e36891763f715a67a8b06dc1d3a6e2bf30b27abc3376baebe390e7a54c27
+AUX engrampa-1.10.2-p7zip-15.14-compat.patch 1225 BLAKE2B b1aa1546aeed6bc3116d8a7ccd8bb2e8a101a5df4fd902d748fbc2afc909db2f0071248107d8dc0f6d2bb2b3c6a2382955e6fab30a3f0ab3430b80c4e1d72104 SHA512 e396976cfce32b4ac48205c0c72a342d713c8798926a2c56855f4083e3f7598b6ce1e3df3fb03ee8b08c0bf18657a2c750389b465a142f4261eb03f12f4a8a3a
+DIST engrampa-1.12.0.tar.xz 1380144 BLAKE2B 87c8a69d3706489f7f2dfc704212714976ba3bb24954d02b798700be4f5c98bada0eec0e22402f85e3ea4d7852ab6bbb523deeef411887c68f5b998871c72069 SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec
+DIST engrampa-1.14.1.tar.xz 1417444 BLAKE2B 95dd08ba2264fb2ba937be61522cf56da8363fdc4af21c18bd3d8a22609ab0c9a606bda5f16b2795ad6b0b7bd017bf1150a2e31f6c29d9c111362ca93ff0ed65 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763
+DIST engrampa-1.16.1.tar.xz 1432272 BLAKE2B 6181da44c6a80030c1ac856c017ba190bf91527e51c9d2eba38e267632360ad5497ee02d0a3ea00d73df4e6f507311e839e0d8d999b6d6561e298d784c3251ec SHA512 d61ee877b5e7ce0aacc46a8b786b1d074bc4d6870f453edf238d9b8fe3eecab750ce14f668c94bbceedec4a9b5bf16a828fff24edef227ae0108351adcfc73f6
+DIST engrampa-1.18.3.tar.xz 1427036 BLAKE2B 816155b7e2a0583263959d77bb5079a3d69ade087cac39e8e9c2c77901d0bfcbdb63a87ec9ed7cf92d2e580ae810d3e46641d690d87c1af7db6f6dca6627dfbc SHA512 6a3872ed9ec1e9d2779842d30c352c5068608913f9261a875b707951a45ff3122df2f4a4ed4da10c4f8a4617cc1d7aae4635b3f1234052793c4a6baa765d80f8
+EBUILD engrampa-1.12.0-r1.ebuild 1943 BLAKE2B 98c5255e301058a3aa09fa54fbd93bfb6c1c70f9f468608eca2cd6cf0b1838bc52ea708b8de3f7347e1d3b970be8a30e7f28803f13678908372cefaede528a75 SHA512 624884bbbc2a2a7c9eaa9f84c4ab7189ed70079f26535c5945eb2c5a96543fdf249599805ac538f304e316ed882645a1b3592b5752b1ba05f6142b356b60eb8d
+EBUILD engrampa-1.12.0-r2.ebuild 1948 BLAKE2B 7563e099ccf74cb69a5bce96804750f8edbb293207910ee652b8cd80a40a0f603c42e128a90f11ea0b737e371ad39dc23106336671846851dac5ee22e22492dc SHA512 0de7123927b4b41fd04606a1b11649ae2ed1f9250bfe6dad32cb8138fcaed7c5271eb9aa30fc921c8134ebbb7f867b36d0b867520a3defa63d1d31e36bd20d44
+EBUILD engrampa-1.14.1-r1.ebuild 1934 BLAKE2B 0d3565cc92cfa229671efd0b8ebdcfa32db2f74b3e2282f2da1969483dd16645dd2e1c6446ad3388ff9d9b502373c25d94719af56a07dd4d48e20e44d5c81fa2 SHA512 48a85e45c15b8d21f9e11e992efcf0fe24f8b6fc3934e26fba77221a8bf568a1f185eb584171d3a16500ab35ba0bd15d4a7d83e2d4dc9030c0a76166ed2643ec
+EBUILD engrampa-1.16.1.ebuild 1774 BLAKE2B b239d80ccc155e40d733b9de4997e689c9a0650eebf58f4c0615c4bd19ea71e51944bf9312135e5cf87ebf45bcc7ef6d8063f8f03c1ccef169b0a392c2efd787 SHA512 975831c6e938ccf8ad5547639a10d7224d01fc4d0b7870878b48cf8cf3051c9dcf779f72aea393c1a2798fb6e818f5e0bd5d8408a773e8b2c64dfeea30534056
+EBUILD engrampa-1.18.3.ebuild 1755 BLAKE2B b741f70a2227e598afdd926a67b3ab4732d04ecfa15de0a3dd370e84df249e0513061bfe2177b771417aea4fa7bfe96af3474b1ddd87687c4e94374bd2f1c8db SHA512 3242a31d0136264618427a4ac7c403d7291a27a8ee357fe443a237859a4e445c3170668fa6e2ff2b8644fdae091010ef558f741885c28abb30819f5f126f41c9
+MISC metadata.xml 763 BLAKE2B 7efc42df178dd52843a8f9c165d2c7a717fb05d24309dfcec6d7dbf61e8943b65f4a8febf2d58bfe29a81e0be37165f1b7345155d75e3e3d7676f625d679aea6 SHA512 fc5a05da5bf07067fc598b9849b068b497d3b9d107eddbe8d38bc15afb9b3df0e1071fae57e9c0a05b9813c03873581e66b0212cd126f14ccaddaccd85a57a96
diff --git a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..0448f8a0511f
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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 x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja gtk3 magic packagekit"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
+	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
+)
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		--disable-deprecations \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.12.0-r2.ebuild b/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..0d3575820196
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja gtk3 magic packagekit"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
+	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
+)
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		--disable-deprecations \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.14.1-r1.ebuild b/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..3af21bd02be2
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja gtk3 magic packagekit"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
+	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		--disable-deprecations \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.16.1.ebuild b/app-arch/engrampa/engrampa-1.16.1.ebuild
new file mode 100644
index 000000000000..6f37d339de9f
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.16.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.1.0 )
+	>=x11-libs/gtk+-3.14:3[X]
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		--disable-deprecations \
+		$(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.18.3.ebuild b/app-arch/engrampa/engrampa-1.18.3.ebuild
new file mode 100644
index 000000000000..b7680487a6d0
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.18.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.17.1 )
+	>=x11-libs/gtk+-3.14:3[X]
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=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/files/engrampa-1.10.2-p7zip-15.09-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
new file mode 100644
index 000000000000..d0937a8959c5
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
@@ -0,0 +1,25 @@
+From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Thu, 24 Dec 2015 17:11:19 +0300
+Subject: [PATCH] 7z: correct checking for p7zip 15.09+
+
+from https://github.com/GNOME/file-roller/commit/ed9c3fd2
+
+fixes https://github.com/mate-desktop/engrampa/issues/114
+---
+ src/fr-command-7z.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index 297ba1b..0b784f7 100644
+--- a/src/fr-command-7z.c
++++ b/src/fr-command-7z.c
+@@ -106,7 +106,7 @@ list__process_line (char     *line,
+ 			strncpy (version, ver_start, ver_len);
+ 			version[ver_len] = 0;
+ 
+-			if (strcmp (version, "4.55") < 0)
++			if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
+ 				p7z_comm->old_style = TRUE;
+ 			else
+ 				p7z_comm->old_style = FALSE;
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
new file mode 100644
index 000000000000..4e25898949f0
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
@@ -0,0 +1,30 @@
+From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001
+From: sc0w <scow@riseup.net>
+Date: Wed, 25 May 2016 02:29:21 +0200
+Subject: [PATCH] p7zip-rar 15.14 supported
+
+since 15.14, p7zip-rar uses the plugin Rar.so to handle archives
+
+It can find on /usr/lib/ or /usr/libexec/
+
+If someone has it in another folder, we can add it
+
+Fixes #136
+---
+ src/fr-command-7z.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index 20cfa2c..a7d032e 100644
+--- a/src/fr-command-7z.c
++++ b/src/fr-command-7z.c
+@@ -599,7 +599,8 @@ fr_command_7z_get_capabilities (FrCommand  *comm,
+ 		if (is_mime_type (mime_type, "application/x-rar")
+ 		    || is_mime_type (mime_type, "application/x-cbr"))
+ 		{
+-			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
++			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS)
++			    || g_file_test ("/usr/libexec/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS))
+ 				capabilities |= FR_COMMAND_CAN_READ;
+ 		}
+ 		else
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
new file mode 100644
index 000000000000..cea4bb4fa4a4
--- /dev/null
+++ b/app-arch/engrampa/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="caja">Enable engrampa to integrate with
+			<pkg>mate-base/caja</pkg> by providing entries in its context 
+			menu</flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+		<flag name="magic">Enable filetype auto-detection via
+			<pkg>sys-apps/file</pkg></flag>
+		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>
+			based on archive type</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/engrampa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/fastjar-0.98-r2 b/app-arch/fastjar-0.98-r2
deleted file mode 100644
index 934e7e821450..000000000000
--- a/app-arch/fastjar-0.98-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=A jar program written in C
-EAPI=4
-HOMEPAGE=https://savannah.nongnu.org/projects/fastjar
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=!<=dev-java/kaffe-1.1.7-r5
-SLOT=0
-SRC_URI=mirror://nongnu/fastjar/fastjar-0.98.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8eb5be6d46fced43f1506fad9a213999
diff --git a/app-arch/fastjar-0.98-r3 b/app-arch/fastjar-0.98-r3
deleted file mode 100644
index c64de8ec071c..000000000000
--- a/app-arch/fastjar-0.98-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=A jar program written in C
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/fastjar
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=!<=dev-java/kaffe-1.1.7-r5
-SLOT=0
-SRC_URI=mirror://nongnu/fastjar/fastjar-0.98.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90b476cb4c20d8b08763837709d2bb11
diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest
new file mode 100644
index 000000000000..3f484056b0d2
--- /dev/null
+++ b/app-arch/fastjar/Manifest
@@ -0,0 +1,5 @@
+AUX 0.98-traversal.patch 3010 BLAKE2B 76450d561450aa9c7d5386f53328c0037d6ce9df2d6aac79deb1e47cee7651723cf2863a0d27cb6431a58525a9d0d3c554820b4f22a3099d1fe43b2ea7bec0d1 SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311
+DIST fastjar-0.98.tar.gz 717984 BLAKE2B 1715f1917076799fc58c6c6cea8fb53fc3261a694fa2392c0dc6e30101a7d42de0c5c55cd593627b4d2d0ffa45e3d44ef220c9579caec669721c6b1b9996e43c SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903
+EBUILD fastjar-0.98-r2.ebuild 518 BLAKE2B 97f7913052525beaad3e399f9a267ad28e5501994c2820a28d0e7e592a4c57f208e4acdb8097a031099b8d6f81052c417938aa9267ac517dc0840b06e01b8da4 SHA512 7ef3b44fc6a5384666c9d5b36f38dc2f2c128b7d57f968f16f6c5d6f332ed4f9d80e98a946b4a9120993d5e89996c5e875a5d9d5cf44ed56434d896fab3693ce
+EBUILD fastjar-0.98-r3.ebuild 522 BLAKE2B 52693d318316be2939b7d4ab00c6b1b41bc5cf859c43a98d8162774cd234e4706d3637b08b517277759a90f149ba2aa5d23e651f6c93cf318705c2bb95ac3ab5 SHA512 4026aea676b408699769ade56ce8a107199429afc8d68b3de6b5d60b8552b57ca8f1098223c9f71e99bc5b66aa4a1e86859cf89518b00c3e4feb9210c5fdfc2a
+MISC metadata.xml 478 BLAKE2B 91d7ee00197567dc201739072627c34a8a7073a28b89c5761793ce628d1f62432d91b36b13a65fb95f821101249697a041af339823bb26fe132873c4a20a7b54 SHA512 3b1f8a2998d8496947b8e6c60698db4311ca1afe7ddcd0fe9d4f7ae762acf4204a87f8ebcb9e0b0677727eb82fdda22a299cf3cafcdf83bd348d98ba16ff4214
diff --git a/app-arch/fastjar/fastjar-0.98-r2.ebuild b/app-arch/fastjar/fastjar-0.98-r2.ebuild
new file mode 100644
index 000000000000..37599ed0d5ba
--- /dev/null
+++ b/app-arch/fastjar/fastjar-0.98-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A jar program written in C"
+HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+
+IUSE=""
+
+# bug #188542
+RDEPEND="!<=dev-java/kaffe-1.1.7-r5"
+
+src_prepare() {
+	# bug #325557
+	epatch "${FILESDIR}/0.98-traversal.patch"
+}
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
new file mode 100644
index 000000000000..2b71543f2a0d
--- /dev/null
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A jar program written in C"
+HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+
+IUSE=""
+
+# bug #188542
+RDEPEND="!<=dev-java/kaffe-1.1.7-r5"
+
+src_prepare() {
+	# bug #325557
+	epatch "${FILESDIR}/0.98-traversal.patch"
+}
diff --git a/app-arch/fastjar/files/0.98-traversal.patch b/app-arch/fastjar/files/0.98-traversal.patch
new file mode 100644
index 000000000000..511f4c6cd838
--- /dev/null
+++ b/app-arch/fastjar/files/0.98-traversal.patch
@@ -0,0 +1,112 @@
+--- fastjar-0.98.orig/jartool.c
++++ fastjar-0.98/jartool.c
+@@ -790,6 +790,7 @@
+ 		   progname, jarfile);
+ 	  return 1;
+ 	}
++      ze->filename[len] = '\0';
+       len = UNPACK_UB4(header, CEN_EFLEN);
+       len += UNPACK_UB4(header, CEN_COMLEN);
+       if (lseek (fd, len, SEEK_CUR) == -1)
+@@ -1257,7 +1258,7 @@
+       exit_on_error("write");
+ 
+   /* write the file name to the zip file */
+-  if (1 == write(jfd, fname, file_name_length))
++  if (-1 == write(jfd, fname, file_name_length))
+     exit_on_error("write");
+ 
+   if(verbose){
+@@ -1730,7 +1731,17 @@
+       struct stat sbuf;
+       int depth = 0;
+ 
+-      tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
++      if(*filename == '/'){
++	fprintf(stderr, "Absolute path names are not allowed.\n");
++	exit(EXIT_FAILURE);
++      }
++
++      tmp_buff = malloc(strlen((const char *)filename));
++
++      if(tmp_buff == NULL) {
++	fprintf(stderr, "Out of memory.\n");
++	exit(EXIT_FAILURE);
++      }
+ 
+       for(;;){
+         const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
+@@ -1738,25 +1749,28 @@
+         if(idx == NULL)
+           break;
+         else if(idx == start){
++	  tmp_buff[idx - filename] = '/';
+           start++;
+           continue;
+         }
+-        start = idx + 1;
+ 
+-        strncpy(tmp_buff, (const char *)filename, (idx - filename));
+-        tmp_buff[(idx - filename)] = '\0';
++	memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
++	tmp_buff[idx - filename] = '\0';
+ 
+ #ifdef DEBUG    
+         printf("checking the existance of %s\n", tmp_buff);
+ #endif
+-	if(strcmp(tmp_buff, "..") == 0){
++	if(idx - start == 2 && memcmp(start, "..", 2) == 0){
+ 	  --depth;
+ 	  if (depth < 0){
+ 	    fprintf(stderr, "Traversal to parent directories during unpacking!\n");
+ 	    exit(EXIT_FAILURE);
+ 	  }
+-	} else if (strcmp(tmp_buff, ".") != 0)
++	} else if (idx - start != 1 || *start != '.')
+ 	  ++depth;
++
++        start = idx + 1;
++
+         if(stat(tmp_buff, &sbuf) < 0){
+           if(errno != ENOENT)
+             exit_on_error("stat");
+@@ -1765,6 +1779,7 @@
+ #ifdef DEBUG    
+           printf("Directory exists\n");
+ #endif
++	  tmp_buff[idx - filename] = '/';
+           continue;
+         }else {
+           fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
+@@ -1781,10 +1796,11 @@
+         if(verbose && handle)
+           printf("%10s: %s/\n", "created", tmp_buff);
+ 
++	tmp_buff[idx - filename] = '/';
+       }
+ 
+       /* only a directory */
+-      if(strlen((const char *)start) == 0)
++      if(*start == '\0')
+         dir = TRUE;
+ 
+ #ifdef DEBUG    
+@@ -1792,7 +1808,7 @@
+ #endif
+ 
+       /* If the entry was just a directory, don't write to file, etc */
+-      if(strlen((const char *)start) == 0)
++      if(*start == '\0')
+         f_fd = -1;
+ 
+       free(tmp_buff);
+@@ -1876,7 +1892,8 @@
+       exit(EXIT_FAILURE);
+     }
+ 
+-    close(f_fd);
++    if (f_fd != -1)
++      close(f_fd);
+ 
+     if(verbose && dir == FALSE && handle)
+       printf("%10s: %s\n",
diff --git a/app-arch/fastjar/metadata.xml b/app-arch/fastjar/metadata.xml
new file mode 100644
index 000000000000..0d201b2da538
--- /dev/null
+++ b/app-arch/fastjar/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Fastjar is a version of Sun's 'jar' utility, written entirely in C,
+		and therefore quite a bit faster. Fastjar can be up to 100x faster
+		than the stock 'jar' program running without a JIT.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/file-roller-3.24.1 b/app-arch/file-roller-3.24.1
deleted file mode 100644
index 54b74f438733..000000000000
--- a/app-arch/file-roller-3.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base ) >=dev-util/intltool-0.50.1 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Archive manager for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
-IUSE=libnotify nautilus packagekit
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
-SLOT=0
-SRC_URI=mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0f8444a135fd97fbe5a287e73d473b59
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
new file mode 100644
index 000000000000..8319f7224620
--- /dev/null
+++ b/app-arch/file-roller/Manifest
@@ -0,0 +1,4 @@
+AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
+DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
+EBUILD file-roller-3.24.1.ebuild 2230 BLAKE2B c0c185067dcd9ddfe7603008161fc8f0dadf5cc533858f6e487ed276cf369c47365fc5d69576d2a8af023aee754f020422a482e47aa8e5e33879c3798d773137 SHA512 23acd0e0fa8385230550b50ffc77b4e7185749840a1b49cedafa1ca9f7f5d8eabdb1d2c9fcd69459baa6465675e9fc7c1bfc6a2cbfe7805351d06589edd6f38e
+MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.24.1.ebuild
new file mode 100644
index 000000000000..e916e5b37d95
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.24.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 readme.gentoo-r1
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="libnotify nautilus packagekit"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.13.2:3
+	sys-apps/file
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
+	nautilus? ( >=gnome-base/nautilus-2.22.2 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+lz4     - app-arch/lz4
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# File providing Gentoo package names for various archivers
+	cp -f "${FILESDIR}"/3.22-packages.match data/packages.match || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --disable-debug because enabling it adds -O0 to CFLAGS
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-static \
+		--disable-debug \
+		--enable-magic \
+		--enable-libarchive \
+		$(use_enable libnotify notification) \
+		$(use_enable nautilus nautilus-actions) \
+		$(use_enable packagekit)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-arch/file-roller/files/3.22-packages.match b/app-arch/file-roller/files/3.22-packages.match
new file mode 100644
index 000000000000..68f6e30a17cf
--- /dev/null
+++ b/app-arch/file-roller/files/3.22-packages.match
@@ -0,0 +1,32 @@
+[Package Matches]
+arj=app-arch/arj
+binutils=sys-devel/binutils
+bzip2=app-arch/bzip2
+cpio=app-arch/cpio
+dpkg=app-arch/dpkg
+genisoimage=virtual/cdrtools
+gzip=app-arch/gzip
+lha=app-arch/lha
+lrzip=app-arch/lrzip
+lz4=app-arch/lz4
+lzip=app-arch/lzip
+lzma=app-arch/xz-utils
+lzop=app-arch/lzop
+ncompress=app-arch/ncompress
+p7zip=app-arch/p7zip
+p7zip-full=
+p7zip-rar=
+rar=app-arch/rar
+rpm=app-arch/rpm
+rzip=app-arch/rzip
+zip=app-arch/zip
+zoo=app-arch/zoo
+tar=app-arch/tar
+unace=app-arch/unace
+unalz=
+unarchiver=app-arch/unar
+unrar=app-arch/unrar
+unstaff=
+unzip=app-arch/unzip
+xz=app-arch/xz-utils
+
diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml
new file mode 100644
index 000000000000..fee03a0b3768
--- /dev/null
+++ b/app-arch/file-roller/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="nautilus">Build contextual menu extension for
+			<pkg>gnome-base/nautilus</pkg>.</flag>
+		<flag name="packagekit">Enable support for the distro-neutral package
+			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">fileroller</remote-id>
+		<remote-id type="cpe">cpe:/a:paolo_bacchilega:file_roller</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/freeze-2.5.0-r1 b/app-arch/freeze-2.5.0-r1
deleted file mode 100644
index 84baa7138062..000000000000
--- a/app-arch/freeze-2.5.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Freeze/unfreeze compression program
-EAPI=4
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/utils/compress/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-1+
-RDEPEND=!<=media-libs/mlt-0.4.2 !media-libs/mlt[melt]
-SLOT=0
-SRC_URI=ftp://ftp.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a78f5f5dff80d5a3f71b38b31f131f69
diff --git a/app-arch/freeze/Manifest b/app-arch/freeze/Manifest
new file mode 100644
index 000000000000..6817bacbaad1
--- /dev/null
+++ b/app-arch/freeze/Manifest
@@ -0,0 +1,4 @@
+AUX freeze-2.5.0-gentoo.patch 1541 BLAKE2B eba0b527a2eb4ab7d1d163d98668dd50270e9edee9d5f2dc0cb0d618bbdb908161a9e07fa294b517049731226c4915344e7bffbc224e5c1851d18d69b202546c SHA512 be93f27959405bb7ca0f7407e32e93d9b1bf5f202ad6100e7a8aa18fb8b978402fe5293714a116c6eb7599c84c2186eaf518025c1dd8cc8f6184d346ca54eeac
+DIST freeze-2.5.0.tar.gz 36010 BLAKE2B 33327c8b879df348ddfd360917525ebc399e8493c5db6f51be1d8a23544b5ac3939570d1b9b002d177d6db736011af1e462c0e037123665041f9931fdd40d5ed SHA512 2e0965e1bb772a829763b99c623b3dfa062a624ed2bd5f658c9df0e4040a9c914aec5a85602340fe994634b82d2fac3250030b35ad3d5f5054b0a6f4059469e7
+EBUILD freeze-2.5.0-r1.ebuild 929 BLAKE2B 852f15218155642c32431dfdfc53293cc59164fadecc00253a9083a41e91d1ce08853552f03a3f912f16da5a36ebb74c50e2c19cc7ed4f1f651fd63a01990443 SHA512 7e49c0c0487795b89d454ae4feb8043ba99d98a1c89600dade03b914bb74db73f03164bc574ff1852a6709819cea5c6fd4b5b4efb90478626a4dce78a3fcc159
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/freeze/files/freeze-2.5.0-gentoo.patch b/app-arch/freeze/files/freeze-2.5.0-gentoo.patch
new file mode 100644
index 000000000000..3be357c25309
--- /dev/null
+++ b/app-arch/freeze/files/freeze-2.5.0-gentoo.patch
@@ -0,0 +1,55 @@
+--- a/Makefile.in	1999-05-20 11:07:51.000000000 +0200
++++ b/Makefile.in	2012-12-12 17:22:36.444775985 +0100
+@@ -3,7 +3,7 @@
+ VPATH         = $(srcdir)
+ 
+ CC            = @CC@
+-CFLAGS        = -I.     # -O2   # for gcc 2.2.2
++CFLAGS        += -I.
+ 
+ INSTALL       = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -79,15 +79,15 @@
+ 
+ freeze$(EXE):   $(OBJS)
+ 		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+-		-strip $@
++		
+ 
+ statist$(EXE):  statist.$(OBJ) lz.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ statist.$(OBJ) lz.$(OBJ) $(LIBS)
+-		-strip $@
++		
+ 
+ showhuf$(EXE):  showhuf.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ showhuf.$(OBJ) $(LIBS)
+-		-strip $@
++		
+ 
+ clobber:        clean
+ 		rm -f freeze$(EXE) statist$(EXE) showhuf$(EXE) *.man \#* *~ config.h Makefile
+@@ -101,18 +101,18 @@
+ 
+ $(DEST)/freeze: freeze
+ 		$(INSTALL_PROGRAM) freeze $@
+-		-ln -f $@ $(DEST)/melt
+-		-ln -f $@ $(DEST)/unfreeze
+-		-ln -f $@ $(DEST)/fcat
++		ln -sf $< $(DEST)/melt
++		ln -sf $< $(DEST)/unfreeze
++		ln -sf $< $(DEST)/fcat
+ 
+ $(DEST)/statist: statist
+ 		$(INSTALL_PROGRAM) statist $@
+ 
+ $(MANDEST)/freeze.$(SEC): freeze.1
+ 		$(INSTALL_DATA) $(srcdir)/freeze.1 $@
+-		-ln -f $@ $(MANDEST)/melt.$(SEC)
+-		-ln -f $@ $(MANDEST)/unfreeze.$(SEC)
+-		-ln -f $@ $(MANDEST)/fcat.$(SEC)
++		ln -sf $< $(MANDEST)/melt.$(SEC)
++		ln -sf $< $(MANDEST)/unfreeze.$(SEC)
++		ln -sf $< $(MANDEST)/fcat.$(SEC)
+ # This is much better for places which keep preformated manpages.
+ #		echo ".so man1/freeze.$(SEC)" > $(MANDEST)/melt.$(SEC)
+ #		echo ".so man1/freeze.$(SEC)" > $(MANDEST)/unfreeze.$(SEC)
diff --git a/app-arch/freeze/freeze-2.5.0-r1.ebuild b/app-arch/freeze/freeze-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..8df74389329f
--- /dev/null
+++ b/app-arch/freeze/freeze-2.5.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Freeze/unfreeze compression program"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/utils/compress/"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/compress/${P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="
+	!<=media-libs/mlt-0.4.2
+	!media-libs/mlt[melt]
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		OPTIONS="-DDEFFILE=\\\"/etc/freeze.cnf\\\""
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+
+	emake \
+		DEST="${D}/usr/bin" \
+		MANDEST="${D}/usr/share/man/man1" \
+		install
+
+	# these symlinks collide with app-forensics/sleuthkit (bug #444872)
+	rm "${D}"/usr/bin/fcat "${D}"/usr/share/man/man1/fcat.1 || die
+
+	dobin showhuf
+	dodoc README *.lsm
+}
diff --git a/app-arch/freeze/metadata.xml b/app-arch/freeze/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-arch/freeze/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-arch/funzix-1.0 b/app-arch/funzix-1.0
deleted file mode 100644
index 9143ba4ad4cf..000000000000
--- a/app-arch/funzix-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=unpacker for the bogus ZIX format
-EAPI=6
-HOMEPAGE=http://funzix.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=mirror://sourceforge/funzix/funzix-1.0.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bd9fc3dcddce416fba01eb10ac689ebd
diff --git a/app-arch/funzix/Manifest b/app-arch/funzix/Manifest
new file mode 100644
index 000000000000..4d69293a899c
--- /dev/null
+++ b/app-arch/funzix/Manifest
@@ -0,0 +1,4 @@
+AUX funzix-1.0-fix-build-system.patch 113 BLAKE2B eb18a424d7f3e029f42c5102bf63f0b6e54dad213540832bdc4e4fd99fa83d52af891792248218608bd4f9883d9e2c76b3722303d54424e17b019a069235f071 SHA512 21d2f71a792ef23a501e691f514dbc4dd2c549542f6c1426bb3fbfc86d41cb97916295384a24075a6b10304a8c913b0379ae46ed42c0f87b4838dfa0b6111ddf
+DIST funzix-1.0.tar.bz2 10792 BLAKE2B d7d6035e558cf6501ee84626f9720dab9d44eb87fb3cedc72721ff491c8535ecd913935b1c9618b85c471b3443a7386485b9bc01c7bd09e01752eda8261b9690 SHA512 30abf29571df7be4a1e92270cb3b4949244f5e50b088bc128c8ac63da88c244f0fe810b4d05b76c68220576b06a1c47e84a3f3339d82a4f0e35a841b29ec4c2c
+EBUILD funzix-1.0.ebuild 487 BLAKE2B 9ab5c04537139bd95d7cc27c3c7f02d276e1d476a2b36a0b4530012146c420b3e9ba9591ce952ab3aaa575715c7a7b17d3e39f7620bf70c37008ea272610ada5 SHA512 e8b5cd0a598d16026cf87b80e95c97556f09f6f5df3ca068d60d8fb029680a8efaf1807accff4f9d5b669c4fc3fd77319d91b26822e119abd3084747685bdaa4
+MISC metadata.xml 243 BLAKE2B bdd58ee3763af689265c063ddc89e4ed90465bd520910a43e92e5d2c85aba25732a8224063b6efe0fa2891578b80ab490bd7389022cca63b6bf962c05893e0ad SHA512 1fc5c4b9fcfc9ecf016a6997a0a7fe145d2819b63bea1cc18ac8489245b347ccd41f10b1d826f6ba4f14d321308a87a51871cfcf6da3c73d80640ece101a348f
diff --git a/app-arch/funzix/files/funzix-1.0-fix-build-system.patch b/app-arch/funzix/files/funzix-1.0-fix-build-system.patch
new file mode 100644
index 000000000000..1fd5482d4dcd
--- /dev/null
+++ b/app-arch/funzix/files/funzix-1.0-fix-build-system.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -Wall -g
++CFLAGS += -Wall
+ LDLIBS += -lz
+ 
+ all: funzix
diff --git a/app-arch/funzix/funzix-1.0.ebuild b/app-arch/funzix/funzix-1.0.ebuild
new file mode 100644
index 000000000000..8f62fd7801f6
--- /dev/null
+++ b/app-arch/funzix/funzix-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="unpacker for the bogus ZIX format"
+HOMEPAGE="http://funzix.sourceforge.net/"
+SRC_URI="mirror://sourceforge/funzix/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin funzix
+	einstalldocs
+}
diff --git a/app-arch/funzix/metadata.xml b/app-arch/funzix/metadata.xml
new file mode 100644
index 000000000000..ce25c1c68815
--- /dev/null
+++ b/app-arch/funzix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">funzix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/gcab-0.7 b/app-arch/gcab-0.7
deleted file mode 100644
index 9cc07bce0bdd..000000000000
--- a/app-arch/gcab-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.22:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4:= ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/msitools
-IUSE=+introspection vala
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.22:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gcab/0.7/gcab-0.7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b7be101f7ee7ed15cc29ba2edfb43433
diff --git a/app-arch/gcab-0.8 b/app-arch/gcab-0.8
deleted file mode 100644
index f71d635cd1a9..000000000000
--- a/app-arch/gcab-0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4:= ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/msitools
-IUSE=+introspection vala
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.32:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gcab/0.8/gcab-0.8.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=026652039e6b9e28dd5dd2b07d58852f
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
new file mode 100644
index 000000000000..3b67db47ba0a
--- /dev/null
+++ b/app-arch/gcab/Manifest
@@ -0,0 +1,5 @@
+DIST gcab-0.7.tar.xz 332248 BLAKE2B ef9c03b86c0e73b94286ff30dcc41c031a91dad0b124b601adda3ccaf5ae5924c4ea4408dcc52960b641e799e1c31e8ae882a205a3707c7a5dfa796036a00dbf SHA512 db8c0b4ee2bc75b8bb540b4fe0e9304782b9848b3ab0ba3077638d13cdec652f6178206ec6474af036fba90e952ef0052dd9d19be9eb72bae97d98f8f18a0c02
+DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
+EBUILD gcab-0.7.ebuild 941 BLAKE2B c84ecf6ad2a57bf19225046f239d0c185b80325476f6f55e68182bad2bd2b5f07c59ce0df83d959ff569da40fd5850b0d09375d6f082a88760794f79c4e6bb76 SHA512 e7cd50ae66c96e9d671ea9fe72074c7b0d0031efaa2819ec6629079de12abde02e12e13117f22d728cf642e653a5a4be974173fdff599c3aa7eb75442c32e729
+EBUILD gcab-0.8.ebuild 925 BLAKE2B ad3ddff0f2f53775305347a17622ff4f2375a2453903b4b908bf1b513f5436521b4f7e0cc7eeca81263a5e6e51e21a5ce27f38a361f20c5125bdaf0f66f17880 SHA512 d2b401d6597417b7e8b0beb93cfb72111add5abd8eed8333592e2889b8c9c34020de3add4622e6c9f0902f7279e1fb536fbec7133fab4dcd99347bbc962e1270
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-0.7.ebuild b/app-arch/gcab/gcab-0.7.ebuild
new file mode 100644
index 000000000000..a14c0902d34b
--- /dev/null
+++ b/app-arch/gcab/gcab-0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.22:2
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use vala || myconf="VAPIGEN=no"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		${myconf}
+}
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
new file mode 100644
index 000000000000..b7d1e756bed8
--- /dev/null
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use vala || myconf="VAPIGEN=no"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		${myconf}
+}
diff --git a/app-arch/gcab/metadata.xml b/app-arch/gcab/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-arch/gcab/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/gnome-autoar-0.2.2 b/app-arch/gnome-autoar-0.2.2
deleted file mode 100644
index 463168a321fa..000000000000
--- a/app-arch/gnome-autoar-0.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-arch/libarchive-3.2.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.14 gnome-base/gnome-common virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Automatic archives creating and extracting library
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-autoar
-IUSE=gtk +introspection vala
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=app-arch/libarchive-3.2.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fac1763c0afbeb60ac019aec494ca14e
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
new file mode 100644
index 000000000000..8ab58f3131a3
--- /dev/null
+++ b/app-arch/gnome-autoar/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-autoar-0.2.2.tar.xz 295488 BLAKE2B 33f614846547921b208239f7756cab3561ec417f2030e3196bece43c47af2a6496fef82838d90fa3ddcf8742023b525bc4e8cbdfbf3fc925c92c74a8a6918c3b SHA512 78faf8f82eeab4cb5f1f364d6e9caa4d24f21f9b81a79ebde4404253f3e7ae120f44600f236612859810afc6fc6f1a8c6f2e065db98be79103255642139c10a2
+EBUILD gnome-autoar-0.2.2.ebuild 954 BLAKE2B a0de53e098a86a73d9407ccd80efefbe1680d0f4fd674fa48ce8ffd14efe859e4212044ab671824cd7b56b7854754288e786a1ddc44a8db67fcf6993441ad5d4 SHA512 d90f8ac96987ebf8f2083c1885475d08432eede009d32713558bea7d9ff725d371008b88b1a77a0a84624346cfeac09cc5812d1fdf136a05021d22d4dc691960
+MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
new file mode 100644
index 000000000000..ee8ace2a9598
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Automatic archives creating and extracting library"
+HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND="
+	>=app-arch/libarchive-3.2.0
+	>=dev-libs/glib-2.35.6:2
+	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	gnome-base/gnome-common
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable gtk)
+}
diff --git a/app-arch/gnome-autoar/metadata.xml b/app-arch/gnome-autoar/metadata.xml
new file mode 100644
index 000000000000..073497f97b3c
--- /dev/null
+++ b/app-arch/gnome-autoar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		gnome-autoar provides functions, widgets, and gschemas for GNOME applications which want to use archives as a method to transfer directories over the Internet.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/gtk-splitter-2.2.1-r1 b/app-arch/gtk-splitter-2.2.1-r1
deleted file mode 100644
index 5778f31058b8..000000000000
--- a/app-arch/gtk-splitter-2.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 virtual/libintl:0 crypt? ( >=app-crypt/mhash-0.8:0 ) virtual/pkgconfig:*
-DESCRIPTION=Split files into smaller pieces and combine them back together
-EAPI=5
-HOMEPAGE=http://gtk-splitter.sourceforge.net
-IUSE=crypt
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 virtual/libintl:0 crypt? ( >=app-crypt/mhash-0.8:0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtk-splitter/gtk-splitter-2.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2abcd674fde4c410b24f7d661b17538
diff --git a/app-arch/gtk-splitter/Manifest b/app-arch/gtk-splitter/Manifest
new file mode 100644
index 000000000000..59eaad53ef84
--- /dev/null
+++ b/app-arch/gtk-splitter/Manifest
@@ -0,0 +1,4 @@
+AUX gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch 325 BLAKE2B e5b7e8f53f7c774631b9d776afa0f74f6e36cbdd6775fee064c50a71b918e780de03360f9bcadf333adb89a9724ea4667726c16807dffdb730c03f44e69303c6 SHA512 19beddfab6ec199f013f4f3d12a5921df49267ea3ee851e2bfb4ec043f899015ffde7bd45308aca8734d735b203a822dede78c785212e45c49351ae7f501c49b
+DIST gtk-splitter-2.2.1.tar.gz 93515 BLAKE2B 32ab62076028efb69584c05f21c28744b1261e03640391787c9fb70a547eb7d184be2ce1f945c3bd659ebdf4b3b9b998331e3e5dbc3c5ee9d5beb72149893e16 SHA512 c84e43dddb5f1eef5a4fed7db7541012374d7e6bed760835adae20fa35a4685cb7a1a866ad02cbaf36ff3ee4d5bd3872a154e46ce9692603a3273859d2eb36dc
+EBUILD gtk-splitter-2.2.1-r1.ebuild 813 BLAKE2B 42c8254e77bfd3167302613b1dac012eeb6a859b719570403a6f28e7c2d9a58ed4f3ff9b2fb60a01dd45ad83820699278a4ac7400c3ee2290ff99a811cc78175 SHA512 3128262c80ef2fb38a9858439e481f341427979d6ad4b372fe1f6a1df174ff387690765df439cf4a4cabae9a604bd675e7dcb24a1439a7f16a3774c2cf6c0d96
+MISC metadata.xml 362 BLAKE2B ffbb2f73871071301f53e07edd9e948fe4a8dcc8cdfe95c73962c070c9fa79eb6f951ce4a3dcf385d4796ed3b185bba0d2ef7879a32bbd08c940a5185a867b2b SHA512 236e11a6730b01e5fd611674c32fa0ca9a8cbff16f4f000766d4104c04ba9c1120e1a0ebe279992487fb2d0102a7d1ce152781132c7d1876dba17c0eef2e91a6
diff --git a/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch b/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch
new file mode 100644
index 000000000000..32fd447c9019
--- /dev/null
+++ b/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch
@@ -0,0 +1,13 @@
+--- a/gtk-splitter.desktop
++++ b/gtk-splitter.desktop
+@@ -3,8 +3,8 @@
+ Name=File Splitter
+ Comment=GTK+ File Splitter
+ Exec=gtk-splitter %F
+-Icon=gtk-splitter.png
++Icon=/usr/share/pixmaps/gtk-splitter.png
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Utility;
++Categories=GNOME;Utility;
+ StartupNotify=true
diff --git a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..0ccad4c508c7
--- /dev/null
+++ b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Split files into smaller pieces and combine them back together"
+HOMEPAGE="http://gtk-splitter.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="crypt"
+
+RDEPEND="x11-libs/gtk+:2
+	virtual/libintl:0
+	crypt? ( >=app-crypt/mhash-0.8:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	epatch "${FILESDIR}/"${P}-r1-desktop-QA-fixes.patch
+}
+
+src_compile() {
+	default
+
+	if ! use crypt ; then
+		# configure script only autodetects
+		sed -i -e 's:-lmhash::' -e 's:-DHAVE_LIBMHASH=1::' src/Makefile || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+}
diff --git a/app-arch/gtk-splitter/metadata.xml b/app-arch/gtk-splitter/metadata.xml
new file mode 100644
index 000000000000..f1254f8446bd
--- /dev/null
+++ b/app-arch/gtk-splitter/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A program to split files into smaller pieces and the put them back together.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gtk-splitter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/gzip-1.8 b/app-arch/gzip-1.8
deleted file mode 100644
index 883552ce826c..000000000000
--- a/app-arch/gzip-1.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Standard GNU compressor
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gzip/
-IUSE=pic static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/gzip/gzip-1.8.tar.xz mirror://gnu-alpha/gzip/gzip-1.8.tar.xz mirror://gentoo/gzip-1.8.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c91591d8dd68d30c47a7db9f99bc7ab2
diff --git a/app-arch/gzip-1.9 b/app-arch/gzip-1.9
deleted file mode 100644
index 5bbd53f5abac..000000000000
--- a/app-arch/gzip-1.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Standard GNU compressor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gzip/
-IUSE=pic static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/gzip/gzip-1.9.tar.xz mirror://gnu-alpha/gzip/gzip-1.9.tar.xz mirror://gentoo/gzip-1.9.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfb5101541b2eefd497f36a8b12db27e
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
new file mode 100644
index 000000000000..6ced80686e16
--- /dev/null
+++ b/app-arch/gzip/Manifest
@@ -0,0 +1,7 @@
+AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
+AUX gzip-1.4-asmv.patch 630 BLAKE2B 64508293c8257db3dafd2b20fe5bc23aa37b54f90b63eaeb7a67643ea837b88d58b90fa8b177d84a538eef183d5e49ab98e6b5f8a482303e68ef2c5acb390faf SHA512 7769c98cfc8d6c7c48bc1772d45b44c6c4e1a9fa266dbe5bfe1b9822434b96f7c42ec0d2f4444a5ee8ae8086e571f6891756c7c22f61352649721044eda61a0f
+DIST gzip-1.8.tar.xz 728116 BLAKE2B 34b707bd403791aca8620de3520637c460dbd9167a4fb693c78438115862781350ef5e256ad0accce75b25515b82fcd3e405cc310d6ea36f2d2609b0a270c4db SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55
+DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
+EBUILD gzip-1.8.ebuild 1177 BLAKE2B aaf2b99cec28e67f048a05c88d3a958140a322cc7f232242c06cd800443e8cb5f5e05d19bb60e6662aa01dea521a0ccb79cddc2bc8160880eaf3ea501da10a32 SHA512 f64ac3b923a2dfcb881f90cadfe64cabde16cbde83fef903b35bae5ce23f5422f281cc04e37c3a043978d59d08cc506a06b489d02b4a347a15b7aee1b43b4a4c
+EBUILD gzip-1.9.ebuild 1110 BLAKE2B 9655656fef362d12701a2b9599ec0ddb9cb14cf667027ca10c7d7f4a6103b12e8b120ea8e89d72e38ea32ddd1664404eb53b2379ae5d02508e3196fff7ec9235 SHA512 fa99968ef76bce8fe88179cd32a28b803739fcc72b28de268930e4f9c8196dbdd74f67669a33dd3f0b247e44dd6718d913dd45cb7f608c0728c78019440371ba
+MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
new file mode 100644
index 000000000000..6f04b42c7696
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -926,7 +926,7 @@
+ 	     rm -f "$$dest" && \
+ 	     case $@ in \
+ 	     install-exec-hook) \
+-	       ln "$$source" "$$dest" || $(LN_S) "$$source" "$$dest";; \
++	       $(LN_S) "$$source" "$$dest";; \
+ 	     esac \
+ 	    ) || exit; \
+ 	  done; \
diff --git a/app-arch/gzip/files/gzip-1.4-asmv.patch b/app-arch/gzip/files/gzip-1.4-asmv.patch
new file mode 100644
index 000000000000..1be1f63738b0
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.4-asmv.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/show_bug.cgi?id=302773
+
+--- a/tailor.h
++++ b/tailor.h
+@@ -69,9 +69,6 @@
+ #  include <io.h>
+ #  define OS_CODE  0x00
+ #  define SET_BINARY_MODE(fd) setmode(fd, O_BINARY)
+-#  if !defined(NO_ASM) && !defined(ASMV)
+-#    define ASMV
+-#  endif
+ #else
+ #  define near
+ #endif
+@@ -182,7 +179,6 @@
+ #  define PATH_SEP2 ':'
+ #  define STDC_HEADERS
+ #  define OS_CODE  0x01
+-#  define ASMV
+ #  ifdef __GNUC__
+ #    define HAVE_DIRENT_H
+ #    define HAVE_FCNTL_H
+@@ -201,7 +197,6 @@
+ #endif
+ 
+ #if defined(ATARI) || defined(atarist)
+-#  define ASMV
+ #  define OS_CODE  0x05
+ #  ifdef TOSFS
+ #    define PATH_SEP2 '\\'
diff --git a/app-arch/gzip/gzip-1.8.ebuild b/app-arch/gzip/gzip-1.8.ebuild
new file mode 100644
index 000000000000..03bc1b2ca591
--- /dev/null
+++ b/app-arch/gzip/gzip-1.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu/gzip/${P}.tar.xz
+	mirror://gnu-alpha/gzip/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pic static"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+	"${FILESDIR}/${PN}-1.4-asmv.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+	use static && append-flags -static
+	# avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+	econf
+}
+
+src_install() {
+	default
+	docinto txt
+	dodoc algorithm.doc gzip.doc
+
+	# keep most things in /usr, just the fun stuff in /
+	dodir /bin
+	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
+}
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
new file mode 100644
index 000000000000..5bfc0488effc
--- /dev/null
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu/gzip/${P}.tar.xz
+	mirror://gnu-alpha/gzip/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pic static"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+)
+
+src_configure() {
+	use static && append-flags -static
+	# avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+	econf
+}
+
+src_install() {
+	default
+	docinto txt
+	dodoc algorithm.doc gzip.doc
+
+	# keep most things in /usr, just the fun stuff in /
+	dodir /bin
+	mv "${ED%/}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED%/}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED%/}"/bin/gunzip || die
+}
diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml
new file mode 100644
index 000000000000..bbcfb3d82afd
--- /dev/null
+++ b/app-arch/gzip/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+ <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
+</upstream>
+<use>
+<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+</use>
+</pkgmetadata>
diff --git a/app-arch/hardlink-0.2.0 b/app-arch/hardlink-0.2.0
deleted file mode 100644
index 7786f56e8894..000000000000
--- a/app-arch/hardlink-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-libs/libpcre virtual/pkgconfig
-DESCRIPTION=A tool which replaces copies of a file with hardlinks
-EAPI=4
-HOMEPAGE=http://jak-linux.org/projects/hardlink/
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/libpcre
-SLOT=0
-SRC_URI=http://jak-linux.org/projects/hardlink/hardlink_0.2.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2f2e11b98907f946dcfa281987686f92
diff --git a/app-arch/hardlink-0.3.0 b/app-arch/hardlink-0.3.0
deleted file mode 100644
index 0c843eaa1b1f..000000000000
--- a/app-arch/hardlink-0.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-libs/libpcre virtual/pkgconfig
-DESCRIPTION=A tool which replaces copies of a file with hardlinks
-EAPI=4
-HOMEPAGE=http://jak-linux.org/projects/hardlink/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libpcre
-SLOT=0
-SRC_URI=http://jak-linux.org/projects/hardlink/hardlink_0.3.0.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5a11e771ce2660114aa27869ef1e0ad6
diff --git a/app-arch/hardlink/Manifest b/app-arch/hardlink/Manifest
new file mode 100644
index 000000000000..b519ee5b3955
--- /dev/null
+++ b/app-arch/hardlink/Manifest
@@ -0,0 +1,5 @@
+DIST hardlink_0.2.0.tar.gz 12478 BLAKE2B 42918fbacdd230796e59f6ae7968599a90b63cc35876872ef34919377d6489c6c99d06f201a122f5859a283cea2672dbcc207e04c6b5ca0c54ab4e2f4178a970 SHA512 963fe90aa09e2bd548722b5c7f047fbd54fddf37967333e86251d7e5d1c646108ce90d78e7efeb8af6b9169b9a0bc5bc8b744afe1e813390f3e0bd535ce22005
+DIST hardlink_0.3.0.tar.xz 14440 BLAKE2B cfbd02b008d49b129e0b75f67bf45d904e89a1e585d0e05e959770a4367ad0f5823f24cb4f3f6715310c749ba368ac00d378f8eb967a1b4437335eecee8a5077 SHA512 22a8945ce5dac74b05bb1231959823aec0cd364d6db9ad808df4acf232d894170c006ac1e88509604ce1859d41bd4a5d91e2b12c8010aa7fc7e19a77922c4486
+EBUILD hardlink-0.2.0.ebuild 947 BLAKE2B e36630eed495ad995eb78de4ec0e345c84c482de144d3634d2d781f0272b8439878a21cd72d013011c678c9fe2b9bb8d7ea8d22b841d9b085a5457879c396ebf SHA512 55d1a806082a726d826f3c8fd44806d009a9efaa9cd7ddcd9ec25b16980aeb86b98f12ca756df7f3190480ebe39cda4e67d36240ce4ea6f41d9dfc10681c9ff2
+EBUILD hardlink-0.3.0.ebuild 951 BLAKE2B 0dcd0bfc08f308499a4b2ba366593c47ae1d35044d1fc6f32107e3ef52e4aa45ac4ec9de3db9325bc02a0f25217a98a1865f29ddef03afa051f7c054ed06a2b8 SHA512 ab20f75ababc3f64f3422f4dad0cfdaa4646aeb118382813c83c17ffbeb3f5577c0f2aec26c16d01b594aa91be7b3072026b37f9680af1e18bc1d485213bfefb
+MISC metadata.xml 375 BLAKE2B d148dcbae6b75d007f0fdb447b3e0a866df0468da507482ce60fbf4dc8f758053bc4fd9d5179f07915576dc10a96102c797747cb499199f55d22c7a989cc10a2 SHA512 1f14b085ab758738cc521af00de93bd47ca037f6b59fff96352c72e8f4acae7fa2bb5a8aa2df9eb865d992035a9c57c0b976cbe5f6033e4a77250e9101b22b7c
diff --git a/app-arch/hardlink/hardlink-0.2.0.ebuild b/app-arch/hardlink/hardlink-0.2.0.ebuild
new file mode 100644
index 000000000000..d45ddbfecf17
--- /dev/null
+++ b/app-arch/hardlink/hardlink-0.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="A tool which replaces copies of a file with hardlinks"
+HOMEPAGE="http://jak-linux.org/projects/hardlink/"
+SRC_URI="http://jak-linux.org/projects/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="README ${T}/README.rsync"
+
+src_prepare() {
+	sed -i -e '/^CF/s:?=:+=:' -e '/^CF/s:-O2 -g::' Makefile || die
+
+	cat <<-EOF > "${T}"/README.rsync
+	https://hardlinkpy.googlecode.com/svn/trunk/hardlink.py has regex '^\..*\.\?{6,6}$'
+	for excluding rsync temporary files by default.
+
+	To accomplish same with this version, you can use following syntax:
+	# hardlink -x '^\..*\.\?{6,6}$'
+
+	This was discussed at https://bugs.gentoo.org/416613
+	EOF
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
diff --git a/app-arch/hardlink/hardlink-0.3.0.ebuild b/app-arch/hardlink/hardlink-0.3.0.ebuild
new file mode 100644
index 000000000000..ba3a9f866baf
--- /dev/null
+++ b/app-arch/hardlink/hardlink-0.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="A tool which replaces copies of a file with hardlinks"
+HOMEPAGE="http://jak-linux.org/projects/hardlink/"
+SRC_URI="http://jak-linux.org/projects/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="README ${T}/README.rsync"
+
+src_prepare() {
+	sed -i -e '/^CF/s:?=:+=:' -e '/^CF/s:-O2 -g::' Makefile || die
+
+	cat <<-EOF > "${T}"/README.rsync
+	https://hardlinkpy.googlecode.com/svn/trunk/hardlink.py has regex '^\..*\.\?{6,6}$'
+	for excluding rsync temporary files by default.
+
+	To accomplish same with this version, you can use following syntax:
+	# hardlink -x '^\..*\.\?{6,6}$'
+
+	This was discussed at https://bugs.gentoo.org/416613
+	EOF
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
diff --git a/app-arch/hardlink/metadata.xml b/app-arch/hardlink/metadata.xml
new file mode 100644
index 000000000000..3d6eb23ac199
--- /dev/null
+++ b/app-arch/hardlink/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/innoextract-1.6 b/app-arch/innoextract-1.6
deleted file mode 100644
index fc59341d0619..000000000000
--- a/app-arch/innoextract-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A tool to unpack installers created by Inno Setup
-EAPI=5
-HOMEPAGE=http://constexpr.org/innoextract/
-IUSE=debug +iconv +lzma
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=http://constexpr.org/innoextract/files/innoextract-1.6.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3951f1e6dc377dc3020b82cd2001b3e
diff --git a/app-arch/innoextract-1.7 b/app-arch/innoextract-1.7
deleted file mode 100644
index 27b3db8171bd..000000000000
--- a/app-arch/innoextract-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A tool to unpack installers created by Inno Setup
-EAPI=6
-HOMEPAGE=http://constexpr.org/innoextract/
-IUSE=debug +iconv +lzma
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=http://constexpr.org/innoextract/files/innoextract-1.7.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c81cd9ccc5b211a0fd556906afa93408
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
new file mode 100644
index 000000000000..9bf87a24919e
--- /dev/null
+++ b/app-arch/innoextract/Manifest
@@ -0,0 +1,5 @@
+DIST innoextract-1.6.tar.gz 183380 BLAKE2B 581c0e28ececbabc8785f50472f312bc39c62d9174c1902645a961f06877c3e702ce0386aa611fe954c412997a1a69355e441cc33e243abd1828ff5e9d2ff8a2 SHA512 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62
+DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4
+EBUILD innoextract-1.6.ebuild 749 BLAKE2B 4b959791b3ed667c0d017f209fd7b0e65d088ab7ca880e9aedc802a3e9cbe44a7b232823578578d540eb23a937a8f2c19465c1036154800d5fb5ac97db5328b2 SHA512 991a70217b350cd81ca3b026425ede051213c804f4032b4ea1b0fe3ad05e9273d705f7d55b3154fe856de2ff56f529e148ce7931215b80fac8299976aa7e37bb
+EBUILD innoextract-1.7.ebuild 733 BLAKE2B f118d601e3de781b5d0a7c881057366776bd62630bdc456c44e55e1537b7a59da58f0e50af6e2097bf99ec65065043308255fe69139d473ae1ad9dcc49c24b4d SHA512 6bad9d6afa092d21a3bc29e89adc6f81046103501e90e0a45999aa9339c59e770c89bb500096b4204bc15f0c84d29d5dc7b985c79fe37b49c6fb73f764afb724
+MISC metadata.xml 928 BLAKE2B 032de64587c2ab814a132d09f624a86f6b87a5fb1c49a1385969fcce89a7f75975480c8b3b70889621a97bb26e1d37240d51ef5a9da868983ee2467fc5c18f92 SHA512 0fb9ebc491eec20dbeee81d92ae7616464717c88684170ea064726b42120d65ac74edfac474e2605c191d91901e952859199c17bc84af3657812671cb3fb9260
diff --git a/app-arch/innoextract/innoextract-1.6.ebuild b/app-arch/innoextract/innoextract-1.6.ebuild
new file mode 100644
index 000000000000..509f67a4b24c
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A tool to unpack installers created by Inno Setup"
+HOMEPAGE="http://constexpr.org/innoextract/"
+SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +iconv +lzma"
+
+RDEPEND="
+	dev-libs/boost:=
+	iconv? ( virtual/libiconv )
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md CHANGELOG )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use lzma LZMA)
+		$(cmake-utils_use debug DEBUG)
+		-DSET_OPTIMIZATION_FLAGS=OFF
+		-DSTRICT_USE=ON
+		-DWITH_CONV=$(usex iconv iconv builtin)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/innoextract/innoextract-1.7.ebuild b/app-arch/innoextract/innoextract-1.7.ebuild
new file mode 100644
index 000000000000..53840c1a0cb4
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A tool to unpack installers created by Inno Setup"
+HOMEPAGE="http://constexpr.org/innoextract/"
+SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +iconv +lzma"
+
+RDEPEND="
+	dev-libs/boost:=
+	iconv? ( virtual/libiconv )
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md CHANGELOG )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEBUG=$(usex debug)
+		-DSET_OPTIMIZATION_FLAGS=OFF
+		-DSTRICT_USE=ON
+		-DUSE_LZMA=$(usex lzma)
+		-DWITH_CONV=$(usex iconv iconv builtin)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml
new file mode 100644
index 000000000000..6d8f19bb3ddf
--- /dev/null
+++ b/app-arch/innoextract/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>daniel@constexpr.org</email>
+		<name>Daniel Scharrer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="debug">Enable debug logging and the --debug command-line option</flag>
+		<flag name="lzma">Enable support for extracting lzma-compressed installers using <pkg>app-arch/xz-utils</pkg></flag>
+	</use>
+	<upstream>
+		<bugs-to>http://innoextract.constexpr.org/issues</bugs-to>
+		<changelog>http://constexpr.org/innoextract/changelog</changelog>
+		<doc lang="en">http://constexpr.org/innoextract/innoextract.1</doc>
+		<remote-id type="github">dscharrer/innoextract</remote-id>
+		<remote-id type="sourceforge">innoextract</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/ipkg-utils-1.7.050831-r2 b/app-arch/ipkg-utils-1.7.050831-r2
deleted file mode 100644
index 0272fec0a724..000000000000
--- a/app-arch/ipkg-utils-1.7.050831-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!minimal? ( app-crypt/gnupg net-misc/curl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tools for working with the ipkg binary package format
-EAPI=5
-HOMEPAGE=http://www.openembedded.org/
-IUSE=minimal python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!minimal? ( app-crypt/gnupg net-misc/curl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://handhelds.org/download/packages/ipkg-utils/ipkg-utils-050831.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e91724444f2ee8b796c761d53b310ccb
diff --git a/app-arch/ipkg-utils-1.7.050831-r3 b/app-arch/ipkg-utils-1.7.050831-r3
deleted file mode 100644
index b0177120a29e..000000000000
--- a/app-arch/ipkg-utils-1.7.050831-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!minimal? ( app-crypt/gnupg net-misc/curl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tools for working with the ipkg binary package format
-EAPI=6
-HOMEPAGE=http://www.openembedded.org/
-IUSE=minimal python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!minimal? ( app-crypt/gnupg net-misc/curl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://handhelds.org/download/packages/ipkg-utils/ipkg-utils-050831.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82ee837107ff570b035db3abff03553f
diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
new file mode 100644
index 000000000000..70a5c39bf8bb
--- /dev/null
+++ b/app-arch/ipkg-utils/Manifest
@@ -0,0 +1,7 @@
+AUX ipkg-utils-1.7.050831-hashlib-r2.patch 534 BLAKE2B d1e1dd0ca3f332f372de1a0e471ac74e7a1eda58527fcb9e34318fd279e809578ad407ab812eb2966033892fb55920b9426e41481db703334b89511602e30e9d SHA512 88a1d2bd32c696953943136d30ab5d4cc8efb280b7c39e142880b05cb6b233d95530331c989e75afad607e3b2d3ee94840ac403e14d97c30865ead63fc098180
+AUX ipkg-utils-1.7.050831-hashlib.patch 614 BLAKE2B 270c85ec7b744510534335d1282f2f843f8e9277348b2638468471f73b1dfc23deb888c89fa50b0b7d4a9ec2f248ba2e96e74768576ec96544bf9d17e9d550c8 SHA512 919773062c52d4f5474d75a0b603d4d20c11936db1c3603695caa3d7d9793715ccca6b90f272bb9cf1ba74052fa160df03cebc7e1d189f20832b482d46891736
+AUX ipkg-utils-tar_call_fixes.patch 1500 BLAKE2B 602c2f2aa68411e966b966490a0c83ff33ae966d6ee44794adaa6d12d77acc2eb6322ef49cd4eaa5bba08e98a609f8aef8c5080ae4c755a5e3adc674f37d51f3 SHA512 8b16b81241e9634696917b9c24dc890e1b03ea37d1130f5894b72d0e475616d6ac9e03cf299243c426651af1b45e29b38ef355905cbfab92c614f32c54964b3f
+DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa
+EBUILD ipkg-utils-1.7.050831-r2.ebuild 1442 BLAKE2B 521b0a10e8412933f157879ac0dd93969c1e7a87be05ce81e0fef28146312267824f1c1f08d20422f8a4e1ac21fbf810f24b6ce0ddbfe11a87dfd102c50f32ab SHA512 a34676119df3073b7f0f3b53d852e7e9404adf99278205d052bc06a72a4f13a3eac95c2fafbd6c97e22f83b3217c7fc8efa3cd95f1fe7e6d64ddca3a28ef223c
+EBUILD ipkg-utils-1.7.050831-r3.ebuild 1417 BLAKE2B 3982d150af3b1d8aaa8e16f48b46acf2e818d44eefc143504c259db3d745cfb9678ff195548080538a1db910f26cf0660c24878df61f9a9dfa30cfb91b3a830c SHA512 50b8bf15728512dce830c09045543cafa434d39b001f996e57b624a24303225bdc060228b2068e570303f5addef4fcc3fc371340d684f854edec386b09f0254b
+MISC metadata.xml 440 BLAKE2B f58f839dd54a3d68454f781aa5a2ccc2ec21a0418fa6de240f084568a4d8853ab191e4de2ed5d26761412109dd57564188aadc141f73646ae4ac93d31dad175f SHA512 ba8bf9b429d587c2fad985c311a8107a08d4362c161a72bc1243a8a14ba842d0c7ee7cc08a0278881a9d61a05702e3cf5817db34234e31761ad7e518d74d29de
diff --git a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
new file mode 100644
index 000000000000..3cdd35bd81c6
--- /dev/null
+++ b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
@@ -0,0 +1,25 @@
+diff --git i/ipkg.py w/ipkg.py
+index 02aab22..145686c 100644
+--- i/ipkg.py
++++ w/ipkg.py
+@@ -36,10 +36,10 @@ import tempfile
+ import os
+ import sys
+ import glob
+-import md5
+ import re
+ import string
+ import commands
++from hashlib import md5
+ from stat import ST_SIZE
+ 
+ class Version:
+@@ -136,7 +136,7 @@ class Package:
+ 
+             # compute the MD5.
+             f = open(fn, "r")
+-            sum = md5.new()
++            sum = md5()
+             while 1:
+                 data = f.read(1024)
+                 if not data: break
diff --git a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch
new file mode 100644
index 000000000000..e7cdf2de8c82
--- /dev/null
+++ b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch
@@ -0,0 +1,30 @@
+--- ipkg.py
++++ ipkg.py
+@@ -36,12 +36,17 @@
+ import os
+ import sys
+ import glob
+-import md5
+ import re
+ import string
+ import commands
+ from stat import ST_SIZE
+ 
++try:
++    from hashlib import md5
++except ImportError:
++    import md5
++    md5 = md5.new
++
+ class Version:
+     """A class for holding parsed package version information."""
+     def __init__(self, epoch, version):
+@@ -136,7 +141,7 @@
+ 
+             # compute the MD5.
+             f = open(fn, "r")
+-            sum = md5.new()
++            sum = md5()
+             while 1:
+                 data = f.read(1024)
+                 if not data: break
diff --git a/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch b/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch
new file mode 100644
index 000000000000..da1e02b4fddb
--- /dev/null
+++ b/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch
@@ -0,0 +1,28 @@
+Index: ipkg-utils-050831/ipkg.py
+===================================================================
+--- ipkg-utils-050831/ipkg.py	{cset c946c633-8984-433c-8beb-a6cf3926b0af}
++++ ipkg-utils-050831/ipkg.py	{local clone}
+@@ -152,9 +152,9 @@ class Package:
+             self.filename = os.path.basename(fn)
+ 	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
+             if self.isdeb:
+-                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r")
++                control = os.popen("ar p "+fn+" control.tar.gz | gtar xfzO - --wildcards '*control'","r")
+             else:
+-                control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
++                control = os.popen("gtar xfzO "+fn+" --wildcards '*control.tar.gz' | gtar xfzO - --wildcards '*control'","r")
+             line = control.readline()
+             while 1:
+                 if not line: break
+@@ -181,7 +181,7 @@ class Package:
+             if self.isdeb:
+                 data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
+             else:
+-                data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
++                data = os.popen("gtar xfzO "+fn+" --wildcards '*data.tar.gz' | gtar tfz -","r")
+             while 1:
+                 line = data.readline()
+                 if not line: break
+# Checksums: MD5
+# 3b32292e44cc49af1d6c599fd8a44fb8  ipkg.py
+# a103926695d45fe3c6d08a841ed6cd99  ipkg.py [diff]
diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild
new file mode 100644
index 000000000000..4833a4dc6cfc
--- /dev/null
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils toolchain-funcs versionator
+
+MY_P="${PN}-$(get_version_component_range 3)"
+
+DESCRIPTION="Tools for working with the ipkg binary package format"
+HOMEPAGE="http://www.openembedded.org/"
+SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+IUSE="minimal"
+
+DEPEND="
+	!minimal? (
+		app-crypt/gnupg
+		net-misc/curl
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-tar_call_fixes.patch"
+	epatch "${FILESDIR}/${P}-hashlib.patch"
+
+	sed '/python setup.py build/d' -i Makefile
+
+	if use minimal; then
+		elog "ipkg-upload is not installed when the \`minimal' USE flag is set.  If you"
+		elog "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use minimal; then
+		rm "${ED}usr/bin/ipkg-upload" \
+			"${D}$(python_get_scriptdir)/ipkg-upload" || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	elog "Consider installing sys-apps/fakeroot for use with the ipkg-build command,"
+	elog "that makes it possible to build packages as a normal user."
+}
diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
new file mode 100644
index 000000000000..649d7001ed2d
--- /dev/null
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils toolchain-funcs versionator
+
+MY_P="${PN}-$(get_version_component_range 3)"
+
+DESCRIPTION="Tools for working with the ipkg binary package format"
+HOMEPAGE="http://www.openembedded.org/"
+SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+IUSE="minimal"
+
+DEPEND="
+	!minimal? (
+		app-crypt/gnupg
+		net-misc/curl
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}/${P}-hashlib-r2.patch")
+
+src_prepare() {
+	default
+
+	sed '/python setup.py build/d' -i Makefile
+
+	if use minimal; then
+		elog "ipkg-upload is not installed when the \`minimal' USE flag is set.  If you"
+		elog "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake CC="$(tc-getCC)"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use minimal; then
+		rm "${ED}usr/bin/ipkg-upload" \
+			"${D}$(python_get_scriptdir)/ipkg-upload" || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dobin ipkg-compare-versions
+}
+
+pkg_postinst() {
+	elog "Consider installing sys-apps/fakeroot for use with the ipkg-build "
+	elog "command, that makes it possible to build packages as a normal user."
+}
diff --git a/app-arch/ipkg-utils/metadata.xml b/app-arch/ipkg-utils/metadata.xml
new file mode 100644
index 000000000000..bbd0686ff3f8
--- /dev/null
+++ b/app-arch/ipkg-utils/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jnrowe@gmail.com</email>
+		<name>James Rowe</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Tools for working with the ipkg format.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/lbzip2-2.3-r1 b/app-arch/lbzip2-2.3-r1
deleted file mode 100644
index 43b40b735b63..000000000000
--- a/app-arch/lbzip2-2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=Parallel bzip2 utility
-EAPI=5
-HOMEPAGE=https://github.com/kjn/lbzip2/
-IUSE=debug symlink
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
-SLOT=0
-SRC_URI=http://archive.lbzip2.org/lbzip2-2.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=59fe2b14b43bb739e7dc570085b489c6
diff --git a/app-arch/lbzip2-2.5 b/app-arch/lbzip2-2.5
deleted file mode 100644
index dd7a55b93aba..000000000000
--- a/app-arch/lbzip2-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=Parallel bzip2 utility
-EAPI=5
-HOMEPAGE=https://github.com/kjn/lbzip2/
-IUSE=debug symlink
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
-SLOT=0
-SRC_URI=http://archive.lbzip2.org/lbzip2-2.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1227c937fee5aa388d6b97eab7d144d6
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
new file mode 100644
index 000000000000..11816e78f473
--- /dev/null
+++ b/app-arch/lbzip2/Manifest
@@ -0,0 +1,6 @@
+AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
+DIST lbzip2-2.3.tar.gz 630226 BLAKE2B c08a7257eff859c0b7fb66ae638a57f837f1a2380c500c42ea65dc36e5650b30865d3c4c9820d6fed62bdbc4e3bdf7bae9e8bfe519897d9aac7f0c77cceacfb2 SHA512 4f694445cc90377bf8dac5046b952ff174db571f390c2d7b0aa001f73c76f3d3f048ff8e7297c2055ed1f7b210174496dc31d6628e1cbeff63146a36a442ad4c
+DIST lbzip2-2.5.tar.gz 651399 BLAKE2B a53fc34084ed16c0e78a9f084f68fc0bd1217245e9470ee023f0a4f5a1e2ae4e5866086f9fbc3ff7ec5654c595b4388d9eff495bc0228edbe0322bf9d1fd1f23 SHA512 76e96cfa75b3ed515b2f891349dffc1403daab2dd0a2a614fa0c811cec6ca25faa395da08ad68a9b6ba4069332c4571f70fb7424f06ef3d800c3082c08d7d3d7
+EBUILD lbzip2-2.3-r1.ebuild 806 BLAKE2B e396324e0fde98a11c66232506c5beac4a5fc24c43ff5ba9550e5408cdd53efffee000b6f03ab70ea7f50a7982a3c20e9ff92fde74dabb1513a3ddb7c35f67b0 SHA512 ce7cb5acd3357e7ad80c782c90c6decd8a9ff6041064988ceb454d559058c1f531c92a903324a2b0e64560119fae3f03f54c6c8fb9b00345382220b5c52338b7
+EBUILD lbzip2-2.5.ebuild 826 BLAKE2B c002af26958aa3d8e0cf2d2e6721e24afabd7080ff6680376828ad05c27e267307114ed096d876f74573cdeb35d35f913fd84c3b1154661c5c0a29e05c341877 SHA512 f63095d9320ab1ba66a8142b13592c5444e79315e1d765da3e47631df79e3b98ff6ab325725ab1dd00990c92190e05c9cc3d098b2b79340568435bd6033b03fa
+MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
diff --git a/app-arch/lbzip2/files/lbzip2-2.3-s_isreg.patch b/app-arch/lbzip2/files/lbzip2-2.3-s_isreg.patch
new file mode 100644
index 000000000000..6f4954102f5d
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.3-s_isreg.patch
@@ -0,0 +1,16 @@
+ src/main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index f030fd5..5f8290e 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -702,7 +702,7 @@ input_init(const struct arg *operand, struct stat *sbuf)
+       return -1;
+     }
+ 
+-    if (OM_REGF == outmode && !S_ISREG(sbuf->st_mode)) {
++    if (!decompress && OM_REGF == outmode && !S_ISREG(sbuf->st_mode)) {
+       warn("skipping \"%s\": not a regular file", operand->val);
+       return -1;
+     }
diff --git a/app-arch/lbzip2/lbzip2-2.3-r1.ebuild b/app-arch/lbzip2/lbzip2-2.3-r1.ebuild
new file mode 100644
index 000000000000..886633a39d7d
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="https://github.com/kjn/lbzip2/"
+SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug symlink"
+
+RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-s_isreg.patch )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_enable debug tracing)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/bzip2
+		dosym lbunzip2 /usr/bin/bunzip2
+	fi
+}
diff --git a/app-arch/lbzip2/lbzip2-2.5.ebuild b/app-arch/lbzip2/lbzip2-2.5.ebuild
new file mode 100644
index 000000000000..e91cd606720e
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="https://github.com/kjn/lbzip2/"
+SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug symlink"
+
+RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3-s_isreg.patch )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_enable debug tracing)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/bzip2
+		dosym lbunzip2 /usr/bin/bunzip2
+	fi
+}
diff --git a/app-arch/lbzip2/metadata.xml b/app-arch/lbzip2/metadata.xml
new file mode 100644
index 000000000000..d0fababc8bb3
--- /dev/null
+++ b/app-arch/lbzip2/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+	<longdescription lang="en">
+		A multi-threaded bzip2/bunzip2 utility that employs multiple threads and an
+		input-bound splitter even when decompressing .bz2 files created by standard
+		bzip2
+	</longdescription>
+	<upstream>
+		<remote-id type="github">kjn/lbzip2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/lcab-1.0_beta12 b/app-arch/lcab-1.0_beta12
deleted file mode 100644
index 524973482225..000000000000
--- a/app-arch/lcab-1.0_beta12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=CAB file creation tool
-EAPI=4
-HOMEPAGE=http://ohnopub.net/lcab/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://mirror.ohnopub.net/mirror/lcab-1.0b12.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4b741b85e6014eb7902edda4580bdbfe
diff --git a/app-arch/lcab/Manifest b/app-arch/lcab/Manifest
new file mode 100644
index 000000000000..2049076a7ae2
--- /dev/null
+++ b/app-arch/lcab/Manifest
@@ -0,0 +1,3 @@
+DIST lcab-1.0b12.tar.gz 74907 BLAKE2B 3b53c9a97319b1029a3fae8e1cc090b041ac12ff3329d7c49f7cba097c6ff47d0842ec009a3483e3bf2d9dfb8f351a5e965e275479a811bfb859798e1337996c SHA512 7aeb1b2aa0b9171963b771cfbec13d1a6d4b2519f0f6f2705b505d0ec7a7425764996de00ed1d2919d08c525617d029035a586e8c7e2fad2f44945fddd2afbcf
+EBUILD lcab-1.0_beta12.ebuild 510 BLAKE2B 7a69003a2e260be21e7eb0164d5474c08c541060ed8f56253865fe9c7a7beef201a0c036545958bef14d7a96e46e035899aa171bea07630c656877e43a8df36c SHA512 2e8a844f3ad6aa5d13083420fc569f901d1998304e446b8cbceea18a213d79847ec71753bf42b00d70cd7eba22913a9609836b1c18de3bf0c95af7e3d5d002bd
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/lcab/lcab-1.0_beta12.ebuild b/app-arch/lcab/lcab-1.0_beta12.ebuild
new file mode 100644
index 000000000000..c9cc63e792b5
--- /dev/null
+++ b/app-arch/lcab/lcab-1.0_beta12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="CAB file creation tool"
+HOMEPAGE="http://ohnopub.net/lcab/"
+SRC_URI="ftp://mirror.ohnopub.net/mirror/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i "s:1.0b11:${MY_PV}:" mytypes.h || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
diff --git a/app-arch/lcab/metadata.xml b/app-arch/lcab/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-arch/lcab/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-arch/lha-114i-r7 b/app-arch/lha-114i-r7
deleted file mode 100644
index d049624af23d..000000000000
--- a/app-arch/lha-114i-r7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utility for creating and opening lzh archives
-EAPI=4
-HOMEPAGE=http://lha.sourceforge.jp
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
-LICENSE=lha
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6fe070c86dd54057a7ce96e3b6dab16
diff --git a/app-arch/lha-114i-r8 b/app-arch/lha-114i-r8
deleted file mode 100644
index 50dc13de969a..000000000000
--- a/app-arch/lha-114i-r8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utility for creating and opening lzh archives
-EAPI=5
-HOMEPAGE=http://lha.sourceforge.jp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
-LICENSE=lha
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=474b9c4b82917c1dd0b18e9353c7bb17
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
new file mode 100644
index 000000000000..f1e70b19c4d3
--- /dev/null
+++ b/app-arch/lha/Manifest
@@ -0,0 +1,6 @@
+AUX lha-114i-file-list-from-stdin.patch 991 BLAKE2B eab4a7c196a1e99bff97dee124d47af0870c01660fd96da3835797e0e14d9b2c271e69d8522278819f97f6787c050016a76916af28e2b949f880003f2f9b6426 SHA512 fb3e112ef592b7542cab4cd34759407b5bace3ebc83af0aad52daf9d8584ec897e26ef1e0d4cc3656c1b0bfbd5eb242dedc6fb0a8fedce765ae30735a95b79a2
+AUX lha-114i-fix-getopt_long-declaration.patch 267 BLAKE2B c87ac7e0842b9b637b5f9201ad0f596a2ee3bdb44447428d2f7e28c61c7da30f397c7dcacee86bdf6e1166f10d0b4962056ea77e443885487eae0eb3bcbb0f2d SHA512 c0e23d742a4e37b86f69e7096eba95e0c41619e2a459d526f5ede31ec73d2cfc14b3660fd1741c68e40d2ddb9bfd7c4250f275edea3965e1077b1a482a788f10
+DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
+EBUILD lha-114i-r7.ebuild 991 BLAKE2B af079ce8bcb696d6f7486c14e4faae0d4767e81556c85dd0c8ecf96e33d4d979b696af26c27abb7598e4410355193e2cd550d0342c555214f71fced05e86b674 SHA512 58af6daefe2f32f9479496811c78e0b224196da43f798d9734ee2bb4e78fcefd143bd2b01b409c8aeb1a736e6eae3548ef483e4a829b0a5a8d52dd226426a1e5
+EBUILD lha-114i-r8.ebuild 1147 BLAKE2B d8d4589cd5130d531750633b00553f98a59da7c7cbdb77750478a3bb3b6fb5f87a477f1bb524c972cd81c34189006d2371117df5c96b75be799e3f06079daee3 SHA512 fc3be81aba9e9f7d9a27c753ea187790956dcec389a890e6d06e939c0aafdc88a0b7e579f05f57809950f88bc32777b10ad3948b95fe27a41cecfd149ef08544
+MISC metadata.xml 534 BLAKE2B 861f00b0b2b6c547ba122d9dbc9da0d9b84bd49b553a2c8f2d2fa5dd7ef7dcd86caca75292a825dccb74becd7ad8c34a4f9cbe71cd5096ba7617953c4f612c7c SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f
diff --git a/app-arch/lha/files/lha-114i-file-list-from-stdin.patch b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
new file mode 100644
index 000000000000..4bd0d17d7527
--- /dev/null
+++ b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
@@ -0,0 +1,29 @@
+Index: src/lharc.c
+===================================================================
+--- src/lharc.c	(revision 773)
++++ src/lharc.c	(working copy)
+@@ -561,7 +561,7 @@
+         if (!isatty(1) && cmd == CMD_ADD)
+             quiet = TRUE;
+     }
+-#if 0 /* Comment out; IMHO, this feature is useless. by Koji Arai */
++#ifndef MINGW32
+     else {
+         if (argc == 3 && !isatty(0)) { /* 1999.7.18 */
+             /* Bug(?) on MinGW, isatty() return 0 on Cygwin console.
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 773)
++++ configure.ac	(working copy)
+@@ -289,6 +289,11 @@
+ 	    [Define to 1 if you want to ignore dot files with -X command line switch])
+ fi
+ 
++AC_MINGW32
++if test "x$MINGW32" = xyes; then
++  AC_DEFINE(MINGW32, 1, [Define to 1 if we're being compiled with MinGW.])
++fi
++
+ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile olddoc/Makefile])
+ AC_CONFIG_FILES([tests/Makefile tests/lha-test])
+ AC_OUTPUT
diff --git a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
new file mode 100644
index 000000000000..b57a1c9c6158
--- /dev/null
+++ b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
@@ -0,0 +1,11 @@
+--- src/getopt_long.c.orig      2013-12-18 16:05:59.789413528 -0600
++++ src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
+@@ -64,7 +64,7 @@
+ 
+ #ifndef USE_GNU
+ #include <stdio.h>
+-#include <getopt_long.h>
++#include "getopt_long.h"
+ 
+ char *optarg;
+ int optind;
diff --git a/app-arch/lha/lha-114i-r7.ebuild b/app-arch/lha/lha-114i-r7.ebuild
new file mode 100644
index 000000000000..9bc254e7cf19
--- /dev/null
+++ b/app-arch/lha/lha-114i-r7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils flag-o-matic
+
+MY_P=${PN}-1.14i-ac20050924p1
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="http://lha.sourceforge.jp"
+SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
+
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-file-list-from-stdin.patch
+
+	sed -i -e '/^AM_C_PROTOTYPES/d' configure.ac || die #423125
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		export ac_cv_header_inttypes_h=no
+		export ac_cv_func_iconv=no
+	fi
+
+	econf
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}"/usr/share/man/ja \
+		install
+
+	dodoc ChangeLog Hacking_of_LHa
+}
diff --git a/app-arch/lha/lha-114i-r8.ebuild b/app-arch/lha/lha-114i-r8.ebuild
new file mode 100644
index 000000000000..2964658932b9
--- /dev/null
+++ b/app-arch/lha/lha-114i-r8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+MY_P=${PN}-1.14i-ac20050924p1
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="http://lha.sourceforge.jp"
+SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-file-list-from-stdin.patch
+	"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	sed -e '/^AM_C_PROTOTYPES/d' \
+		-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+		-i configure.ac || die #423125, 467544
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		export ac_cv_header_inttypes_h=no
+		export ac_cv_func_iconv=no
+	fi
+
+	econf
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}"/usr/share/man/ja \
+		install
+
+	dodoc ChangeLog Hacking_of_LHa
+}
diff --git a/app-arch/lha/metadata.xml b/app-arch/lha/metadata.xml
new file mode 100644
index 000000000000..ee8ee630babf
--- /dev/null
+++ b/app-arch/lha/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nitro@legroom.net</email>
+		<name>Jared B.</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		A utility for creating and opening lzh archives.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge-jp">lha</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/libarchive-3.3.1 b/app-arch/libarchive-3.3.1
deleted file mode 100644
index d43d4869e94a..000000000000
--- a/app-arch/libarchive-3.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=BSD tar command
-EAPI=6
-HOMEPAGE=http://www.libarchive.org/
-IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-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
-LICENSE=BSD BSD-2 BSD-4 public-domain
-RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0/13
-SRC_URI=http://www.libarchive.org/downloads/libarchive-3.3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35a702d42b9ebc8b8b607bffc76d5cf3
diff --git a/app-arch/libarchive-3.3.2 b/app-arch/libarchive-3.3.2
deleted file mode 100644
index 47943c1f1a39..000000000000
--- a/app-arch/libarchive-3.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=BSD tar command
-EAPI=6
-HOMEPAGE=http://www.libarchive.org/
-IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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
-LICENSE=BSD BSD-2 BSD-4 public-domain
-RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0/13
-SRC_URI=http://www.libarchive.org/downloads/libarchive-3.3.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=beebe474f9e3e23c08969785983567bd
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
new file mode 100644
index 000000000000..a71577786344
--- /dev/null
+++ b/app-arch/libarchive/Manifest
@@ -0,0 +1,7 @@
+AUX libarchive-3.3.1-libressl.patch 1069 BLAKE2B 0fb6c7c3d85b620387e76e6e2fb7b787effe8fb8c9bd911561e348eb7d0c7cbd504d8932ff5d7c2856649948c556b3807a0fc6019ef4d38fa37d873729275e17 SHA512 d82e3de1201168f6e187824e237f35a9581c34450043ce84478aca3ca74df7b00bbcba5bc462f354837e1720bcc135ce4864f81cfd499b398b1939b886b7fd3f
+AUX libarchive-3.3.2-libressl.patch 1105 BLAKE2B 9b62a5b4029b8c0fd97d4c5012fac9a7dd25655e3b0d8adbcb839f05c1999eb77b902ef476841af8eb8b9de76ce9bad893d065084121434f06717d5f4db93b29 SHA512 ffcc66414f72ee2262544f4d59ca2d0b83ba2eca4f58261ec4694f5cd5d5d7975d9626a1f9ad8a1047d3e656d4dc98dd28d991ef3e6311959d8bf797ad6bc936
+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.3.1.ebuild 3421 BLAKE2B 58a7875a34993cd05f6c3dd944dbd984f659931fc41a088a718c5d5f0237a7494295ad7e48aeef783905a61ea3c3c55e2617bed6994cdf3f97aa73e1306f2261 SHA512 45dcf64451b3325ab3a99a37d5e3fa23222fcc681a1e12ae9104ffc86544298b91b282328615af2da832d79d6680484ff81c1de2bec9868ef47b27864c006a67
+EBUILD libarchive-3.3.2.ebuild 3492 BLAKE2B 62da4fbace1866bb6949a0b3d611a2a5b8375c734a650ecc05229014e58290d2c4b9182b8fb573de040823bc8ab9547d2c5983c7f60099de70470187e1bd27f0 SHA512 8a2ec5bf5324f73df45481fcba3a3f20a730ec96e7db2dedd1479156ea9524d78af1105893f9b3c65e1f0d9debe6e8139d984f18b355e7c86288b0a73098f68e
+MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
new file mode 100644
index 000000000000..7ee48d4e5f50
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
@@ -0,0 +1,25 @@
+--- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
+@@ -28,7 +28,8 @@
+ #include <openssl/evp.h>
+ #include <openssl/opensslv.h>
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memset */
+ static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
+
+--- a/libarchive/archive_openssl_hmac_private.h	2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_hmac_private.h	2018-04-19 04:02:18.309167446 +0000
+@@ -28,7 +28,8 @@
+ #include <openssl/hmac.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memset */
+ static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
new file mode 100644
index 000000000000..e053a539fae8
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
@@ -0,0 +1,25 @@
+--- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
+@@ -28,7 +28,8 @@
+ #include <openssl/evp.h>
+ #include <openssl/opensslv.h>
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memset */
+ static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
+
+--- a/libarchive/archive_openssl_hmac_private.h	2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_hmac_private.h	2018-04-19 04:02:18.309167446 +0000
+@@ -28,7 +28,8 @@
+ #include <openssl/hmac.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memset */
+ static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
new file mode 100644
index 000000000000..23c5543689d1
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.3.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 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 ~x64-cygwin ~amd64-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}"/${PN}-3.3.1-libressl.patch
+)
+
+# Various test problems, starting with the fact that sandbox
+# explodes on long paths. https://bugs.gentoo.org/598806
+RESTRICT="test"
+
+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
+
+	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/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild
new file mode 100644
index 000000000000..b9482078762d
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.3.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2018 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 ~x64-cygwin ~amd64-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}"/${PN}-3.3.2-libressl.patch
+)
+
+# Various test problems, starting with the fact that sandbox
+# explodes on long paths. https://bugs.gentoo.org/598806
+RESTRICT="test"
+
+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
+
+	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
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	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/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
new file mode 100644
index 000000000000..126e3e29930f
--- /dev/null
+++ b/app-arch/libarchive/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>bsd@gentoo.org</email>
+		<name>BSD Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The bsdtar program creates and manipulates streaming archive files.
+		It has a number of advantages over previous tar implementations.
+	</longdescription>
+	<use>
+		<flag name="bzip2">
+			Allow accessing bzip2-compressed archives through libbz2 (which
+			comes with <pkg>app-arch/bzip2</pkg>). This only affects
+			libarchive's native support: bsdtar will keep using bunzip2 as a
+			filter if that's not built-in.
+		</flag>
+		<flag name="e2fsprogs">
+			Use file flags from <pkg>sys-fs/e2fsprogs</pkg> headers instead of <pkg>virtual/os-headers</pkg> headers
+		</flag>
+		<flag name="lz4">
+			Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg>
+		</flag>
+		<flag name="nettle">
+			Use <pkg>dev-libs/nettle</pkg> as crypto backend
+		</flag>
+		<flag name="zlib">
+			Allow accessing gzip-compressed archives through
+			<pkg>sys-libs/zlib</pkg>. This only affects libarchive's native
+			support: bsdtar will keep using gunzip as a filter if that's not
+			built-in. It's also needed for supporting extraction of ZIP
+			files.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-arch/libpar2-0.4 b/app-arch/libpar2-0.4
deleted file mode 100644
index a54f944d0e84..000000000000
--- a/app-arch/libpar2-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libsigc++:2 virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=A library for par2, extracted from par2cmdline
-EAPI=5
-HOMEPAGE=https://launchpad.net/libpar2/
-IUSE=static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libsigc++:2
-SLOT=0
-SRC_URI=https://launchpad.net/libpar2/trunk/0.4/+download/libpar2-0.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76a41989dfed6bf9269353979119b995
diff --git a/app-arch/libpar2/Manifest b/app-arch/libpar2/Manifest
new file mode 100644
index 000000000000..4e86ecc99a5a
--- /dev/null
+++ b/app-arch/libpar2/Manifest
@@ -0,0 +1,3 @@
+DIST libpar2-0.4.tar.gz 516613 BLAKE2B d5102ca9b9a25c77bc63524c04b0cb25ad3dd44e63dc0fd92ac7744d00b0044b79df4737428350ff2ea4f65acb212bac8f983d299bb5a934fc7f916994b61a98 SHA512 36d6f91bb3ea94dca1c4c45be41d37662a928bed39edace1a38ae0ad167804308d252a9fe49c2babb194b297fa4671654532add3758b7d7d528161cdceb278e6
+EBUILD libpar2-0.4.ebuild 673 BLAKE2B 2c57135fe1ccb2d1668b4c502c853c01f07cecd7821b11df2839eabe652ae1235306d711f03c52aa4491e7ad94afa6aade5e0ab22334ab154a479b478214e52a SHA512 756949f83e667ca42be78185128ceb7183c9dd1010f1efc37d7faccdfac9872acfbcff1bf606e0aa80d319a66dc725734dfbe78371e515f1117fe89455fd741b
+MISC metadata.xml 331 BLAKE2B 0a33f3aec55ef11330ecae9aa5e55fca141fe1cd07f100f846be7d8b6ff29da81caae4df35e9ae995683633b5de8c225628d084958a799ff6cefe62d0a790a59 SHA512 4f615121ef89e72ea1c0a9a38e197ffef0edcd9603ec716e56c933acb24e5958f574a911319d389d94b4faba8fb4815aae7dbe46979f9d922cb71e2352162191
diff --git a/app-arch/libpar2/libpar2-0.4.ebuild b/app-arch/libpar2/libpar2-0.4.ebuild
new file mode 100644
index 000000000000..6408f5475665
--- /dev/null
+++ b/app-arch/libpar2/libpar2-0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils flag-o-matic
+
+DESCRIPTION="A library for par2, extracted from par2cmdline"
+HOMEPAGE="https://launchpad.net/libpar2/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libsigc++:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+# Needed to install all headers properly (bug #391815)
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	autotools-utils_src_prepare
+	append-cxxflags -std=c++11 #567498
+}
diff --git a/app-arch/libpar2/metadata.xml b/app-arch/libpar2/metadata.xml
new file mode 100644
index 000000000000..1cb3032538b0
--- /dev/null
+++ b/app-arch/libpar2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">libpar2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/lrzip-0.621 b/app-arch/lrzip-0.621
deleted file mode 100644
index 555be931740f..000000000000
--- a/app-arch/lrzip-0.621
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
-DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
-EAPI=5
-HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README.md
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
-SLOT=0
-SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.621.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=534604a34f955125e060bd331f30b2af
diff --git a/app-arch/lrzip-0.630 b/app-arch/lrzip-0.630
deleted file mode 100644
index 8e65f0b35a73..000000000000
--- a/app-arch/lrzip-0.630
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
-DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
-EAPI=6
-HOMEPAGE=https://github.com/ckolivas/lrzip
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
-SLOT=0
-SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.630.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e0bed2e91ceeefc29bf0ca08cb07a47
diff --git a/app-arch/lrzip-0.631 b/app-arch/lrzip-0.631
deleted file mode 100644
index cddc074e12ca..000000000000
--- a/app-arch/lrzip-0.631
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
-DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
-EAPI=6
-HOMEPAGE=https://github.com/ckolivas/lrzip
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
-SLOT=0
-SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.631.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00eb59665fa4753c5964cf49f865db8a
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
new file mode 100644
index 000000000000..6f7f04d4e40e
--- /dev/null
+++ b/app-arch/lrzip/Manifest
@@ -0,0 +1,9 @@
+AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b79906decefde76d3245e21cb711587b37750146a9a5db0221d37e7aea9259dc1ab85932463b8e94dc23e18ec7c4ac SHA512 eec9086ad4ed4a148540ef1729fc3be4e4763950a35e3f2eec981451353f9ab0358aaa754ae4675ba22d057a97f17c2478fae06c173a38e423e32338f1cf5784
+AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
+DIST lrzip-0.621.tar.bz2 503286 BLAKE2B 3fb80f72f0bb81340d4e83b996ad2cd94fc0067b8e67599defb535e86614ad4a2436d8e6ab00bae24e4c9799a01aef267a7078cc6745d68acf868d0f1dbd606a SHA512 be94f54c3d84c93e3c1ab7b08ca6d2a02bc343983785be4884f42521520d2babc31db3abbec4b77dc9f710d18648adcc3d24b203289d8d4728afb3ef0fb90c0a
+DIST lrzip-0.630.tar.bz2 521517 BLAKE2B 7b99caf1310b352839113fb20b6dd08fafde2a6696a84f96d5bf2118fb559ef61d599cbf3a293c607bc014ddbb042d25753b8d1293f416530e9738a80107028f SHA512 fa46a2e9cb2574086d24296b7376865ac9f998724041c00e69f28d4984a6b8f7441de7d7fab2820e6cd6d6da4ead8ba66d0eb18f0381e8438db09301fb009460
+DIST lrzip-0.631.tar.bz2 522158 BLAKE2B d0ffe63e1bdd21304d6d7a7dc969d4e79770fed105cf03ea9d504f890cda35178566afa5f88e13beadcc1095f052a014deada3b3f102247eadb8c746d989d119 SHA512 6420cd465ccd4581066408482335a82089f84f0aca1b05249b9fc6039b7e67df94457a7c871859e363206df3a40e93cfde576388785113f6c99b31d34c00a307
+EBUILD lrzip-0.621.ebuild 764 BLAKE2B df960ea53f8be42a3c77ff6e4f63969ab3d3d5d591c92d950c8f88c44b719edad1073271399d79bbb5e2d3ab1085b5875f3c811d3ffc660b843ef6296b8fefff SHA512 8fee8f421ebdb8e7e6f66cebbce65346a82f18a8e290fda9dc6295545c9132bbb2f48c1f30f2af880a939ab60f3ed58f74a15bb7939dc8390788bad0f84734b8
+EBUILD lrzip-0.630.ebuild 746 BLAKE2B 4a57f6ee2f9a02875813ed6cbdbc6957bbfc50ebc519318323c449baec3ea0b109170d28b3d1e3452b5f102844df0d408db3b7fd3f6668c59320814cb6614c76 SHA512 4737636d13d31d93308c2dc7525de24e2ae02270927d313b822e59adb75dcae8a16d66a5084ce1b1dbb9b694545fd2a1c6889781f8d2a0bc31d406a1142be6d9
+EBUILD lrzip-0.631.ebuild 870 BLAKE2B ae05e39fc88426380170164ff00aed0ee0a4f6f96759beff0d8622858c3cbef17cf45cbcacc3fffd41cd55fe383e0469758fae09a3549f49bb6375dc91a4ccac SHA512 698ba9830b8c0ef0fe16e43115c1f40fee79c282ef16d44096792f06ce6b28f6fc9ce61f0510388600a190ea1727476e5678e177cb92b5846c88b5c5ac291044
+MISC metadata.xml 581 BLAKE2B e34acd5b35b3f661015d6323b59056a981a7cf41da0b2ee1e440b912022e20e3fb9fe8ea513aa071837320e1d280076e6eac0213add715f1e8b70554536a7c40 SHA512 392a7bd77026e5e4726390c4fc649805234b6fe2803115f205e22f7669675cb404bc0f1341f16ba59c622e1c922300b3a4dc0466b8c420da69a941cd49954c9a
diff --git a/app-arch/lrzip/files/lrzip-0.631-solaris.patch b/app-arch/lrzip/files/lrzip-0.631-solaris.patch
new file mode 100644
index 000000000000..d8eb95e563d2
--- /dev/null
+++ b/app-arch/lrzip/files/lrzip-0.631-solaris.patch
@@ -0,0 +1,11 @@
+--- a/liblrzip.c
++++ b/liblrzip.c
+@@ -36,7 +36,7 @@
+ #include "lrzip_core.h"
+ #include "rzip.h"
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) || defined(sun)
+ # define fmemopen(s, len, modes) fake_fmemopen((s), (len), (modes))
+ static FILE *fake_fmemopen(void *buf, size_t buflen, const char *mode)
+ {
diff --git a/app-arch/lrzip/files/lrzip-missing-stdarg_h.patch b/app-arch/lrzip/files/lrzip-missing-stdarg_h.patch
new file mode 100644
index 000000000000..8f427d46a6a1
--- /dev/null
+++ b/app-arch/lrzip/files/lrzip-missing-stdarg_h.patch
@@ -0,0 +1,11 @@
+diff -Naur Lrzip.h.orig Lrzip.h
+--- a/Lrzip.h	2013-11-30 20:07:27.343086997 +0000
++++ b/Lrzip.h	2013-11-30 20:07:44.072641056 +0000
+@@ -22,6 +22,7 @@
+ 
+ #include <stdbool.h>
+ #include <stdio.h>
++#include <stdarg.h>
+ #ifdef _WIN32
+ # include <stddef.h>
+ #else
diff --git a/app-arch/lrzip/lrzip-0.621.ebuild b/app-arch/lrzip/lrzip-0.621.ebuild
new file mode 100644
index 000000000000..265b8fdcddcf
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.621.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README.md"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-libs/lzo
+	 app-arch/bzip2
+	 sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	virtual/perl-Pod-Parser"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-missing-stdarg_h.patch
+}
+
+src_configure() {
+	econf --docdir="/usr/share/doc/${P}"
+}
+
+src_install() {
+	default
+	rm "${D}/usr/share/doc/${P}/COPYING"
+}
diff --git a/app-arch/lrzip/lrzip-0.630.ebuild b/app-arch/lrzip/lrzip-0.630.ebuild
new file mode 100644
index 000000000000..42b8bbc2147c
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.630.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/lzo
+	 app-arch/bzip2
+	 sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	virtual/perl-Pod-Parser"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
+	)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-arch/lrzip/lrzip-0.631.ebuild b/app-arch/lrzip/lrzip-0.631.ebuild
new file mode 100644
index 000000000000..e5f89de483dd
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.631.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/lzo
+	 app-arch/bzip2
+	 sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	virtual/perl-Pod-Parser"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
+	"${FILESDIR}"/${P}-solaris.patch
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-arch/lrzip/metadata.xml b/app-arch/lrzip/metadata.xml
new file mode 100644
index 000000000000..136f7dc61c02
--- /dev/null
+++ b/app-arch/lrzip/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+	This is a compression program optimised for large files. The larger the
+	file and the more memory you have, the better the compression advantage
+	this will provide, especially once the files are larger than 100MB.
+	The advantage can be chosen to be either size (much smaller than bzip2)
+	or speed (much faster than bzip2).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ckolivas/lrzip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/lz4-0_p131 b/app-arch/lz4-0_p131
deleted file mode 100644
index a952f2637bc6..000000000000
--- a/app-arch/lz4-0_p131
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( valgrind? ( dev-util/valgrind ) )
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=5
-HOMEPAGE=https://github.com/Cyan4973/lz4
-IUSE=test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-SRC_URI=https://github.com/Cyan4973/lz4/archive/r131.tar.gz -> lz4-r131.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933e7d3d3d512732fb5b10732f5e052d
diff --git a/app-arch/lz4-1.7.5-r1 b/app-arch/lz4-1.7.5-r1
deleted file mode 100644
index c77f7da087ab..000000000000
--- a/app-arch/lz4-1.7.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.7.5.tar.gz -> lz4-1.7.5.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd07475be18ecfa84c0393b77c68e5f3
diff --git a/app-arch/lz4-1.8.0 b/app-arch/lz4-1.8.0
deleted file mode 100644
index 79b4ed1d1738..000000000000
--- a/app-arch/lz4-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.0.tar.gz -> lz4-1.8.0.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f5eae4a4ac663aa29dba6c785b27b12
diff --git a/app-arch/lz4-1.8.1.2 b/app-arch/lz4-1.8.1.2
deleted file mode 100644
index a7e06f594e41..000000000000
--- a/app-arch/lz4-1.8.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.1.2.tar.gz -> lz4-1.8.1.2.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3b54d305140a16dabec87151acdfae6
diff --git a/app-arch/lz4-1.8.2 b/app-arch/lz4-1.8.2
deleted file mode 100644
index 4056057a1385..000000000000
--- a/app-arch/lz4-1.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.2.tar.gz -> lz4-1.8.2.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9febdfa850ea2a41b2b6e0a0427c5865
diff --git a/app-arch/lz4-9999 b/app-arch/lz4-9999
deleted file mode 100644
index 615d6269be31..000000000000
--- a/app-arch/lz4-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6cc3706f403e6c0c8351a065e42b6449
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
new file mode 100644
index 000000000000..0f58b65fe9e1
--- /dev/null
+++ b/app-arch/lz4/Manifest
@@ -0,0 +1,12 @@
+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-1.8.1.2.tar.gz 228640 BLAKE2B e5e7176dcce5319e2dcb1f6d69c47749976fd7e8c53c2379bdd0ef4c6f60bf426b2b58d606407f69d0b91e6835c9740265299107d11554e7a13963cdc855e8e5 SHA512 f4ed450bc05477cc6c2b42e6fe1fbb1fb0907f1d05b68b1d69d975b555ddb385550f204258e6d91642e14ce373815141dc218cda03b711793935d5458bc45c7f
+DIST lz4-1.8.2.tar.gz 320742 BLAKE2B cd97b6a31a1f45d410d598af0b0b696b3ccc3ffdc4fd523316576ebc68e24e545b8ce359889b0dca1968b1c296cb69951617b91b49cbe8eb98cfdb9ce400803c SHA512 5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763
+DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
+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 1057 BLAKE2B e6b3016fe489b1d4fabad368d8aa41fe86950d35a741b0cfd4a0a04c29351a5bd49257afd8f52f50c75f2b41d194e71552435390f4d0c3582bdaece90732164d SHA512 0760e2cfa0aa04b9141728d1361f27bd82f55bb5814c9c3f92adbe763bf64fda6a0f36f965766263f49d36861ab6ff5a02e37cd597840550208543d2ab51f70f
+EBUILD lz4-1.8.1.2.ebuild 1068 BLAKE2B c29f13447c24f824d19816f9c8bd97e5be475a39ca4fc94c3dbabcf476779d1ce7177ebdf3cf97ec7ff899b7bb27b6867793ec5852b95b57093bafbad07d9a56 SHA512 e300a60ac5575a1fc16577efec351f886d98e7ecfa389098e72f4ec393fecf6b675caea554647eddf91edae1c0e01f2784602f4e94ac7fed5285a28801ef7cb6
+EBUILD lz4-1.8.2.ebuild 847 BLAKE2B d74ec14097136bb3e244bba53c6e0f60e9f0a261ff646ee0e47c6633f81238cb1f879db36fa482e8368580bceb35958a3337f96d12af9659601d737cdd20f4f6 SHA512 9a333c5d7d56e5f9d598ae04fabd812d703749b04d7e4b9f5fb247ade28099e82823e2bd85bea065af66820e6f42186ac49f4966ef279890b372111fc5abaf10
+EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
+MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
diff --git a/app-arch/lz4/lz4-0_p131.ebuild b/app-arch/lz4/lz4-0_p131.ebuild
new file mode 100644
index 000000000000..dff53bc2e12d
--- /dev/null
+++ b/app-arch/lz4/lz4-0_p131.ebuild
@@ -0,0 +1,57 @@
+# 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="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 -C lib liblz4 liblz4.pc
+	emake -C programs lz4 lz4c
+	# work around lack of proper target dependencies
+	touch lib/liblz4
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
diff --git a/app-arch/lz4/lz4-1.7.5-r1.ebuild b/app-arch/lz4/lz4-1.7.5-r1.ebuild
new file mode 100644
index 000000000000..90bd29e89780
--- /dev/null
+++ b/app-arch/lz4/lz4-1.7.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	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"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+# note: abi-tracker is most likely wrong about 1.7.3 changing ABI,
+# the maintainer is looking into fixing that
+SLOT="0/r131"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+
+	# fix missing version in .pc, #608144
+	sed -i -e "/Version/s:$:${PV}:" "${BUILD_DIR}"/liblz4.pc || die
+}
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
new file mode 100644
index 000000000000..80f2cb6525f0
--- /dev/null
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	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-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+# 1.7.5->1.8.0 has some minor changes; the only really incompatible
+# would be removing 'const' from LZ4F_freeDecompressionContext() arg
+# however, it is extremely unlikely that this 'const' would actually
+# be relied on
+SLOT="0/r131"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/lz4/lz4-1.8.1.2.ebuild b/app-arch/lz4/lz4-1.8.1.2.ebuild
new file mode 100644
index 000000000000..42e9ba2e839a
--- /dev/null
+++ b/app-arch/lz4/lz4-1.8.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	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-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+# 1.7.5->1.8.0 has some minor changes; the only really incompatible
+# would be removing 'const' from LZ4F_freeDecompressionContext() arg
+# however, it is extremely unlikely that this 'const' would actually
+# be relied on
+SLOT="0/r131"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/lz4/lz4-1.8.2.ebuild b/app-arch/lz4/lz4-1.8.2.ebuild
new file mode 100644
index 000000000000..0fc870435ede
--- /dev/null
+++ b/app-arch/lz4/lz4-1.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	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-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r131"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
new file mode 100644
index 000000000000..267436933dac
--- /dev/null
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	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"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r131"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
new file mode 100644
index 000000000000..58af32e0d07c
--- /dev/null
+++ b/app-arch/lz4/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ryao@gentoo.org</email>
+		<name>Richard Yao</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="valgrind">Enable usage of dev-util/valgrind in tests</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Cyan4973/lz4</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/lz5-2.0 b/app-arch/lz5-2.0
deleted file mode 100644
index b26285dc49c9..000000000000
--- a/app-arch/lz5-2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=An efficient compressor with very fast decompression
-EAPI=6
-HOMEPAGE=https://github.com/inikep/lz5
-IUSE=static-libs
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD-2
-SLOT=0/2
-SRC_URI=https://github.com/inikep/lz5/archive/v2.0.tar.gz -> lz5-2.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6f742b7cc1f509d3eeb38c65f674623a
diff --git a/app-arch/lz5/Manifest b/app-arch/lz5/Manifest
new file mode 100644
index 000000000000..4ddf2624495c
--- /dev/null
+++ b/app-arch/lz5/Manifest
@@ -0,0 +1,3 @@
+DIST lz5-2.0.tar.gz 207478 BLAKE2B a283650b9d44b75c169e054574b6e4a76b9735ceead51c6dc80fab16666813cc19a5cba1d7e153a9eecd7f95dcda0c36ae02d4c1ea40e1224a803e563fc7824b SHA512 be304d4fe95ff237420cdc054ce7751c5b51e9b438f6cfcb3189e138909331175201cf77615d289d4ea016d66118592794b961ea07c318f477a27263eff2b82e
+EBUILD lz5-2.0.ebuild 832 BLAKE2B 0d91a023f1301bb509511dfd79d08f2b667d112f10c1c83c19bc79eb40e6b59e3e6d6a8b716d05b736e52760af594602e8e7feb48d04c7550f5c9a36368551a8 SHA512 a5df64cee6f516ea011bbd88fdb941367d29a6b6a6068e99ba108217cb40e57ff3116961d0da188e66fdb183232e1f8ecb7f222767b99f086cd7ab7dbbc62637
+MISC metadata.xml 242 BLAKE2B bd9ff4373c957e6c210561f874dc3bc0553deabb554e8c44c40d402511b901aee2f3a642c3cebb0c7b8d4e6a7e331bdb882dd2f68cf1b887d093f482a1e52534 SHA512 8f5562898c2a92f16bfe6b66dc5fde18195f65dbfee8719ec2a3653006046c42867207f60ba682a34229aee5dcc940496eabf783ca213b89c7f96fc20f81e8c2
diff --git a/app-arch/lz5/lz5-2.0.ebuild b/app-arch/lz5/lz5-2.0.ebuild
new file mode 100644
index 000000000000..1e20502cc3bb
--- /dev/null
+++ b/app-arch/lz5/lz5-2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="An efficient compressor with very fast decompression"
+HOMEPAGE="https://github.com/inikep/lz5"
+SRC_URI="https://github.com/inikep/lz5/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0/2"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	sed -i -e 's/install: lz5$(EXT)/install:/' programs/Makefile || die
+	sed -i -e 's/install: lib liblz5.pc/install:/' lib/Makefile || die
+}
+
+src_compile() {
+	emake -Clib CC="$(tc-getCC)" lib liblz5.pc
+	emake -Cprograms CC="$(tc-getCC)" lz5
+}
+
+src_install(){
+	emake install DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)"
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/liblz5.a || die
+	fi
+}
diff --git a/app-arch/lz5/metadata.xml b/app-arch/lz5/metadata.xml
new file mode 100644
index 000000000000..dffa8fbd23c4
--- /dev/null
+++ b/app-arch/lz5/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">inikep/lz5</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/lzip-1.18 b/app-arch/lzip-1.18
deleted file mode 100644
index b13b5dd9dfc5..000000000000
--- a/app-arch/lzip-1.18
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=lossless data compressor based on the LZMA algorithm
-EAPI=5
-HOMEPAGE=https://www.nongnu.org/lzip/lzip.html
-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
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.18.tar.gz https://download.savannah.gnu.org/releases/lzip/lzip-1.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2fc5d692b6748fd0c60e194da11b2b39
diff --git a/app-arch/lzip-1.20 b/app-arch/lzip-1.20
deleted file mode 100644
index 729664a7f254..000000000000
--- a/app-arch/lzip-1.20
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=lossless data compressor based on the LZMA algorithm
-EAPI=6
-HOMEPAGE=https://www.nongnu.org/lzip/lzip.html
-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
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.20.tar.gz https://download.savannah.gnu.org/releases/lzip/lzip-1.20.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8b42219e8774a30d38358b8e6e9ab9cc
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
new file mode 100644
index 000000000000..22326371926e
--- /dev/null
+++ b/app-arch/lzip/Manifest
@@ -0,0 +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 865 BLAKE2B 0ac7787515890593eb73fb90b185788b6193947f0411fd042afebf31f98c92c059aa1e7cd125901c40f4d8b47a8e8fc897c37d6ddacde3c17eec034acbed52bd SHA512 4e35afa3011eea4e7d287184c0b34c2bdc561ea0333cdf44a3aac9660134c82b6c6d6cf0b1c2349dc126fc89884d9aa6190a81ce84b8145476e38a4218b7a9fd
+MISC metadata.xml 357 BLAKE2B baa377044f421ed8bc913a5bbdc72e49e026bf0529190f07aa2d0081208870453f140af7ce3d3a97121b563891b4a4b36196db233a3fdb6a98b6eee34af9e9ba SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9
diff --git a/app-arch/lzip/lzip-1.18.ebuild b/app-arch/lzip/lzip-1.18.ebuild
new file mode 100644
index 000000000000..0fe356a4b09f
--- /dev/null
+++ b/app-arch/lzip/lzip-1.18.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="lossless data compressor based on the LZMA algorithm"
+HOMEPAGE="https://www.nongnu.org/lzip/lzip.html"
+SRC_URI="https://download.savannah.gnu.org/releases-noredirect/${PN}/${P/_/-}.tar.gz
+	https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
+
+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"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	# not autotools-based
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/lzip/lzip-1.20.ebuild b/app-arch/lzip/lzip-1.20.ebuild
new file mode 100644
index 000000000000..63e41fb72010
--- /dev/null
+++ b/app-arch/lzip/lzip-1.20.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="lossless data compressor based on the LZMA algorithm"
+HOMEPAGE="https://www.nongnu.org/lzip/lzip.html"
+SRC_URI="https://download.savannah.gnu.org/releases-noredirect/${PN}/${P/_/-}.tar.gz
+	https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
+
+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"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	# not autotools-based
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/lzip/metadata.xml b/app-arch/lzip/metadata.xml
new file mode 100644
index 000000000000..e19adf122bfb
--- /dev/null
+++ b/app-arch/lzip/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer type="person">
+	<email>mgorny@gentoo.org</email>
+	<name>Michał Górny</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/lziprecover-1.17 b/app-arch/lziprecover-1.17
deleted file mode 100644
index 0cb852d2d0ce..000000000000
--- a/app-arch/lziprecover-1.17
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Lziprecover is a data recovery tool and decompressor for lzip compressed files
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.17.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5aad9de4d6de2f9507aa62d89d20ffac
diff --git a/app-arch/lziprecover-1.20 b/app-arch/lziprecover-1.20
deleted file mode 100644
index 0a07a9ed48c9..000000000000
--- a/app-arch/lziprecover-1.20
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Lziprecover is a data recovery tool and decompressor for lzip compressed files
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.20.tar.gz http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.20.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=caf845a6a08b6016ac3099938b0e2e72
diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest
new file mode 100644
index 000000000000..8850ce30990a
--- /dev/null
+++ b/app-arch/lziprecover/Manifest
@@ -0,0 +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 725 BLAKE2B 4f1906842981415232cda50f7976a21b40846c8a35434b41275623ed8efdc14af5563370af5c217a92ada4729a81af4bd1313de9767dc8d6c9782b7e72ecc6a8 SHA512 f6823acd1549f0b7b31160d7eac788b68f9e6a769904f7039e7b0769a2733547956b1ff1b9c2a63aec23fed17ab7e1838b94d9cea913529b6f55566e9cbd8f9d
+MISC metadata.xml 2674 BLAKE2B 470d5c221311328b1620bc51fb5ccb6393f04e9a1d0367fcef04579061b9d88ac5bb131e050eb2cd3e2a8608db58586cf49bef3e58ca320d93398aba7579799b SHA512 c39f9d4478cdc3e5865567f5e6560e4fa34f014aa6538ca47a1dddf51f1d5549f8edcee34dda36e691bd28b734a8df4c04ff0a94d68c16caccc22e57c35a7823
diff --git a/app-arch/lziprecover/lziprecover-1.17.ebuild b/app-arch/lziprecover/lziprecover-1.17.ebuild
new file mode 100644
index 000000000000..5e7b8947ad16
--- /dev/null
+++ b/app-arch/lziprecover/lziprecover-1.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files"
+HOMEPAGE="http://www.nongnu.org/lzip/lziprecover.html"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	# not autotools-based
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/lziprecover/lziprecover-1.20.ebuild b/app-arch/lziprecover/lziprecover-1.20.ebuild
new file mode 100644
index 000000000000..bd72f2a3510b
--- /dev/null
+++ b/app-arch/lziprecover/lziprecover-1.20.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files"
+HOMEPAGE="http://www.nongnu.org/lzip/lziprecover.html"
+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"
+IUSE=""
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	# not autotools-based
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/lziprecover/metadata.xml b/app-arch/lziprecover/metadata.xml
new file mode 100644
index 000000000000..5e2c4af9ecad
--- /dev/null
+++ b/app-arch/lziprecover/metadata.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription lang="en">
+		Lziprecover is a data recovery tool and decompressor for files in the lzip
+		compressed data format (.lz), able to repair slightly damaged files,
+		recover badly damaged files from two or more copies, extract data from
+		damaged files, decompress files and test integrity of files.
+		The lzip file format is designed for long-term data archiving. It is clean,
+		provides very safe 4 factor integrity checking, and is backed by the
+		recovery capabilities of lziprecover.
+		Lziprecover is able to recover or decompress files produced by any of the
+		compressors in the lzip family; lzip, plzip, minilzip/lzlib, clzip and
+		pdlzip.
+		Lziprecover makes lzip files resistant to bit-flip (one of the most common
+		forms of data corruption), and can safely merge multiple damaged backup
+		copies.
+		If the cause of file corruption is damaged media, the combination GNU
+		ddrescue + lziprecover is the best option for recovering data from multiple
+		damaged copies.
+		If a file is too damaged for lziprecover to repair it, all the recoverable
+		data in all members of the file can be extracted with the '-D' option.
+		Lziprecover is able to efficiently extract a range of bytes from a
+		multi-member file, because it only decompresses the members containing the
+		desired data.
+		Lziprecover can print correct total file sizes and ratios even for
+		multi-member files.
+		When recovering data, lziprecover takes as arguments the names of the
+		damaged files and writes zero or more recovered files depending on the
+		operation selected and whether the recovery succeeded or not. The damaged
+		files themselves are never modified.
+		When decompressing or testing file integrity, lziprecover behaves like lzip
+		or lunzip.
+		To give you an idea of its possibilities, when merging two copies, each of
+		them with one damaged area affecting 1 percent of the copy, the probability
+		of obtaining a correct file is about 98 percent. With three such copies the
+		probability rises to 99.97 percent. For large files (a few MB) with small
+		errors (one sector damaged per copy), the probability approaches 100 percent
+		even with only two copies.
+		Lziprecover is not a replacement for regular backups, but a last line of
+		defense for the case where the backups are also damaged.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/lzlib-1.9 b/app-arch/lzlib-1.9
deleted file mode 100644
index d3b128ce0ebd..000000000000
--- a/app-arch/lzlib-1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Library for lzip compression
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/lzip/lzlib.html
-KEYWORDS=~amd64 ~x86
-LICENSE=libstdc++
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.9.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=654743abac28b5006b039db9b2c3dae7
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
new file mode 100644
index 000000000000..d6f7fd68397e
--- /dev/null
+++ b/app-arch/lzlib/Manifest
@@ -0,0 +1,3 @@
+DIST lzlib-1.9.tar.gz 96147 BLAKE2B 17de794c1823558a804c93a4df14cd75e66eb8ebb6d62af1ef7349e1ed187fc77b57cc44901af76767871632dac2dd624f9e4313226fcf41225d140b5c64f54f SHA512 2d36e0b27f544fdab958dbf7d966b41e44c134382ec9f792d94dacf60355eadc25a1cf2b8b7049287995fa5bfc27aec0f3e4253304e3b10813c96b0609408278
+EBUILD lzlib-1.9.ebuild 725 BLAKE2B 7bdc92b62acac168410f61c4fbbe667fbe0ccf7811af9f85a3a57d3057941046fdd77e27b98e3335bcce30b9a39fe8658301bfd2d4377f093898b9381f390931 SHA512 c1bb9e14b7402262e738f190f989f8b2ac637bed38fcb293965ec836f3397bd556ddefc0876db5c27cd90b53cb85f486b29f4a340f465ea4331a7ba5b7a38825
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzlib/lzlib-1.9.ebuild b/app-arch/lzlib/lzlib-1.9.ebuild
new file mode 100644
index 000000000000..72bec4c5725b
--- /dev/null
+++ b/app-arch/lzlib/lzlib-1.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Library for lzip compression"
+HOMEPAGE="http://www.nongnu.org/lzip/lzlib.html"
+SRC_URI="http://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+
+LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	local myconf=(
+		--enable-shared
+		--disable-static
+		--disable-ldconfig
+		--prefix="${EPREFIX}"/usr
+		--libdir='$(prefix)'/$(get_libdir)
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/lzlib/metadata.xml b/app-arch/lzlib/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-arch/lzlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/lzma-9.20-r1 b/app-arch/lzma-9.20-r1
deleted file mode 100644
index 6a99ce6cd525..000000000000
--- a/app-arch/lzma-9.20-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=LZMA Stream Compressor from the SDK
-EAPI=6
-HOMEPAGE=https://www.7-zip.org/sdk.html
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=public-domain
-SLOT=0
-SRC_URI=mirror://sourceforge/sevenzip/lzma920.tar.bz2 -> lzma-9.20.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c20eb37412ef184c2919b02f7ad7aec5
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
new file mode 100644
index 000000000000..3e0de361c3e9
--- /dev/null
+++ b/app-arch/lzma/Manifest
@@ -0,0 +1,3 @@
+DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
+EBUILD lzma-9.20-r1.ebuild 887 BLAKE2B 32ce4e9ca1d660403802f8d5275656acbcfc2e2ca9ff645ac24a00c09f55bf1df1f9dd164b7ac87de77dbf721141b32c3362797667196b944e2781c63c5303a9 SHA512 72bdd25f10cbf4944cf20aef08f5c19d7c16d65179ee99703138bc71524d6e38a64f1aad0443b298919299e1e4acbd1e7fd41cde0c9255ab11e871ba2859b0f4
+MISC metadata.xml 250 BLAKE2B e05a373f0ea02a1a107bb27632d2f6b87bb754d82a7a7c6f56b7bb6041a92a0bea6ef1a6353cd535f5f9d992b10cb68e402c4efa3189d7f65d2c9fc904a4610a SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
new file mode 100644
index 000000000000..80cac224e6b3
--- /dev/null
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="LZMA Stream Compressor from the SDK"
+HOMEPAGE="https://www.7-zip.org/sdk.html"
+SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+S=${WORKDIR}
+
+src_compile() {
+	cd CPP/7zip/Bundles/LzmaCon || die
+	emake -f makefile.gcc \
+		CXX="$(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS}" \
+		CXX_C="$(tc-getCC) ${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon || die
+	dodoc lzma.txt history.txt
+	use doc && dodoc 7zC.txt 7zFormat.txt Methods.txt
+}
+
+pkg_postinst() {
+	einfo "The lzma binary is now 'lzmacon' to avoid xz-utils conflicts #218459"
+}
diff --git a/app-arch/lzma/metadata.xml b/app-arch/lzma/metadata.xml
new file mode 100644
index 000000000000..86f4ac1ea62b
--- /dev/null
+++ b/app-arch/lzma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">sevenzip</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/lzop-1.04 b/app-arch/lzop-1.04
deleted file mode 100644
index c2e209284390..000000000000
--- a/app-arch/lzop-1.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=>=dev-libs/lzo-2
-DESCRIPTION=Utility for fast (even real-time) compression/decompression
-EAPI=6
-HOMEPAGE=http://www.lzop.org/
-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
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/lzo-2
-SLOT=0
-SRC_URI=http://www.lzop.org/download/lzop-1.04.tar.gz
-_md5_=4b9d42f06014a19a48865f23f468c842
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
new file mode 100644
index 000000000000..4926734cfb2c
--- /dev/null
+++ b/app-arch/lzop/Manifest
@@ -0,0 +1,3 @@
+DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
+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.04.ebuild b/app-arch/lzop/lzop-1.04.ebuild
new file mode 100644
index 000000000000..31e4fc993cba
--- /dev/null
+++ b/app-arch/lzop/lzop-1.04.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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}"
+
+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() {
+	# do not install COPYING or redundant conversions of manpage
+	emake DESTDIR="${D}" install \
+		dist_doc_DATA="AUTHORS NEWS README THANKS"
+}
diff --git a/app-arch/lzop/metadata.xml b/app-arch/lzop/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-arch/lzop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/makeself-2.2.0-r2 b/app-arch/makeself-2.2.0-r2
deleted file mode 100644
index 61f57a00d78f..000000000000
--- a/app-arch/makeself-2.2.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=shell script that generates a self-extractible tar.gz
-EAPI=6
-HOMEPAGE=http://www.megastep.org/makeself/
-KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=588602b5a4e68bcd8f766613b6088d9d
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
new file mode 100644
index 000000000000..2e296a5685fa
--- /dev/null
+++ b/app-arch/makeself/Manifest
@@ -0,0 +1,5 @@
+AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
+AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
+DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
+EBUILD makeself-2.2.0-r2.ebuild 705 BLAKE2B b875164894c64ca897952cb4bc6ef8e9c0b5ec8e793e9e2ae2470d07190520306ebf3b92ae086b4ce0ca030a2a261656efb70d770985a7f8dc0aabb4810ab84b SHA512 d2f7fa649ef481a7b5a7fce78aebc7b7581ac374216bf778b26af642251ca44bcfbde3fdda261fe314cd9c5d1e1679e46941d0e8008c8f4c6a3ce106e27b1b81
+MISC metadata.xml 254 BLAKE2B 3ab17d846132717878fe0587992dc65ac209a16e145e687773a2221f2ea17cb0568d03b4c3b20954ff4ad7deb6e15ead243d5b0410742c2c4c7dd24c56d69081 SHA512 fb782a70e1be3e60d1cc5465b54e05eb5eb3956d281d0951cc53a7b0f320255bc0ec62ffd08b18c765dd6ee0ad3f8c364c93c52ea884375f2782a1bcb90fb9eb
diff --git a/app-arch/makeself/files/makeself-2.2.0-help-header.patch b/app-arch/makeself/files/makeself-2.2.0-help-header.patch
new file mode 100644
index 000000000000..5726bf55f7da
--- /dev/null
+++ b/app-arch/makeself/files/makeself-2.2.0-help-header.patch
@@ -0,0 +1,124 @@
+From c9f605cb4a3903985f2c6f816c30c1edf728c1b5 Mon Sep 17 00:00:00 2001
+From: Jon Salz <jsalz@google.com>
+Date: Mon, 27 Jan 2014 16:04:33 +0800
+Subject: [PATCH] Add --help-header option to prepend a string to the archive's
+ --help.
+
+---
+ makeself-header.sh |  3 ++-
+ makeself.sh        | 71 ++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 41 insertions(+), 33 deletions(-)
+
+diff --git a/makeself-header.sh b/makeself-header.sh
+index e3f6c11..f97758c 100755
+--- a/makeself-header.sh
++++ b/makeself-header.sh
+@@ -13,6 +13,7 @@ label="$LABEL"
+ script="$SCRIPT"
+ scriptargs="$SCRIPTARGS"
+ licensetxt="$LICENSE"
++helpheader='$HELPHEADER'
+ targetdir="$archdirname"
+ filesizes="$filesizes"
+ keep="$KEEP"
+@@ -119,7 +120,7 @@ MS_dd_Progress()
+ MS_Help()
+ {
+     cat << EOH >&2
+-Makeself version $MS_VERSION
++\${helpheader}Makeself version $MS_VERSION
+  1) Getting help or info about \$0 :
+   \$0 --help   Print this message
+   \$0 --info   Print embedded info : title, default target directory, embedded script ...
+diff --git a/makeself.sh b/makeself.sh
+index 361d710..cb2d6f2 100755
+--- a/makeself.sh
++++ b/makeself.sh
+@@ -88,38 +88,39 @@ MS_Usage()
+ {
+     echo "Usage: $0 [params] archive_dir file_name label startup_script [args]"
+     echo "params can be one or more of the following :"
+-    echo "    --version | -v  : Print out Makeself version number and exit"
+-    echo "    --help | -h     : Print out this help message"
+-    echo "    --quiet | -q    : Do not print any messages other than errors."
+-    echo "    --gzip          : Compress using gzip (default if detected)"
+-    echo "    --bzip2         : Compress using bzip2 instead of gzip"
+-    echo "    --pbzip2        : Compress using pbzip2 instead of gzip"
+-    echo "    --xz            : Compress using xz instead of gzip"
+-    echo "    --compress      : Compress using the UNIX 'compress' command"
+-    echo "    --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
+-    echo "    --base64        : Instead of compressing, encode the data using base64"
+-    echo "    --nocomp        : Do not compress the data"
+-    echo "    --notemp        : The archive will create archive_dir in the"
+-    echo "                      current directory and uncompress in ./archive_dir"
+-    echo "    --copy          : Upon extraction, the archive will first copy itself to"
+-    echo "                      a temporary directory"
+-    echo "    --append        : Append more files to an existing Makeself archive"
+-    echo "                      The label and startup scripts will then be ignored"
+-    echo "    --target dir    : Extract directly to a target directory"
+-    echo "                      directory path can be either absolute or relative"
+-    echo "    --current       : Files will be extracted to the current directory"
+-    echo "                      Both --current and --target imply --notemp"
+-    echo "    --tar-extra opt : Append more options to the tar command line"
+-    echo "    --nomd5         : Don't calculate an MD5 for archive"
+-    echo "    --nocrc         : Don't calculate a CRC for archive"
+-    echo "    --header file   : Specify location of the header script"
+-    echo "    --follow        : Follow the symlinks in the archive"
+-    echo "    --noprogress    : Do not show the progress during the decompression"
+-    echo "    --nox11         : Disable automatic spawn of a xterm"
+-    echo "    --nowait        : Do not wait for user input after executing embedded"
+-    echo "                      program from an xterm"
+-    echo "    --lsm file      : LSM file describing the package"
+-    echo "    --license file  : Append a license file"
++    echo "    --version | -v     : Print out Makeself version number and exit"
++    echo "    --help | -h        : Print out this help message"
++    echo "    --quiet | -q       : Do not print any messages other than errors."
++    echo "    --gzip             : Compress using gzip (default if detected)"
++    echo "    --bzip2            : Compress using bzip2 instead of gzip"
++    echo "    --pbzip2           : Compress using pbzip2 instead of gzip"
++    echo "    --xz               : Compress using xz instead of gzip"
++    echo "    --compress         : Compress using the UNIX 'compress' command"
++    echo "    --complevel lvl    : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
++    echo "    --base64           : Instead of compressing, encode the data using base64"
++    echo "    --nocomp           : Do not compress the data"
++    echo "    --notemp           : The archive will create archive_dir in the"
++    echo "                         current directory and uncompress in ./archive_dir"
++    echo "    --copy             : Upon extraction, the archive will first copy itself to"
++    echo "                         a temporary directory"
++    echo "    --append           : Append more files to an existing Makeself archive"
++    echo "                         The label and startup scripts will then be ignored"
++    echo "    --target dir       : Extract directly to a target directory"
++    echo "                         directory path can be either absolute or relative"
++    echo "    --current          : Files will be extracted to the current directory"
++    echo "                         Both --current and --target imply --notemp"
++    echo "    --tar-extra opt    : Append more options to the tar command line"
++    echo "    --nomd5            : Don't calculate an MD5 for archive"
++    echo "    --nocrc            : Don't calculate a CRC for archive"
++    echo "    --header file      : Specify location of the header script"
++    echo "    --follow           : Follow the symlinks in the archive"
++    echo "    --noprogress       : Do not show the progress during the decompression"
++    echo "    --nox11            : Disable automatic spawn of a xterm"
++    echo "    --nowait           : Do not wait for user input after executing embedded"
++    echo "                         program from an xterm"
++    echo "    --lsm file         : LSM file describing the package"
++    echo "    --license file     : Append a license file"
++    echo "    --help-header file : Add a header to the archive's --help output"
+     echo
+     echo "Do not forget to give a fully qualified startup script name"
+     echo "(i.e. with a ./ prefix if inside the archive)."
+@@ -254,6 +255,12 @@ do
+ 	LSM_CMD="cat \"$2\" >> \"\$archname\""
+     if ! shift 2; then MS_Help; exit 1; fi
+ 	;;
++    --help-header)
++	HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2`
++    if ! shift 2; then MS_Help; exit 1; fi
++	[ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER
++"
++    ;;
+     -q | --quiet)
+ 	QUIET=y
+ 	shift
+-- 
+1.8.5.5
+
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack
new file mode 100644
index 000000000000..90b98312c8b9
--- /dev/null
+++ b/app-arch/makeself/files/makeself-unpack
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Glue to keep unpack_makeself() unchanged
+source /lib/gentoo/functions.sh
+find_unpackable_file() { echo "$@"; }
+debug-print() { :; }
+emktemp() { mktemp "$@"; }
+die() { eerror "$*"; exit 1; }
+assert() { _pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die; }
+
+# Straight copied from unpacker.eclass ... should be kept in sync
+
+unpack_banner() {
+	echo ">>> Unpacking ${1##*/} to ${PWD}"
+}
+
+unpack_makeself() {
+	local src_input=${1:-${A}}
+	local src=$(find_unpackable_file "${src_input}")
+	local skip=$2
+	local exe=$3
+
+	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
+
+	unpack_banner "${src}"
+
+	if [[ -z ${skip} ]] ; then
+		local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
+		local skip=0
+		exe=tail
+		case ${ver} in
+			1.5.*|1.6.0-nv*)	# tested 1.5.{3,4,5} ... guessing 1.5.x series is same
+				skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
+				;;
+			2.0|2.0.1)
+				skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
+				;;
+			2.1.1)
+				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
+				(( skip++ ))
+				;;
+			2.1.2)
+				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
+				(( skip++ ))
+				;;
+			2.1.3)
+				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
+				(( skip++ ))
+				;;
+			2.1.4|2.1.5|2.1.6|2.2.0)
+				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
+				skip=$(head -n ${skip} "${src}" | wc -c)
+				exe="dd"
+				;;
+			*)
+				eerror "I'm sorry, but I was unable to support the Makeself file."
+				eerror "The version I detected was '${ver}'."
+				eerror "Please file a bug about the file ${src##*/} at"
+				eerror "http://bugs.gentoo.org/ so that support can be added."
+				die "makeself version '${ver}' not supported"
+				;;
+		esac
+		debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
+	fi
+	case ${exe} in
+		tail)	exe="tail -n +${skip} '${src}'";;
+		dd)		exe="dd ibs=${skip} skip=1 if='${src}'";;
+		*)		die "makeself cant handle exe '${exe}'"
+	esac
+
+	# lets grab the first few bytes of the file to figure out what kind of archive it is
+	local filetype tmpfile=$(emktemp)
+	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
+	filetype=$(file -b "${tmpfile}") || die
+	case ${filetype} in
+		*tar\ archive*)
+			eval ${exe} | tar --no-same-owner -xf -
+			;;
+		bzip2*)
+			eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
+			;;
+		gzip*)
+			eval ${exe} | tar --no-same-owner -xzf -
+			;;
+		compress*)
+			eval ${exe} | gunzip | tar --no-same-owner -xf -
+			;;
+		XZ*)
+			eval ${exe} | unxz | tar --no-same-owner -xf -
+			;;
+		*)
+			eerror "Unknown filetype \"${filetype}\" ?"
+			false
+			;;
+	esac
+	assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})"
+	rm "${tmpfile}"
+}
+
+for x; do unpack_makeself "$x" ; done
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..798ab5b911ef
--- /dev/null
+++ b/app-arch/makeself/makeself-2.2.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker eutils
+
+DESCRIPTION="shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-apps/gentoo-functions"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-help-header.patch" )
+
+src_install() {
+	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README.md makeself.lsm
+}
diff --git a/app-arch/makeself/metadata.xml b/app-arch/makeself/metadata.xml
new file mode 100644
index 000000000000..924a4644bdb9
--- /dev/null
+++ b/app-arch/makeself/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">megastep/makeself</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/metadata.xml b/app-arch/metadata.xml
new file mode 100644
index 000000000000..72ecbb92d2e3
--- /dev/null
+++ b/app-arch/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-arch category contains tools for archiving, compressing and
+		uncompressing files or groups of files.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-arch enthält Werkzeuge für das Archivieren, Packen und
+		Entpacken von Dateien oder Gruppen von Dateien.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-arch contiene herramientas para archivar, comprimir
+		y descomprimir archivos ó grupos de archivos.
+	</longdescription>
+	<longdescription lang="ja">
+		app-archカテゴリにはファイルをアーカイブする、圧縮する、解凍する
+		ツールが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		The app-arch categorie bevat applicaties met betrekking tot het
+		archiveren en comprimeren van bestanden.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-arch chứa những công cụ để lưu trữ, nén và
+		giải nén các tập tin hoặc nhóm các tập tin.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-arch contiene strumenti di archiviazione, compressione e decompressione di file o gruppi di files.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-arch contém ferramentas para arquivar, comprimir
+		e descomprimir arquivos ou grupos de arquivos.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-arch zawiera narzędzia służące do archiwizowania,
+		kompresji i dekompresji zarówno pojedynczych plików jak i ich grup.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-arch/mscompress-0.3-r1 b/app-arch/mscompress-0.3-r1
deleted file mode 100644
index 0c98d4167742..000000000000
--- a/app-arch/mscompress-0.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Microsoft compress.exe/expand.exe compatible (de)compressor
-EAPI=5
-HOMEPAGE=http://gnuwin32.sourceforge.net/packages/mscompress.htm
-KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.penguin.cz/pub/users/mhi/mscompress/mscompress-0.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f321701fd97420b6b2981c0169795da
diff --git a/app-arch/mscompress/Manifest b/app-arch/mscompress/Manifest
new file mode 100644
index 000000000000..707b7030e972
--- /dev/null
+++ b/app-arch/mscompress/Manifest
@@ -0,0 +1,5 @@
+AUX mscompress-0.3-amd64.patch 613 BLAKE2B 310ad5f0b5f068dfaefe3916d44560a7b29a3ba41a81a87b0db65cf3210a55ec4b7ca4ff1d9c15c282e6d60fa7d5101d65489865276e4e81e784dbb68cfa23d5 SHA512 94d17fa87a0ba7029569da65e8f22af834b557db1c0a4715afe3afcfc6cee63e7bb604bc37f700729c2efe08b38b46a940b4ee8fd426e293747fb4003d7f53db
+AUX mscompress-0.3-makefile.patch 467 BLAKE2B bb5c6f88194ab577e167b0c0ab4f0e8174674d82bd3337e8c618532084811bc0ac8521b2a3950d5cb73d164c620a6ea3a5c22d93682cf75298934be8864495ed SHA512 d633867a102ba099576c6671967c802bca293a81896ba6ecd5486ad025dfa66220dec9ecc4615c97db22deea914183d8dbedf5ab75221abeb5a65e0c7e949669
+DIST mscompress-0.3.tar.bz2 40989 BLAKE2B b8aeca23fb62a6b4b779da4d4155ba835085e79fea0d69d4da2e65ececb856531d43ee45b44c24415d5827c749c3dc7ceff9de3043fc6174244939a3f75b4c68 SHA512 e69a95e9c12979e852227553028b578f324ec38472ead11f9c0cce85b77bc817ea39d5ecf74599c7935c692eaac537456ebefe110400514a3c834b12597dde14
+EBUILD mscompress-0.3-r1.ebuild 799 BLAKE2B d600170377899df90f44660317950e3d88daf20583fdb7561d0f280e021a4e62417f86dba4762ed9d8213167aa4355c49e9da103e93fbcacd7207b67d1644066 SHA512 4d095c633591ea3182f4910674e72cdf8532a4f894cbdae7ede263719c371936a080f18a8669396ccd542fd8595e331da484dae13cfcb097d1ee44b8ed8b2bca
+MISC metadata.xml 368 BLAKE2B 7e47a9f9006d136b7482be3211b16fdcaaa9b4f0795fbd155d39dfe1c9b6c53113f5558ec9f93b78ef4832fedf0438c593f62e8aa89fd0598f9b7a12e2370174 SHA512 4e24e69033ec97407b9b9f7a496762b76a54ed9e9135f71c34d5575c8b604c20054fe34d189a54172af48c5f2ab26f167ac1b7b3852a481e70aafbe2d2298f20
diff --git a/app-arch/mscompress/files/mscompress-0.3-amd64.patch b/app-arch/mscompress/files/mscompress-0.3-amd64.patch
new file mode 100644
index 000000000000..95e4e617aefc
--- /dev/null
+++ b/app-arch/mscompress/files/mscompress-0.3-amd64.patch
@@ -0,0 +1,24 @@
+--- mscompress.c.old	2006-11-27 23:58:51.000000000 +0100
++++ mscompress.c	2006-11-27 23:59:50.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include <stdint.h>
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+ #else
+@@ -156,10 +157,10 @@
+   int ch, i, run, len, match, size, mask;
+   char buf[17];
+   struct stat st;
+-  unsigned long magic1;
+-  unsigned long magic2;
++  uint32_t magic1;
++  uint32_t magic2;
+   unsigned short magic3;
+-  unsigned long filesize;
++  uint32_t filesize;
+ 
+   /* 28.5 kB */
+   buffer = malloc (N + F + (N + 1 + N + N + 256) * sizeof (int));
diff --git a/app-arch/mscompress/files/mscompress-0.3-makefile.patch b/app-arch/mscompress/files/mscompress-0.3-makefile.patch
new file mode 100644
index 000000000000..21c38155082e
--- /dev/null
+++ b/app-arch/mscompress/files/mscompress-0.3-makefile.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.in	2004-04-14 07:48:23.088418656 +0000
++++ b/Makefile.in	2004-04-14 07:48:38.233116312 +0000
+@@ -37,7 +37,7 @@
+ 	bzip2 -9f $(OUTDIR)/mscompress-$(VERS)-$(OSTYPE).tar
+ 
+ mscompress:	mscompress.o version.o
+-	$(CC) -o mscompress mscompress.o version.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mscompress mscompress.o version.o
+ 
+ msexpand:	msexpand.o version.o
+-	$(CC) -o msexpand msexpand.o version.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o msexpand msexpand.o version.o
diff --git a/app-arch/mscompress/metadata.xml b/app-arch/mscompress/metadata.xml
new file mode 100644
index 000000000000..3425a95bc07a
--- /dev/null
+++ b/app-arch/mscompress/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A (de)compressor for microsoft's compress.exe and expand.exe functions.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gnuwin32</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
new file mode 100644
index 000000000000..e7a2b9214c20
--- /dev/null
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Microsoft compress.exe/expand.exe compatible (de)compressor"
+HOMEPAGE="http://gnuwin32.sourceforge.net/packages/mscompress.htm"
+SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-amd64.patch
+}
+
+src_configure() {
+	tc-export CC
+	[[ $(tc-arch) == ppc* ]] && append-flags -fsigned-char
+	econf
+}
+
+src_install() {
+	dobin mscompress msexpand || die
+	doman mscompress.1 msexpand.1
+	dodoc README ChangeLog
+}
diff --git a/app-arch/mt-st-1.3 b/app-arch/mt-st-1.3
deleted file mode 100644
index 22a64892c76c..000000000000
--- a/app-arch/mt-st-1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=control magnetic tape drive operation
-EAPI=6
-HOMEPAGE=https://github.com/iustin/mt-st
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/iustin/mt-st/releases/download/mt-st-1.3/mt-st-1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dae3610c0f8baa8dfec95fb20654880
diff --git a/app-arch/mt-st-9999 b/app-arch/mt-st-9999
deleted file mode 100644
index aa84f377f7a5..000000000000
--- a/app-arch/mt-st-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=control magnetic tape drive operation
-EAPI=6
-HOMEPAGE=https://github.com/iustin/mt-st
-LICENSE=GPL-2
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff2e9e9d295fa94ce781257e1ece6e76
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
new file mode 100644
index 000000000000..ec8e43d0f454
--- /dev/null
+++ b/app-arch/mt-st/Manifest
@@ -0,0 +1,4 @@
+DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
+EBUILD mt-st-1.3.ebuild 553 BLAKE2B 771bd7f4331a3bf7a3d47c14c767e998219474d3e1740a6cb0e6479f1fafd64cbc16ee5da23c9fea150aef89be89a919f4b2984bd57927bc3ea47d1953274470 SHA512 4a03eaace0857dd917054aab4a5040872bfee230cdb5b3b5560d3b2982c31a3ba235ed821920faf78c93b69aa31e9b48b97e57d0975c51f59363fbdc61e410bd
+EBUILD mt-st-9999.ebuild 483 BLAKE2B 87f468fd1451e561a88a635b6720ef63c39af6a2d576eb671c542519a56f4ad4211a5ccb432bdd23bab63246bfec9ccc3a5cf9f5005db43c0696977c14efaff1 SHA512 d10eb52475d7b3cf4068e819e40241edbf23e3b0f973428837318898c339616a894468111c5d28c188f6ecb8b2626d7aaf419dc89300036c5694fc04a1078c76
+MISC metadata.xml 321 BLAKE2B 3f2c57ecada60ab514926a4ddfe2fc0bdc11148a50bdeed1d336f13863e735f83056d4e647e80995c90fba92466252c2ec202e2fa9e3c667ba5a8ae6acbcece1 SHA512 79dc941553281909153cdda8422d4ac5da172a6d782936986b581a1300dcf4b4781704bb7c730f48905f0dc487f5ce781bd96abde16691d67bf5da220eb94471
diff --git a/app-arch/mt-st/metadata.xml b/app-arch/mt-st/metadata.xml
new file mode 100644
index 000000000000..5fa14a0aa1e3
--- /dev/null
+++ b/app-arch/mt-st/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">iustin/mt-st</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/mt-st/mt-st-1.3.ebuild b/app-arch/mt-st/mt-st-1.3.ebuild
new file mode 100644
index 000000000000..d45c956874e4
--- /dev/null
+++ b/app-arch/mt-st/mt-st-1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="control magnetic tape drive operation"
+HOMEPAGE="https://github.com/iustin/mt-st"
+SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dosbin mt stinit
+	doman mt.1 stinit.8
+	dodoc README* stinit.def.examples
+}
diff --git a/app-arch/mt-st/mt-st-9999.ebuild b/app-arch/mt-st/mt-st-9999.ebuild
new file mode 100644
index 000000000000..7433526bff92
--- /dev/null
+++ b/app-arch/mt-st/mt-st-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils git-r3 toolchain-funcs
+
+DESCRIPTION="control magnetic tape drive operation"
+HOMEPAGE="https://github.com/iustin/mt-st"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dosbin mt stinit
+	doman mt.1 stinit.8
+	dodoc README* stinit.def.examples
+}
diff --git a/app-arch/ncompress-4.2.4.4 b/app-arch/ncompress-4.2.4.4
deleted file mode 100644
index 3c4798b54160..000000000000
--- a/app-arch/ncompress-4.2.4.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Another uncompressor for compatibility
-EAPI=4
-HOMEPAGE=https://github.com/vapier/ncompress
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-SLOT=0
-SRC_URI=mirror://sourceforge/ncompress/ncompress-4.2.4.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6f6b5e1024955099a90955581e749a7b
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
new file mode 100644
index 000000000000..17310580ba63
--- /dev/null
+++ b/app-arch/ncompress/Manifest
@@ -0,0 +1,3 @@
+DIST ncompress-4.2.4.4.tar.gz 32571 BLAKE2B 6b404b350e46635856f7329a1e5eefcf38ce1f16137c35ca2226ab8add12ff4d94a289642b0a3f2ff59cc584c2f54bc330756df63f41fd34c958eb173b8eccba SHA512 abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be
+EBUILD ncompress-4.2.4.4.ebuild 717 BLAKE2B e7674f1828c2887ebbd0e19df0511055f318eda353a379d7d5e695c9e54b88024cd1e7a1edc20dcfa5d6f3473622d446fde1680901e732d27b799d2e72a8de13 SHA512 b7190ac40d5e63ee28697cc49f9678195e189efc1f23fefe088230b82b314bfba274dea7fe2149b84f87fedf7f04e38676f1f9293690e358682fbc002227201d
+MISC metadata.xml 392 BLAKE2B 1e59934b640d08d7728f15bd88534fb4e72e0c8cc6c39cf4fa5f5a188c4443bfaacf081a8284d2c508806b7c11553d1ea5c18cc477db48fa733875d2d4535cd8 SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13
diff --git a/app-arch/ncompress/metadata.xml b/app-arch/ncompress/metadata.xml
new file mode 100644
index 000000000000..0d4bcdec12c1
--- /dev/null
+++ b/app-arch/ncompress/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ncompress</remote-id>
+		<remote-id type="github">vapier/ncompress</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/ncompress/ncompress-4.2.4.4.ebuild b/app-arch/ncompress/ncompress-4.2.4.4.ebuild
new file mode 100644
index 000000000000..a7820bb9aa6c
--- /dev/null
+++ b/app-arch/ncompress/ncompress-4.2.4.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Another uncompressor for compatibility"
+HOMEPAGE="https://github.com/vapier/ncompress"
+SRC_URI="mirror://sourceforge/ncompress/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin compress
+	dosym compress /usr/bin/uncompress
+	doman compress.1
+	echo '.so compress.1' > "${ED}"/usr/share/man/man1/uncompress.1
+	dodoc Acknowleds Changes LZW.INFO README
+}
diff --git a/app-arch/p7zip-16.02-r4 b/app-arch/p7zip-16.02-r4
deleted file mode 100644
index f63aaed96a55..000000000000
--- a/app-arch/p7zip-16.02-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )
-DESCRIPTION=Port of 7-Zip archiver for Unix
-EAPI=6
-HOMEPAGE=http://p7zip.sourceforge.net/
-IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=LGPL-2.1 rar? ( unRAR )
-RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-REQUIRED_USE=kde? ( wxwidgets )
-SLOT=0
-SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=73c44fb7222d3f0b1d2e937602b40718
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
new file mode 100644
index 000000000000..6b5cd4db1ce3
--- /dev/null
+++ b/app-arch/p7zip/Manifest
@@ -0,0 +1,8 @@
+AUX CVE-2016-9296.patch 495 BLAKE2B 34aad92d8a22b05119242e57effb85648acaa0c0b89a68c8ff03faa8c455ba4e95185732c2f26a462728d872f268d4a716cb14a703c05a1cb157c23dcc24cb86 SHA512 7a7fddf4122c3f5d4632640149a94c285a18515f38510388709c2fb9ecd450f9f34ae2e5fe4926c1c68507567b0affa2c8e9194c732673171dd5ee625192b194
+AUX CVE-2017-17969.patch 804 BLAKE2B 1b3d12f6d81d3b3a934088020509435c07a8bfe5ab2003e7369aa9b775808711915b1a0ede48ab6b8b24f37b55f2b84eefff020c34ec171002d9d714bac96f57 SHA512 fb97f6cccedda5b53492afffd65e9933055ffb3dba1419799bb5bf069d066f1172424a7913e0661fbe5937d23c94c062499968ddd09b7310f5d2c8003274340a
+AUX CVE-2018-10115.patch 8946 BLAKE2B 21fc8367ec1c811119bd43b5ca8ac1399748d4fe0c4a9c2cc98b9c3d48a806ccb8416905f18c2b740fd76dad0f9f469c2105d8a7986c11eb123caf48b6c0d31e SHA512 757d0f50ccce2a21dce81f165a9f408a71ea53c226ef29b4d3843f30b2fc518d06cd784e2de644904813cd16a87f24387c5cc35c2499b1df9d86377057be032a
+AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40
+AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37
+DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
+EBUILD p7zip-16.02-r4.ebuild 4641 BLAKE2B 65ec0c3f7c87ac30a5c14d04f9df48344de917a8e03a85bc2362d0dc615fcbb88da85970bd6ad26a5ef54240adc17621c06daf5aee49812b24f480b61634365e SHA512 76570b6c97ba50cbff41445031938eeccbb56af112995842d4543c1deffbe6492bbac5b4e8434e6bf7b5130c1d0d6a26c6a9d106d33e665dc114797dc474f9ff
+MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/files/CVE-2016-9296.patch b/app-arch/p7zip/files/CVE-2016-9296.patch
new file mode 100644
index 000000000000..773f92a46e0e
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2016-9296.patch
@@ -0,0 +1,12 @@
+--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig	2016-11-21 01:42:29.460901230 +0000
++++ ./CPP/7zip/Archive/7z/7zIn.cpp	2016-11-21 01:42:57.481197725 +0000
+@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
+       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
+         ThrowIncorrect();
+   }
+-  HeadersSize += folders.PackPositions[folders.NumPackStreams];
++  if (folders.PackPositions)
++      HeadersSize += folders.PackPositions[folders.NumPackStreams];
+   return S_OK;
+ }
+ 
diff --git a/app-arch/p7zip/files/CVE-2017-17969.patch b/app-arch/p7zip/files/CVE-2017-17969.patch
new file mode 100644
index 000000000000..9a820af73067
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2017-17969.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <anarcat@debian.org>
+Date: Sun, 28 Jan 2018 21:19:50 +0100
+Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta
+
+---
+ CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
+index 80b7e67..4acdce5 100644
+--- a/CPP/7zip/Compress/ShrinkDecoder.cpp
++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
+@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+     {
+       _stack[i++] = _suffixes[cur];
+       cur = _parents[cur];
+-    }
++      if (i >= kNumItems)
++        break;
++     }
++
++    if (i >= kNumItems)
++      break;
+     
+     _stack[i++] = (Byte)cur;
+     lastChar2 = (Byte)cur;
diff --git a/app-arch/p7zip/files/CVE-2018-10115.patch b/app-arch/p7zip/files/CVE-2018-10115.patch
new file mode 100644
index 000000000000..7d9c4bf81f00
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2018-10115.patch
@@ -0,0 +1,311 @@
+From: Robert Luberda <robert@debian.org>
+Date: Tue, 29 May 2018 23:59:09 +0200
+Subject: Fix CVE-2018-10115
+
+Apply "patch" taken from https://landave.io/files/patch_7zip_CVE-2018-10115.txt
+
+
+Bugs-Debian: https://bugs.debian.org/897674
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 16 +++++++++++-----
+ CPP/7zip/Compress/Rar1Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar2Decoder.cpp | 17 +++++++++++++----
+ CPP/7zip/Compress/Rar2Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar3Decoder.cpp | 19 +++++++++++++++----
+ CPP/7zip/Compress/Rar3Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar5Decoder.cpp |  8 ++++++++
+ CPP/7zip/Compress/Rar5Decoder.h   |  1 +
+ 8 files changed, 54 insertions(+), 16 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 68030c7..8c890c8 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
++++ b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
++CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -345,7 +345,7 @@ void CDecoder::GetFlagsBuf()
+ 
+ void CDecoder::InitData()
+ {
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
+     AvrPlc = 0x3500;
+@@ -391,6 +391,11 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+     return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++    return S_FALSE;
++
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+     return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -398,13 +403,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+ 
+   m_UnpackSize = (Int64)*outSize;
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++  m_OutWindowStream.Init(_isSolid);
+   m_InBitStream.SetStream(inStream);
+   m_InBitStream.Init();
+ 
+   // CCoderReleaser coderReleaser(this);
+   InitData();
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     _errorMode = false;
+     InitStructures();
+@@ -475,6 +480,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   }
+   if (m_UnpackSize < 0)
+     return S_FALSE;
++  _solidAllowed = true;
+   return m_OutWindowStream.Flush();
+ }
+ 
+@@ -491,7 +497,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
+index 01b606b..8abb3a3 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.h
++++ b/CPP/7zip/Compress/Rar1Decoder.h
+@@ -38,7 +38,8 @@ public:
+   UInt32 LastLength;
+ 
+   Int64 m_UnpackSize;
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool _errorMode;
+ 
+   UInt32 ReadBits(int numBits);
+diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
+index 0580c8d..be8d842 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
++++ b/CPP/7zip/Compress/Rar2Decoder.cpp
+@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
+ static const UInt32 kWindowReservSize = (1 << 22) + 256;
+ 
+ CDecoder::CDecoder():
+-  m_IsSolid(false),
++  _isSolid(false),
++  _solidAllowed(false),
+   m_TablesOK(false)
+ {
+ }
+@@ -320,6 +321,10 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+     return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++    return S_FALSE;
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+     return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -330,12 +335,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   UInt64 pos = 0, unPackSize = *outSize;
+   
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++  m_OutWindowStream.Init(_isSolid);
+   m_InBitStream.SetStream(inStream);
+   m_InBitStream.Init();
+ 
+   // CCoderReleaser coderReleaser(this);
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     InitStructures();
+     if (unPackSize == 0)
+@@ -343,6 +348,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+       if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
+         if (!ReadTables())
+           return S_FALSE;
++      _solidAllowed = true;
+       return S_OK;
+     }
+     if (!ReadTables())
+@@ -386,6 +392,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+ 
+   if (!ReadLastTables())
+     return S_FALSE;
++
++  _solidAllowed = true;
++
+   return m_OutWindowStream.Flush();
+ }
+ 
+@@ -402,7 +411,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
+index 0e9005f..370bce2 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.h
++++ b/CPP/7zip/Compress/Rar2Decoder.h
+@@ -138,7 +138,8 @@ class CDecoder :
+   Byte m_LastLevels[kMaxTableSize];
+ 
+   UInt64 m_PackSize;
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool m_TablesOK;
+ 
+   void InitStructures();
+diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
+index 6cb8a6a..7b85833 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.cpp
++++ b/CPP/7zip/Compress/Rar3Decoder.cpp
+@@ -92,7 +92,8 @@ CDecoder::CDecoder():
+   _writtenFileSize(0),
+   _vmData(0),
+   _vmCode(0),
+-  m_IsSolid(false),
++  _isSolid(false),
++  _solidAllowed(false),
+   _errorMode(false)
+ {
+   Ppmd7_Construct(&_ppmd);
+@@ -821,7 +822,7 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+ {
+   _writtenFileSize = 0;
+   _unsupportedFilter = false;
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     _lzSize = 0;
+     _winPos = 0;
+@@ -840,12 +841,15 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+   if (_errorMode)
+     return S_FALSE;
+ 
+-  if (!m_IsSolid || !TablesRead)
++  if (!_isSolid || !TablesRead)
+   {
+     bool keepDecompressing;
+     RINOK(ReadTables(keepDecompressing));
+     if (!keepDecompressing)
++    {
++      _solidAllowed = true;
+       return S_OK;
++    }
+   }
+ 
+   for (;;)
+@@ -870,6 +874,9 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+     if (!keepDecompressing)
+       break;
+   }
++
++  _solidAllowed = true;
++
+   RINOK(WriteBuf());
+   UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize();
+   RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
+@@ -890,6 +897,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+     if (!inSize)
+       return E_INVALIDARG;
+ 
++    if (_isSolid && !_solidAllowed)
++      return S_FALSE;
++    _solidAllowed = false;
++
+     if (!_vmData)
+     {
+       _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax);
+@@ -928,7 +939,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
+index 2f72d7d..32c8943 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.h
++++ b/CPP/7zip/Compress/Rar3Decoder.h
+@@ -191,7 +191,8 @@ class CDecoder:
+   CRecordVector<CTempFilter *>  _tempFilters;
+   UInt32 _lastFilter;
+ 
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool _errorMode;
+ 
+   bool _lzMode;
+diff --git a/CPP/7zip/Compress/Rar5Decoder.cpp b/CPP/7zip/Compress/Rar5Decoder.cpp
+index dc8830f..a826d5a 100644
+--- a/CPP/7zip/Compress/Rar5Decoder.cpp
++++ b/CPP/7zip/Compress/Rar5Decoder.cpp
+@@ -72,6 +72,7 @@ CDecoder::CDecoder():
+     _writtenFileSize(0),
+     _dictSizeLog(0),
+     _isSolid(false),
++    _solidAllowed(false),
+     _wasInit(false),
+     _inputBuf(NULL)
+ {
+@@ -801,7 +802,10 @@ HRESULT CDecoder::CodeReal()
+   */
+ 
+   if (res == S_OK)
++  {
++    _solidAllowed = true;
+     res = res2;
++  }
+      
+   if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize)
+     return S_FALSE;
+@@ -821,6 +825,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+ {
+   try
+   {
++    if (_isSolid && !_solidAllowed)
++      return S_FALSE;
++    _solidAllowed = false;
++
+     if (_dictSizeLog >= sizeof(size_t) * 8)
+       return E_NOTIMPL;
+ 
+diff --git a/CPP/7zip/Compress/Rar5Decoder.h b/CPP/7zip/Compress/Rar5Decoder.h
+index b0a4dd1..3db5018 100644
+--- a/CPP/7zip/Compress/Rar5Decoder.h
++++ b/CPP/7zip/Compress/Rar5Decoder.h
+@@ -271,6 +271,7 @@ class CDecoder:
+   Byte _dictSizeLog;
+   bool _tableWasFilled;
+   bool _isSolid;
++  bool _solidAllowed;
+   bool _wasInit;
+ 
+   UInt32 _reps[kNumReps];
diff --git a/app-arch/p7zip/files/CVE-2018-5996.patch b/app-arch/p7zip/files/CVE-2018-5996.patch
new file mode 100644
index 000000000000..6733bff91895
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2018-5996.patch
@@ -0,0 +1,221 @@
+From: Robert Luberda <robert@debian.org>
+Date: Sun, 28 Jan 2018 23:47:40 +0100
+Subject: CVE-2018-5996
+
+Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by
+applying a few changes from 7Zip 18.00-beta.
+
+Bug-Debian: https://bugs.debian.org/#888314
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++----
+ CPP/7zip/Compress/Rar1Decoder.h   |  1 +
+ CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++-
+ CPP/7zip/Compress/Rar2Decoder.h   |  1 +
+ CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++---
+ CPP/7zip/Compress/Rar3Decoder.h   |  2 ++
+ 6 files changed, 42 insertions(+), 8 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 1aaedcc..68030c7 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
++++ b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false) { }
++CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   InitData();
+   if (!m_IsSolid)
+   {
++    _errorMode = false;
+     InitStructures();
+     InitHuff();
+   }
++
++  if (_errorMode)
++    return S_FALSE;
++
+   if (m_UnpackSize > 0)
+   {
+     GetFlagsBuf();
+@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+     const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
+ {
+   try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
+-  catch(const CInBufferException &e) { return e.ErrorCode; }
+-  catch(const CLzOutWindowException &e) { return e.ErrorCode; }
+-  catch(...) { return S_FALSE; }
++  catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; }
++  catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; }
++  catch(...) { _errorMode = true; return S_FALSE; }
+ }
+ 
+ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
+index 630f089..01b606b 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.h
++++ b/CPP/7zip/Compress/Rar1Decoder.h
+@@ -39,6 +39,7 @@ public:
+ 
+   Int64 m_UnpackSize;
+   bool m_IsSolid;
++  bool _errorMode;
+ 
+   UInt32 ReadBits(int numBits);
+   HRESULT CopyBlock(UInt32 distance, UInt32 len);
+diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
+index b3f2b4b..0580c8d 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
++++ b/CPP/7zip/Compress/Rar2Decoder.cpp
+@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
+ static const UInt32 kWindowReservSize = (1 << 22) + 256;
+ 
+ CDecoder::CDecoder():
+-  m_IsSolid(false)
++  m_IsSolid(false),
++  m_TablesOK(false)
+ {
+ }
+ 
+@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB
+ 
+ bool CDecoder::ReadTables(void)
+ {
++  m_TablesOK = false;
++
+   Byte levelLevels[kLevelTableSize];
+   Byte newLevels[kMaxTableSize];
+   m_AudioMode = (ReadBits(1) == 1);
+@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void)
+   }
+   
+   memcpy(m_LastLevels, newLevels, kMaxTableSize);
++  m_TablesOK = true;
++
+   return true;
+ }
+ 
+@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+       return S_FALSE;
+   }
+ 
++  if (!m_TablesOK)
++    return S_FALSE;
++
+   UInt64 startPos = m_OutWindowStream.GetProcessedSize();
+   while (pos < unPackSize)
+   {
+diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
+index 3a0535c..0e9005f 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.h
++++ b/CPP/7zip/Compress/Rar2Decoder.h
+@@ -139,6 +139,7 @@ class CDecoder :
+ 
+   UInt64 m_PackSize;
+   bool m_IsSolid;
++  bool m_TablesOK;
+ 
+   void InitStructures();
+   UInt32 ReadBits(unsigned numBits);
+diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
+index 3bf2513..6cb8a6a 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.cpp
++++ b/CPP/7zip/Compress/Rar3Decoder.cpp
+@@ -92,7 +92,8 @@ CDecoder::CDecoder():
+   _writtenFileSize(0),
+   _vmData(0),
+   _vmCode(0),
+-  m_IsSolid(false)
++  m_IsSolid(false),
++  _errorMode(false)
+ {
+   Ppmd7_Construct(&_ppmd);
+ }
+@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
+     return InitPPM();
+   }
+ 
++  TablesRead = false;
++  TablesOK = false;
++
+   _lzMode = true;
+   PrevAlignBits = 0;
+   PrevAlignCount = 0;
+@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
+       }
+     }
+   }
++  if (InputEofError())
++    return S_FALSE;
++
+   TablesRead = true;
+ 
+   // original code has check here:
+@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
+   RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
+ 
+   memcpy(m_LastLevels, newLevels, kTablesSizesSum);
++
++  TablesOK = true;
++
+   return S_OK;
+ }
+ 
+@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+     PpmEscChar = 2;
+     PpmError = true;
+     InitFilters();
++    _errorMode = false;
+   }
++
++  if (_errorMode)
++    return S_FALSE;
++
+   if (!m_IsSolid || !TablesRead)
+   {
+     bool keepDecompressing;
+@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+     bool keepDecompressing;
+     if (_lzMode)
+     {
++      if (!TablesOK)
++        return S_FALSE;
+       RINOK(DecodeLZ(keepDecompressing))
+     }
+     else
+@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+     _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1;
+     return CodeReal(progress);
+   }
+-  catch(const CInBufferException &e)  { return e.ErrorCode; }
+-  catch(...) { return S_FALSE; }
++  catch(const CInBufferException &e)  { _errorMode = true; return e.ErrorCode; }
++  catch(...) { _errorMode = true; return S_FALSE; }
+   // CNewException is possible here. But probably CNewException is caused
+   // by error in data stream.
+ }
+diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
+index c130cec..2f72d7d 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.h
++++ b/CPP/7zip/Compress/Rar3Decoder.h
+@@ -192,6 +192,7 @@ class CDecoder:
+   UInt32 _lastFilter;
+ 
+   bool m_IsSolid;
++  bool _errorMode;
+ 
+   bool _lzMode;
+   bool _unsupportedFilter;
+@@ -200,6 +201,7 @@ class CDecoder:
+   UInt32 PrevAlignCount;
+ 
+   bool TablesRead;
++  bool TablesOK;
+ 
+   CPpmd7 _ppmd;
+   int PpmEscChar;
diff --git a/app-arch/p7zip/files/p7zip-16.02-darwin.patch b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
new file mode 100644
index 000000000000..1c3899f30a53
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
@@ -0,0 +1,46 @@
+--- a/CPP/myWindows/StdAfx.h
++++ b/CPP/myWindows/StdAfx.h
+@@ -32,7 +32,7 @@
+ #include <errno.h>
+ #include <math.h>
+ 
+-#ifdef __NETWARE__
++#if defined(__NETWARE__) || defined(__MACH__)
+ #include <sys/types.h>
+ #endif
+ 
+
+https://svnweb.freebsd.org/ports/head/archivers/p7zip/files/patch-CPP_Windows_ErrorMsg.cpp?view=markup&pathrev=458172
+This fixes the build with Clang 6.0:
+
+ ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka  'unsigned int') [-Wc++11-narrowing]
+     case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
+          ^
+ ../../../../CPP/Common/MyWindows.h:89:22: note: expanded from macro 'E_INVALIDARG'
+ #define E_INVALIDARG ((HRESULT)0x80070057L)
+                      ^
+
+The HRESULT cast in the macro causes the value to be read as signed int.
+--- a/CPP/Windows/ErrorMsg.cpp
++++ b/CPP/Windows/ErrorMsg.cpp
+@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode)
+ 
+   switch(errorCode) {
+     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
+-    case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
+-    case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
+-    case E_ABORT               : txt = "E_ABORT"; break ;
+-    case E_FAIL                : txt = "E_FAIL"; break ;
+-    case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
+-    case E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
+-    case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
++    case (DWORD)(E_NOTIMPL)             : txt = "E_NOTIMPL"; break ;
++    case (DWORD)(E_NOINTERFACE)         : txt = "E_NOINTERFACE"; break ;
++    case (DWORD)(E_ABORT)               : txt = "E_ABORT"; break ;
++    case (DWORD)(E_FAIL)                : txt = "E_FAIL"; break ;
++    case (DWORD)(STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ;
++    case (DWORD)(E_OUTOFMEMORY)         : txt = "E_OUTOFMEMORY"; break ;
++    case (DWORD)(E_INVALIDARG)          : txt = "E_INVALIDARG"; break ;
+     case ERROR_DIRECTORY          : txt = "Error Directory"; break ;
+     default:
+       txt = strerror(errorCode);
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
new file mode 100644
index 000000000000..17c1bda0021e
--- /dev/null
+++ b/app-arch/p7zip/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="rar">Enable support for non-free rar decoder</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">p7zip</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild b/app-arch/p7zip/p7zip-16.02-r4.ebuild
new file mode 100644
index 000000000000..dc858bf58b87
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+DOCS=( ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/CVE-2016-9296.patch
+	"${FILESDIR}"/CVE-2017-17969.patch
+	"${FILESDIR}"/CVE-2018-5996.patch
+	"${FILESDIR}"/CVE-2018-10115.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e 's:-pipe::g' \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+#		emake -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+#		doexe bin/7z{G,FM}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/Lang
+		doins -r DOC/MANUAL
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kservices5/ServiceMenus
+			doins GUI/kde4/*.desktop
+			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
+			for item in "${ED}"usr/share/kservices5/ServiceMenus/*.desktop; do
+				item="$(basename ${item})"
+				dosym "/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
+			done
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+
+	if use doc; then
+		dodoc DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}
diff --git a/app-arch/par-1.1 b/app-arch/par-1.1
deleted file mode 100644
index 4bde683a7d8b..000000000000
--- a/app-arch/par-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=!app-text/par !dev-util/par
-DESCRIPTION=Parchive archive fixing tool
-EAPI=6
-HOMEPAGE=http://parchive.sourceforge.net/
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=!app-text/par !dev-util/par
-SLOT=0
-SRC_URI=mirror://sourceforge/parchive/par-v1.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=76d88f140e23d407650a330c066ee96e
diff --git a/app-arch/par/Manifest b/app-arch/par/Manifest
new file mode 100644
index 000000000000..78b88788eba0
--- /dev/null
+++ b/app-arch/par/Manifest
@@ -0,0 +1,4 @@
+AUX par-1.1-fix-build-system.patch 320 BLAKE2B a26b6d38129771b727fbd68340033303643f1214a1df0fc72a14d953679a0ad3161d6fd60264ef656fa330555d339b28e697ff5eabd2a759a6fdfe95bdf5d1ab SHA512 a9d802c3a2e60aa7e3be3dfd3f43365b46f3b6e8ff25ce2fca953df6db0fa97c42510665f6b191b090c267be8ab51e317e5d8df573db11a0cf72b2ade5bf5a64
+DIST par-v1.1.tar.gz 40959 BLAKE2B a15a7addccf1edb036e73219cbd6c9f92ecc41c7cda16136f5a703e812d56bf8a84a31681c0fd02b9bd5e8a29ca76e4c9c61b8f2752104c8891ac9416bf169f7 SHA512 539be3cac0513429f44c9d53dcd61afa02b1e5a2935def3164398577882f47199b5a393f21ed6a1d6972409034bb0a7b63f338d69aa1fcdd3655adaf5993b95d
+EBUILD par-1.1.ebuild 613 BLAKE2B 2295b899a7f2fa5344468b2b511ec05ac131da2de6ed948be2f92b24c5aa0fe10ce1b26c1a4b8b13663104a963cc0a063f5818f7fcc67143b36d1d5d2b58ad15 SHA512 a7487d67500a9be2dbf7ff37c28acdfd59e25e8590d93f8ee7c01ea5741e06fd8d8aaa26479a3d4ac9213a15dd8ba8a839e75c4cebd43898bac4913134403594
+MISC metadata.xml 245 BLAKE2B 2238bcaede7173c554f122293f371ef5fdbc9fcd11c670a5a729505e1dd5e9d676c42870c7cdedb3d4d60cd82575bf110d8398657d3af32007138d201b45faa6 SHA512 023dccf92d6be9a5ccefa97f75d1d4df7a5590ec62f5969e24f45ba12be7d2128e0b2bcf0e5a0b59e2616d586c830c58fa43535d17e38c00b896b05490ecdf42
diff --git a/app-arch/par/files/par-1.1-fix-build-system.patch b/app-arch/par/files/par-1.1-fix-build-system.patch
new file mode 100644
index 000000000000..30361579f226
--- /dev/null
+++ b/app-arch/par/files/par-1.1-fix-build-system.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ 
+-CFLAGS=-g -W -Wall -Wno-unused -O2
++CFLAGS += -W -Wall -Wno-unused
+ 
+ par: backend.o checkpar.o makepar.o rwpar.o rs.o md5.o fileops.o main.o readoldpar.o interface.o ui_text.o
+-	$(CC) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ clean:
+ 	rm -f core par par.exe *.o
diff --git a/app-arch/par/metadata.xml b/app-arch/par/metadata.xml
new file mode 100644
index 000000000000..6d3e0da21dc0
--- /dev/null
+++ b/app-arch/par/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">parchive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/par/par-1.1.ebuild b/app-arch/par/par-1.1.ebuild
new file mode 100644
index 000000000000..63ac82a7d472
--- /dev/null
+++ b/app-arch/par/par-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parchive archive fixing tool"
+HOMEPAGE="http://parchive.sourceforge.net/"
+SRC_URI="mirror://sourceforge/parchive/par-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="
+	!app-text/par
+	!dev-util/par"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/par-cmdline
+PATCHES=( "${FILESDIR}"/${PN}-1.1-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin par
+	einstalldocs
+}
diff --git a/app-arch/par2cmdline-0.7.3 b/app-arch/par2cmdline-0.7.3
deleted file mode 100644
index 16a595116d0b..000000000000
--- a/app-arch/par2cmdline-0.7.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=pretend setup test
-DESCRIPTION=A PAR-2.0 file verification and repair tool
-EAPI=6
-HOMEPAGE=https://github.com/Parchive/par2cmdline
-IUSE=openmp
-KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.7.3/par2cmdline-0.7.3.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=388d410fefeef7d9d02e3875174735f0
diff --git a/app-arch/par2cmdline-0.7.4 b/app-arch/par2cmdline-0.7.4
deleted file mode 100644
index 82913cf31380..000000000000
--- a/app-arch/par2cmdline-0.7.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=pretend setup test
-DESCRIPTION=A PAR-2.0 file verification and repair tool
-EAPI=6
-HOMEPAGE=https://github.com/Parchive/par2cmdline
-IUSE=openmp
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.7.4/par2cmdline-0.7.4.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f67d21b2d5079537ef6a26685d7a888d
diff --git a/app-arch/par2cmdline-0.8.0 b/app-arch/par2cmdline-0.8.0
deleted file mode 100644
index 81046ac6720b..000000000000
--- a/app-arch/par2cmdline-0.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=pretend setup test
-DESCRIPTION=A PAR-2.0 file verification and repair tool
-EAPI=6
-HOMEPAGE=https://github.com/Parchive/par2cmdline
-IUSE=openmp
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.0/par2cmdline-0.8.0.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f67d21b2d5079537ef6a26685d7a888d
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
new file mode 100644
index 000000000000..b68caf9eb0ed
--- /dev/null
+++ b/app-arch/par2cmdline/Manifest
@@ -0,0 +1,7 @@
+DIST par2cmdline-0.7.3.tar.bz2 3129759 BLAKE2B 4206c1ec4b41e58044b29d1ae0fe7c2cb9611b87aee2186105cc3f6f1afb5a22540ae31b837edd6a8a4b852000081bc52a16e88c6951326504f219edbd2f0b0a SHA512 85fe91f2e7cc1888171390f82fe2d12279e65eab17b3a6db209998aed316c5ea9dd5e63004cf975cbe460c1ef27860af31160e8757921c4027e27997dcd8be8a
+DIST par2cmdline-0.7.4.tar.bz2 3129835 BLAKE2B 5cdc03a71d3db04928eb818037f66e4d624ee7479f1b942982b095e24a4a17c6fd5aebd032b4ba81b23f15b80ee4727b027746edbe9d1b4390cc327f469e5c5c SHA512 20f99556b4dae2e4467d781a96adab8d9f9a42dd43707de788b268eeea2bf59d92847e3c4faf413ea3de361360ef1236e97343ee8b625c9c2cd65ec9546e61ec
+DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276ccdff8bc23d7cc8f7c8aab03f9dc992777fd0d67e39b877ed94b77cca679f5c9d2824c778f6481e71c7120a90b45cc0 SHA512 af91024dc80a4af0935c2fc0b867e57a8d3879d93146f52ab62d8bb105f2c637abe46c762302515417691d12144818446932c970d1018d2f10c0d4e1fa455020
+EBUILD par2cmdline-0.7.3.ebuild 782 BLAKE2B e47827829b2b16d5c92913d1408fba4732a398e34fe5e6eb2735a9254919a3de757568ca02af751e17bab4b23eb4e3bb984169da9d96eee84be0d7b57f3d7e67 SHA512 ab03cd0dbac07acbdb43e2a0d681c6e73469ea137ff9bf1f9340f3c85d1823a3ad3e15312682bde3cec2f5f4eadb1605e1a91544e69c809d6f46814d3a4731e6
+EBUILD par2cmdline-0.7.4.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
+EBUILD par2cmdline-0.8.0.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
+MISC metadata.xml 425 BLAKE2B f0f51687772e2555fb17f45d60b41cf8350fb6598c35c544ee9e110e8dcfdf89288fb3fd506080f678a25d98e7dc1e8fdc891efbc81a5bad1ee8bdc89466e233 SHA512 9813ec014f97b8c9ead9021596d60d724e5f4427ed266ab430535b172cc50636d623d44648af1d05c532b38299aab49de91d03c6658a937ed724b161f629da8f
diff --git a/app-arch/par2cmdline/metadata.xml b/app-arch/par2cmdline/metadata.xml
new file mode 100644
index 000000000000..39157a67ffd1
--- /dev/null
+++ b/app-arch/par2cmdline/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>swegener@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Parchive/par2cmdline</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/par2cmdline/par2cmdline-0.7.3.ebuild b/app-arch/par2cmdline/par2cmdline-0.7.3.ebuild
new file mode 100644
index 000000000000..adb97f855c6e
--- /dev/null
+++ b/app-arch/par2cmdline/par2cmdline-0.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A PAR-2.0 file verification and repair tool"
+HOMEPAGE="https://github.com/Parchive/par2cmdline"
+SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="openmp"
+
+DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_test() {
+	# test22 fails when run in parallel
+	emake -j1 check
+}
diff --git a/app-arch/par2cmdline/par2cmdline-0.7.4.ebuild b/app-arch/par2cmdline/par2cmdline-0.7.4.ebuild
new file mode 100644
index 000000000000..5dfb2290f555
--- /dev/null
+++ b/app-arch/par2cmdline/par2cmdline-0.7.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A PAR-2.0 file verification and repair tool"
+HOMEPAGE="https://github.com/Parchive/par2cmdline"
+SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="openmp"
+
+DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_test() {
+	# test22 fails when run in parallel
+	emake -j1 check
+}
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
new file mode 100644
index 000000000000..5dfb2290f555
--- /dev/null
+++ b/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A PAR-2.0 file verification and repair tool"
+HOMEPAGE="https://github.com/Parchive/par2cmdline"
+SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="openmp"
+
+DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_test() {
+	# test22 fails when run in parallel
+	emake -j1 check
+}
diff --git a/app-arch/patool-1.12 b/app-arch/patool-1.12
deleted file mode 100644
index 63f25621d1a8..000000000000
--- a/app-arch/patool-1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Portable archive file manager
-EAPI=6
-HOMEPAGE=http://wummel.github.io/patool/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=749544014fd0a73e4dfba4b553f45029
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
new file mode 100644
index 000000000000..9333353e6ed5
--- /dev/null
+++ b/app-arch/patool/Manifest
@@ -0,0 +1,3 @@
+DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
+EBUILD patool-1.12.ebuild 440 BLAKE2B c20b8218e91411288339c1b48c1166680aa151998de785168545a75623caf1296adc2cbe61538f8d3111a2f85f81e0ba242a8955a5c0444874586a02df62dfd7 SHA512 12655ad8a3730151d392acef7a1585a90355357935e96499139355cf1fd25229cd1ca58ee08c47e47588f43510f317da78c389721912d9b9a72fe98fbd8d660b
+MISC metadata.xml 455 BLAKE2B 7e079e454e413cbafeb93e91a28ae913348ef108667e76e5cb5e4f63106e43fb8d55cdc6549f110af324acfa1d280e2d483bdc7f648f0bbffbba0c361adc1272 SHA512 d6d0b1c1a2704fbf8949295fe2a4e3f527bbd9b4cf509f3d6da756cf358fb123afc717b87a7cc463c90246fc597bef8394d4a70f1bee68b0c58f8ce99178201b
diff --git a/app-arch/patool/metadata.xml b/app-arch/patool/metadata.xml
new file mode 100644
index 000000000000..a4abc22153ba
--- /dev/null
+++ b/app-arch/patool/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>horea.christ@gmail.com</email>
+    <name>Horea Christian</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">patool</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/patool/patool-1.12.ebuild b/app-arch/patool/patool-1.12.ebuild
new file mode 100644
index 000000000000..49aba770e2b7
--- /dev/null
+++ b/app-arch/patool/patool-1.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Portable archive file manager"
+HOMEPAGE="http://wummel.github.io/patool/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/app-arch/pax-20161104 b/app-arch/pax-20161104
deleted file mode 100644
index 2aabf6ddf01d..000000000000
--- a/app-arch/pax-20161104
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/libbsd elibc_musl? ( sys-libs/fts-standalone ) app-arch/cpio
-DESCRIPTION=pax (Portable Archive eXchange) is the POSIX standard archive tool
-EAPI=6
-HOMEPAGE=https://www.mirbsd.org/pax.htm
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-libs/libbsd elibc_musl? ( sys-libs/fts-standalone )
-SLOT=0
-SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20161104.cpio.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64c5937977d99e40b49f12d60fa57efd
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
new file mode 100644
index 000000000000..7dd30700df50
--- /dev/null
+++ b/app-arch/pax/Manifest
@@ -0,0 +1,4 @@
+AUX pax-20160306-glibc-to-linux.patch 852 BLAKE2B ebca2d148954e511d3a4f79ef96cadad0eb93c35e9959a2fe6833c8371aa8c2d20f2a471ef3e8e19efbebd2f15ae1ff66ab976191166603998cf4b4ccbc705ce SHA512 f6ee4abbc2f9a422a735fc6a09098a6bec9b855211bcdce088cc7362cb88def65ec574d91ad7cc48ee055e0438d481ed1e4b6ff650419ce3c7c09449ab82b69a
+DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
+EBUILD pax-20161104.ebuild 1456 BLAKE2B f467bffa0c0b8696d48b5f2161d75de38d21dac88cfc05cabe84ea16ccc1f691336ecb00016e22c5c99f626331d19abebf8b944ff81337669ea19503f3fb4a77 SHA512 0e79f2be36f84d4717d820e56a6b57a9b955a7b95881a3c28f298d6749659bdc16a68c1b48e19bdc592a6344b8859956918f05544f790f1a21250bfdf2b870fb
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
new file mode 100644
index 000000000000..eec6624eedc2
--- /dev/null
+++ b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
@@ -0,0 +1,38 @@
+--- a/cache.c
++++ b/cache.c
+@@ -195,7 +195,7 @@
+ 	 * No entry for this uid, we will add it
+ 	 */
+ 	if (!pwopn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ 		setpwent();
+ #elif !defined(__INTERIX)
+ 		setpassent(1);
+@@ -265,7 +265,7 @@
+ 	 * No entry for this gid, we will add it
+ 	 */
+ 	if (!gropn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ 		setgrent();
+ #elif !defined(__INTERIX) && !defined(__CYGWIN__)
+ 		setgroupent(1);
+@@ -336,7 +336,7 @@
+ 	}
+ 
+ 	if (!pwopn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ 		setpwent();
+ #elif !defined(__INTERIX)
+ 		setpassent(1);
+@@ -403,7 +403,7 @@
+ 	}
+ 
+ 	if (!gropn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ 		setgrent();
+ #elif !defined(__INTERIX) && !defined(__CYGWIN__)
+ 		setgroupent(1);
diff --git a/app-arch/pax/metadata.xml b/app-arch/pax/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-arch/pax/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
new file mode 100644
index 000000000000..c9fc9875ca5c
--- /dev/null
+++ b/app-arch/pax/pax-20161104.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit unpacker toolchain-funcs flag-o-matic
+
+DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
+HOMEPAGE="https://www.mirbsd.org/pax.htm"
+SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+
+RDEPEND="
+	dev-libs/libbsd
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+DEPEND="
+	${RDEPEND}
+	$(unpacker_src_uri_depends)
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-20160306-glibc-to-linux.patch"
+)
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Newer C libraries omit this include from sys/types.h.
+	sed -i '1i#include <sys/sysmacros.h>' extern.h || die
+	default
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	use elibc_musl && append-ldflags "-lfts"
+
+	# We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support.
+	set -- \
+		${CC} ${CPPFLAGS} ${CFLAGS} \
+		-DPAX_SAFE_PATH=\"/bin:/usr/bin\" \
+		-DHAVE_STRLCPY -DHAVE_VIS -DHAVE_STRMODE \
+		-DLONG_OFF_T -DHAVE_LINKAT \
+		$(${PKG_CONFIG} --cflags libbsd-overlay) \
+		-Wall ${LDFLAGS} *.c -o ${PN} \
+		$(${PKG_CONFIG} --libs libbsd-overlay)
+	echo "$@"
+	"$@" || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+
+	dosym pax /usr/bin/paxcpio
+	newman cpio.1 paxcpio.1
+
+	dosym pax /usr/bin/paxtar
+	newman tar.1 paxtar.1
+}
diff --git a/app-arch/pbzip2-1.1.12 b/app-arch/pbzip2-1.1.12
deleted file mode 100644
index a5c71964d790..000000000000
--- a/app-arch/pbzip2-1.1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static? ( app-arch/bzip2[static-libs(+)] )
-DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
-EAPI=5
-HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
-IUSE=static symlink
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BZIP2
-RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
-SLOT=0
-SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.12/+download/pbzip2-1.1.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf51814fcd9f1dc627517dd287b2fb54
diff --git a/app-arch/pbzip2-1.1.12-r1 b/app-arch/pbzip2-1.1.12-r1
deleted file mode 100644
index 417a9756b107..000000000000
--- a/app-arch/pbzip2-1.1.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static? ( app-arch/bzip2[static-libs(+)] )
-DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
-EAPI=5
-HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
-IUSE=static symlink
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BZIP2
-RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
-SLOT=0
-SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.12/+download/pbzip2-1.1.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a7ec54d37ab1b2323859864ff3b8521
diff --git a/app-arch/pbzip2-1.1.13 b/app-arch/pbzip2-1.1.13
deleted file mode 100644
index cb427b85ed80..000000000000
--- a/app-arch/pbzip2-1.1.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static? ( app-arch/bzip2[static-libs(+)] )
-DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
-EAPI=5
-HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
-IUSE=static symlink
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BZIP2
-RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
-SLOT=0
-SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e501520e92df2759ba3a04abac5e3e86
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
new file mode 100644
index 000000000000..652aab9e7624
--- /dev/null
+++ b/app-arch/pbzip2/Manifest
@@ -0,0 +1,8 @@
+AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df
+AUX pbzip2-1.1.12-data_truncation_fix.patch 3348 BLAKE2B 848afb0cb6311a28ba958346fdda210aa7bb325c8e3a174c7359e574322f8eb41a04d8e785aa70332de953db170706e9c1fefef6d7274ebfbc211769f4dc88dd SHA512 c6bac8fe33f9d123358c1a01cdb94a8dd6be4c63553f62568311f06b25cf371ab7d881797ebb0d66d9f772c5644fe1f38a70fdbd64b99adaaed82f1e96dcc966
+DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
+DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
+EBUILD pbzip2-1.1.12-r1.ebuild 1122 BLAKE2B d1e86f7fdabc1a141aaa5443e9737c214a69c812ff9dacafcbebd5e9ff7bc4d9b43881dda6f637213e8f411c5d3e9e959c18509499596dca6680b37dc379db9f SHA512 137c5d554c2cae6a9db6010037aa24c1edcff8656ee524526eabde2c175543f596cd25d87f5fefa32567ca9b22856504f52a5f4683c6d619f7fac87dcd47a2db
+EBUILD pbzip2-1.1.12.ebuild 1060 BLAKE2B acb4e0bebcca4008e9ce3e759b57128845688b8ba18f9357564ef6907980899669630f46edcab7ff9b74d7f1f93a111e47f319bd76ffe57fb3c1e445a1940ced SHA512 3c6d032f54827eedf507faddb4c9ef4662dafcd5e36e5730a864f391714f08ab4089e595a2b314dfd494bb2df967ed9e8fa180032daf4c5c7ee63d055cebaf44
+EBUILD pbzip2-1.1.13.ebuild 1141 BLAKE2B 0b4df36bdb353d65c4e338b016b055e8511df3ac7b739c74efae6a632cee5297aa58917c294ed97ceec1230515f4671dec8adccad52a723fe12b65adb62538bf SHA512 5ca654096b0d32c8abeb8123e94030c027782a30e0a088c52850ba104516c1324e50def6bac92eb9f0529592df65de02948f2ce19fe6503191e836d27a8eff86
+MISC metadata.xml 443 BLAKE2B 3a25a8281989265bb3339d4b46442e5c73920567ff19bd12e57a6aa41d40534428e409ca9dc548318d2487288e12e2c6bb305809c7585c3d6742c8709a649d9e SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.10-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.10-makefile.patch
new file mode 100644
index 000000000000..6524b6bf2a05
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.1.10-makefile.patch
@@ -0,0 +1,20 @@
+--- pbzip2-1.1.10/Makefile
++++ pbzip2-1.1.10/Makefile
+@@ -17,7 +17,7 @@
+ 
+ 
+ # Optimization flags
+-CXXFLAGS = -O2
++#CXXFLAGS = -O2
+ 
+ #CXXFLAGS += -g -Wall
+ #CXXFLAGS += -ansi
+@@ -50,7 +50,7 @@
+ 
+ 
+ # Linker flags
+-LDFLAGS =
++#LDFLAGS =
+ 
+ 
+ # External libraries
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch b/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
new file mode 100644
index 000000000000..0ce62e7a77fe
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
@@ -0,0 +1,142 @@
+https://bugs.launchpad.net/pbzip2/+bug/1524909
+https://bugs.gentoo.org/567952
+
+
+=== modified file 'pbzip2.cpp'
+--- pbzip2.cpp	2014-12-21 10:20:27 +0000
++++ pbzip2.cpp	2015-12-11 00:14:31 +0000
+@@ -2083,6 +2083,17 @@
+ 	return 0;
+ }
+ 
++void close_streams(FILE *stream, FILE *zStream)
++{
++	if (stream != NULL)
++		fflush(stream);
++
++	if (zStream != NULL && zStream != stdin)
++		fclose(zStream);
++	if (stream != NULL && stream != stdout)
++		fclose(stream);
++}
++
+ /*
+  *********************************************************
+  */
+@@ -2125,9 +2136,7 @@
+ 	// check file stream for errors
+ 	if (ferror(zStream))
+ 	{
+-		if (zStream != stdin)
+-			fclose(zStream);
+-
++		close_streams(stream, zStream);
+ 		handle_error(EF_EXIT, -1,
+ 				"pbzip2: *ERROR: Problem with input stream of file [%s]!  Aborting...\n", InFilename);
+ 		return -1;
+@@ -2155,9 +2164,7 @@
+ 	// check file stream for errors
+ 	if (ferror(stream))
+ 	{
+-		if (stream != stdout)
+-			fclose(stream);
+-		
++		close_streams(stream, zStream);
+ 		handle_error(EF_EXIT, -1,
+ 				"pbzip2: *ERROR: Problem with output stream of file [%s]!  Aborting...\n", InFilename);
+ 		return -1;
+@@ -2169,10 +2176,7 @@
+ 		if (syncGetTerminateFlag() != 0)
+ 		{
+ 			fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n");
+-			if (zStream != stdin)
+-				fclose(zStream);
+-			if (stream != stdout)
+-				fclose(stream);
++			close_streams(stream, zStream);
+ 			return -1;
+ 		}
+ 
+@@ -2180,11 +2184,8 @@
+ 		if (bzf == NULL || bzerr != BZ_OK)
+ 		{
+ 			ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+-			if (zStream != stdin)
+-				fclose(zStream);
+-			if (stream != stdout)
+-				fclose(stream);
+-			
++			close_streams(stream, zStream);
++	
+ 			if (ret != 0)
+ 			{
+ 				syncSetTerminateFlag(1);
+@@ -2200,10 +2201,7 @@
+ 			if (syncGetTerminateFlag() != 0)
+ 			{
+ 				fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n");
+-				if (zStream != stdin)
+-					fclose(zStream);
+-				if (stream != stdout)
+-					fclose(stream);
++				close_streams(stream, zStream);
+ 				return -1;
+ 			}
+ 
+@@ -2225,11 +2223,8 @@
+ 						if (ferror(zStream))
+ 						{
+ 							ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+-							if (zStream != stdin)
+-								fclose(zStream);
+-							if (stream != stdout)
+-								fclose(stream);
+-							
++							close_streams(stream, zStream);
++
+ 							if (ret != 0)
+ 							{
+ 								syncSetTerminateFlag(1);
+@@ -2242,11 +2237,8 @@
+ 						if (ferror(stream))
+ 						{
+ 							ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+-							if (zStream != stdin)
+-								fclose(zStream);
+-							if (stream != stdout)
+-								fclose(stream);
+-							
++							close_streams(stream, zStream);
++
+ 							if (ret != 0)
+ 							{
+ 								syncSetTerminateFlag(1);
+@@ -2263,11 +2255,8 @@
+ 			if (ferror(stream))
+ 			{
+ 				ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+-				if (zStream != stdin)
+-					fclose(zStream);
+-				if (stream != stdout)
+-					fclose(stream);
+-				
++				close_streams(stream, zStream);
++
+ 				if (ret != 0)
+ 				{
+ 					syncSetTerminateFlag(1);
+@@ -2278,11 +2267,8 @@
+ 		if (bzerr != BZ_STREAM_END)
+ 		{
+ 			ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+-			if (zStream != stdin)
+-				fclose(zStream);
+-			if (stream != stdout)
+-				fclose(stream);
+-			
++			close_streams(stream, zStream);
++
+ 			if (ret != 0)
+ 			{
+ 				syncSetTerminateFlag(1);
+
diff --git a/app-arch/pbzip2/metadata.xml b/app-arch/pbzip2/metadata.xml
new file mode 100644
index 000000000000..98d33df27533
--- /dev/null
+++ b/app-arch/pbzip2/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="symlink">Install symlinks which override <pkg>app-arch/bzip2</pkg> implementation</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">pbzip2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
new file mode 100644
index 000000000000..17dd86164475
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
+HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
+SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static symlink"
+
+LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	symlink? ( !app-arch/lbzip2[symlink] )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch \
+		"${FILESDIR}"/${P}-data_truncation_fix.patch
+	tc-export CXX
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dobin pbzip2
+	dodoc AUTHORS ChangeLog README
+	doman pbzip2.1
+	dosym pbzip2 /usr/bin/pbunzip2
+
+	if use symlink ; then
+		local s
+		for s in bzip2 bunzip2 bzcat ; do
+			dosym pbzip2 /usr/bin/${s}
+		done
+	fi
+}
diff --git a/app-arch/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
new file mode 100644
index 000000000000..2fbefa71b8fa
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
+HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
+SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static symlink"
+
+LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	symlink? ( !app-arch/lbzip2[symlink] )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch
+	tc-export CXX
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dobin pbzip2
+	dodoc AUTHORS ChangeLog README
+	doman pbzip2.1
+	dosym pbzip2 /usr/bin/pbunzip2
+
+	if use symlink ; then
+		local s
+		for s in bzip2 bunzip2 bzcat ; do
+			dosym pbzip2 /usr/bin/${s}
+		done
+	fi
+}
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
new file mode 100644
index 000000000000..abf49d114075
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
+HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
+SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static symlink"
+
+LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	symlink? ( !app-arch/lbzip2[symlink] )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	# https://bugs.launchpad.net/pbzip2/+bug/1746369
+	sed -i 's:"PRIuMAX":" PRIuMAX ":g' *.cpp || die
+	epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch
+	tc-export CXX
+	use static && append-ldflags -static
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	dodoc AUTHORS ChangeLog README
+
+	if use symlink ; then
+		local s
+		for s in bzip2 bunzip2 bzcat ; do
+			dosym pbzip2 /usr/bin/${s}
+		done
+	fi
+}
diff --git a/app-arch/pdlzip-1.8 b/app-arch/pdlzip-1.8
deleted file mode 100644
index 9f0842386557..000000000000
--- a/app-arch/pdlzip-1.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Public-domain version of lzip compressor
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/lzip/pdlzip.html
-KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fa5658c9d25f13fb574b6ff386cf7497
diff --git a/app-arch/pdlzip/Manifest b/app-arch/pdlzip/Manifest
new file mode 100644
index 000000000000..d2014067dc3a
--- /dev/null
+++ b/app-arch/pdlzip/Manifest
@@ -0,0 +1,3 @@
+DIST pdlzip-1.8.tar.gz 60564 BLAKE2B 2fd38cb6d17e0344a73cb44d36c53be373ae0ddfaa88af01c78dd54f33c6fd7ec5b52a61fbf6c134b080f42006c01d24a419bbae91d23205fd7902c312952050 SHA512 ecab8500105754499448c0cc481917404ce5b9dcfb6ba66c5c51fbc8a6189b109d025f38bc7c497aa2f602e7722f302d6b05e4ee37c5ec8f97cdf253c128ad9e
+EBUILD pdlzip-1.8.ebuild 618 BLAKE2B b80aeb64af232e13fd3cc1989c8b3c4d027a4fa22182a4d74308d22d85137cab0beb4c1f2ba36892e9fae165a21c765a16ee0e83a2b1057267554b2e1f42cc93 SHA512 6eb150c202f8ec95df5674b1817d14c15f99ed11c15cff59b39110b3c860b99a729bde2a1c72edb8b56e259637c499b27312e052925d03c44b9fecfd7b5d2bdc
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/pdlzip/metadata.xml b/app-arch/pdlzip/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-arch/pdlzip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/pdlzip/pdlzip-1.8.ebuild b/app-arch/pdlzip/pdlzip-1.8.ebuild
new file mode 100644
index 000000000000..160eee1561e9
--- /dev/null
+++ b/app-arch/pdlzip/pdlzip-1.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Public-domain version of lzip compressor"
+HOMEPAGE="http://www.nongnu.org/lzip/pdlzip.html"
+SRC_URI="http://download.savannah.gnu.org/releases/lzip/pdlzip/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/pdv-1.5.1-r3 b/app-arch/pdv-1.5.1-r3
deleted file mode 100644
index 3cb5c09a1462..000000000000
--- a/app-arch/pdv-1.5.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=X? ( >=x11-libs/motif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXext-1.0.0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=build a self-extracting and self-installing binary package
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/pdv
-IUSE=X
-KEYWORDS=amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=X? ( >=x11-libs/motif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXext-1.0.0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pdv/pdv-1.5.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9b143c032372f537d2f47a1d10b21752
diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest
new file mode 100644
index 000000000000..ef22b41fc38b
--- /dev/null
+++ b/app-arch/pdv/Manifest
@@ -0,0 +1,8 @@
+AUX pdv-1.5.1-default-args.patch 892 BLAKE2B 24fb0f0931ffd35e36eff66f0a0d8c09483b8f16b50e8db824a4313b650a4f2b8ba4db8a1fd985c647fea3b057a19c17acca9623e04f0901376a51d27c3532c1 SHA512 31f3b4f3331723e1bb99b16a9e9c80eb55d95dfce3bc3cbce7d3f629c1aadb16e5dc037bfa4a6157e1a85e889444d0c5c0b687022bf1e60d9a49acc8352e4f34
+AUX pdv-1.5.1-early-free.patch 512 BLAKE2B 085bb8891aacdaf8193dc70cdc009c845a87a53700b9d4100b6984fae7ee6afdd628a12b53b555a45c17400a0e62dbc3a5541556eb246f1bf708939494de3eb7 SHA512 52c921d80e33233e92c44948e9468f93b093bac4ae500e7e3a6b54b6e9b3d8d38c30ad776ea53e86e2000d634a0e7fb03e95b0df39b1fd88624831bb4f95e563
+AUX pdv-1.5.1-no-strip.patch 419 BLAKE2B 94d963ecc43585f6d2d359a8cf23f6ecaf12d19f7d965ae0e1f9af91f597dbaa91e2157b461d1492ff21704d5664dbe1583c13d4aa100b94592b31e13566efec SHA512 e45976aea1f0573ccd31379759c32e2504637b183a31451aca0ccf628ce12301760fb005376768c2f98d697dde59489768edad10c542d21a06a69d06b6c43b19
+AUX pdv-1.5.1-opt.patch 696 BLAKE2B 83503bcba43c43f06e2e60791a0b4166c994206d767d35c7bd541204f00ae4777e1cfe31acef0d28fbd7c5d8c23d70fff13553a0e2bee0b1379860b8a68fa18e SHA512 bbe6cece336f649970227a577d17835b401262e9d6021a61d97dee69972826466b720e5f9b60d552d84e1223003fcf047314390afdf48e07f4b2c55868caf599
+AUX pdv-1.5.1-x-config.patch 529 BLAKE2B cbdec2a9d9a512534ea5be14a2557d7cb0d89da8732adfd77b48de0a6881473ea95a9e5472f8efc8dce18aa55a28337921b06ef8bb8ad14dffc734ef0d822212 SHA512 7be234893169656537c15a124d5a50de138e85d2d23ab5884d600399f3aba86724ebac397846d03992a4556e7ca8a8ba42f5cf8c3e4348080e4c9e0522e05cb6
+DIST pdv-1.5.1.tar.gz 87858 BLAKE2B b0397e177803ed57a69fd69a331b61743379be5ff4272fa5b03012856e9bf5a671e67701215964aabf8d57836da350bf66db20c81985e5f6949bbc9cafbda11c SHA512 c8db9aa4c29016474d33111e8343174a1fb25f152517bceb29428def5e02590b1de523ffcf2c0f6ffbaec5b357e3893f48188775c2e66d343a21e04343b1d0e9
+EBUILD pdv-1.5.1-r3.ebuild 1420 BLAKE2B a2185d1edcc325de5b26f1dfc33c0d6d6dfc91c2d6c59da038ec07c8655e6ad0ad69ce5abfa820c0c5e686bb5b289c22e89b8d5c88ff916690bcb03582edac55 SHA512 f52996ffa01d64ec5e883250187a4ea351f7d411fc5ad6cd0208707554a807a93b01b4304fcf787dcba26020c01fb7fe26326cad3aef037c5a0fb1e877ae11fa
+MISC metadata.xml 368 BLAKE2B 2e8f5fb6b3f8549f4ab592d8fa60bc700c0c646115c381deebe95c8f9bb0461b5cb7d88d2e49a983fb70393a799713658d4e7dca01c23609cb645e6972823c9b SHA512 99c932094f434a6fff58492ce7bd1e2195bd6c7bfd69dc3dcfd46b8ef2ce0111dfb56a679b6e696b02a8333f1a6459ed107ac6226bb8b9624fea009a74bdd488
diff --git a/app-arch/pdv/files/pdv-1.5.1-default-args.patch b/app-arch/pdv/files/pdv-1.5.1-default-args.patch
new file mode 100644
index 000000000000..dc61def911fb
--- /dev/null
+++ b/app-arch/pdv/files/pdv-1.5.1-default-args.patch
@@ -0,0 +1,16 @@
+diff -ur pdv-1.5.1.orig/pdv.h pdv-1.5.1/pdv.h
+--- pdv-1.5.1.orig/pdv.h	2001-09-01 12:09:28.000000000 -0700
++++ pdv-1.5.1/pdv.h	2006-07-22 22:20:43.000000000 -0700
+@@ -47,9 +47,9 @@
+ 	char   *cmd;           /* command to execute after delivery */
+ 	char   *hlpmsg;        /* user help message */
+ 	char   *agrmsg;        /* optional agreement message */
+-	char   iscompressed;   /* filter payload through uncompress */ 
+-	char   isatar;         /* filter payload through tar */
+-	char   iszipped;       /* use internal compression library */
++	signed char   iscompressed;    /* filter payload through uncompress */ 
++	signed char   isatar;          /* filter payload through tar */
++	signed char   iszipped;        /* use internal compression library */
+ 	off_t  payloadstart;   /* start of payload (after pdv stub) */
+ 	off_t  metadatastart;  /* start of payload data (at end of file) */
+ };
diff --git a/app-arch/pdv/files/pdv-1.5.1-early-free.patch b/app-arch/pdv/files/pdv-1.5.1-early-free.patch
new file mode 100644
index 000000000000..6896d9437f47
--- /dev/null
+++ b/app-arch/pdv/files/pdv-1.5.1-early-free.patch
@@ -0,0 +1,21 @@
+diff -ur pdv-1.5.1-orig/mkpkgutils.c pdv-1.5.1/mkpkgutils.c
+--- pdv-1.5.1-orig/mkpkgutils.c	2005-04-26 15:01:30.525131384 -0700
++++ pdv-1.5.1/mkpkgutils.c	2005-04-26 15:55:19.004327944 -0700
+@@ -114,8 +114,6 @@
+ 	if(access(fn_tst, R_OK) == 0)
+ 		fn = strdup(fn_tst);
+ 
+-	free(fn_tst);
+-
+ 	/* if we could not find it then try the search path
+ 	   including the current directory as a last resort */
+ 
+@@ -144,6 +142,8 @@
+ 		free(path);
+ 	} /* if(fn == NULL) */
+ 
++	free(fn_tst);
++
+ 	return fn;
+ } /* findpdv */
+ 
diff --git a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch
new file mode 100644
index 000000000000..630bf5eb7c36
--- /dev/null
+++ b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch
@@ -0,0 +1,13 @@
+diff -ur pdv-1.5.1-orig/pdv.c pdv-1.5.1/pdv.c
+--- pdv-1.5.1-orig/Makefile.in	2008-12-06 23:17:46.000000000 -0800
++++ pdv-1.5.1/Makefile.in	2008-12-06 23:18:37.000000000 -0800
+@@ -536,7 +536,8 @@
+ 	touch $@
+ 
+ pdv_fixed : pdv_fixed.c pdv
+-	$(STRIPBIN) pdv
++	# let portage decide whether to strip binaries
++	#$(STRIPBIN) pdv
+ 	printf "%-5.5s" $$VERSION >> pdv
+ 	printf "\000\000\000\000\000\000\000\000" >> pdv
+ 	sleep 1
diff --git a/app-arch/pdv/files/pdv-1.5.1-opt.patch b/app-arch/pdv/files/pdv-1.5.1-opt.patch
new file mode 100644
index 000000000000..df3ebb1b6699
--- /dev/null
+++ b/app-arch/pdv/files/pdv-1.5.1-opt.patch
@@ -0,0 +1,24 @@
+diff -ur pdv-1.5.1-orig/pdv.c pdv-1.5.1/pdv.c
+--- pdv-1.5.1-orig/pdv.c	2005-04-24 19:27:15.705946000 -0700
++++ pdv-1.5.1/pdv.c	2005-04-24 19:17:27.042436456 -0700
+@@ -79,7 +79,7 @@
+ int
+ main(int argc, char *argv[])
+ {
+-	char   opt;
++	int    opt;
+ 	int    retval   = 0;
+ 	int    showhelp = 0;
+ 	struct payload_st pld_data;
+diff -ur pdv-1.5.1-orig/pdvmkpkg.c pdv-1.5.1/pdvmkpkg.c
+--- pdv-1.5.1-orig/pdvmkpkg.c	2005-04-24 19:27:28.680973496 -0700
++++ pdv-1.5.1/pdvmkpkg.c	2005-04-24 19:21:49.992461976 -0700
+@@ -94,7 +94,7 @@
+ 	int  promptusr  = 0;
+ 	int  nopts      = 0;
+ 	int  result;
+-	char opt;
++	int  opt;
+ 	struct stat       payldstat;
+ 	struct payload_st pld_data;
+ 	struct pdvspec_st spec;
diff --git a/app-arch/pdv/files/pdv-1.5.1-x-config.patch b/app-arch/pdv/files/pdv-1.5.1-x-config.patch
new file mode 100644
index 000000000000..8bab9bee1bfe
--- /dev/null
+++ b/app-arch/pdv/files/pdv-1.5.1-x-config.patch
@@ -0,0 +1,18 @@
+diff -ur pdv-1.5.1-orig/X11/configure.in pdv-1.5.1/X11/configure.in
+--- pdv-1.5.1-orig/X11/configure.in	2005-05-13 13:43:27.577544136 -0700
++++ pdv-1.5.1/X11/configure.in	2005-05-13 13:36:14.218424736 -0700
+@@ -17,8 +17,12 @@
+ AC_PATH_X
+ 
+ dnl Checks for libraries.
+-CFLAGS=-I$x_includes
+-LDFLAGS=-L$x_libraries
++if test "x$x_includes" != x ; then
++  CFLAGS="$CFLAGS -I$x_includes"
++fi
++if test "x$x_libraries" != x ; then
++  LDFLAGS="$LDFLAGS -L$x_libraries"
++fi
+ 
+ AC_CHECK_LIB(Xt, XtManageChild)
+ AC_CHECK_LIB(X11, XLoadFont)
diff --git a/app-arch/pdv/metadata.xml b/app-arch/pdv/metadata.xml
new file mode 100644
index 000000000000..c2df9b225a0e
--- /dev/null
+++ b/app-arch/pdv/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A payload Delivery vehicle that contains a complete package and
+the commands to install it.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pdv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/pdv/pdv-1.5.1-r3.ebuild b/app-arch/pdv/pdv-1.5.1-r3.ebuild
new file mode 100644
index 000000000000..8b712196c4de
--- /dev/null
+++ b/app-arch/pdv/pdv-1.5.1-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+DESCRIPTION="build a self-extracting and self-installing binary package"
+HOMEPAGE="https://sourceforge.net/projects/pdv"
+SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos"
+IUSE="X"
+
+DEPEND="
+	X? (
+		>=x11-libs/motif-2.3:0
+		>=x11-libs/libX11-1.0.0
+		>=x11-libs/libXt-1.0.0
+		>=x11-libs/libXext-1.0.0 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# fix a size-of-variable bug
+	eapply "${FILESDIR}"/${P}-opt.patch
+	# fix a free-before-use bug
+	eapply "${FILESDIR}"/${P}-early-free.patch
+	# fix a configure script bug
+	eapply "${FILESDIR}"/${P}-x-config.patch
+	# fix default args bug from assuming 'char' is signed
+	eapply "${FILESDIR}"/${P}-default-args.patch
+	# prevent pre-stripped binaries
+	eapply "${FILESDIR}"/${P}-no-strip.patch
+
+	# re-build configure script since patch was applied to configure.in
+	cd "${S}"/X11
+	mv configure.in configure.ac || die
+	eautoreconf
+	tc-export CC
+}
+
+src_configure() {
+	local myconf=""
+	use X || myconf="--without-x" # configure script is broken, cant use use_with
+	econf ${myconf}
+}
+
+src_install() {
+	dobin pdv pdvmkpkg
+	doman pdv.1 pdvmkpkg.1
+	if use X ; then
+		dobin X11/xmpdvmkpkg
+		doman xmpdvmkpkg.1
+	fi
+	dodoc AUTHORS ChangeLog NEWS README pdv.lsm
+}
diff --git a/app-arch/pet2tgz-0.3 b/app-arch/pet2tgz-0.3
deleted file mode 100644
index 71dc3bce2afd..000000000000
--- a/app-arch/pet2tgz-0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Puppy Linux .pet to .tar.gz converter
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/pet2tgz/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/pet2tgz/pet2tgz-0.3.tar.gz
-_md5_=5c18991667135df17e321b0c5063e830
diff --git a/app-arch/pet2tgz/Manifest b/app-arch/pet2tgz/Manifest
new file mode 100644
index 000000000000..d8d5dd388231
--- /dev/null
+++ b/app-arch/pet2tgz/Manifest
@@ -0,0 +1,3 @@
+DIST pet2tgz-0.3.tar.gz 90758 BLAKE2B cfefb54467739e4b045c0ef927f6b21815ec59379635a81f782b6355d459715004ef29de0c9f76a3ce71d9b274ea3f066787d80efb20976316e36f2e486d0e93 SHA512 e6d2612c27184ea06114f9ee1927f0d1c6fa5f2bdecd85366d4b35564b59318a123159180eb3da747d46d4ddcdd2f4ec40def0b10d2882acafe5ed40e84826c5
+EBUILD pet2tgz-0.3.ebuild 343 BLAKE2B 37aebc398e047142749a6737049f7d3e7c49dd4e2dbb30a783f255f8ca1e8456e17d91f7e2f7b6e1780a6b3dc2eb7943ff3443f7d5403f39b60cd0696484574b SHA512 16dc40d1819da026f102234353bd76e02cce512234e4554b645ec076b621172ff16ccd036a15e0aa03224857ef49d91823da09ad52e3103fc62968d697dd5ead
+MISC metadata.xml 220 BLAKE2B 29393a6879c82eba92146de2269d51f8285d9e762dec1a78d3a75ce9ebe7e974adea4c8c015aa896680a196f051f38020b0642a0bd06af4c3b59d34e6902010b SHA512 97f16489a2e8400e75ba59f23e380a89e66d6e9765e2bb3ca309a99a797b525cd6f333194226aea6c933e99907d4fe13f95850d033e4273d8b61ca06814a6be5
diff --git a/app-arch/pet2tgz/metadata.xml b/app-arch/pet2tgz/metadata.xml
new file mode 100644
index 000000000000..913962483b48
--- /dev/null
+++ b/app-arch/pet2tgz/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="sourceforge">pet2tgz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/pet2tgz/pet2tgz-0.3.ebuild b/app-arch/pet2tgz/pet2tgz-0.3.ebuild
new file mode 100644
index 000000000000..a2c746113538
--- /dev/null
+++ b/app-arch/pet2tgz/pet2tgz-0.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Puppy Linux .pet to .tar.gz converter"
+HOMEPAGE="https://sourceforge.net/projects/pet2tgz/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS="AUTHORS"
diff --git a/app-arch/pigz-2.3.4 b/app-arch/pigz-2.3.4
deleted file mode 100644
index 944bf87883b8..000000000000
--- a/app-arch/pigz-2.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test? ( app-arch/ncompress )
-DESCRIPTION=A parallel implementation of gzip
-EAPI=6
-HOMEPAGE=http://www.zlib.net/pigz/
-IUSE=static symlink test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
-LICENSE=ZLIB
-RDEPEND=!static? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://www.zlib.net/pigz/pigz-2.3.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5373d91ed35113cbc6907d6f6f14ebae
diff --git a/app-arch/pigz-2.4 b/app-arch/pigz-2.4
deleted file mode 100644
index e350d66c31fe..000000000000
--- a/app-arch/pigz-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test? ( app-arch/ncompress )
-DESCRIPTION=A parallel implementation of gzip
-EAPI=6
-HOMEPAGE=http://www.zlib.net/pigz/
-IUSE=static symlink test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
-LICENSE=ZLIB
-RDEPEND=!static? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://www.zlib.net/pigz/pigz-2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=253de06c90fccc673f090c58d6159a97
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
new file mode 100644
index 000000000000..45fd43bfa112
--- /dev/null
+++ b/app-arch/pigz/Manifest
@@ -0,0 +1,5 @@
+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 944 BLAKE2B f1e8735848abf2191d33d49d7b82ce5282a61729190f6ed50b189404d25b77bcefb6f37b6c8bbba1e4103cd8918795bf4ed0ba4ba1d339b27b48c26e657c6084 SHA512 9f2c44c679e867d4d813d93f975a0ed9de6cde5be6c0844c2b414593cc49bc03680bb075ee821c1b18c45dfaed540d976aa5c02e38404179b877f3ae93bf8109
+MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
new file mode 100644
index 000000000000..478203e0a5c1
--- /dev/null
+++ b/app-arch/pigz/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<longdescription lang="en">
+		A parallel implementation of gzip for modern
+		multi-processor, multi-core machines.
+	</longdescription>
+	<use>
+		<flag name="symlink">Install symlinks which override <pkg>app-arch/gzip</pkg> implementation</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-arch/pigz/pigz-2.3.4.ebuild b/app-arch/pigz/pigz-2.3.4.ebuild
new file mode 100644
index 000000000000..8ce1f35518a1
--- /dev/null
+++ b/app-arch/pigz/pigz-2.3.4.ebuild
@@ -0,0 +1,38 @@
+# 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
+}
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4.ebuild
new file mode 100644
index 000000000000..631e27619c32
--- /dev/null
+++ b/app-arch/pigz/pigz-2.4.ebuild
@@ -0,0 +1,38 @@
+# 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
+}
diff --git a/app-arch/pixz-1.0.6 b/app-arch/pixz-1.0.6
deleted file mode 100644
index d35603edf135..000000000000
--- a/app-arch/pixz-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
-DESCRIPTION=Parallel Indexed XZ compressor
-EAPI=6
-HOMEPAGE=https://github.com/vasi/pixz
-IUSE=static
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=BSD-2
-RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
-SLOT=0
-SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.6/pixz-1.0.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9b1d93001f6adc958aa241ed7e5d458
diff --git a/app-arch/pixz-9999 b/app-arch/pixz-9999
deleted file mode 100644
index 315bd13726f9..000000000000
--- a/app-arch/pixz-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] ) app-text/asciidoc >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Parallel Indexed XZ compressor
-EAPI=6
-HOMEPAGE=https://github.com/vasi/pixz
-IUSE=static
-LICENSE=BSD-2
-RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3db5c3c56847b11f31263192d3ef1fd7
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
new file mode 100644
index 000000000000..6295ccc91a9b
--- /dev/null
+++ b/app-arch/pixz/Manifest
@@ -0,0 +1,4 @@
+DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
+EBUILD pixz-1.0.6.ebuild 1131 BLAKE2B 254d32a3d043048d78d6e2b30c908e7c04498ebc482b4dda7341cb188d48b072920c6b2a4ee966e7277df044393071f0ec1e85d1fb10c470ac49709f04e086ae SHA512 21e5b3ee64b56218818e9a8c41f5ab271c9a836cc8edf875d54881f39e62369425b9ca0874d3388b78eed67f38c6988e816c2c71fb371bfb8ff03faff6c7defb
+EBUILD pixz-9999.ebuild 1133 BLAKE2B 1df4240b4409c81ce3a28ac47a276954e3b977c1964411c995e8335da4246fd79350be5c1543b5ab896230fb81a28c6aa8ec7be26b0e5d87d2bf0c45f1cb8a7c SHA512 350b2274074199349d2724816d233df340c015a2fa2efc228bae5bf35838a92ce91150e9d3b0bc86cca7433830288876da11d6217a79bd4495d8e5ae974dab16
+MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/metadata.xml b/app-arch/pixz/metadata.xml
new file mode 100644
index 000000000000..4256054ae7c0
--- /dev/null
+++ b/app-arch/pixz/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vasi/pixz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/pixz/pixz-1.0.6.ebuild b/app-arch/pixz/pixz-1.0.6.ebuild
new file mode 100644
index 000000000000..c1aa84906349
--- /dev/null
+++ b/app-arch/pixz/pixz-1.0.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+fi
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="static"
+
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
+	>=app-arch/xz-utils-5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	append-flags -std=gnu99
+	# Workaround silly logic that breaks cross-compiles.
+	# https://github.com/vasi/pixz/issues/67
+	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
+	econf
+}
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
new file mode 100644
index 000000000000..488b2bce873f
--- /dev/null
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="static"
+
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
+	>=app-arch/xz-utils-5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	append-flags -std=gnu99
+	# Workaround silly logic that breaks cross-compiles.
+	# https://github.com/vasi/pixz/issues/67
+	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
+	econf
+}
diff --git a/app-arch/plzip-1.6 b/app-arch/plzip-1.6
deleted file mode 100644
index 314da0132b55..000000000000
--- a/app-arch/plzip-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-arch/lzlib:0=
-DESCRIPTION=Parallel lzip compressor
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/lzip/plzip.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/lzlib:0=
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.6.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c477b95b1e38f9290c00816069337199
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
new file mode 100644
index 000000000000..8700eb616030
--- /dev/null
+++ b/app-arch/plzip/Manifest
@@ -0,0 +1,3 @@
+DIST plzip-1.6.tar.gz 66214 BLAKE2B 8f3865b8170c456cd37ac550b68e0846316f4c7329dda4470b3298d139ca392d000a357a1ec52c0f7c2303e6612ea4a1204e93c2fa487e70f387d9cffe96c21b SHA512 14f794e290eb58bcdf1fc5699c08c36f57473e36eeb3920dff519741c4265883f8ee348095a9315562812574c3f5ece7bd7ef4a11fbd955fe2ee54e361900f77
+EBUILD plzip-1.6.ebuild 629 BLAKE2B fc8d93c5f2475a5810b9512eb98caefcbe849fe0d1057f43a9035c8b9bbc61fcf02f56fbbb02a302f5265e0014f6e57fc29eb1d39bc7a7fae437d647fe40d2d5 SHA512 dbf4a42c5641ae7f411591a9a79cfbffbf93a4249be5c1f650810311cd29bb136274002d1f182dd1e97e2671d6d3d1b966df0a9fc6cfcc8eadc903a780420e29
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/plzip/metadata.xml b/app-arch/plzip/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-arch/plzip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/plzip/plzip-1.6.ebuild b/app-arch/plzip/plzip-1.6.ebuild
new file mode 100644
index 000000000000..1d8e4b07cda7
--- /dev/null
+++ b/app-arch/plzip/plzip-1.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallel lzip compressor"
+HOMEPAGE="http://www.nongnu.org/lzip/plzip.html"
+SRC_URI="http://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/lzlib:0="
+DEPEND=${RDEPEND}
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CXX="$(tc-getCXX)"
+		CPPFLAGS="${CPPFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/pure-sfv-0.3-r1 b/app-arch/pure-sfv-0.3-r1
deleted file mode 100644
index cfed866cd759..000000000000
--- a/app-arch/pure-sfv-0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=utility to test and create .sfv files and create .par files
-EAPI=6
-HOMEPAGE=http://pure-sfv.sourceforge.net/
-KEYWORDS=amd64 ~hppa ppc x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/pure-sfv/pure-sfv_0.3_src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d9b2cbee8633b047f36dac501295558
diff --git a/app-arch/pure-sfv/Manifest b/app-arch/pure-sfv/Manifest
new file mode 100644
index 000000000000..ddb4fb155873
--- /dev/null
+++ b/app-arch/pure-sfv/Manifest
@@ -0,0 +1,4 @@
+AUX pure-sfv-0.3-fix-build-system.patch 517 BLAKE2B 87fddfd692c2d21ba5369ed57280d7b56568bae03396d9702e963285d6346a95693b049ef046c68a5116c7dd98e50444b1a50419c18fde99be0e67a142b775fa SHA512 317527bbf283ec603d06cf4705adf04915d57d7251301403dc43c359359f644728f61ba0997b04753f5c1c820341d5e0986ad0e3fb8c93a932d2000c9fc2c207
+DIST pure-sfv_0.3_src.tar.gz 79069 BLAKE2B 77bfa8ccad35a9f3bde4a5710deceb9e0786e905cd0ff44903b08154043012849c7f5f797806429b9005aa6977e23c451cd1cfeee2870c35298248d0783a078c SHA512 defacdaa0b78f708c83198e911ad93a5c5456bf15e2b33df61c984241df8a82ff4d962b8c7994c6413b36a61df2cc6d91c467bf8994fa43e0ac01db2585a78a6
+EBUILD pure-sfv-0.3-r1.ebuild 618 BLAKE2B 2eb5441f25c272303a5135009948eba2123fa7c65db8f512ceca160a0163dbd538dea456aa1b3a59e61797ba20d069dfdfbbef3971924df2a57b981fec4dceb3 SHA512 085a72af3f963aa2a5e9a6eb53ab191e4fb055e851bbc758209a285ca48a5450b6979d4ff081e774e4649c69977b385f198b944da2d5ec098118145c1d05622c
+MISC metadata.xml 245 BLAKE2B 8b7fc4825aab5e4cfdb98dbb19741e82e1f550601f15430d7ef70ea99e7d589cac19abfb8e248252be008b25820fb6de7b23d80cba84301e823e313fbb848a25 SHA512 4423c18a453e8c9b251ccc387341ffa1e1f492c2b0408d05b3948b94fd8f135145740bb9a04862d5f567c931c50c113f685a08fb10667ed1fcd1a005cbbe46da
diff --git a/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch b/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch
new file mode 100644
index 000000000000..ca2143f1f956
--- /dev/null
+++ b/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -54,18 +54,16 @@
+ 
+ VC_CRAP = pure-sfv.ncb pure-sfv.plg
+ 
+-CFLAGS +=	-Wall -Werror -O2 -g -Wno-unused
+ INSTALL_PREFIX = /usr/local
+ INSTALL_PROGRAM = /usr/bin/install -c
+ 
+ all: pure-sfv
+ 
+-CC = gcc
+ 
+ OBJ = ${SRCS:%.c=%.o}
+ 
+ pure-sfv: $(OBJ)
+-	$(CC) -lm -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(OBJ)
++	$(CC) -DVERSION=\"$(VERSION)\" $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(PROG) $(OBJ) -lm
+ 
+ PURIFY_OPTIONS=-follow-child-processes=yes -always-use-cache-dir=yes
+ PURIFY=purify
diff --git a/app-arch/pure-sfv/metadata.xml b/app-arch/pure-sfv/metadata.xml
new file mode 100644
index 000000000000..e48e0f140627
--- /dev/null
+++ b/app-arch/pure-sfv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pure-sfv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild b/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
new file mode 100644
index 000000000000..f28c6df42ec4
--- /dev/null
+++ b/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="utility to test and create .sfv files and create .par files"
+HOMEPAGE="http://pure-sfv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pure-sfv/${PN}_${PV}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86"
+IUSE=""
+RESTRICT="test"
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${PN}-0.3-fix-build-system.patch )
+
+src_configure() {
+	append-cflags -Wall -Wno-unused
+	tc-export CC
+}
+
+src_install() {
+	dobin pure-sfv
+	newdoc ReadMe.txt README
+}
diff --git a/app-arch/pxz-5.0_pre20151029 b/app-arch/pxz-5.0_pre20151029
deleted file mode 100644
index 9a42de18b857..000000000000
--- a/app-arch/pxz-5.0_pre20151029
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
-DESCRIPTION=Parallel implementation of the XZ compression utility
-EAPI=6
-HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
-SLOT=0
-SRC_URI=https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd341eed.tar.gz -> pxz-5.0_pre20151029.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=a1994b8a849c798199b32db18039ec9f
diff --git a/app-arch/pxz-9999 b/app-arch/pxz-9999
deleted file mode 100644
index 84dd95ca5b15..000000000000
--- a/app-arch/pxz-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=parallel LZMA compressor (no parallel decompression!)
-EAPI=6
-HOMEPAGE=https://jnovy.fedorapeople.org/pxz/
-LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d6147d4384c9520a5cf6af8720caed2
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
new file mode 100644
index 000000000000..7c29da553944
--- /dev/null
+++ b/app-arch/pxz/Manifest
@@ -0,0 +1,4 @@
+DIST pxz-5.0_pre20151029.tar.gz 12271 BLAKE2B 6ba2cb7629b0475761b59620375a2d0de7c6a3a61f7af20140e214383f737e046c45f0c602830c0331794fe1d38332d8d309ed0b8451e3a780ef1a2835de85e6 SHA512 d26bfdf9b70baf91c575e21824920cb42d0a9bd171254b99147a6e5e322ed3d1f7351a570358213431bdacdcbe6e7b22646a2dd2d7a127e167c8237bc4f3038a
+EBUILD pxz-5.0_pre20151029.ebuild 760 BLAKE2B f612a0a8e208c9307ecba3daf1dcc5b2140eb93edbd296a9e243909f0e2e03ada3d1d8e5ce1f338c6b3b05433b14d1c7e0f2ca7e233d5122b5e17a89dbadf9d2 SHA512 eca8f250030d3336529c2e435bdf73ca404799924f5e040c63b37d1fcb6b32848ba3acad3af9e3dcebeb4246f623ad1e27150fcb76c2678bf8b6de2ca51513f0
+EBUILD pxz-9999.ebuild 938 BLAKE2B 97012bed530fc61b2a72b6bf94c63c5d6d0eb08b6dcc03acae211e60b8e46b12008068dd3de04db16df233f63b011463bec2bb69a746a8c5c21e7ea5c381d965 SHA512 1c959a24fc0dc0584d735cc4f612608e42bcb4098530df8d93a767ba820133ba1db077edbd52b2f5d43a7d6770760b23a8d7028d48b8d73f7e05332f7460f004
+MISC metadata.xml 589 BLAKE2B 2a18a26af893fcf39313001b7e3199ccae582cbc2dd71738c0affe08fea79c59f9908e9a9eab5d5517bf778441c65ac259197a539c68235df868d7c6ac66e3d0 SHA512 4d345f2f0e3097fef6c502d28abb4ea2f236ec608c4ef0a56d2769513dc3f170e1589f9c14850e365c9914f25868a67352c52e8335a5c9694b69fcb3c27033ac
diff --git a/app-arch/pxz/metadata.xml b/app-arch/pxz/metadata.xml
new file mode 100644
index 000000000000..1d95e2b04b5d
--- /dev/null
+++ b/app-arch/pxz/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>chutzpah@gentoo.org</email>
+<name>Patrick McLean</name>
+</maintainer>
+<longdescription lang="en">
+Parallel XZ is a compression utility that takes advantage of running LZMA
+compression of different parts of an input file on multiple cores and
+processors simultaneously. Its primary goal is to utilize all resources
+to speed up compression time with minimal possible influence on compression
+ratio.
+</longdescription>
+</pkgmetadata>
diff --git a/app-arch/pxz/pxz-5.0_pre20151029.ebuild b/app-arch/pxz/pxz-5.0_pre20151029.ebuild
new file mode 100644
index 000000000000..1ae6092ecb65
--- /dev/null
+++ b/app-arch/pxz/pxz-5.0_pre20151029.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Parallel implementation of the XZ compression utility"
+HOMEPAGE="http://jnovy.fedorapeople.org/pxz/"
+SRC_URI="https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd341eed.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux"
+IUSE=""
+
+# needs the library from xz-utils
+# needs the libgomp library from gcc at runtime
+RDEPEND="app-arch/xz-utils
+	sys-devel/gcc:*[openmp]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	tc-check-openmp
+	tc-export CC
+	export BINDIR="${EPREFIX}"/usr/bin
+	export MANDIR="${EPREFIX}"/usr/share/man
+	default_src_prepare
+}
diff --git a/app-arch/pxz/pxz-9999.ebuild b/app-arch/pxz/pxz-9999.ebuild
new file mode 100644
index 000000000000..24f23c3bd088
--- /dev/null
+++ b/app-arch/pxz/pxz-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jnovy/pxz.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_}
+	case ${MY_PV} in
+	*beta?*) MY_PV="${MY_PV/beta/beta.}git" ;;
+	esac
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://jnovy.fedorapeople.org/pxz/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P/beta*/beta}
+fi
+
+DESCRIPTION="parallel LZMA compressor (no parallel decompression!)"
+HOMEPAGE="https://jnovy.fedorapeople.org/pxz/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# needs the library from xz-utils
+# needs the libgomp library from gcc at runtime
+DEPEND="app-arch/xz-utils
+	sys-devel/gcc:*[openmp]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	tc-check-openmp
+	tc-export CC
+	export BINDIR="${EPREFIX}"/usr/bin
+	export MANDIR="${EPREFIX}"/usr/share/man
+	default_src_prepare
+}
diff --git a/app-arch/qpress-1.1 b/app-arch/qpress-1.1
deleted file mode 100644
index 5d6a52ba6e32..000000000000
--- a/app-arch/qpress-1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A portable file archiver using QuickLZ algorithm
-EAPI=6
-HOMEPAGE=http://www.quicklz.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://www.quicklz.com/qpress-11-source.zip
-_md5_=e92ea3f4b9ee00f68149971605d30df1
diff --git a/app-arch/qpress/Manifest b/app-arch/qpress/Manifest
new file mode 100644
index 000000000000..a50b803cd869
--- /dev/null
+++ b/app-arch/qpress/Manifest
@@ -0,0 +1,4 @@
+AUX makefile 128 BLAKE2B 8022d7cac27556d27a2ca1e4c760ec4c59fb1073071f2cb0877ea6554f340ffe5a2dee4c2e786173c8cc73e73319420c38d33cf43e243213f67f3e3c47129d16 SHA512 57004d5735f486170824b3056970d2c4787abf0708e0771b1a7161f942458abea9edc223d940a93f0560d630fe80d7ab6053e20984120ffda545349bcf4debfd
+DIST qpress-11-source.zip 26998 BLAKE2B 08dd943f248f7211e8588fbaf7a2c2eee988d33b17aebfb5f1178647d80314fde576caec9b4aab67d69689f5931d086f88fd51204c1df6d3abc2cca583830380 SHA512 986754cca8bb2cdcfc7e197f7e123c6b2da90db840642a6385f14613f49f7ec6b2c18944838405fe35d5382d71fcd5d69050a036dda4c5de2e588d144e16ea6b
+EBUILD qpress-1.1.ebuild 525 BLAKE2B 9fc94482e6d05ba3d8ab6176ded9443e853173b2a3a10b55110fbd9a65c8cfef2d5ac37ac7cc40bfd5bfc2d09bb163976d0dcc61ab6fe77d7b78e3b07d79145d SHA512 aee317456ab1126bb2c4f7a9eaa487f8ae6487e3777ee1d63433afdc12d11fef66c699e6e809c29de7b93ef8d068216efd33eecdbc1cbb2f537648eb96f680e5
+MISC metadata.xml 477 BLAKE2B ac47bfa42430372f34f6bb63148e95db752d885f1f64740d3d2a817189e01921659914c1b16c5e5b5ec3810c9e654c9a56b2803c164249d5c009bd76de1e0af0 SHA512 e75146f4a742e9c51d47ea4e0c2e4058547378907abc0fce61e83d048c7af2eebe67fbb2f52d9affdef9a793e7c6abf63c5a1799dbe45b37c3dba74cafeffaba
diff --git a/app-arch/qpress/files/makefile b/app-arch/qpress/files/makefile
new file mode 100644
index 000000000000..63c1f91b3943
--- /dev/null
+++ b/app-arch/qpress/files/makefile
@@ -0,0 +1,6 @@
+CXX ?= g++
+CXXFLAGS ?= -O3
+LIBS=-lpthread
+
+qpress:
+	$(CXX) $(CXXFLAGS) qpress.cpp aio.cpp quicklz.c utilities.cpp -o $@ $(LIBS)
diff --git a/app-arch/qpress/metadata.xml b/app-arch/qpress/metadata.xml
new file mode 100644
index 000000000000..f326e2195f06
--- /dev/null
+++ b/app-arch/qpress/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		A portable file archiver using QuickLZ algorithm.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/qpress/qpress-1.1.ebuild b/app-arch/qpress/qpress-1.1.ebuild
new file mode 100644
index 000000000000..e7787c7973a5
--- /dev/null
+++ b/app-arch/qpress/qpress-1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A portable file archiver using QuickLZ algorithm"
+HOMEPAGE="http://www.quicklz.com/"
+SRC_URI="http://www.quicklz.com/${PN}-${PV/./}-source.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# Fix compilation with newer gcc
+	sed -i '1i #include <unistd.h>' qpress.cpp || die
+	cp "${FILESDIR}/makefile" "${S}" || die
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-arch/rar-5.6.0_p20180624 b/app-arch/rar-5.6.0_p20180624
deleted file mode 100644
index 37a95d63865f..000000000000
--- a/app-arch/rar-5.6.0_p20180624
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=all_sfx? ( app-arch/unrar )
-DESCRIPTION=RAR compressor/uncompressor
-EAPI=6
-HOMEPAGE=https://rarlab.com/
-IUSE=all_sfx
-KEYWORDS=-* amd64 x86
-LICENSE=RAR BSD BSD-2
-RDEPEND=sys-libs/glibc
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.0_p20180624.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.0_p20180624.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.0_p20180624.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.0_p20180624.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-5.6.0_p20180624.exe )
-_md5_=fb6692bf2e2ae910d50c4cece43c1983
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
new file mode 100644
index 000000000000..2705cd59cf87
--- /dev/null
+++ b/app-arch/rar/Manifest
@@ -0,0 +1,5 @@
+DIST rarlinux-5.6.0_p20180624.tar.gz 552245 BLAKE2B 9988b67d545df89bb7087c2bbec5a6fc47d99f6fd8a97e3581f135dc829a43e5c044248e95f60f7cd29370a0955a3c4c8a6667bfcead17301dc0f45ddae0057f SHA512 a0baba489c9268bc25c814c94747c117de66599f91da875b0e0b8233c24910f0e831f8b407f7a9bd8d709da6bdea4ef50306ce456ea5089f893619b8ee5b780f
+DIST rarlinux-x64-5.6.0_p20180624.tar.gz 541604 BLAKE2B 2fd865af38db47c556341bb2482ee9af83857bc196e08f9b47d5a0f8ccae708931c09dcca2115866d37c03b77f7548da87cf2e778f003e9a432634b9ae378aae SHA512 e8427d12016d4298d1e3ca3dc32f367e2b7a407572e48c665eaec796c3538d50349760b5691bc6d58256a5470dc0c6637740fcdc6e8a9bd420193fae16e209eb
+DIST winrar-x64-5.6.0_p20180624.exe 3180248 BLAKE2B 3ddbef82e2ecee7960c5d282de905a2d4d279c3ebae9ceb9e5b72a822d352a80d189a76514a414840ea5ad8002d718435757c860a0935134b6eba01b70e0f444 SHA512 61896901b580476d4c12d40d42eef725de270beb0b01526e7d5d4e02847a7b67b0380f0a365e92eafe2a2303d60945146457d43430aace51c9a443a8b1ceef48
+EBUILD rar-5.6.0_p20180624.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
+MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
new file mode 100644
index 000000000000..89f2e872e662
--- /dev/null
+++ b/app-arch/rar/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<use>
+		<flag name="all_sfx">
+			Install all SFX (Self-Extracting) files rather than just the native
+			format (allows creation of Windows EXEs on Linux ELF systems)
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-arch/rar/rar-5.6.0_p20180624.ebuild b/app-arch/rar/rar-5.6.0_p20180624.ebuild
new file mode 100644
index 000000000000..763345d655c2
--- /dev/null
+++ b/app-arch/rar/rar-5.6.0_p20180624.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar || die
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar || die
+	dosym ../rar/unrar /opt/bin/unrar || die
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+	else
+		doins default.sfx || die
+	fi
+	doins rarfiles.lst || die
+	dodoc *.txt
+}
diff --git a/app-arch/rpm-4.11.0.1 b/app-arch/rpm-4.11.0.1
deleted file mode 100644
index 5269ae08fa8c..000000000000
--- a/app-arch/rpm-4.11.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!app-arch/rpm5 >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Red Hat Package Management Utils
-EAPI=5
-HOMEPAGE=http://www.rpm.org
-IUSE=nls python doc caps lua acl selinux python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=[-build(-)]
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://rpm.org/releases/rpm-4.11.x/rpm-4.11.0.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=61070d94dfe0b301cc8a4e99eb4bb615
diff --git a/app-arch/rpm-4.12.0.1 b/app-arch/rpm-4.12.0.1
deleted file mode 100644
index 46c5232800e9..000000000000
--- a/app-arch/rpm-4.12.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Red Hat Package Management Utils
-EAPI=5
-HOMEPAGE=http://www.rpm.org
-IUSE=nls python doc caps lua acl selinux python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=[-build(-)]
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://rpm.org/releases/rpm-4.12.x/rpm-4.12.0.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b09557c26675054dcc4b03b4e9ccbfbd
diff --git a/app-arch/rpm-4.14.1 b/app-arch/rpm-4.14.1
deleted file mode 100644
index 04bc2508778a..000000000000
--- a/app-arch/rpm-4.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=
-DESCRIPTION=Red Hat Package Management Utils
-EAPI=6
-HOMEPAGE=http://www.rpm.org https://github.com/rpm-software-management/rpm
-IUSE=acl caps doc lua nls python selinux test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=567ea0f7d948dc2b831eb9a12ce86f4c
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
new file mode 100644
index 000000000000..18055ce17019
--- /dev/null
+++ b/app-arch/rpm/Manifest
@@ -0,0 +1,10 @@
+AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017ebaffbad9c2a14947c43e784ddaa349cc77da9ee7fb9e1ce4ee2dec296b57234a74d56c9e08449e067bca403fa7ee6 SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305
+AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
+AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
+DIST rpm-4.11.0.1.tar.bz2 3670158 BLAKE2B 8190cd760ce86275a27a64aca7622340a2894f4f7aad0171425c7f5d3cfcf58e82c2a792f7d4687fff9270fe3f9c861027b6eea43f3602be8b12098dbccf408f SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535
+DIST rpm-4.12.0.1.tar.bz2 4129093 BLAKE2B 85addde70d031f179566771350f5907311cf61a077b647b5dbb75e1e157141e541cb7a236e5a1d4fce881d98eb7c0331a0eadd0ca1dd09e53d9d28dd954203bf SHA512 ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f
+DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
+EBUILD rpm-4.11.0.1.ebuild 2739 BLAKE2B 80664cf24466365a81eb4774a49a146327367b20c26fabc11c872ad8c4c22079235ae9dc0ece0956478668fcf47caca1215fe77674f7f06e778eea7003502ef6 SHA512 ecade45798b73e1a573edac06b60dbe0d0e2d4915a13beb41bbdfdc2596e208899bf6b7a36ad1144d65ebf1c186889c6f9928575ff7f5f14516deb5687b2d83a
+EBUILD rpm-4.12.0.1.ebuild 2894 BLAKE2B cf3ba401cf5c1b327c9911416926e849e52841bbc1ab937eaea44949a68ce91bc609ad2c6cf241d57f93b948ded48753cd888cadb3ff21a78fcc5b8586e9c355 SHA512 cf4c78083f32a3f54d732261d284e6a8ea4b7f5d6ff5150ff398627929b8329913a188e629fb930c7c042e4391725ce83546ec030a8d47095eb8065bc202d9f2
+EBUILD rpm-4.14.1.ebuild 3240 BLAKE2B c5affb6379387da560f5de40de55fbb22dd4ddad850a87b9f72ef7615cec38056d9465cf6b41b49f17b90fde0c4d72c4ddcba6134e06e0fc26bcf7f91f6da5b5 SHA512 88a58c95d18b05fb910ffc09ffaad08d8592235dc1b1110b4c07a7e8e6c1c0f886030c2e7629d7a8a1d45c9722ea82adc23bc589bb5fbea8c9e00d9447e6dd22
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-arch/rpm/files/rpm-4.11.0-autotools.patch b/app-arch/rpm/files/rpm-4.11.0-autotools.patch
new file mode 100644
index 000000000000..2a2dcb129de3
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.11.0-autotools.patch
@@ -0,0 +1,14 @@
+diff -urN rpm-4.11.0.1.old/configure.ac rpm-4.11.0.1/configure.ac
+--- rpm-4.11.0.1.old/configure.ac	2013-03-26 18:38:35.137667450 +0100
++++ rpm-4.11.0.1/configure.ac	2013-03-26 18:44:08.632673258 +0100
+@@ -824,10 +810,6 @@
+ 
+ AC_SUBST(OBJDUMP)
+ 
+-if test "$with_external_db" = no; then
+-    AC_CONFIG_SUBDIRS(db3)
+-fi
+-
+ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no])
+ AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])
+ AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes])
diff --git a/app-arch/rpm/files/rpm-4.8.1-db-path.patch b/app-arch/rpm/files/rpm-4.8.1-db-path.patch
new file mode 100644
index 000000000000..634dd2373ab8
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.8.1-db-path.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index 587cfa7..498abfb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in
+ 
+ usrsrcdir = $(prefix)/src
+ 
+-rpmvardir = $(localstatedir)/lib/rpm
++rpmvardir = $(localstatedir)/rpm
+ rpmvar_DATA =
+ 
+ install-exec-hook:
+diff --git a/macros.in b/macros.in
+index ae46fcb..213b53c 100644
+--- a/macros.in
++++ b/macros.in
+@@ -155,7 +155,7 @@
+ %_bzip2bin		%{__bzip2}
+ 
+ #	The location of the rpm database file(s).
+-%_dbpath		%{_var}/lib/rpm
++%_dbpath		%{_var}/rpm
+ 
+ #	The location of the rpm database file(s) after "rpm --rebuilddb".
+ %_dbpath_rebuild	%{_dbpath}
diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
new file mode 100644
index 000000000000..221926494411
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
@@ -0,0 +1,31 @@
+diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac
+--- rpm-4.9.1.2.old/configure.ac	2012-04-19 12:18:27.584725220 +0200
++++ rpm-4.9.1.2/configure.ac	2012-04-19 12:34:50.302722933 +0200
+@@ -846,13 +846,7 @@
+ AC_SUBST(RPMCANONGNU)
+ AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor])
+ 
+-if test X"$prefix" = XNONE ; then
+-    usrprefix="$ac_default_prefix"
+-else
+-    usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+diff -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am
+--- rpm-4.9.1.2.old/rpm.am	2012-04-19 12:18:27.584725220 +0200
++++ rpm-4.9.1.2/rpm.am	2012-04-19 12:24:49.035724332 +0200
+@@ -1,7 +1,5 @@
+ # Internal binaries
+-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+-## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-arch/rpm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-arch/rpm/rpm-4.11.0.1.ebuild b/app-arch/rpm/rpm-4.11.0.1.ebuild
new file mode 100644
index 000000000000..7f596c6dab79
--- /dev/null
+++ b/app-arch/rpm/rpm-4.11.0.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="nls python doc caps lua acl selinux"
+
+CDEPEND="!app-arch/rpm5
+	>=sys-libs/db-4.5:*
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpm )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
+		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
+		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	econf \
+		--without-selinux \
+		--with-external-db \
+		--without-beecrypt \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	# remove la files
+	prune_libtool_files --all
+
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary}
+	done
+
+	use nls || rm -rf "${ED}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	if use doc; then
+		pushd doc/hacking/html
+		dohtml -p hacking -r .
+		popd
+		pushd doc/librpm/html
+		dohtml -p librpm -r .
+		popd
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
+	fi
+}
diff --git a/app-arch/rpm/rpm-4.12.0.1.ebuild b/app-arch/rpm/rpm-4.12.0.1.ebuild
new file mode 100644
index 000000000000..18a141c8aa2b
--- /dev/null
+++ b/app-arch/rpm/rpm-4.12.0.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="nls python doc caps lua acl selinux"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="!app-arch/rpm5
+	app-arch/libarchive
+	>=sys-libs/db-4.5:*
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
+		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
+		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i 's:@__PYTHON@:/usr/bin/python2:' macros.in || die "Fixing %__python failed"
+
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	econf \
+		--without-selinux \
+		--with-external-db \
+		--without-beecrypt \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	# remove la files
+	prune_libtool_files --all
+
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary}
+	done
+
+	use nls || rm -rf "${ED}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	if use doc; then
+		pushd doc/hacking/html
+		dohtml -p hacking -r .
+		popd
+		pushd doc/librpm/html
+		dohtml -p librpm -r .
+		popd
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
+	fi
+}
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
new file mode 100644
index 000000000000..d931c8394a45
--- /dev/null
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps doc lua nls python selinux test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="!app-arch/rpm5
+	app-arch/libarchive
+	>=sys-libs/db-4.5:*
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
+	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	eapply "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	eapply_user
+
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	econf \
+		--without-selinux \
+		--with-external-db \
+		--with-crypto=nss \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		for docname in hacking librpm; do
+			docinto "html/${docname}"
+			dodoc -r "doc/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500):
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}" || die
+	fi
+}
diff --git a/app-arch/rpm2targz-9.0.0.5g b/app-arch/rpm2targz-9.0.0.5g
deleted file mode 100644
index 98c7449905bb..000000000000
--- a/app-arch/rpm2targz-9.0.0.5g
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Convert a .rpm file to a .tar.gz archive
-EAPI=4
-HOMEPAGE=http://www.slackware.com/config/packages.php
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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
-LICENSE=BSD-1
-RDEPEND=app-arch/cpio
-SLOT=0
-SRC_URI=mirror://gentoo/rpm2targz-9.0.0.5g.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4e9b1132ff2df45e859e38cea2302188
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
new file mode 100644
index 000000000000..cf50d627e0e9
--- /dev/null
+++ b/app-arch/rpm2targz/Manifest
@@ -0,0 +1,3 @@
+DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
+EBUILD rpm2targz-9.0.0.5g.ebuild 787 BLAKE2B 8b25af939b097576c66a4b4debc037184d83c9fe876ab054149866e18968a717a907c99f0c3997196edb0239ade26a02efc100bf927370a94187a98d97b0eed5 SHA512 821e0b916e813b41fbf330525ef04f00ff6801a0305cd219462fa82c94e756500a7902b0f2e8aa4a18397155223dbbad56c4a30a3ce8bea9c6a60cb58b827e4b
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/metadata.xml b/app-arch/rpm2targz/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-arch/rpm2targz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
new file mode 100644
index 000000000000..bbe23041901c
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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=""
+
+RDEPEND="app-arch/cpio"
+DEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install # need explicit install line #397835
+	dodoc *.README*
+}
diff --git a/app-arch/rzip-2.1-r3 b/app-arch/rzip-2.1-r3
deleted file mode 100644
index 4a668e92fd94..000000000000
--- a/app-arch/rzip-2.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Compression program for large files
-EAPI=6
-HOMEPAGE=https://rzip.samba.org/
-KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2:=
-SLOT=0
-SRC_URI=https://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3fc1435f4cd5fb3890ca436c5e318ad3
diff --git a/app-arch/rzip/Manifest b/app-arch/rzip/Manifest
new file mode 100644
index 000000000000..4cc217a623a4
--- /dev/null
+++ b/app-arch/rzip/Manifest
@@ -0,0 +1,5 @@
+AUX rzip-2.1-CVE-2017-8364.patch 1006 BLAKE2B dc84fc222e5fcf1c0e5a37eda05bfb136b9603eb3c510edabd91bfc639b2c4a9f9956ce8cf152c94fb255c1b749a5eb8dfd0d13f65a2a4682a008f6fc236ab4d SHA512 18f594eca2f805770dad7569ad8cffbb934e74b85b04cc91cbcbb04fbc936529f68121504c50b037cfb848e9ba90131a5b35a1d236f0c1453d55fd8b415a7ed6
+AUX rzip-2.1-darwin.patch 4829 BLAKE2B 7e6cd7273573517aa29e73f0556e6b33d4386d71872d643d448859a48308b8fcd59b1a2c6749117e39c8184ac4239053a97757b2e4e821b7b9e7232e99af2120 SHA512 a3cd2c98a486626767eacd5a949ecf1f328f11bd663a1f4b9f758314dde709e9fd73fb1239dec8737d4511f61225f47682b610b9a2609646613a774d6f6ad5f8
+DIST rzip-2.1.tar.gz 46785 BLAKE2B da38d7ae74149824dd33f3ecb1a7f6f63d63a8ee54c57565e4edc5915b503882d4de20b19c22228e8d3fc698477b6c8f095c2a399d442101a83ee66f4bfbcc63 SHA512 06ed760ba2b7f09781a2e9312b645d41c145f96e3ee55ddf573714493e92466366ec6394267e5e06b0d8c42dcb67e1ae99dafa417a84737ce2b4a650a9059a6f
+EBUILD rzip-2.1-r3.ebuild 1098 BLAKE2B 1e460e70954a817ddb95638de32d3333079741a6101c33f55c0b5dd16911343253ecdf3e6e41ad18f7ddd4ba1ca2593d4c476a5475aadf320086457b79deeeb2 SHA512 a3789a90c00622d6e2d9c54bdee2a3b9c69a18cb9d266d150088dee340062f243af38056f767c6cfc094e6f6c537dbcb7c1974a8816075c9045b94b8ef0eed39
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/rzip/files/rzip-2.1-CVE-2017-8364.patch b/app-arch/rzip/files/rzip-2.1-CVE-2017-8364.patch
new file mode 100644
index 000000000000..3c65e6f1939d
--- /dev/null
+++ b/app-arch/rzip/files/rzip-2.1-CVE-2017-8364.patch
@@ -0,0 +1,33 @@
+Index: rzip-2.1/stream.c
+===================================================================
+--- rzip-2.1.orig/stream.c
++++ rzip-2.1/stream.c
+@@ -147,16 +147,16 @@ static int write_u32(int f, u32 v)
+ 	return 0;
+ }
+ 
+-static int read_buf(int f, uchar *p, int len)
++static int read_buf(int f, uchar *p, unsigned int len)
+ {
+ 	int ret;
+ 	ret = read(f, p, len);
+ 	if (ret == -1) {
+-		err_msg("Read of length %d failed - %s\n", len, strerror(errno));
++		err_msg("Read of length %u failed - %s\n", len, strerror(errno));
+ 		return -1;
+ 	}
+ 	if (ret != len) {
+-		err_msg("Partial read!? asked for %d bytes but got %d\n", len, ret);
++		err_msg("Partial read!? asked for %u bytes but got %d\n", len, ret);
+ 		return -1;
+ 	}
+ 	return 0;
+@@ -399,7 +399,7 @@ static int fill_buffer(struct stream_inf
+ 	if (sinfo->s[stream].buf) {
+ 		free(sinfo->s[stream].buf);
+ 	}
+-	sinfo->s[stream].buf = malloc(u_len);
++	sinfo->s[stream].buf = malloc(c_len > u_len ? c_len : u_len);
+ 	if (!sinfo->s[stream].buf) {
+ 		return -1;
+ 	}
diff --git a/app-arch/rzip/files/rzip-2.1-darwin.patch b/app-arch/rzip/files/rzip-2.1-darwin.patch
new file mode 100644
index 000000000000..b07aa1712309
--- /dev/null
+++ b/app-arch/rzip/files/rzip-2.1-darwin.patch
@@ -0,0 +1,163 @@
+--- a/configure.in	2003-11-03 09:19:11.000000000 +0100
++++ b/configure.in	2008-07-27 21:59:45.774740303 +0200
+@@ -2,6 +2,12 @@
+ AC_INIT(main.c)
+ AC_CONFIG_HEADER(config.h)
+ 
++# test prior to AC_PROG_CC, since it sets cflags on it's own.
++if test x"CFLAGS" = x
++then
++	DEFAULT_CFLAGS="-g -Wall -O3"
++fi
++
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -9,10 +15,10 @@
+ AC_SYS_LARGEFILE
+ 
+ # Thanks to Martin Pool
+-if test x"$GCC" = xyes 
++if test x"$GCC" = xyes && test x"$DEFAULT_CFLAGS" != x
+ then
+     CFLAGS="-g -Wall -O3"
+-    AC_MSG_NOTICE([Setting gcc options: $CFLAGS])
++    AC_MSG_RESULT([Setting default cflags: $CFLAGS])
+ fi
+ 
+ AC_CHECK_HEADERS(fcntl.h sys/time.h sys/unistd.h unistd.h)
+@@ -45,12 +51,8 @@
+ AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , 
+         AC_MSG_ERROR([Could not find bz2 library - please install libbz2-devel]))
+ 
+-echo $ac_n "checking for errno in errno.h... $ac_c"
+-AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
+-echo yes; AC_DEFINE(HAVE_ERRNO_DECL),
+-echo no)
+-
+ AC_CHECK_FUNCS(mmap strerror)
+ AC_CHECK_FUNCS(getopt_long)
++AC_CHECK_FUNCS(strndup)
+ 
+ AC_OUTPUT(Makefile)
+--- a/main.c	2006-02-14 01:38:23.000000000 +0100
++++ b/main.c	2008-07-27 22:00:28.298071207 +0200
+@@ -18,6 +18,7 @@
+ /* rzip compression - main program */
+ 
+ #include "rzip.h"
++#include "strutils.h"
+ 
+ static void usage(void)
+ {
+--- a/rzip.h	2006-02-14 01:38:23.000000000 +0100
++++ b/rzip.h	2008-07-27 21:58:08.204752617 +0200
+@@ -94,7 +94,7 @@
+ #define strerror(i) sys_errlist[i]
+ #endif
+ 
+-#ifndef HAVE_ERRNO_DECL
++#if !defined(errno)
+ extern int errno;
+ #endif
+ 
+--- a/strutils.c	1970-01-01 01:00:00.000000000 +0100
++++ b/strutils.c	2008-07-27 21:58:08.204752617 +0200
+@@ -0,0 +1,29 @@
++/* 
++   Copyright (C) 2005 Gentoo Foundation
++   
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++   
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++   
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++/* string utilities that may be missing on various platforms */
++
++#include "strutils.h"
++
++#ifndef HAVE_STRNDUP
++char* strndup(const char* s, size_t n) {
++	char* ret = malloc(n + 1);
++	if (ret == NULL) return(ret);
++	ret[n] = '\0';
++	return(memcpy(ret, s, n));
++}
++#endif
+--- a/strutils.h	1970-01-01 01:00:00.000000000 +0100
++++ b/strutils.h	2008-07-27 21:58:08.204752617 +0200
+@@ -0,0 +1,31 @@
++/* 
++   Copyright (C) 2005 Gentoo Foundation
++   
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++   
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++   
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++/* string utilities that may be missing on various platforms */
++
++#ifndef _HEADER_STRUTIL
++#define _HEADER_STRUTIL 1
++
++#include <stdlib.h>
++#include <string.h>
++#include "config.h"
++
++# ifndef HAVE_STRNDUP
++char* strndup(const char* s, size_t n);
++# endif
++
++#endif
+--- a/Makefile.in	2006-02-14 01:38:23.000000000 +0100
++++ b/Makefile.in	2010-08-26 23:34:38.000000000 +0200
+@@ -3,8 +3,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-INSTALL_BIN=$(exec_prefix)/bin
+-INSTALL_MAN=$(prefix)/man
++INSTALL_BIN=$(DESTDIR)/@bindir@
++INSTALL_MAN=$(DESTDIR)/@mandir@
+ 
+ LIBS=@LIBS@
+ CC=@CC@
+@@ -20,7 +20,7 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
+-OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o
++OBJS= rzip.o runzip.o strutils.o main.o stream.o util.o crc32.o
+ 
+ # note that the -I. is needed to handle config.h when using VPATH
+ .c.o:
+@@ -35,9 +35,10 @@
+ 	${INSTALLCMD} -m 755 rzip ${INSTALL_BIN}
+ 	-mkdir -p ${INSTALL_MAN}/man1
+ 	${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
++	ln -s rzip $(INSTALL_BIN)/runzip
+ 
+ rzip: $(OBJS)
+-	$(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o rzip $(OBJS) $(LIBS)
+ 
+ rzip.1: rzip.yo
+ 	yodl2man -o rzip.1 rzip.yo
diff --git a/app-arch/rzip/metadata.xml b/app-arch/rzip/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-arch/rzip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-arch/rzip/rzip-2.1-r3.ebuild b/app-arch/rzip/rzip-2.1-r3.ebuild
new file mode 100644
index 000000000000..915c6deeef2b
--- /dev/null
+++ b/app-arch/rzip/rzip-2.1-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Compression program for large files"
+HOMEPAGE="https://rzip.samba.org/"
+SRC_URI="https://rzip.samba.org/ftp/rzip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="app-arch/bzip2:="
+DEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1-darwin.patch
+	"${FILESDIR}"/${PN}-2.1-CVE-2017-8364.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+pkg_postinst() {
+	ewarn "Warning: Gentoo shipped a broken rzip for quite some time. During"
+	ewarn "compression of large files it didn't set the right file size, so"
+	ewarn "if you have any reason to believe that your archive was compressed "
+	ewarn "with an old Gentoo rzip, please refer to "
+	ewarn "     https://bugs.gentoo.org/show_bug.cgi?id=217552 "
+	ewarn "for the rzip-handle-broken-archive.patch patch to rescue your"
+	ewarn "data."
+	ewarn
+	ewarn "We apologize for the inconvenience."
+}
diff --git a/app-arch/sharutils-4.14-r1 b/app-arch/sharutils-4.14-r1
deleted file mode 100644
index 7232386e242c..000000000000
--- a/app-arch/sharutils-4.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
-DESCRIPTION=Tools to deal with shar archives
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/sharutils/
-IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/sharutils/sharutils-4.14.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b0dae34b4acf7d2366bfd0c5debab518
diff --git a/app-arch/sharutils-4.15.1 b/app-arch/sharutils-4.15.1
deleted file mode 100644
index e513b614c4f9..000000000000
--- a/app-arch/sharutils-4.15.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
-DESCRIPTION=Tools to deal with shar archives
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/sharutils/
-IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/sharutils/sharutils-4.15.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=127f00f3dbbbb8754c11a7a73cec0060
diff --git a/app-arch/sharutils-4.15.2 b/app-arch/sharutils-4.15.2
deleted file mode 100644
index 4040c6d08cfb..000000000000
--- a/app-arch/sharutils-4.15.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
-DESCRIPTION=Tools to deal with shar archives
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/sharutils/
-IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=283a6f1b8e14a2fe0e7c10a7ea451992
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
new file mode 100644
index 000000000000..45763830ffa8
--- /dev/null
+++ b/app-arch/sharutils/Manifest
@@ -0,0 +1,8 @@
+AUX sharutils-4.14-popen-rb.patch 791 BLAKE2B 3708a7b94ec238957a94ba8105a13543438d7239fe8d3aa75c970c106b5d9096f65814a53d880324f2ed4fe847dd3db9005b5e667c0a8d5d0fb596440bdb4dd9 SHA512 96b7aa7b594cf2d31b6a0d85c7d4ff0901c66776bf83328651a6717f633d9fd3f0ce1e3185b110aecfb8c59009087b0853cbef3736eaf9aa25a08a11500d4833
+DIST sharutils-4.14.tar.xz 1089052 BLAKE2B 2fe3edc016840b51528b9a7c41219f901ed29399051f1f6f4bcedd75ee85037ac3e3b9a67278aea34cd7b4a20d226b4143501bda481612c5b348b2fe57f71e75 SHA512 c1b87bc87915f7aebc9e02dfc1e08321f5ed2e144509c063139cde23eb8f75cb6469aa8042e4c6ec801f55d805e595f4c1c674cf5f2b4580a1e4933fcd605614
+DIST sharutils-4.15.1.tar.xz 1126672 BLAKE2B b570ae35c0f516cdd24c75f59596a0cbff1c0747c92d1cfa78c0828e8d68ceb5b42f0a32113bdd557e099774ef3dbc5af1ef019ffe33469f4011090b8e27a6e6 SHA512 791e37730cfff36ef96793ff7e70af05845eef72c6f581ce05a873d7d9beb7d42504a253fb944c77938f355c5d29c1a9de78653812fbbf859574b7b72dc4d8e1
+DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
+EBUILD sharutils-4.14-r1.ebuild 735 BLAKE2B 2afdd68f317d6affd432d6d291a7516906b992f5cea53c1a4cf794fb5dd4da03006759b005f6e66ba7abec0d9ef636dc56f910affe2c6dc43b6f8d337010bb56 SHA512 53c7501e69be3b24924b7178ba561d997a579ac12f45e6e36abed598debee3917ec0bafaba3207a9b266918da3ec055279daaf82544af94c6e0e5b3b2baee71e
+EBUILD sharutils-4.15.1.ebuild 748 BLAKE2B 7af24df5f5a521195425ca96994d285b62f58a08398751ed73c450480af9213f7dd0255d227663c3811a69baa24c911709c6155b9ac400559369ffc43465dfc1 SHA512 b0c5db15b48a7eae0f690b8693b532f070eb29905eeba07f996cf0b46799c13daa9f5192ad15d4e5c1322e38c1519e730e11347d43ba890dc302d74f43bca8fe
+EBUILD sharutils-4.15.2.ebuild 947 BLAKE2B 7f3fd78c6a452250f534bf217015db13850c4c3a093044768fc26825db762aff392c10f96478d2dc8962362c939a960da4459829525377691468d30465028e67 SHA512 1fd94402f3c98991339522de39f1da7c27471b0ee1be545ecc2e560c9147e88678a4912d7a907c110a91d09e93346bb86e8dd47259a866af5016b2966af4996b
+MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94
diff --git a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
new file mode 100644
index 000000000000..c502a623c1f6
--- /dev/null
+++ b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
@@ -0,0 +1,33 @@
+delete the run time test which dies on cross-compiles.
+we know the answer already, so hardcode it to true.
+
+--- a/configure
++++ b/configure
+@@ -30745,25 +30745,8 @@
+   CATALOGS="$new_CATALOGS"
+ fi
+ 
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-    FILE * fp = popen ("date", "rb");
+-    exit (fp == NULL);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
++if false; then
++if true; then
+ 
+ $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
+ 
diff --git a/app-arch/sharutils/metadata.xml b/app-arch/sharutils/metadata.xml
new file mode 100644
index 000000000000..92fa5463f2b2
--- /dev/null
+++ b/app-arch/sharutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+  <remote-id type="cpe">cpe:/a:gnu:sharutils</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-arch/sharutils/sharutils-4.14-r1.ebuild b/app-arch/sharutils/sharutils-4.14-r1.ebuild
new file mode 100644
index 000000000000..ed1b2a733c44
--- /dev/null
+++ b/app-arch/sharutils/sharutils-4.14-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Tools to deal with shar archives"
+HOMEPAGE="https://www.gnu.org/software/sharutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.14-popen-rb.patch
+}
+
+src_configure() {
+	strip-linguas -u po
+	econf $(use_enable nls)
+}
diff --git a/app-arch/sharutils/sharutils-4.15.1.ebuild b/app-arch/sharutils/sharutils-4.15.1.ebuild
new file mode 100644
index 000000000000..402e15b75376
--- /dev/null
+++ b/app-arch/sharutils/sharutils-4.15.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Tools to deal with shar archives"
+HOMEPAGE="https://www.gnu.org/software/sharutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.14-popen-rb.patch
+}
+
+src_configure() {
+	strip-linguas -u po
+	econf $(use_enable nls)
+}
diff --git a/app-arch/sharutils/sharutils-4.15.2.ebuild b/app-arch/sharutils/sharutils-4.15.2.ebuild
new file mode 100644
index 000000000000..1edfe87ae807
--- /dev/null
+++ b/app-arch/sharutils/sharutils-4.15.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+MY_P="${P/_/-}"
+DESCRIPTION="Tools to deal with shar archives"
+HOMEPAGE="https://www.gnu.org/software/sharutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Upstream is aware but thinks this isn't a bug/problem in sharutils itself
+	# See http://lists.gnu.org/archive/html/bug-gnu-utils/2013-10/msg00011.html
+	append-cflags $(test-flags-CC -Wno-error=format-security)
+}
+
+src_configure() {
+	strip-linguas -u po
+	econf $(use_enable nls)
+}
diff --git a/app-arch/snappy-1.1.7 b/app-arch/snappy-1.1.7
deleted file mode 100644
index c4f9613fdc58..000000000000
--- a/app-arch/snappy-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A high-speed compression/decompression library by Google
-EAPI=6
-HOMEPAGE=https://github.com/google/snappy
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-REQUIRED_USE=!static-libs
-SLOT=0/1
-SRC_URI=https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba526199d2fe323b983c711371c8eeae
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
new file mode 100644
index 000000000000..514fba7d33f6
--- /dev/null
+++ b/app-arch/snappy/Manifest
@@ -0,0 +1,4 @@
+AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BLAKE2B e9181a6a89bd62c3433c71008d182fcbdd2960e29542539f9ef5a48eff15347968a8a1a2d362633056f27df0a5ea84a5a721afcc375335295cb7c0cdd9267790 SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4
+DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
+EBUILD snappy-1.1.7.ebuild 1935 BLAKE2B 846088d7d1831d9c18160eb6215bcc906d88310488de2a1888b5da5a84a388238ea25393ddb05689711bae5f896e59002ecf525f3cd120ea49be896c30ed234d SHA512 58ce4a5283355b1e562285642fe197903b7715dd049f3a990f65b16e1bc63cb0c99348c90e40229c3b187c3b33a694e4b3de653ed12d5ed5c4574853ef425b91
+MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
new file mode 100644
index 000000000000..3327b8bcf0ac
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -0,0 +1,31 @@
+From 1c9f699a6275f085ad710c9ae940e096ce552452 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 31 Jul 2017 20:49:22 +0200
+Subject: [PATCH] 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 | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f534b1..3a44aa9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,10 @@ if(SNAPPY_BUILD_TESTS)
+       "${PROJECT_SOURCE_DIR}/snappy-test.cc"
+   )
+   target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
+-  target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
++  target_link_libraries(snappy_unittest
++    snappy
++    ${GFLAGS_LIBRARIES}
++    ${GTEST_LIBRARIES})
+ 
+   if(HAVE_LIBZ)
+     target_link_libraries(snappy_unittest z)
+-- 
+2.14.1
+
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
new file mode 100644
index 000000000000..e5215ea6cd04
--- /dev/null
+++ b/app-arch/snappy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type='person'>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
+		maximum compression, or compatibility with any other compression
+		library; instead, it aims for very high speeds and reasonable
+		compression.</longdescription>
+	<upstream>
+		<remote-id type="github">google/snappy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
new file mode 100644
index 000000000000..2c091619b04b
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 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 ia64 ~mips ppc ppc64 ~sparc 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.7-0001-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=(
+		-DBUILD_SHARED_LIBS=ON
+
+		# 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
+	)
+	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/star-1.5.3 b/app-arch/star-1.5.3
deleted file mode 100644
index a4e310588e75..000000000000
--- a/app-arch/star-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=acl? ( sys-apps/acl ) xattr? ( sys-apps/attr )
-DESCRIPTION=An enhanced (world's fastest) tar, as well as enhanced mt/rmt
-EAPI=5
-HOMEPAGE=http://s-tar.sourceforge.net/
-IUSE=acl xattr
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
-RDEPEND=acl? ( sys-apps/acl ) xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=mirror://sourceforge/s-tar/star-1.5.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36f277ca242422fa81579bca0e7d74da
diff --git a/app-arch/star/Manifest b/app-arch/star/Manifest
new file mode 100644
index 000000000000..af735dcccc39
--- /dev/null
+++ b/app-arch/star/Manifest
@@ -0,0 +1,3 @@
+DIST star-1.5.3.tar.bz2 889881 BLAKE2B d5d21a99d78c877d422bb6326ec0833d11c35dbe591ba1b892b267f811ae7f6108d9e34c14925b873a53b0f12c703f7c646012010d79d841e0e7be04a5c9dfed SHA512 622032a0e87f3df06ab1091af0af99d0362f478f70351cfe3d47195eec0fcc96f458fb6e50cae3531183984b1d390b598176ce008bcc5f29764795f66436efef
+EBUILD star-1.5.3.ebuild 2699 BLAKE2B 5b5bec4befa27d2a87e13c4d1a4d61681281736695cd9e5af3ecbee194de6b50f1ad5d59bd5219c76a50137aa9d00d2a990f0f8c142cf3e3e5a8c0c8ab3d1ab0 SHA512 457ea7ff0caba696702e0d754598d9e368e374db959a264a50742fa483b6325c3eb250a6044736df0ccd3adf0f15f6a46f75ba8fdb40404ebed3386f7ae73e4f
+MISC metadata.xml 350 BLAKE2B 9ca6ab6c8bcb830e9635e148dfc550ae71d785bd4e7f3620bc4a81e27dce3f9a7cb3ad5b2321ca0bdb7dae5082725ea75dfb73ed36e2507129c6937c7f3ef06f SHA512 2e9d3fb7c591893162b2518657d39d6c0a53e80b666b5aa4b307cc80bdb47a5c2f9f300abb42e99b8216be8f09ee407571ca39d2b5ea2dbdf427ba350db457bf
diff --git a/app-arch/star/metadata.xml b/app-arch/star/metadata.xml
new file mode 100644
index 000000000000..5e16a72b054f
--- /dev/null
+++ b/app-arch/star/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">s-tar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/star/star-1.5.3.ebuild b/app-arch/star/star-1.5.3.ebuild
new file mode 100644
index 000000000000..f841e026ddc1
--- /dev/null
+++ b/app-arch/star/star-1.5.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
+HOMEPAGE="http://s-tar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/s-tar/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="acl xattr"
+
+DEPEND="
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+src_prepare() {
+	find -type f -exec chmod -c u+w '{}' + || die
+	sed \
+		-e "s:/opt/schily:${EPREFIX}/usr:g" \
+		-e 's:bin:root:g' \
+		-e "s:/usr/src/linux/include:${EPREFIX}/usr/include:" \
+		-i DEFAULTS/Defaults.linux || die
+
+	# Disable libacl autodependency (hacky build system, hacky fix...)
+	if use acl; then
+		sed \
+			-e 's:[$]ac_cv_header_sys_acl_h:disable acl:' \
+			-i "${S}/autoconf/configure" || die
+	fi
+
+	if use xattr; then
+		sed \
+			-e 's:[$]ac_cv_header_attr_xattr_h:disable xattr:' \
+			-i "${S}/autoconf/configure" || die
+	fi
+
+	# Create additional symlinks needed for some archs.
+	pushd "${S}/RULES" > /dev/null
+	local t
+	for t in ppc64 s390x ; do
+		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
+		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
+	done
+	popd > /dev/null
+}
+
+src_configure() { :; } #avoid ./configure run
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		COPTX="${CFLAGS}" \
+		CPPOPTX="${CPPFLAGS}" \
+		COPTGPROF= \
+		COPTOPT= \
+		LDOPTX="${LDFLAGS}"
+}
+
+src_install() {
+	# Joerg Schilling suggested to integrate star into the main OS using call:
+	# make INS_BASE=/usr DESTDIR="${D}" install
+
+	dobin \
+		star/OBJ/*-*-cc/star \
+		tartest/OBJ/*-*-cc/tartest \
+		star_sym/OBJ/*-*-cc/star_sym \
+		mt/OBJ/*-*-cc/smt
+
+	newsbin rmt/OBJ/*-*-cc/rmt rmt.star
+	newman rmt/rmt.1 rmt.star.1
+
+	# Note that we should never install gnutar, tar or rmt in this package.
+	# tar and rmt are provided by app-arch/tar. gnutar is not compatible with
+	# GNU tar and breakes compilation, or init scripts. bug #33119
+	dosym {star,/usr/bin/ustar}
+	dosym {star,/usr/bin/spax}
+	dosym {star,/usr/bin/scpio}
+	dosym {star,/usr/bin/suntar}
+
+	#  match is needed to understand the pattern matcher, if you wondered why ;)
+	doman man/man1/match.1 tartest/tartest.1 \
+		star/{star.4,star.1,spax.1,scpio.1,suntar.1}
+
+	insinto /etc/default
+	newins star/star.dfl star
+	newins rmt/rmt.dfl rmt
+
+	dodoc star/{README.ACL,README.crash,README.largefiles,README.otherbugs} \
+		star/{README.pattern,README.pax,README.posix-2001,README,STARvsGNUTAR} \
+			rmt/default-rmt.sample TODO AN-* Changelog CONTRIBUTING
+}
diff --git a/app-arch/stenc-1.0.7 b/app-arch/stenc-1.0.7
deleted file mode 100644
index a85159adc130..000000000000
--- a/app-arch/stenc-1.0.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=SCSI Tape Encryption Manager enables AES support for LTO drives.
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/stenc/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/stenc/source/stenc-1.0.7.tar.gz
-_md5_=45ca1e82d5aa06f212223bad1e65ad8d
diff --git a/app-arch/stenc/Manifest b/app-arch/stenc/Manifest
new file mode 100644
index 000000000000..3bcee21abe59
--- /dev/null
+++ b/app-arch/stenc/Manifest
@@ -0,0 +1,3 @@
+DIST stenc-1.0.7.tar.gz 107096 BLAKE2B 678be2fea4eb3db5cf84a70243fd61dcb574627bacb59b2f9af682e2e0851d41187565b4706313c98bb5b297f865b1424bc47c52f15efa2a2e8b2c7413b09009 SHA512 84cb0114c969e1a5122a8621d2c136663ee2a2d9aae1d455631c1d4555e947f4841004b74a1f63b800be713cfae637c19ea34adf40f0bc81f1c56a555a27ba31
+EBUILD stenc-1.0.7.ebuild 392 BLAKE2B 0c77bb626edfa95d7daf8d0af5812188d9bd847ef5973ef9a8093a7144fcb3a4e888b1ef056237d0e7561bd269aabb56c0cca2d76d18c51568ef66d22d2b96b9 SHA512 161372826f561a9b8b483740a6dd953e0f0d990fe072e281fb574ae477828b3ae712db0139e03f13bcb26107c42ba09e8630017fe1c658ad30fc8e4acd443387
+MISC metadata.xml 654 BLAKE2B 982000d4f28b24c8227f79cdf9f8303602cce90c331f65006b9c643ce2dc8f4d8ac279d035a3a13880061d2f046a4d6409d1b4a0fd32471857d1de3a7852dff0 SHA512 b006cc3b028a14809d2a203b165b1eb71861202a6a067447d715c211a1e6c6b6239e9eaf76f0d88e735dbabc4aa6c87457fdbe86ef1a4e0152ce936a90d62a08
diff --git a/app-arch/stenc/metadata.xml b/app-arch/stenc/metadata.xml
new file mode 100644
index 000000000000..8dabb18f4782
--- /dev/null
+++ b/app-arch/stenc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jstein@gentoo.org</email>
+		<name>Jonas Stein</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>mailto:jcoleman1981@live.com</bugs-to>
+		<remote-id type="sourceforge">stenc</remote-id>
+	</upstream>
+	<longdescription>SCSI Tape Encryption Manager - Manages encryption on LTO 
+		tape drives with hardware-based encryption (LTO-4 and later).
+		This program should work on any other SSP capable tape drives. 
+		Supports key change auditing and key descriptors (uKAD).
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/stenc/stenc-1.0.7.ebuild b/app-arch/stenc/stenc-1.0.7.ebuild
new file mode 100644
index 000000000000..2a47f9366245
--- /dev/null
+++ b/app-arch/stenc/stenc-1.0.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives."
+HOMEPAGE="https://sourceforge.net/projects/stenc/"
+SRC_URI="mirror://sourceforge/${PN}/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/app-arch/stuffit-5.2.0.611 b/app-arch/stuffit-5.2.0.611
deleted file mode 100644
index 606efab5fb3b..000000000000
--- a/app-arch/stuffit-5.2.0.611
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=Aladdin Software's StuffIt and StuffIt Expander
-EAPI=6
-HOMEPAGE=http://www.stuffit.com/
-KEYWORDS=-* x86 amd64
-LICENSE=Stuffit
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=http://my.smithmicro.com/downloads/files/stuffit520.611linux-i386.tar.gz
-_md5_=48e7448f38101dcda5735bbbd3aea203
diff --git a/app-arch/stuffit/Manifest b/app-arch/stuffit/Manifest
new file mode 100644
index 000000000000..14f52665da9b
--- /dev/null
+++ b/app-arch/stuffit/Manifest
@@ -0,0 +1,3 @@
+DIST stuffit520.611linux-i386.tar.gz 1955619 BLAKE2B fb80abef29d266c93747b3359c62840afa15a32786a82ee01cab22cf0eddad750817c87b767632df5bb2ef681c1c9dd6dfe136dae388f8390bcab0b137a2c0bc SHA512 a1d4631c2d238b49c710816cd5ed8a01dcf52c29b870297b8dfd76fb0cb6e725c5b0f9d4a6c155c7b6980005df52fc4597632f72e90f00bf93ad80a28972270a
+EBUILD stuffit-5.2.0.611.ebuild 1471 BLAKE2B 33b12391d0b2ee3a638b85f5010ad500032570d52a875ed72f36403f43fd238a6e47b9316f30be82966a78e6f602ff45b9db764d898f6894490e1eada29cacce SHA512 816b2b903025599753824cff5eed538c327b49ab146c26967e5246fdc0e2b2168f1531266970c1670d2cf2bcf1f45ab7eb3332b41294734c2214ad7e69b42cea
+MISC metadata.xml 302 BLAKE2B f1870466f061240593b130854dc1baaffbc351f573e2f8e7bd4e5d8dcb986a794d151bc6a41bb7929b34a5bea104f0f95efbedd3bd068af39896fd444997cf45 SHA512 cb8ca2c4b1b49221c5e2ef4d37a9f8faa4a03ec8e116dfe31185f0a09aeaadf1034f45f655d984658e8318f057ca9028edb4cd373abb0d5bfe05ff6dd83d00b3
diff --git a/app-arch/stuffit/metadata.xml b/app-arch/stuffit/metadata.xml
new file mode 100644
index 000000000000..9721c8429868
--- /dev/null
+++ b/app-arch/stuffit/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>Stuffit is a archive creating application, supporting .sit, .sitx .zip, and self-extracting archives</longdescription>
+</pkgmetadata>
diff --git a/app-arch/stuffit/stuffit-5.2.0.611.ebuild b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
new file mode 100644
index 000000000000..2e6528ed2126
--- /dev/null
+++ b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="stuffit520.611linux-i386"
+
+DESCRIPTION="Aladdin Software's StuffIt and StuffIt Expander"
+HOMEPAGE="http://www.stuffit.com/"
+SRC_URI="http://my.smithmicro.com/downloads/files/${MY_P}.tar.gz"
+
+LICENSE="Stuffit"
+SLOT="0"
+KEYWORDS="-* x86 amd64"
+IUSE=""
+RESTRICT="fetch strip"
+
+S="${WORKDIR}"
+
+INSTALLDIR=/opt/stuffit
+
+pkg_nofetch() {
+	einfo "Please download stuffit from"
+	einfo "${SRC_URI}"
+	einfo "and put the file in ${DISTDIR}"
+	einfo
+	einfo "Note that StuffIt requires registration within 30 days,"
+	einfo "but StuffIt Expander is freeware."
+	einfo
+}
+
+src_install() {
+	# First do the binaries
+	exeinto ${INSTALLDIR}/bin
+	doexe bin/stuff
+	doexe bin/unstuff
+
+	# Now the registration binary
+	exeinto ${INSTALLDIR}/extra
+	doexe bin/register
+
+	# Now the documentation
+	docinto stuff
+	dodoc doc/stuff/{README,stuff.html}
+	docinto unstuff
+	dodoc doc/unstuff/{README,unstuff.html}
+
+	# And now the man pages
+	doman man/man1/*
+
+	# Also add the executables to the path
+	dodir /etc/env.d
+	cat > "${T}"/10stuffit <<- EOF || die
+		PATH="${EPREFIX}${INSTALLDIR}/bin"
+		ROOTPATH="${EPREFIX}${INSTALLDIR}/bin"
+	EOF
+	doenvd "${T}"/10stuffit
+}
+
+pkg_postinst() {
+	elog
+	elog "Reminder: StuffIt requires registration within 30 days."
+	elog "The registration program is located in ${INSTALLDIR}/extra"
+	elog
+	elog "The binaries are named 'stuff' and 'unstuff'"
+	elog
+}
diff --git a/app-arch/tapeutils-0.4 b/app-arch/tapeutils-0.4
deleted file mode 100644
index 30b0a9755286..000000000000
--- a/app-arch/tapeutils-0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Utilities for manipulation of tapes and tape image files
-EAPI=6
-HOMEPAGE=http://www.brouhaha.com/~eric/software/tapeutils/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/hercules
-SLOT=0
-SRC_URI=http://www.brouhaha.com/~eric/software/tapeutils/tapeutils-0.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=167d669f46e36cfa47b8184d1c79e5a9
diff --git a/app-arch/tapeutils/Manifest b/app-arch/tapeutils/Manifest
new file mode 100644
index 000000000000..6bf3520f4e40
--- /dev/null
+++ b/app-arch/tapeutils/Manifest
@@ -0,0 +1,5 @@
+AUX tapeutils-0.4-fix-C-decl.patch 700 BLAKE2B c3786edd42d711a528b7fc81c6c9569e2cd265aae7c4205fc642d8ee088d756f2b810197af3fd4aa2c0303e310ced41a9013d76ceb84cb9d5adf5a91ad4227c6 SHA512 bb38dd764d94279894f2ed76b8e882622a30db6b68bfb48ef882422fc326274842961fc0d27b2d812444382dd19aaee64788f8a4a604c2506961c405d4f20621
+AUX tapeutils-0.4-fix-build-system.patch 201 BLAKE2B b0c4d271b1a52ce613d57c7006f485f63e93dba380fb2a8e6db0da50cbc752b2cbe115f05e9b0c475a690ec2dfda87bc9d0beab33a8292cb2af2779c69f271a0 SHA512 c286c5592874a147341182fa98f13181937fd5ef0f581b8ebdd790f156dcc1c358e1b69240cf8fbccd2d3d34c319e29b2a9e8a3674fede6b712c4f12538710ff
+DIST tapeutils-0.4.tar.gz 14116 BLAKE2B 1eb633ef1593b6f50142ae0128438a4346fafdaa4a847ff9e21caf278f1123844af16dc2c04d3d0cc2c015d0ec7fc15eaab48e6be9ae7c18d3cd2972434f2617 SHA512 b87b725c3f1610f5a116263120ffea84a7e81146cc9e46be69391388bb0b3bf4814d16428bfabd285557a0f72a3607f138e454b61989f2606697875e30c948bd
+EBUILD tapeutils-0.4.ebuild 655 BLAKE2B 3f59c8b660b90afd9f51c510069a4c85e298eb88ffb71588119335e18701b8fb33fd619288e0eb96c938fd2fbe2b866554df20eda27d0f037d5ee18703b57255 SHA512 43386adefd194fe12d0430de17b57a3992b694c1c1520daa89a94e2eaadbdabcaac843a6b759bbaca706523a5c9d2d5e641513bdadcbb3ee2fe67eef3c2c6f3d
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch
new file mode 100644
index 000000000000..ee07c252d168
--- /dev/null
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch
@@ -0,0 +1,31 @@
+--- a/tapecopy.c
++++ b/tapecopy.c
+@@ -26,6 +26,8 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <stdlib.h>
++
+ #include "tapeio.h"
+ #include "stdio.h"
+ #include "stdarg.h"
+--- a/tapedump.c
++++ b/tapedump.c
+@@ -26,6 +26,8 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <stdlib.h>
++
+ #include "tapeio.h"
+ #include "stdio.h"
+ #include "stdarg.h"
+@@ -158,7 +160,7 @@
+       len = getrec (src, buf, MAX_REC_LEN);
+       if (len == 0)
+ 	{
+-	  printf ("total length of file %d = %d records, %d bytes\n",
++	  printf ("total length of file %d = %d records, %lu bytes\n",
+ 		  file, record, filebytes);
+ 	  tapebytes += filebytes;
+ 	  file++;
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch
new file mode 100644
index 000000000000..e1670a47fe2b
--- /dev/null
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,6 @@
+ # options
+ # -----------------------------------------------------------------------------
+ 
+-CFLAGS = -O2
+-LDFLAGS = 
+ 
+ # CFLAGS = -g
+ # LDFLAGS = -g
diff --git a/app-arch/tapeutils/metadata.xml b/app-arch/tapeutils/metadata.xml
new file mode 100644
index 000000000000..a4e0d354f696
--- /dev/null
+++ b/app-arch/tapeutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/app-arch/tapeutils/tapeutils-0.4.ebuild b/app-arch/tapeutils/tapeutils-0.4.ebuild
new file mode 100644
index 000000000000..50e3aac72747
--- /dev/null
+++ b/app-arch/tapeutils/tapeutils-0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utilities for manipulation of tapes and tape image files"
+HOMEPAGE="http://www.brouhaha.com/~eric/software/tapeutils/"
+SRC_URI="http://www.brouhaha.com/~eric/software/tapeutils/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-emulation/hercules"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.4-fix-C-decl.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin tapecopy tapedump
+	# no docs to install
+}
diff --git a/app-arch/tar-1.29-r1 b/app-arch/tar-1.29-r1
deleted file mode 100644
index 8aadb8b1817f..000000000000
--- a/app-arch/tar-1.29-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) )
-DESCRIPTION=Use this to make tarballs :)
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/tar/
-IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-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
-LICENSE=GPL-3+
-RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbd60ccaa0a9115aeb33a83a93fb8ca5
diff --git a/app-arch/tar-1.29-r3 b/app-arch/tar-1.29-r3
deleted file mode 100644
index dc69b5684192..000000000000
--- a/app-arch/tar-1.29-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) )
-DESCRIPTION=Use this to make tarballs :)
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/tar/
-IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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
-LICENSE=GPL-3+
-RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee9da58663a7e877dbb060ad93ea8362
diff --git a/app-arch/tar-1.30 b/app-arch/tar-1.30
deleted file mode 100644
index 1f008f10fc4a..000000000000
--- a/app-arch/tar-1.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) )
-DESCRIPTION=Use this to make tarballs :)
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/tar/
-IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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
-LICENSE=GPL-3+
-RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://gnu/tar/tar-1.30.tar.bz2 mirror://gnu-alpha/tar/tar-1.30.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfa8d997deaca57ba2682a7ddf72479c
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
new file mode 100644
index 000000000000..61712921af97
--- /dev/null
+++ b/app-arch/tar/Manifest
@@ -0,0 +1,12 @@
+AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
+AUX tar-1.29-add-files.patch 6602 BLAKE2B ac4687bccd88e1fb3b2c565901815988b0ff0d9d42b46f71878c0293db0e0ce453d3b2fd3ead26d136997bd6f87b1400eb2310fd4d40c07a56b63a5528e5a7fa SHA512 5c87dd4a8e6d86c8e2311ac8487958abbda846484aec664ab82b7502ac1bb6a6cd43d3869fc64e06f792915b6a0659c41b9481357e5da19fbe43f9c913a10f3e
+AUX tar-1.29-extract-pathname-bypass-upstream.patch 1604 BLAKE2B 83364c5dee8d12b7cb67d8497666ec3082e0e209aeb4c84cc26292d43da0820bd14188f3003244a379cf5b6bdb5d3d7d566b42ec2c35d62f1d5713be7395e001 SHA512 c13046f8b0bcc435197c859006b1cfd12b79377f3b90edfd4b77f86ec6d3ca431c716d731be84884f0ec6d6129765cbfbccb5971d0b909c3f45aff8f0b9b45cb
+AUX tar-1.29-extract-pathname-bypass.patch 723 BLAKE2B c63c23dd1f256263cb4d1371e7a3eeccfe1da4aa74c13fd23f9bc1721b06e06d388eb99e1d9d17fb3344875be8b80e2a433f78360c89f6b2b7408302f346d0cc SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a
+AUX tar-1.30-fix-test-117-and-118.patch 3109 BLAKE2B d547dfb115d6cdbdf565c93dcdc70c9d2d0cde70228f58763e74d4cf5df7d621a5fccea375c3e103f8dcc04a19b3318b227384db2dc983cec5876eed8861cece SHA512 d104bbd88dafc0c3bb0308fbfb1dfb39b6c26fed14a316c30c2355d57ebe16172c0dde8ed6c91696b90f37622a43b5b1d70f397f7de521b9bd1552a5af78bb14
+AUX tar-1.30-fix-test-92.patch 257 BLAKE2B ee4fe8420f56191a8e4d9edefd109c948eb693532e2c3bb2073a8d55631aed142ab9c3adfa64d6461eb1aa9221a1aca6ec5086f15b3b9154effdb8e7128a8601 SHA512 aa1c80edbf1c846e23aa34ed343ffebad969b26fed9d4ccdc779f3df5bc384bb44d6c78044c385dbb7c01e68462568b941e8ec1060eb97bf36606d7beb790c1c
+DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf01551131bdf0cfa895b7b2a7d073a4cd51e9bec4169b134d83155aca18af1a89ddb5d14cb1dc0d9968184870d69f3 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b
+DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8
+EBUILD tar-1.29-r1.ebuild 2157 BLAKE2B 4a1e4e3cbbc34cf71f41b5ce9e1f7b8b65a9413fdc3e08bb97f09eb64a4f72b8952461fef59d7b6beca00350ea0b7718d2a4d99d3f9a8a830479d1e194f44641 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b
+EBUILD tar-1.29-r3.ebuild 2227 BLAKE2B 50afab4df588f55fdab5d3cfd4258d3c65192ee0cc7079527a05fcbee0a2ec50e3875302a241faa351edc41e5f77351382ecd3e291037eec11115d4c729aebde SHA512 270db39d7490c4829fb11cb680b39e75963bb065fe3ebdf78ab024300dae27f78e18453dc76c029a6cdfc4af9511074322aaafc3e89910e63e976065d92867a3
+EBUILD tar-1.30.ebuild 2201 BLAKE2B 47202beceb4d1780e307b6bb5edf17a3275cbab15d9d91641a47c0912cb295a63597189e952d4a8a49a3a3824a4ac8f54ea35ce4894a76da548be3c8021bb563 SHA512 722c0d360a4be6d9b7507bd349a866becaa2adbf4346a257a68ab5b2fde29125767e9c90fa402a81e3d793879b45e52946f9cdf1fee0627018fda687786f9abe
+MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/files/rmt b/app-arch/tar/files/rmt
new file mode 100644
index 000000000000..15ed6aa91fad
--- /dev/null
+++ b/app-arch/tar/files/rmt
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# This is not a mistake.  This shell script (/etc/rmt) has been provided
+# for compatibility with other Unix-like systems, some of which have
+# utilities that expect to find (and execute) rmt in the /etc directory
+# on remote systems.
+#
+exec rmt "$@"
diff --git a/app-arch/tar/files/tar-1.29-add-files.patch b/app-arch/tar/files/tar-1.29-add-files.patch
new file mode 100644
index 000000000000..8ab15ac32aff
--- /dev/null
+++ b/app-arch/tar/files/tar-1.29-add-files.patch
@@ -0,0 +1,194 @@
+From 3a283cfe9f8f1f127e8dc5597a5ea1d249985a54 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Sat, 12 Nov 2016 11:20:47 +0200
+Subject: [PATCH] Fix the --add-file option.
+
+* src/common.h (name_more_files): New proto.
+(files_from_option): Remove.
+* src/names.c (name_more_files): New file.
+(names_options): Fix declaration of the
+add-file option.
+(names_parse_opt): Handle --add-file.
+* src/tar.c (struct tar_args): Remove the input_files member.
+Change all uses: use name_more_files() instead.
+* tests/Makefile.am: Add new test.
+* tests/add-file.at: New testcase.
+* tests/testsuite.at: Add new test.
+---
+ src/common.h       |  4 +---
+ src/names.c        | 24 ++++++++++++-------
+ src/tar.c          | 16 ++++---------
+ tests/Makefile.am  |  3 ++-
+ tests/add-file.at  | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/testsuite.at |  1 +
+ 6 files changed, 92 insertions(+), 23 deletions(-)
+ create mode 100644 tests/add-file.at
+
+diff --git a/src/common.h b/src/common.h
+index 50c34cc7c09b..6fdb6225f18b 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -414,9 +414,6 @@ GLOBAL bool show_transformed_names_option;
+    timestamps from archives with an unusual member order. It is automatically
+    set for incremental archives. */
+ GLOBAL bool delay_directory_restore_option;
+-
+-/* When set, tar will not refuse to create empty archives */
+-GLOBAL bool files_from_option;
+ 
+ /* Declarations for each module.  */
+ 
+@@ -738,6 +735,7 @@ void uid_to_uname (uid_t uid, char **uname);
+ int uname_to_uid (char const *uname, uid_t *puid);
+ 
+ void name_init (void);
++bool name_more_files (void);
+ void name_add_name (const char *name);
+ void name_term (void);
+ const char *name_next (int change_dirs);
+diff --git a/src/names.c b/src/names.c
+index 219aa77a4356..1a9465667cd3 100644
+--- a/src/names.c
++++ b/src/names.c
+@@ -32,7 +32,8 @@ static void name_add_file (const char *name);
+ 
+ enum
+   {
+-    EXCLUDE_BACKUPS_OPTION = 256,
++    ADD_FILE_OPTION = 256,
++    EXCLUDE_BACKUPS_OPTION,
+     EXCLUDE_CACHES_OPTION,
+     EXCLUDE_CACHES_UNDER_OPTION,
+     EXCLUDE_CACHES_ALL_OPTION,
+@@ -67,7 +68,7 @@ static struct argp_option names_options[] = {
+   {NULL, 0, NULL, 0,
+    N_("Local file name selection:"), GRID },
+ 
+-  {"add-file", ARGP_KEY_ARG, N_("FILE"), 0,
++  {"add-file", ADD_FILE_OPTION, N_("FILE"), 0,
+    N_("add given FILE to the archive (useful if its name starts with a dash)"), GRID+1 },
+   {"directory", 'C', N_("DIR"), 0,
+    N_("change to directory DIR"), GRID+1 },
+@@ -190,10 +191,10 @@ names_parse_opt (int key, char *arg, struct argp_state *state)
+ 
+     case 'T':
+       name_add_file (arg);
+-      /* Indicate we've been given -T option. This is for backward
+-	 compatibility only, so that `tar cfT archive /dev/null will
+-	 succeed */
+-      files_from_option = true;
++      break;
++
++    case ADD_FILE_OPTION:
++      name_add_name (arg);
+       break;
+ 
+     default:
+@@ -651,8 +652,8 @@ struct name_elt        /* A name_array element. */
+   } v;
+ };
+ 
+-static struct name_elt *name_head;  /* store a list of names */
+-size_t name_count;	 	    /* how many of the entries are names? */
++static struct name_elt *name_head;/* store a list of names */
++size_t name_count;	 	  /* how many of the entries are file names? */
+ 
+ static struct name_elt *
+ name_elt_alloc (void)
+@@ -784,6 +785,12 @@ name_list_advance (void)
+     }
+ }
+ 
++/* Return true if there are names or options in the list */
++bool
++name_more_files (void)
++{
++  return name_count > 0;
++}
+ 
+ /* Add to name_array the file NAME with fnmatch options MATFLAGS */
+ void
+@@ -823,6 +830,7 @@ name_add_file (const char *name)
+   ep->v.file.name = name;
+   ep->v.file.line = 0;
+   ep->v.file.fp = NULL;
++  name_count++;
+ }
+ 
+ /* Names from external name file.  */
+diff --git a/src/tar.c b/src/tar.c
+index 35bac38c2793..a361fc2c607f 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -813,7 +813,6 @@ struct tar_args        /* Variables used during option parsing */
+   bool pax_option;                 /* True if --pax-option was given */
+   char const *backup_suffix_string;   /* --suffix option argument */
+   char const *version_control_string; /* --backup option argument */
+-  bool input_files;                /* True if some input files where given */
+   int compress_autodetect;         /* True if compression autodetection should
+ 				      be attempted when creating archives */
+ };
+@@ -1322,7 +1321,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
+     case ARGP_KEY_ARG:
+       /* File name or non-parsed option, because of ARGP_IN_ORDER */
+       name_add_name (arg);
+-      args->input_files = true;
+       break;
+ 
+     case 'A':
+@@ -2179,7 +2177,7 @@ more_options (int argc, char **argv, struct option_locus *loc)
+   args.loc = loc;
+   if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_EXIT, &idx, &args))
+     abort (); /* shouldn't happen */
+-  if (loc->source == OPTS_ENVIRON && args.input_files)
++  if (loc->source == OPTS_ENVIRON && name_more_files ())
+     USAGE_ERROR ((0, 0, _("non-option arguments in %s"), loc->name));
+ }
+ 
+@@ -2221,7 +2219,6 @@ decode_options (int argc, char **argv)
+   args.pax_option = false;
+   args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
+   args.version_control_string = 0;
+-  args.input_files = false;
+   args.compress_autodetect = false;
+ 
+   subcommand_option = UNKNOWN_SUBCOMMAND;
+@@ -2340,10 +2337,7 @@ decode_options (int argc, char **argv)
+ 
+   /* Handle operands after any "--" argument.  */
+   for (; idx < argc; idx++)
+-    {
+-      name_add_name (argv[idx]);
+-      args.input_files = true;
+-    }
++    name_add_name (argv[idx]);
+ 
+   /* Derive option values and check option consistency.  */
+ 
+@@ -2365,7 +2359,7 @@ decode_options (int argc, char **argv)
+ 
+   if (occurrence_option)
+     {
+-      if (!args.input_files)
++      if (!name_more_files ())
+ 	USAGE_ERROR ((0, 0,
+ 		      _("--occurrence is meaningless without a file list")));
+       if (!IS_SUBCOMMAND_CLASS (SUBCL_OCCUR))
+@@ -2569,7 +2563,7 @@ decode_options (int argc, char **argv)
+     {
+       /* --test-label is silent if the user has specified the label name to
+ 	 compare against. */
+-      if (!args.input_files)
++      if (!name_more_files ())
+ 	verbose_option++;
+     }
+   else if (utc_option)
+@@ -2598,7 +2592,7 @@ decode_options (int argc, char **argv)
+   switch (subcommand_option)
+     {
+     case CREATE_SUBCOMMAND:
+-      if (!args.input_files && !files_from_option)
++      if (!name_more_files ())
+ 	USAGE_ERROR ((0, 0,
+ 		      _("Cowardly refusing to create an empty archive")));
+       if (args.compress_autodetect && archive_names
diff --git a/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch b/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch
new file mode 100644
index 000000000000..2030ca6d2bdd
--- /dev/null
+++ b/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/598334
+
+From 7340f67b9860ea0531c1450e5aa261c50f67165d Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@Penguin.CS.UCLA.EDU>
+Date: Sat, 29 Oct 2016 21:04:40 -0700
+Subject: [PATCH] When extracting, skip ".." members
+
+* NEWS: Document this.
+* src/extract.c (extract_archive): Skip members whose names
+contain "..".
+---
+ NEWS          | 8 +++++++-
+ src/extract.c | 8 ++++++++
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+--- a/NEWS
++++ b/NEWS
+@@ -1,6 +1,16 @@
+ GNU tar NEWS - User visible changes. 2016-05-16
+ Please send GNU tar bug reports to <bug-tar@gnu.org>
+ 
++
++
++version 1.29-r2+ Gentoo
++
++* Member names containing '..' components are now skipped when extracting.
++
++This fixes tar's behavior to match its documentation, and is a bit
++safer when extracting untrusted archives over old files (an unsafe
++practice that the tar manual has long recommended against).
++
+ 
+ version 1.29 - Sergey Poznyakoff, 2016-05-16
+ 
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -1629,12 +1629,20 @@
+ {
+   char typeflag;
+   tar_extractor_t fun;
++  bool skip_dotdot_name;
+ 
+   fatal_exit_hook = extract_finish;
+ 
+   set_next_block_after (current_header);
+ 
++  skip_dotdot_name = (!absolute_names_option
++		      && contains_dot_dot (current_stat_info.orig_file_name));
++  if (skip_dotdot_name)
++    ERROR ((0, 0, _("%s: Member name contains '..'"),
++	    quotearg_colon (current_stat_info.orig_file_name)));
++
+   if (!current_stat_info.file_name[0]
++      || skip_dotdot_name
+       || (interactive_option
+ 	  && !confirm ("extract", current_stat_info.file_name)))
+     {
+-- 
+2.11.0.rc2
+
diff --git a/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch b/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch
new file mode 100644
index 000000000000..6470fe082bda
--- /dev/null
+++ b/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch
@@ -0,0 +1,27 @@
+--- a/lib/paxnames.c	2016-04-06 00:04:47.314860045 +0300
++++ b/lib/paxnames.c	2016-04-06 02:08:44.962297881 +0300
+@@ -18,6 +18,7 @@
+ #include <system.h>
+ #include <hash.h>
+ #include <paxlib.h>
++#include <quotearg.h>
+ 
+ 
+ /* Hash tables of strings.  */
+@@ -114,7 +115,15 @@
+       for (p = file_name + prefix_len; *p; )
+ 	{
+           if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
+-	    prefix_len = p + 2 - file_name;
++            {
++	      static char const *const diagnostic[] =
++	      {
++		N_("%s: Member name contains '..'"),
++		N_("%s: Hard link target contains '..'")
++	      };
++	      ERROR ((0, 0, _(diagnostic[link_target]),
++	              quotearg_colon (file_name)));
++	    }
+ 
+ 	  do
+ 	    {
diff --git a/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch b/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch
new file mode 100644
index 000000000000..2f75da6cd247
--- /dev/null
+++ b/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch
@@ -0,0 +1,89 @@
+tests: fix race in dirrem01 and dirrem02
+
+Previously the '--checkpoint-action=echo' was triggered after
+'--checkpoint-action=sleep=1' - so the order of events *usually*
+was (for --format='gnu'):
+
+  ...
+  1. checkpoint handler before write of 'dir/sub' member
+  2. one-second delay
+  3. stderr write: 'tar: Write checkpoint 3'
+  4. write the member 'dir/sub' into the archive
+  5. check that the member's ctime has not been changed
+  6. genfile's detecting 'Write checkpoint', doing unlink
+  ...
+
+But sometimes, the genfile was fast enough to win the race and
+unlinked the directory before the member was written into the
+archive (IOW, the order was 1-2-3-6-4-5).  This led to the
+occasional warning 'tar: dir/sub: file changed as we read it'.
+
+Swap the order of 'sleep=1' and 'echo' actions so the genfile
+utility has (hopefully) enough time to do the unlink before
+writing the file into the archive (enforce 1-2-3-6-4-5 order).
+
+* tests/dirrem01.at: Swap 'sleep=1' and 'echo' actions.
+* tests/dirrem02.at: Likewise.
+
+Origin: https://lists.gnu.org/archive/html/bug-tar/2018-01/msg00000.html
+---
+ tests/dirrem01.at | 5 +++--
+ tests/dirrem02.at | 7 ++++---
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/tests/dirrem01.at b/tests/dirrem01.at
+index 40344dc..dabc206 100644
+--- a/tests/dirrem01.at
++++ b/tests/dirrem01.at
+@@ -47,14 +47,15 @@ gnu)   CPT=3;;
+ esac
+ 
+ genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
+-       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
+-       --checkpoint-action='echo' -c -f archive.tar \
++       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='echo' \
++       --checkpoint-action='sleep=1' -c -f archive.tar \
+        --listed-incremental db -v dir >/dev/null
+ ],
+ [1],
+ [ignore],
+ [tar: dir: Directory is new
+ tar: dir/sub: Directory is new
++tar: dir/sub: file changed as we read it
+ tar: dir/sub: File removed before we read it
+ ],[],[],[gnu,posix])
+ 
+diff --git a/tests/dirrem02.at b/tests/dirrem02.at
+index e1cf9ef..924454f 100644
+--- a/tests/dirrem02.at
++++ b/tests/dirrem02.at
+@@ -20,7 +20,7 @@
+ 
+ # Description:
+ #
+-# When an explicitley named directory disappears during creation
++# When an explicitly named directory disappears during creation
+ # of incremental dump, tar should still exit with TAREXIT_FAILURE (2).
+ #
+ # For further details see dirrem01.at
+@@ -44,14 +44,15 @@ gnu)   CPT=3;;
+ esac
+ 
+ genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
+-       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
+-       --checkpoint-action='echo' -c -f archive.tar \
++       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='echo' \
++       --checkpoint-action='sleep=1' -c -f archive.tar \
+        --listed-incremental db -v dir dir/sub >/dev/null
+ ],
+ [2],
+ [ignore],
+ [tar: dir: Directory is new
+ tar: dir/sub: Directory is new
++tar: dir/sub: file changed as we read it
+ tar: dir/sub: Cannot open: No such file or directory
+ tar: Exiting with failure status due to previous errors
+ ],[],[],[gnu,posix])
+-- 
+cgit v1.0-41-gc330
+
diff --git a/app-arch/tar/files/tar-1.30-fix-test-92.patch b/app-arch/tar/files/tar-1.30-fix-test-92.patch
new file mode 100644
index 000000000000..d5a63e4ab355
--- /dev/null
+++ b/app-arch/tar/files/tar-1.30-fix-test-92.patch
@@ -0,0 +1,13 @@
+http://lists.gnu.org/archive/html/bug-tar/2017-12/msg00027.html
+
+--- a/tests/difflink.at
++++ b/tests/difflink.at
+@@ -21,7 +21,7 @@ mkdir a
+ genfile -f a/x
+ ln -s x a/y
+ ln a/y a/z
+-tar cf a.tar a
++tar cf a.tar a/x a/y a/z
+ rm a/z
+ ln -s x a/z
+ tar df a.tar
diff --git a/app-arch/tar/metadata.xml b/app-arch/tar/metadata.xml
new file mode 100644
index 000000000000..c7c95933065b
--- /dev/null
+++ b/app-arch/tar/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name="minimal">just install `tar`</flag>
+</use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:tar</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-arch/tar/tar-1.29-r1.ebuild b/app-arch/tar/tar-1.29-r1.ebuild
new file mode 100644
index 000000000000..cc4cfe9bcbef
--- /dev/null
+++ b/app-arch/tar/tar-1.29-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-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 elibc_glibc minimal nls selinux static userland_GNU xattr"
+
+RDEPEND="acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-extract-pathname-bypass.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	FORCE_UNSAFE_CONFIGURE=1 \
+	econf \
+		--enable-backup-scripts \
+		--bindir="${EPREFIX}"/bin \
+		--libexecdir="${EPREFIX}"/usr/sbin \
+		$(usex userland_GNU "" "--program-prefix=g") \
+		$(use_with acl posix-acls) \
+		$(use_enable nls) \
+		$(use_with selinux) \
+		$(use_with xattr xattrs)
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/tar/tar-1.29-r3.ebuild b/app-arch/tar/tar-1.29-r3.ebuild
new file mode 100644
index 000000000000..7f8e1ba1631b
--- /dev/null
+++ b/app-arch/tar/tar-1.29-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 elibc_glibc minimal nls selinux static userland_GNU xattr"
+
+RDEPEND="acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-extract-pathname-bypass-upstream.patch" #598334
+	"${FILESDIR}/${P}-add-files.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	FORCE_UNSAFE_CONFIGURE=1 \
+	econf \
+		--enable-backup-scripts \
+		--bindir="${EPREFIX}"/bin \
+		--libexecdir="${EPREFIX}"/usr/sbin \
+		$(usex userland_GNU "" "--program-prefix=g") \
+		$(use_with acl posix-acls) \
+		$(use_enable nls) \
+		$(use_with selinux) \
+		$(use_with xattr xattrs)
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/tar/tar-1.30.ebuild b/app-arch/tar/tar-1.30.ebuild
new file mode 100644
index 000000000000..f202b7126d40
--- /dev/null
+++ b/app-arch/tar/tar-1.30.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 elibc_glibc minimal nls selinux static userland_GNU xattr"
+
+RDEPEND="acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-test-92.patch
+	"${FILESDIR}"/${P}-fix-test-117-and-118.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(usex userland_GNU "" "--program-prefix=g")
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+	)
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/tardelta-1.0.1 b/app-arch/tardelta-1.0.1
deleted file mode 100644
index 5e5e51f0437f..000000000000
--- a/app-arch/tardelta-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Generate a tarball of differences between two tarballs
-EAPI=5
-HOMEPAGE=https://github.com/zmedico/tardelta
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-1.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9aeddfdceac8ae9863ac318dbc260e74
diff --git a/app-arch/tardelta/Manifest b/app-arch/tardelta/Manifest
new file mode 100644
index 000000000000..72b7960e480e
--- /dev/null
+++ b/app-arch/tardelta/Manifest
@@ -0,0 +1,3 @@
+DIST tardelta-1.0.1.tar.gz 3672 BLAKE2B de1914402bbc79865ef1b60a79493cea34972c5448583e2f7f549bf5135a7c4d4db4ee4e31efed4a2c9bf8f4036707f3db3bff44ccdaf60b6be1cd8e94f54158 SHA512 e2ef4fffd484c8e76d2c8b2c148e31e8af8dc6ff7d11625375c50353898f3051b22c4c36bd2c8eb9f3aee4fd5009d0b6a133eccf605ef3d50c27f381af17de57
+EBUILD tardelta-1.0.1.ebuild 594 BLAKE2B c125ef0dea2354857701a53d82668cbb5fe09e0daff9bbb53ce4c574236c6e7e272ac013e6946f6d41a111c0e4f43a4887349b4449b846bfe2009d9b785c3604 SHA512 f6370dff99b56821743c17396a3df9a32885b69dfaf233fc1e01d302a19ae513fdc13e441f45abc058bea611bdb028e50093a874bbc817125a7890f460f97d1e
+MISC metadata.xml 299 BLAKE2B 3301852415bf0c37ed7360589798ee45e1dea1e5e8a5ed9daed76dde7b63e410de7219c0c414573919c737eef7c3b3854cd9db394cb003981a9e89851b35b224 SHA512 4842f9100c9032fd47975247671e59c2c24cf3e90ddbcab576a168776b09966ddb2c582637f3aabe5b34a35f25dd8f4f8a3f215752d9a15346ac03edd882bfd0
diff --git a/app-arch/tardelta/metadata.xml b/app-arch/tardelta/metadata.xml
new file mode 100644
index 000000000000..727296200d6d
--- /dev/null
+++ b/app-arch/tardelta/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">zmedico/tardelta</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/tardelta/tardelta-1.0.1.ebuild b/app-arch/tardelta/tardelta-1.0.1.ebuild
new file mode 100644
index 000000000000..ea1d9e7cfc3a
--- /dev/null
+++ b/app-arch/tardelta/tardelta-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generate a tarball of differences between two tarballs"
+HOMEPAGE="https://github.com/zmedico/tardelta"
+SRC_URI="https://github.com/zmedico/tardelta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN}.py || die
+	distutils-r1_src_prepare
+}
diff --git a/app-arch/tardy-1.28 b/app-arch/tardy-1.28
deleted file mode 100644
index 5a98621d069f..000000000000
--- a/app-arch/tardy-1.28
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libexplain sys-libs/zlib dev-libs/boost
-DESCRIPTION=A tar post-processor
-EAPI=5
-HOMEPAGE=http://tardy.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libexplain sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/tardy/tardy-1.28.D001.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b41b7d513dc3127f1ef6f2c483ca816d
diff --git a/app-arch/tardy/Manifest b/app-arch/tardy/Manifest
new file mode 100644
index 000000000000..b2dbdc4aa490
--- /dev/null
+++ b/app-arch/tardy/Manifest
@@ -0,0 +1,4 @@
+AUX tardy-1.28-test-utc.patch 247 BLAKE2B 32ef5f3ac00059cca3f4562b81de9059e472bb5d30d84f22e84af09104cdfe48b0e3ce30be893e867e35c36c8d87961a4b733ba92f688d28dc2da0bf3e255754 SHA512 402988d7e0f73cde0bffbcb9ffa4ec60eee310e17c108a80993effdeb6bf00c8a5d6298e7c0b6ad71f85a74046b9d3722346cb4d0beea958653ec29dcafd8b7a
+DIST tardy-1.28.D001.tar.gz 1848303 BLAKE2B 5e0c7869e691e83a40ef09cc7f45cabe32dcf14e56685d85628f507e55e4131e7a4488bfa7b890abebe06a59959d9d715e03470fa9da5d1ddf239c4a3cac32c5 SHA512 d8f02d8a310cd3d84f89a67f3bf4e91689e33631b1701a98b70d32b801b1a7cafee5755f13ed18e31bb9d5b1ec147da21b13b57722e1bf15a9efc355ea5438df
+EBUILD tardy-1.28.ebuild 703 BLAKE2B 0b2527f5337a9b8230571a7d940396d640f654e0c72de1e1c4d2713d45cb77807dc1fe4652ea9ec423dc01be7ba8936c2e499649c1df66ee8c18ad0407cebfe4 SHA512 95d4f4660acec1239ab747cbd7632c4cb511d4fcc95b388cd409e8bc54e7cf000107afabe7d643b481a8358eb9eca0f75c0e3c35680e612fa5e1f50dd4504f0f
+MISC metadata.xml 343 BLAKE2B 7082ea3371e041a810013911796bcf9bc81b7c5eea2fcafb3ee4b647851350621e3da098db50c4a0943e49487680020f8fa16ee1678c417484ee7f11adfc961c SHA512 97b6897b8a642636f9a9b5e1a09eda1c81469a281c7d53278753aca7638a58c0ac7053699f9f6bb31a4642c17489d46f34ccfdd4c98b9d96fe70cf2cadb6741d
diff --git a/app-arch/tardy/files/tardy-1.28-test-utc.patch b/app-arch/tardy/files/tardy-1.28-test-utc.patch
new file mode 100644
index 000000000000..3f15c38020e7
--- /dev/null
+++ b/app-arch/tardy/files/tardy-1.28-test-utc.patch
@@ -0,0 +1,10 @@
+--- tardy-1.28/test/00/t0075a.sh
++++ tardy-1.28/test/00/t0075a.sh
+@@ -19,6 +19,7 @@
+ 
+ TEST_SUBJECT="tarballs >2GB"
+ . test_prelude
++export TZ=UTC
+ 
+ #                                         |||||
+ #    beware potential timezone mismatch:  vvvvv
diff --git a/app-arch/tardy/metadata.xml b/app-arch/tardy/metadata.xml
new file mode 100644
index 000000000000..5af9ba8260f4
--- /dev/null
+++ b/app-arch/tardy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>Tardy is a tar post-processor for manipulating the file headers.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tardy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/tardy/tardy-1.28.ebuild b/app-arch/tardy/tardy-1.28.ebuild
new file mode 100644
index 000000000000..1c542688d194
--- /dev/null
+++ b/app-arch/tardy/tardy-1.28.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A tar post-processor"
+HOMEPAGE="http://tardy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tardy/${P}.D001.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/libexplain
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+src_prepare() {
+	sed -e 's/$(CXX) .* $(CXXFLAGS) -I./\0 -o $@/' \
+		-e '/mv \(.*\)\.o $@/d' \
+		-e '/@sleep 1/d' \
+		-e 's#^\(install-man: $(mandir)/man1/tardy.1\).*#\1#' \
+		-i Makefile.in || die
+
+	epatch "${FILESDIR}"/${P}-test-utc.patch
+	tc-export AR
+}
diff --git a/app-arch/tarsync-0.2.1-r1 b/app-arch/tarsync-0.2.1-r1
deleted file mode 100644
index b7caa2dbc2f0..000000000000
--- a/app-arch/tarsync-0.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=dev-util/diffball-0.7
-DESCRIPTION=Delta compression suite for using/generating binary patches
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-util/diffball-0.7
-SLOT=0
-SRC_URI=mirror://gentoo/tarsync-0.2.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7cf23615334391f790e9198b75af9f3
diff --git a/app-arch/tarsync/Manifest b/app-arch/tarsync/Manifest
new file mode 100644
index 000000000000..0cbd6bd3674d
--- /dev/null
+++ b/app-arch/tarsync/Manifest
@@ -0,0 +1,5 @@
+AUX tarsync-0.2.1-gcc5.patch 2069 BLAKE2B eaa4c529c95caa2d70eda5c9a6901cc92ca3e885a0fd2ef3c4df1a6e53d6b1febe8aba4a043844dd31334aea0d58df964152c1245cccdc112658d2bdc229cf1e SHA512 f62fa7f65e506d34d6f9a90579cda2e0568da55cd11c0926dc8f39b5f3d0f4952e6984bd4b6913f3bff938271d37e689e2b8168f393382a04ae269aafbebcd8c
+AUX tarsync-0.2.1-make.patch 269 BLAKE2B 07b9391018c76b5e34c4cea40bf458bc7681aac0c0e16ae23071c0ff603d156051e321007401cced3d0e1208927f5352e4773c0d275314443bd9be2a48fb18dd SHA512 011c028ffad1575f0b7c1eca10d9744d1466fa74efd9414af54d8b0ef336ef1f7d340ff486a915a946ed2720141016597d3831f452c560bc6fda9569de90643f
+DIST tarsync-0.2.1.tar.bz2 13593 BLAKE2B 4841d501587c8d4932031fe939fce9f41019622af2a4253bfe12c01160956e7eaeebf5ff00174332dce6b17ae150ead42b7c1a57483f948ba191b5c3943f6596 SHA512 bebf8e495ad196c002414c41f9fe9737b5300de18b7c3b16576a7d3bfd94608f36f1b86cb6ed4879c600b71c7706255d9b2d4140b73c5743a473fa2500dbca2d
+EBUILD tarsync-0.2.1-r1.ebuild 662 BLAKE2B 1bb5ce8d30d45e4d00c8c3a670a7e9e692921243988c1ccc45b27f8f108187657cd51d2819ad6f773e62432446a3ac6c9d5b53e640c9e44929e469978d9c71f1 SHA512 d511e4cafdfa0bc266b3dce3d4de5d96c688b89fd39990dd1f60e144fc5420d5a9053762eb2d8abe2e26279212e34dfd9e37acfbdcedce8ba940c5a1696701b1
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch b/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
new file mode 100644
index 000000000000..f11c86bb248a
--- /dev/null
+++ b/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
@@ -0,0 +1,59 @@
+diff --git a/excludes.c b/excludes.c
+index b7c928d..fa43cef 100644
+--- a/excludes.c
++++ b/excludes.c
+@@ -106,7 +106,7 @@ build_exclude(fnm_exclude **ex_ptr, const char *pattern)
+ }
+ 
+ 
+-inline int
++int
+ match_excludes(const char *dir, const char *file, fnm_exclude **excludes)
+ {
+ 	char *p;
+diff --git a/main.c b/main.c
+index 84feed4..2c2da3e 100644
+--- a/main.c
++++ b/main.c
+@@ -42,8 +42,8 @@ int remove_node(const char *path, struct stat *st);
+ int ensure_files_layout(const tar_entry **ttar, const unsigned int ttar_count, tar_entry ***missing, 
+ 	unsigned int *missing_count, tar_entry ***existing, unsigned int *existing_count,
+ 	fnm_exclude **excludes);
+-inline int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
+-inline int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
++int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
++int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
+ int copy_whole_file(cfile *tar_cfh, const tar_entry *ttent);
+ 
+ static int check_mtime = 1;
+@@ -669,7 +669,7 @@ recursively_delete_dir(const char *path)
+ 	return ret;
+ }
+ 
+-inline int
++int
+ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st)
+ {
+ 	int type;
+@@ -685,7 +685,7 @@ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st
+ 	return 0;
+ }
+ 
+-inline int
++int
+ enforce_owner(const char *path, const tar_entry *t, struct stat *st)
+ {
+ 	struct stat st2;
+diff --git a/tar.c b/tar.c
+index 792ccd4..42dc8e7 100644
+--- a/tar.c
++++ b/tar.c
+@@ -40,7 +40,7 @@ int check_str_chksum(const char *block)
+ 
+ /* possibly this could be done different, what of endptr of strtol?
+    Frankly I worry about strtol trying to go too far and causing a segfault, due to tar fields not always having trailing \0 */
+-inline unsigned long octal_str2long(const char *string, unsigned int length)
++unsigned long octal_str2long(const char *string, unsigned int length)
+ {
+ 	if(string[length]) {
+ 		char *ptr = strndup(string, length);
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-make.patch b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
new file mode 100644
index 000000000000..72591115a45a
--- /dev/null
+++ b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
@@ -0,0 +1,13 @@
+Respect CC and LDFLAGS.
+
+--- Makefile
++++ Makefile
+@@ -2,7 +2,7 @@
+ 	CC=gcc
+ endif
+ tarsync:	main.o names.o tar.o string-misc.o fs.o options.o excludes.o
+-	gcc $(CFLAGS) $^ -o tarsync -lcfile
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o tarsync -lcfile
+ all:		tarsync
+ 
+ clean:	
diff --git a/app-arch/tarsync/metadata.xml b/app-arch/tarsync/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-arch/tarsync/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-arch/tarsync/tarsync-0.2.1-r1.ebuild b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..c9db986bc6c6
--- /dev/null
+++ b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Delta compression suite for using/generating binary patches"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux"
+IUSE=""
+
+DEPEND=">=dev-util/diffball-0.7"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P}-gcc5.patch
+}
+
+src_install() {
+	dobin "${PN}" #make install doesn't support prefix
+}
diff --git a/app-arch/torrentzip-0.9 b/app-arch/torrentzip-0.9
deleted file mode 100644
index 3904fd126fd8..000000000000
--- a/app-arch/torrentzip-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-libs/zlib app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Create identical zip archives over multiple systems
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/trrntzip
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/torrentzip-0.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=53aa13c453dc1f9abd14e5366c90fce4
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
new file mode 100644
index 000000000000..3f1ac1812459
--- /dev/null
+++ b/app-arch/torrentzip/Manifest
@@ -0,0 +1,3 @@
+DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
+EBUILD torrentzip-0.9.ebuild 545 BLAKE2B d611213e01e6fa3257de87fba67f97d8c58a00e5b465f4068c92dcaced997147995d5cb0829b051ce5d109e76f0f8091fa86868e31863afb03aa51bf47755e76 SHA512 e8529a17ef17a9907b32c91fa31bb743a2773ed4bff637fd0cce9f88e510e50e814fb779f96e93567b32485fa7cf2130bd32daac22219e4ffec61e83e89ee5bd
+MISC metadata.xml 721 BLAKE2B 3a3fff9bfc6d5ab338abecf42f6a742f6e46e00907bb4858c6c41144d46dc40612346a7421274d62b33d4e66f284049da348c5389627492550c2c853aa0e2c34 SHA512 3e9c20623abceddb37559d631e498012bdd080a9b63f29aed8503553e6db7dfc2bff44226f3615c56a9bcc4ddb1c15b2f322d9f77fc1dc1788e62b4b2ea4c2ae
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
new file mode 100644
index 000000000000..8c0252f5120a
--- /dev/null
+++ b/app-arch/torrentzip/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alex.miller@gmx.de</email>
+		<name>Alexander Miller</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+
+	<longdescription>
+		TorrentZip is a replacement for MameZip. The goal of the program is to 
+		use standard values when creating zips to create identical files over 
+		multiple systems. It has the ability to create a torrentzip format 
+		from a zip file.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">trrntzip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/torrentzip/torrentzip-0.9.ebuild b/app-arch/torrentzip/torrentzip-0.9.ebuild
new file mode 100644
index 000000000000..0aa3083323bf
--- /dev/null
+++ b/app-arch/torrentzip/torrentzip-0.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Create identical zip archives over multiple systems"
+HOMEPAGE="https://sourceforge.net/projects/trrntzip"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib"
+
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip"
+
+DOCS=(README AUTHORS)
+
+src_prepare() {
+	default
+	export CPPFLAGS+=" -DOF\\(args\\)=args"
+	eautoreconf
+}
diff --git a/app-arch/unace-2.5-r5 b/app-arch/unace-2.5-r5
deleted file mode 100644
index a119437d2bdd..000000000000
--- a/app-arch/unace-2.5-r5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=ACE unarchiver
-EAPI=6
-HOMEPAGE=http://www.winace.com/
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris
-LICENSE=freedist
-SLOT=1
-SRC_URI=mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5-9.debian.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b04cbc34ef17ecb61eb0e8b92b9e7aec
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
new file mode 100644
index 000000000000..922b23255b03
--- /dev/null
+++ b/app-arch/unace/Manifest
@@ -0,0 +1,4 @@
+DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb16e4c501510f88c4b20e214026d1a39f93e3a1e37129d8b54b61f90aa04ca56d9bb1bb186ea3d394772ef48660d6926312ea3 SHA512 bb704cc1881601b3319b6052bce71f1c98d638b6822f32b9595c9b5434898187d747220c7167cc4acb2bbdbe8bde8618856fdcd277a69026a4bef41950cbb46b
+DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
+EBUILD unace-2.5-r5.ebuild 677 BLAKE2B ca0a577950e223e6df924ccf5a79d8462ae4bd52d7dd0fda717d1aff235dab09be092eefed7a09199ef262328d99dc542a37313711b68d20bd52ab0477d6e8fc SHA512 d9115f91b9b747b93cb6ef18dd50f2b497426d9e61ab3433ff446ef849316e5f5619768331873e895fbf3bc9fefbecdde87c253acf2566e84826b0ce302bc988
+MISC metadata.xml 334 BLAKE2B 70154980d5673f6a7b222729a9d122d52b6a9eeb273105a0a99f8c8a334f9b2ce7b723e0055de15205177da6c833a989c5c19c60a551e9df9041e559096b53ea SHA512 13504f823b15124d38de0d351767169e9b51ed0f397175b3bb59ee7c16684c494d1adf2dc2be5cdea91e2f9186c5e318ee514d37b821eeec73f9f14ed5d731c4
diff --git a/app-arch/unace/metadata.xml b/app-arch/unace/metadata.xml
new file mode 100644
index 000000000000..538a6fc509dc
--- /dev/null
+++ b/app-arch/unace/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<longdescription>Unace is a archive opener for the Ace format.</longdescription>
+</pkgmetadata>
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r5.ebuild
new file mode 100644
index 000000000000..953d96dfa859
--- /dev/null
+++ b/app-arch/unace/unace-2.5-r5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DEB_VER="9"
+DESCRIPTION="ACE unarchiver"
+HOMEPAGE="http://www.winace.com/"
+SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
+	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}-${DEB_VER}.debian.tar.xz"
+
+LICENSE="freedist"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE=""
+
+PATCHES=( "${WORKDIR}"/debian/patches/ )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin unace
+	doman "${WORKDIR}"/debian/manpage/unace.1
+}
diff --git a/app-arch/unadf-0.7.12-r1 b/app-arch/unadf-0.7.12-r1
deleted file mode 100644
index 841aba07e1e2..000000000000
--- a/app-arch/unadf-0.7.12-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Extract files from Amiga adf disk images
-EAPI=6
-HOMEPAGE=http://lclevy.free.fr/adflib/
-IUSE=static-libs
-KEYWORDS=amd64 hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://lclevy.free.fr/adflib/adflib-0.7.12.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7e88d13cd4ba74723f7cee8e942de72e
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
new file mode 100644
index 000000000000..94f244259159
--- /dev/null
+++ b/app-arch/unadf/Manifest
@@ -0,0 +1,4 @@
+AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
+DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
+EBUILD unadf-0.7.12-r1.ebuild 711 BLAKE2B 3f5f4f4ce0b60f1cc8e5f52b12b52ce83159bb12286613eae5360d3b5145324da315fa0eb719289dbb275619c70a1726a3aa152db80a2432eef7a00f6bbe0b44 SHA512 8fdca2e22a57466c677457a56124ffece2f87578b97b70b8d3e2faba0b8062c31a6ab2505a47309e021e83dddc15c3f1fc62335d6d105e1382742c66019fc62a
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-arch/unadf/files/unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch b/app-arch/unadf/files/unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch
new file mode 100644
index 000000000000..5547e0047cbc
--- /dev/null
+++ b/app-arch/unadf/files/unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch
@@ -0,0 +1,146 @@
+Description: Fix unsafe extraction by using mkdir() instead of shell command
+  This commit fixes following vulnerabilities:
+
+  - CVE-2016-1243: stack buffer overflow caused by blindly trusting on
+    pathname lengths of archived files
+
+    Stack allocated buffer sysbuf was filled with sprintf() without any
+    bounds checking in extracTree() function.
+
+  - CVE-2016-1244: execution of unsanitized input
+
+    Shell command used for creating directory paths was constructed by
+    concatenating names of archived files to the end of the command
+    string.
+
+  So, if the user was tricked to extract a specially crafted .adf file,
+  the attacker was able to execute arbitrary code with privileges of the
+  user.
+
+  This commit fixes both issues by
+
+    1) replacing mkdir shell commands with mkdir() function calls
+    2) removing redundant sysbuf buffer
+
+Author: Tuomas Räsänen <tuomasjjrasanen@tjjr.fi>
+Last-Update: 2016-09-20
+--
+--- a/examples/unadf.c
++++ b/examples/unadf.c
+@@ -24,6 +24,8 @@
+ 
+ #define UNADF_VERSION "1.0"
+ 
++#include <sys/stat.h>
++#include <sys/types.h>
+ 
+ #include<stdlib.h>
+ #include<errno.h>
+@@ -31,17 +33,15 @@
+ 
+ #include "adflib.h"
+ 
+-/* The portable way used to create a directory is to call the MKDIR command via the
+- * system() function.
+- * It is used to create the 'dir1' directory, like the 'dir1/dir11' directory
++/* The portable way used to create a directory is to call mkdir()
++ * which is defined by following standards: SVr4, BSD, POSIX.1-2001
++ * and POSIX.1-2008
+  */
+ 
+ /* the portable way to check if a directory 'dir1' already exists i'm using is to
+  * do fopen('dir1','rb'). NULL is returned if 'dir1' doesn't exists yet, an handle instead
+  */
+ 
+-#define MKDIR "mkdir"
+-
+ #ifdef WIN32
+ #define DIRSEP '\\'
+ #else
+@@ -51,6 +51,13 @@
+ #define EXTBUFL 1024*8
+ 
+ 
++static void mkdirOrLogErr(const char *const path)
++{
++	if (mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO))
++		fprintf(stderr, "mkdir: cannot create directory '%s': %s\n",
++			path, strerror(errno));
++}
++
+ void help()
+ {
+     puts("unadf [-lrcsp -v n] dumpname.adf [files-with-path] [-d extractdir]");
+@@ -152,7 +159,6 @@ void extractTree(struct Volume *vol, str
+ {
+ 	struct Entry* entry;
+     char *buf;
+-    char sysbuf[200];
+ 
+     while(tree) {
+         entry = (struct Entry*)tree->content;
+@@ -162,16 +168,14 @@ void extractTree(struct Volume *vol, str
+                 buf=(char*)malloc(strlen(path)+1+strlen(entry->name)+1);
+                 if (!buf) return;
+                 sprintf(buf,"%s%c%s",path,DIRSEP,entry->name);
+-                sprintf(sysbuf,"%s %s",MKDIR,buf);
+                 if (!qflag) printf("x - %s%c\n",buf,DIRSEP);
++                if (!pflag) mkdirOrLogErr(buf);
+             }
+             else {
+-                sprintf(sysbuf,"%s %s",MKDIR,entry->name);
+                 if (!qflag) printf("x - %s%c\n",entry->name,DIRSEP);
++                if (!pflag) mkdirOrLogErr(entry->name);
+             }
+ 
+-            if (!pflag) system(sysbuf);
+-
+ 	        if (tree->subdir!=NULL) {
+                 if (adfChangeDir(vol,entry->name)==RC_OK) {
+                     if (buf!=NULL)
+@@ -301,21 +305,20 @@ void processFile(struct Volume *vol, cha
+         extractFile(vol, name, path, extbuf, pflag, qflag);
+     }
+     else {
+-        /* the all-in-one string : to call system(), to find the filename, the convert dir sep char ... */
+-        bigstr=(char*)malloc(strlen(MKDIR)+1+strlen(path)+1+strlen(name)+1);
++        bigstr=(char*)malloc(strlen(path)+1+strlen(name)+1);
+         if (!bigstr) { fprintf(stderr,"processFile : malloc"); return; }
+ 
+         /* to build to extract path */
+         if (strlen(path)>0) {
+-            sprintf(bigstr,"%s %s%c%s",MKDIR,path,DIRSEP,name);
+-            cdstr = bigstr+strlen(MKDIR)+1+strlen(path)+1;
++            sprintf(bigstr,"%s%c%s",path,DIRSEP,name);
++            cdstr = bigstr+strlen(path)+1;
+         }
+         else {
+-            sprintf(bigstr,"%s %s",MKDIR,name);
+-            cdstr = bigstr+strlen(MKDIR)+1;
++            sprintf(bigstr,"%s",name);
++            cdstr = bigstr;
+         }
+         /* the directory in which the file will be extracted */
+-        fullname =  bigstr+strlen(MKDIR)+1;
++        fullname =  bigstr;
+ 
+         /* finds the filename, and separates it from the path */
+         filename = strrchr(bigstr,'/')+1;
+@@ -333,7 +336,7 @@ void processFile(struct Volume *vol, cha
+                     return;
+                 tfile = fopen(fullname,"r"); /* the only portable way to test if the dir exists */
+                 if (tfile==NULL) { /* does't exist : create it */
+-                    if (!pflag) system(bigstr);
++                    if (!pflag) mkdirOrLogErr(bigstr);
+                     if (!qflag) printf("x - %s%c\n",fullname,DIRSEP);
+                 }
+                 else
+@@ -350,7 +353,7 @@ void processFile(struct Volume *vol, cha
+                     return;
+                 tfile = fopen(fullname,"r");
+                 if (tfile==NULL) {
+-                    if (!pflag) system(bigstr);
++                    if (!pflag) mkdirOrLogErr(bigstr);
+                     if (!qflag) printf("x - %s%c\n",fullname,DIRSEP);
+                 }
+                 else
diff --git a/app-arch/unadf/metadata.xml b/app-arch/unadf/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/app-arch/unadf/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/unadf/unadf-0.7.12-r1.ebuild b/app-arch/unadf/unadf-0.7.12-r1.ebuild
new file mode 100644
index 000000000000..1bbe4e3b7be6
--- /dev/null
+++ b/app-arch/unadf/unadf-0.7.12-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_PN="adflib"
+
+DESCRIPTION="Extract files from Amiga adf disk images"
+HOMEPAGE="http://lclevy.free.fr/adflib/"
+SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/unar-1.10.1 b/app-arch/unar-1.10.1
deleted file mode 100644
index a336e2ad4e4f..000000000000
--- a/app-arch/unar-1.10.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base sys-libs/zlib:= >=gnustep-base/gnustep-make-2.6.0[native-exceptions] sys-devel/gcc[objc]
-DESCRIPTION=unpacker for various archiving formats, e.g. rar v3
-EAPI=6
-HOMEPAGE=https://unarchiver.c3.cx/
-KEYWORDS=amd64
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base sys-libs/zlib:=
-SLOT=0
-SRC_URI=https://unarchiver.c3.cx/downloads/unar1.10.1_src.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=385bd468d63b2816ee534d304e2d7f19
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
new file mode 100644
index 000000000000..583c6c577b34
--- /dev/null
+++ b/app-arch/unar/Manifest
@@ -0,0 +1,3 @@
+DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
+EBUILD unar-1.10.1.ebuild 1169 BLAKE2B ebac22af794e9a19dba80156dfe96c912ddb27b163b485e884a3c9cb7a8e725c01f420f733cf216a5b19c97d50330144700b56f12426152f893d80e33f2cd261 SHA512 e8681f438331639273f32e52a9fd51f761b628584a75ad0792f42fecadde25cc5dbc175a647df031bbb1914b2f848feb1e60ce098e9a707287013ae727936492
+MISC metadata.xml 299 BLAKE2B e4ba80605afa425e3affada863a2816f561e3ac3a7eba58e6392df43b9772dbc8de406a660688c556a4ebcd48647722bbb1139b2016596901a34712b9a8d4a31 SHA512 6b3bfdb09755e678dc609356ff3819f66574af5718870ff7f2ca29a6f1a1c85e1cc781d713bd27ebc8ae2d44171efabd3a69202f3b1c75323c4f410136c2850f
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
new file mode 100644
index 000000000000..0cdd2da33f04
--- /dev/null
+++ b/app-arch/unar/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">theunarchiver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/unar/unar-1.10.1.ebuild b/app-arch/unar/unar-1.10.1.ebuild
new file mode 100644
index 000000000000..e81a5cd05425
--- /dev/null
+++ b/app-arch/unar/unar-1.10.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="unpacker for various archiving formats, e.g. rar v3"
+HOMEPAGE="https://unarchiver.c3.cx/"
+SRC_URI="https://unarchiver.c3.cx/downloads/${PN}${PV}_src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/icu:=
+	gnustep-base/gnustep-base
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
+	sys-devel/gcc[objc]
+"
+
+S="${WORKDIR}/The Unarchiver/XADMaster"
+
+src_prepare() {
+	default
+	# avoid jobserver warning, upstream bug:
+	# https://bitbucket.org/WAHa_06x36/theunarchiver/issues/918/dont-call-make-from-makefile
+	sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
+}
+
+src_compile() {
+	emake -f Makefile.linux \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		OBJCC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		OBJCFLAGS="${CFLAGS}" \
+		LD="$(tc-getCXX)" \
+		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
+}
+
+src_install() {
+	dobin {ls,un}ar
+	doman ../Extra/{ls,un}ar.1
+}
diff --git a/app-arch/unarj-2.65 b/app-arch/unarj-2.65
deleted file mode 100644
index 7abbb02833f8..000000000000
--- a/app-arch/unarj-2.65
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Utility for opening arj archives
-EAPI=6
-HOMEPAGE=http://www.arjsoftware.com/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=arj
-SLOT=0
-SRC_URI=mirror://freebsd/ports/local-distfiles/ache/unarj-2.65.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c8bb4c216be8fb2dd384c91207926917
diff --git a/app-arch/unarj/Manifest b/app-arch/unarj/Manifest
new file mode 100644
index 000000000000..9f1bb8868699
--- /dev/null
+++ b/app-arch/unarj/Manifest
@@ -0,0 +1,7 @@
+AUX unarj-2.65-CAN-2004-0947.patch 1523 BLAKE2B f746d4a06119c6c8b926e208d122dc54338706f13534badbdf66edae0bbe6551afdca0de235553812fb258db4f55029ad54832f5625cd1e5e8c1595e2af06e88 SHA512 714580c0602b12013ca39fc3850298c1fe11d48ac156a5883a3d7b0c5a8adabd96d85963e5e4500df82ebc9300366d437be0f67bf6577739da9ce880eaa44b85
+AUX unarj-2.65-Wformat-security.patch 1303 BLAKE2B c13a77846264f9e5e8ab552179d005ead44e5c4418a58206cea3d00a2f3470b5176c82558a0ad2e1765c9a3d14760e941324af3057de9cf21f6d2c6191442600 SHA512 498386e182976b97f46614b73d345836b60440236b71d41bedd9b7671331d98dd485554eb93353055ae5d93619a8eeed0dc84a558cafb1c84188cb5fc865415e
+AUX unarj-2.65-gentoo-fbsd.patch 168 BLAKE2B db8ad647f7666cc2e0032b35f5cfc36d63a38f918e4424681778f8d3ad599a1356c4c0733c35d4140618a311b8e07da61b035d7ff391efec1f1ae6fea7de9a78 SHA512 fc3d42d7ee9b38e871938c159398e773102e9d83896393f074f0cf02b4619d6d663668cea50d84d04b1372b7b5d4f6e46db36345123a65750b545416ef7f2eb2
+AUX unarj-2.65-sanitation.patch 2710 BLAKE2B 814acc285392cdc44d2f4151e2aa10b9664f3dfec0968028e6f6c20207586034182cbeab9dee8e8340fe52f1a2bd7bb4d1793714d2f6806889128d2bb200d0c6 SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755
+DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
+EBUILD unarj-2.65.ebuild 726 BLAKE2B 9d30c053d0671c7b804734afbea557a7f1c86213c3bce1d5d29b44371cb81408d45d52e0acadab67280e9cec5381c4a94fc227edabfa5585beedc3a9a68cf8d5 SHA512 171e05906682922bd79516ab32a628a6e7fbe3229b370cbe16c616d5ae29cd47eb04182712d55329d7c6d443d43d745a5cf5e58ea0d8a091f541a68c49b7561c
+MISC metadata.xml 438 BLAKE2B f481e5ad2c0786e15e1f0c2aa835fd356d239f84ad59319f8330538466576c342f3c10a7c04b646ce3474d04e8fa52d592368ea2958cd03c60d514e178cfb049 SHA512 507f17fa799964dd8c11492327b7077f9a2e667aefe2c9249a05df95f8f0a7a1c4ffd1735a2f9292f999c0914ba901f7f3a534c626c72eb69dff04a0f5ca22a6
diff --git a/app-arch/unarj/files/unarj-2.65-CAN-2004-0947.patch b/app-arch/unarj/files/unarj-2.65-CAN-2004-0947.patch
new file mode 100644
index 000000000000..f52af83ac2ca
--- /dev/null
+++ b/app-arch/unarj/files/unarj-2.65-CAN-2004-0947.patch
@@ -0,0 +1,49 @@
+Index: unarj-2.65/unarj.c
+===================================================================
+--- unarj-2.65.orig/unarj.c
++++ unarj-2.65/unarj.c
+@@ -217,7 +217,7 @@ static uchar  arj_flags;
+ static short  method;
+ static uint   file_mode;
+ static ulong  time_stamp;
+-static short  entry_pos;
++static ushort entry_pos;
+ static ushort host_data;
+ static uchar  *get_ptr;
+ static UCRC   file_crc;
+@@ -608,6 +608,7 @@ char *name;
+         error(M_BADHEADR, "");
+ 
+     crc = CRC_MASK;
++    memset(header, 0, sizeof(header));
+     fread_crc(header, (int) headersize, fd);
+     header_crc = fget_crc(fd);
+     if ((crc ^ CRC_MASK) != header_crc)
+@@ -632,9 +633,13 @@ char *name;
+ 
+     if (origsize < 0 || compsize < 0)
+         error(M_HEADRCRC, "");
++    if(first_hdr_size > headersize-2) /* need two \0 for file and comment */
++        error(M_BADHEADR, "");
+ 
+     hdr_filename = (char *)&header[first_hdr_size];
+     strncopy(filename, hdr_filename, sizeof(filename));
++    if(entry_pos >= strlen(filename))
++        error(M_BADHEADR, "");
+     if (host_os != OS)
+         strparity((uchar *)filename);
+     if ((arj_flags & PATHSYM_FLAG) != 0)
+@@ -733,11 +738,11 @@ extract()
+ 
+     no_output = 0;
+     if (command == 'E')
+-        strcpy(name, &filename[entry_pos]);
++        strncopy(name, &filename[entry_pos], sizeof(name));
+     else
+     {
+         strcpy(name, DEFAULT_DIR);
+-        strcat(name, filename);
++        strncopy(name+strlen(name), filename, sizeof(name)-strlen(name));
+     }
+ 
+     if (host_os != OS)
diff --git a/app-arch/unarj/files/unarj-2.65-Wformat-security.patch b/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
new file mode 100644
index 000000000000..a076dd91f13d
--- /dev/null
+++ b/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
@@ -0,0 +1,66 @@
+Bug: https://bugs.gentoo.org/520478
+
+--- a/unarj.c
++++ b/unarj.c
+@@ -699,7 +699,7 @@
+     }
+     if ((arj_flags & GARBLE_FLAG) != 0)
+     {
+-        printf(M_ENCRYPT);
++        puts(M_ENCRYPT);
+         printf(M_SKIPPED, filename);
+         skip();
+         return -1;
+@@ -763,7 +763,7 @@
+     }
+     printf(M_EXTRACT, name);
+     if (host_os != OS && file_type == BINARY_TYPE)
+-        printf(M_DIFFHOST);
++        puts(M_DIFFHOST);
+     printf("  ");
+ 
+     crc = CRC_MASK;
+@@ -779,10 +779,10 @@
+     set_ftime_mode(name, time_stamp, file_mode, (uint) host_os);
+ 
+     if ((crc ^ CRC_MASK) == file_crc)
+-        printf(M_CRCOK);
++        puts(M_CRCOK);
+     else
+     {
+-        printf(M_CRCERROR);
++        puts(M_CRCERROR);
+         error_count++;
+     }
+     return 1;
+@@ -808,10 +808,10 @@
+         decode_f();
+ 
+     if ((crc ^ CRC_MASK) == file_crc)
+-        printf(M_CRCOK);
++        puts(M_CRCOK);
+     else
+     {
+-        printf(M_CRCERROR);
++        puts(M_CRCERROR);
+         error_count++;
+     }
+     return 1;
+@@ -958,7 +958,7 @@
+     int i;
+ 
+     for (i = 0; M_USAGE[i] != NULL; i++)
+-        printf(M_USAGE[i]);
++        puts(M_USAGE[i]);
+ }
+ 
+ int
+@@ -973,7 +973,7 @@
+     argc = ccommand(&argv);
+ #endif
+ 
+-    printf(M_VERSION);
++    puts(M_VERSION);
+ 
+     if (argc == 1)
+     {
diff --git a/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
new file mode 100644
index 000000000000..2091f091e2d2
--- /dev/null
+++ b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
@@ -0,0 +1,9 @@
+--- a/environ.c
++++ b/environ.c
+@@ -437,7 +437,6 @@
+ #endif
+ 
+ extern struct tm *localtime();
+-extern time_t time();
+ extern char   *strcpy();
+ extern voidp  *malloc();
+\ No newline at end of file
diff --git a/app-arch/unarj/files/unarj-2.65-sanitation.patch b/app-arch/unarj/files/unarj-2.65-sanitation.patch
new file mode 100644
index 000000000000..f37784ed2491
--- /dev/null
+++ b/app-arch/unarj/files/unarj-2.65-sanitation.patch
@@ -0,0 +1,126 @@
+Index: unarj-2.65/sanitize.c
+===================================================================
+--- /dev/null
++++ unarj-2.65/sanitize.c
+@@ -0,0 +1,81 @@
++/*
++ * Path sanitation code by Ludwig Nussel <ludwig.nussel@suse.de>. Public Domain.
++ */
++
++#include "unarj.h"
++
++#include <string.h>
++#include <limits.h>
++#include <stdio.h>
++
++#ifndef PATH_CHAR
++#define PATH_CHAR '/'
++#endif
++#ifndef MIN
++#define MIN(x,y) ((x)<(y)?(x):(y))
++#endif
++
++/* copy src into dest converting the path to a relative one inside the current
++ * directory. dest must hold at least len bytes */
++void copy_path_relative(char *dest, char *src, size_t len)
++{
++    char* o = dest;
++    char* p = src;
++
++    *o = '\0';
++
++    while(*p && *p == PATH_CHAR) ++p;
++    for(; len && *p;)
++    {
++	src = p;
++	p = strchr(src, PATH_CHAR);
++	if(!p) p = src+strlen(src);
++
++	/* . => skip */
++	if(p-src == 1 && *src == '.' )
++	{
++	    if(*p) src = ++p;
++	}
++	/* .. => pop one */
++	else if(p-src == 2 && *src == '.' && src[1] == '.')
++	{
++	    if(o != dest)
++	    {
++		char* tmp;
++		*o = '\0';
++		tmp = strrchr(dest, PATH_CHAR);
++		if(!tmp)
++		{
++		    len += o-dest;
++		    o = dest;
++		    if(*p) ++p;
++		}
++		else
++		{
++		    len += o-tmp;
++		    o = tmp;
++		    if(*p) ++p;
++		}
++	    }
++	    else /* nothing to pop */
++		if(*p) ++p;
++	}
++	else
++	{
++	    size_t copy;
++	    if(o != dest)
++	    {
++		--len;
++		*o++ = PATH_CHAR;
++	    }
++	    copy = MIN(p-src,len);
++	    memcpy(o, src, copy);
++	    len -= copy;
++	    src += copy;
++	    o += copy;
++	    if(*p) ++p;
++	}
++	while(*p && *p == PATH_CHAR) ++p;
++    }
++    o[len?0:-1] = '\0';
++}
+Index: unarj-2.65/unarj.c
+===================================================================
+--- unarj-2.65.orig/unarj.c
++++ unarj-2.65/unarj.c
+@@ -235,6 +235,8 @@ static UCRC   crctable[UCHAR_MAX + 1];
+ 
+ /* Functions */
+ 
++void copy_path_relative(char *dest, char *src, size_t len);
++
+ static void
+ make_crctable()
+ {
+@@ -738,11 +740,11 @@ extract()
+ 
+     no_output = 0;
+     if (command == 'E')
+-        strncopy(name, &filename[entry_pos], sizeof(name));
++        copy_path_relative(name, &filename[entry_pos], sizeof(name));
+     else
+     {
+         strcpy(name, DEFAULT_DIR);
+-        strncopy(name+strlen(name), filename, sizeof(name)-strlen(name));
++        copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name));
+     }
+ 
+     if (host_os != OS)
+--- unarj-2.65.orig/Makefile	Mon Nov 29 16:47:24 2004
++++ unarj-2.65/Makefile	Mon Nov 29 22:46:56 2004
+@@ -9,7 +9,9 @@
+ 
+ decode.o:   decode.c  unarj.h
+ 
+-OBJS = unarj.o decode.o environ.o
++sanitize.o: sanitize.c unarj.h
++
++OBJS = unarj.o decode.o environ.o sanitize.o
+ 
+ unarj: $(OBJS)
+ 	$(CC) $(LDFLAGS) $(OBJS) -o unarj
diff --git a/app-arch/unarj/metadata.xml b/app-arch/unarj/metadata.xml
new file mode 100644
index 000000000000..e8c216b62618
--- /dev/null
+++ b/app-arch/unarj/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>nitro@legroom.net</email>
+  <name>Jared B.</name>
+</maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>A utility that is designed to open arj archives.</longdescription>
+</pkgmetadata>
diff --git a/app-arch/unarj/unarj-2.65.ebuild b/app-arch/unarj/unarj-2.65.ebuild
new file mode 100644
index 000000000000..ec1cba73be8e
--- /dev/null
+++ b/app-arch/unarj/unarj-2.65.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility for opening arj archives"
+HOMEPAGE="http://www.arjsoftware.com/"
+SRC_URI="mirror://freebsd/ports/local-distfiles/ache/${P}.tgz"
+
+LICENSE="arj"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CAN-2004-0947.patch
+	"${FILESDIR}"/${P}-sanitation.patch
+	"${FILESDIR}"/${P}-gentoo-fbsd.patch
+	"${FILESDIR}"/${PN}-2.65-Wformat-security.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin unarj
+	dodoc unarj.txt technote.txt
+}
diff --git a/app-arch/unmakeself-1.1 b/app-arch/unmakeself-1.1
deleted file mode 100644
index bcbe3fc74d4d..000000000000
--- a/app-arch/unmakeself-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-arch/libarchive:=[bzip2,zlib] virtual/pkgconfig
-DESCRIPTION=Makeself archive extractor
-EAPI=6
-HOMEPAGE=https://www.freshports.org/archivers/unmakeself
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive:=[bzip2,zlib]
-SLOT=0
-SRC_URI=mirror://gentoo/unmakeself-1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe0c49aaf82e72d947403801be64e956
diff --git a/app-arch/unmakeself/Manifest b/app-arch/unmakeself/Manifest
new file mode 100644
index 000000000000..c120a52d06af
--- /dev/null
+++ b/app-arch/unmakeself/Manifest
@@ -0,0 +1,3 @@
+DIST unmakeself-1.1.tar.gz 3635 BLAKE2B 650a7f45dc5204f5ae42002addc5892fb3ce3d4d2b8b5ed343329cd34ae7086e1f680ddcb25123255feff1dd2a70d4427a30aa0a8ac7c0309b19847fefcb5390 SHA512 3e8a05a907b8807080208300f6c20577587a0e87000c6746ba457c276e4dff37c8d61227bd1db37e60ac20d9532290c4110a1204c8389a8a1e97a121b68c682b
+EBUILD unmakeself-1.1.ebuild 650 BLAKE2B 1c5979c4b1dc9bb6e72ae30fa82e96c8ab267ec75244658cf2d678a1e197a1ce6994e4bda91998c0c64532f3975000850b6416afa6b4f096f80a093214701a4a SHA512 223b4154e20e4b028353f5e417fefb5660f986cb80e5db698cf446c4b90b4160e82423050dc6c5e71de996e1bea49641b6d0c74c3328d4f88fdea275c0bde4b1
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-arch/unmakeself/metadata.xml b/app-arch/unmakeself/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-arch/unmakeself/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/app-arch/unmakeself/unmakeself-1.1.ebuild b/app-arch/unmakeself/unmakeself-1.1.ebuild
new file mode 100644
index 000000000000..f826b09d6035
--- /dev/null
+++ b/app-arch/unmakeself/unmakeself-1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Makeself archive extractor"
+HOMEPAGE="https://www.freshports.org/archivers/unmakeself"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-arch/libarchive:=[bzip2,zlib]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libarchive)
+	export LDLIBS=$($(tc-getPKG_CONFIG) --libs libarchive)
+
+	tc-export CC
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	dobin unmakeself
+}
diff --git a/app-arch/unp-2.0_pre7_p1-r1 b/app-arch/unp-2.0_pre7_p1-r1
deleted file mode 100644
index cfc61b73dcb5..000000000000
--- a/app-arch/unp-2.0_pre7_p1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=nls? ( sys-devel/gettext )
-DESCRIPTION=Script for unpacking various file formats
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/u/unp.html
-IUSE=nls
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=nls? ( sys-devel/gettext ) dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a0405a26c72674f806337d427265f50
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
new file mode 100644
index 000000000000..a35d6b223189
--- /dev/null
+++ b/app-arch/unp/Manifest
@@ -0,0 +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
+EBUILD unp-2.0_pre7_p1-r1.ebuild 1230 BLAKE2B 9f89106a462a6e5ac713f7a5b31e8cbd394318642f8e11f73f10d64e1654705045c2c382d96bd59f24656ba09f66a469b84fa1179945dff36a92aa9714c38fb0 SHA512 afeb1d792d4a30a9b4db076080d44c201bd85217350f211db0ea22db428070a73cd7473b225b9461128bb652d3fdb14742a09ebba202a7e740ef7fcaabca434b
+MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff b/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff
new file mode 100644
index 000000000000..a0838a82559f
--- /dev/null
+++ b/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff
@@ -0,0 +1,10 @@
+diff -Naur unp-2.0~pre7+nmu1/bash_completion.d/unp unp-2.0~pre7+nmu1-1/bash_completion.d/unp
+--- unp-2.0~pre7+nmu1/bash_completion.d/unp	2012-05-16 22:05:13.000000000 +0200
++++ unp-2.0~pre7+nmu1-1/bash_completion.d/unp	2014-10-22 10:34:20.343233166 +0200
+@@ -1,6 +1,5 @@
+ # bash completion for unp
+ 
+-have unp &&
+ _unp()
+ {
+     local cur
diff --git a/app-arch/unp/metadata.xml b/app-arch/unp/metadata.xml
new file mode 100644
index 000000000000..28ef3c7b080f
--- /dev/null
+++ b/app-arch/unp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
new file mode 100644
index 000000000000..cfaff187f34c
--- /dev/null
+++ b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+PATCHES=( "${FILESDIR}/${P}-remove-deprecated-have.diff" )
+
+src_compile() {
+	if use nls; then
+		strip-linguas -i .
+		if [ -n "$LINGUAS" ]; then
+			emake -C po MOFILES="${LINGUAS// /.po }.po"
+		else
+			emake -C po
+		fi
+	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
+		if [ -n "$LINGUAS" ]; then
+			emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install
+		else
+			emake -C po DESTDIR="${D}" install
+		fi
+	fi
+}
diff --git a/app-arch/unrar-5.5.8 b/app-arch/unrar-5.5.8
deleted file mode 100644
index b08d48ecc298..000000000000
--- a/app-arch/unrar-5.5.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.5.8.tar.gz -> unrar-5.5.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e543e9397386c7a2369869af8ad69dc
diff --git a/app-arch/unrar-5.6.3 b/app-arch/unrar-5.6.3
deleted file mode 100644
index d42a60f4f18b..000000000000
--- a/app-arch/unrar-5.6.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.3.tar.gz -> unrar-5.6.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f9c5668b2efd9a80faa745eb16e6d11
diff --git a/app-arch/unrar-5.6.4 b/app-arch/unrar-5.6.4
deleted file mode 100644
index e02d08cf387d..000000000000
--- a/app-arch/unrar-5.6.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.4.tar.gz -> unrar-5.6.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f9c5668b2efd9a80faa745eb16e6d11
diff --git a/app-arch/unrar-5.6.5 b/app-arch/unrar-5.6.5
deleted file mode 100644
index 80e7956f1a83..000000000000
--- a/app-arch/unrar-5.6.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.5.tar.gz -> unrar-5.6.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f9c5668b2efd9a80faa745eb16e6d11
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
new file mode 100644
index 000000000000..618acc1e1567
--- /dev/null
+++ b/app-arch/unrar/Manifest
@@ -0,0 +1,11 @@
+AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
+AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
+DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
+DIST unrar-5.6.3.tar.gz 225788 BLAKE2B 8baf99ef85052a395fe0f2daed41803587e7d839949488eb3430e3d3a3dbca30ef894530d5ef40757f7ea2ffdfb2d493e8e13d7322e65885cf03f8fa0859b804 SHA512 cd3c97d357242a91917cdd9ee6898527829bff73dd187e58d7490d0d0ed5ffd8f8db651ce63d4bd8307c6a085fa95d72faa7b0cf1348bba191086136232a98fc
+DIST unrar-5.6.4.tar.gz 225849 BLAKE2B 56257ab9482841a1a27e5afd5b00b19e7319eef250168f08826e3cb63eefa063ece8198133d8439fca8d8905d303715751e24ed36a5018f03982c03cda27a53b SHA512 0ff55a82f8593c59c9773ffa7dec00386b762c504a08497bc1a50de5502c52e1c1d1043cb8ba353291aa61a3ebc9f5f0a21d313d89639f400e5fc45f01d62cca
+DIST unrar-5.6.5.tar.gz 226296 BLAKE2B c35dfdc10976ee2a7827f9386021f79af6712ae3a6641e83934ef7223e1202c46c59e12d2b78abe230c3f929f2228fe8c0664f05275b905ea06806a02cd685aa SHA512 984340935671913b4d2a765db5c4edc0d08d859fc43f3ae0e97e681c4ea302a51808fefa8c11c3aeecad1c2681541f363c5051813d978b5b14959c2e55f71281
+EBUILD unrar-5.5.8.ebuild 1862 BLAKE2B 0b70c50aac539ba810e1764dc0baf9e7eb69a049d48f3eae43e8cc4d1754b3b728ae1a4d8903f8e7a95f0f9429394e85766a34b20b4a54f1355fab7eba64eb86 SHA512 9fc24eb6ed0aa9b333eb6369c529acc062ea89ac95a943b7b7553f69dd0767eadd7e1a6af13a34b62e4717d8996f010c9f6af997b44df134cce4770c48f32fd3
+EBUILD unrar-5.6.3.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
+EBUILD unrar-5.6.4.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
+EBUILD unrar-5.6.5.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
+MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/files/unrar-5.5.5-build.patch b/app-arch/unrar/files/unrar-5.5.5-build.patch
new file mode 100644
index 000000000000..5d69a25d65af
--- /dev/null
+++ b/app-arch/unrar/files/unrar-5.5.5-build.patch
@@ -0,0 +1,44 @@
+Makefile: Fix parallel build issue
+
+If clean runs in parallel with $(OBJECTS), it is possible to build some
+objects first, then the clean target fires and deletes some, and then we
+try to link and fail.
+
+Gentoo-Bug: https://bugs.gentoo.org/528218
+
+--- a/makefile
++++ b/makefile
+@@ -139,23 +139,23 @@ uninstall:	uninstall-unrar
+ 
+ clean:
+ 	@rm -f *.o *.bak *~
+-
+-unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
++	@rm -f default.sfx
++	@rm -f libunrar.so
++	@rm -f libunrar.a
++
++unrar:	$(OBJECTS) $(UNRAR_OBJ)
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+ 	$(STRIP) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+-sfx:	clean $(OBJECTS)
+-	@rm -f default.sfx
++sfx:	$(OBJECTS)
+ 	$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
+ 	$(STRIP) default.sfx
+ 
+ lib:	WHAT=RARDLL
+ lib:	CXXFLAGS+=$(LIBFLAGS)
+-lib:	clean $(OBJECTS) $(LIB_OBJ)
+-	@rm -f libunrar.so
+-	@rm -f libunrar.a
++lib:	$(OBJECTS) $(LIB_OBJ)
+ 	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
+ 
+-- 
+2.13.1
+
diff --git a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch b/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch
new file mode 100644
index 000000000000..0237e3d30f05
--- /dev/null
+++ b/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch
@@ -0,0 +1,46 @@
+Makefile: Honor {LD,CXX}FLAGS, add LIBFLAGS
+
+ - append -pthread to LDFLAGS instead of replacing them
+ - use CXXFLAGS when linking
+ - append LIBFLAGS to the individual targets instead of the final link
+
+Gentoo-Bug: https://bugs.gentoo.org/461806
+
+--- a/makefile
++++ b/makefile
+@@ -8,7 +8,7 @@ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+ AR=ar
+-LDFLAGS=-pthread
++LDFLAGS+=-pthread
+ DESTDIR=/usr
+ 
+ # Linux using LCC
+@@ -145,18 +145,19 @@ clean:
+ 	@rm -f libunrar.a
+ 
+ unrar:	$(OBJECTS) $(UNRAR_OBJ)
+-	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
++	$(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
+ 	$(STRIP) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+ sfx:	$(OBJECTS)
+-	$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
++	$(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS)
+ 	$(STRIP) default.sfx
+ 
++$(OBJECTS) $(LIB_OBJ):	CXXFLAGS+=$(LIBFLAGS)
++
+ lib:	WHAT=RARDLL
+-lib:	CXXFLAGS+=$(LIBFLAGS)
+ lib:	$(OBJECTS) $(LIB_OBJ)
+-	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
++	$(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
+-- 
+2.13.1
+
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
new file mode 100644
index 000000000000..08898384e738
--- /dev/null
+++ b/app-arch/unrar/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>whissi@gentoo.org</email>
+  <name>Thomas Deutschmann</name>
+</maintainer>
+<maintainer type="project">
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
+<slots>
+  <subslots>Reflect ABI of libunrar.so.</subslots>
+</slots>
+<upstream>
+  <remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-arch/unrar/unrar-5.5.8.ebuild b/app-arch/unrar/unrar-5.5.8.ebuild
new file mode 100644
index 000000000000..560952a8c5bc
--- /dev/null
+++ b/app-arch/unrar/unrar-5.5.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-arch/unrar/unrar-5.6.3.ebuild b/app-arch/unrar/unrar-5.6.3.ebuild
new file mode 100644
index 000000000000..78288603ed4f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-arch/unrar/unrar-5.6.4.ebuild b/app-arch/unrar/unrar-5.6.4.ebuild
new file mode 100644
index 000000000000..78288603ed4f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-arch/unrar/unrar-5.6.5.ebuild b/app-arch/unrar/unrar-5.6.5.ebuild
new file mode 100644
index 000000000000..78288603ed4f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-arch/unrpa-1.4.1 b/app-arch/unrpa-1.4.1
deleted file mode 100644
index 775a2dd2ccca..000000000000
--- a/app-arch/unrpa-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Ren'Py's RPA data file extractor
-EAPI=5
-HOMEPAGE=https://github.com/Lattyware/unrpa
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/Lattyware/unrpa/archive/1.4.1.tar.gz -> unrpa-1.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2688f6e4ba98cf207db16ff07ae5f479
diff --git a/app-arch/unrpa-1.4.2 b/app-arch/unrpa-1.4.2
deleted file mode 100644
index 3cf858b9e12d..000000000000
--- a/app-arch/unrpa-1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Ren'Py's RPA data file extractor
-EAPI=6
-HOMEPAGE=https://github.com/Lattyware/unrpa
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/Lattyware/unrpa/archive/1.4.2.tar.gz -> unrpa-1.4.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=61517e3767606a2a2f8ae1e96ea393bc
diff --git a/app-arch/unrpa-9999 b/app-arch/unrpa-9999
deleted file mode 100644
index ab11c3b9850d..000000000000
--- a/app-arch/unrpa-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Ren'Py's RPA data file extractor
-EAPI=6
-HOMEPAGE=https://github.com/Lattyware/unrpa
-IUSE=python_targets_python2_7
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=61517e3767606a2a2f8ae1e96ea393bc
diff --git a/app-arch/unrpa/Manifest b/app-arch/unrpa/Manifest
new file mode 100644
index 000000000000..5af09a24c637
--- /dev/null
+++ b/app-arch/unrpa/Manifest
@@ -0,0 +1,6 @@
+DIST unrpa-1.4.1.tar.gz 14367 BLAKE2B 91e29a4867f8ae9901e5e06663cb8fb8cd1567e7efa4491d54d16aaa6bdcad4ec8314082b4dfff45a99727453b8f19f54df0f156a2194a0eaec35acfba4e6e01 SHA512 9b058adda9a39178950df4c39af40726cdca410f0fca699d0dec1bd5d7046c75c8811c8914c0c8756c29988b6362d3b4ad3756aa77f238eafb13d4414d3266cc
+DIST unrpa-1.4.2.tar.gz 14458 BLAKE2B eb3cf0a0501de06d264047e063805c45aca95a8fb0273ebae4fcefe4e7ab975db6f89123b60cfdc43063e38cfb974c8c8b950cb718ecd238bc4f7146832b2b29 SHA512 2608f4ec11540de1b14290ce1aaad6f06e8111a55b5c6a38c0c9e4d7228c04ccef480425f812a7cbc3913c0ed6865d0b63c8aa0d5ec9131495eab40bbdfcdcc5
+EBUILD unrpa-1.4.1.ebuild 635 BLAKE2B 33ee08b1dc4f669ce6bc553b006a0023e6b1906005a3fcb3c80f6cf6b6976770483b5ab8f2aaed024230df6f7a74a92ae68815676893f993df0176c8faf13ece SHA512 f902a1168f7043abebd81b68089bc32decfe21f624f09fcd07367360f65319d0f225fa6d05002307dfc4db195c6b3c9d5dca81da3b956611ce3531bf38d22ae2
+EBUILD unrpa-1.4.2.ebuild 649 BLAKE2B 41f929559103ea845f9d506b2d051633435ff30420c00b4c494df94a9c5e4fb82d9703a73f5fb820d01f4cdf30b3729b713c4c9a7af70ea4b6a28158a719f0de SHA512 7c14f5bb9a71dcf41307b368ee05a9ca8fe1d8c85ba16552ff5ee7eecce8704537c07b3213f78365c0f44b127d9a8ac4c89ab8ddb3652ded2890492b6244b1a3
+EBUILD unrpa-9999.ebuild 649 BLAKE2B 41f929559103ea845f9d506b2d051633435ff30420c00b4c494df94a9c5e4fb82d9703a73f5fb820d01f4cdf30b3729b713c4c9a7af70ea4b6a28158a719f0de SHA512 7c14f5bb9a71dcf41307b368ee05a9ca8fe1d8c85ba16552ff5ee7eecce8704537c07b3213f78365c0f44b127d9a8ac4c89ab8ddb3652ded2890492b6244b1a3
+MISC metadata.xml 489 BLAKE2B 38e48e25c0ca75341f8192b2511ab974f435f919c38ed09923665fdc9894aa5faaa19aa84c1421615dbf45cb61fc386e3f6663065eb0a615c01f2ea87fb3e61b SHA512 801ef857b1af21d77179f7ab9c0a00060178146509a43cd8d7e18ee89191f435bcf080e1a14367d38a08242eb387eb5cb78afedbfa46274b45bb9a88d1081c29
diff --git a/app-arch/unrpa/metadata.xml b/app-arch/unrpa/metadata.xml
new file mode 100644
index 000000000000..d3970960d42d
--- /dev/null
+++ b/app-arch/unrpa/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<longdescription>
+		Unrpa is a script to extract files from archives created for
+		the Ren'Py Visual Novel Engine (http://www.renpy.org/)
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Lattyware/unrpa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/unrpa/unrpa-1.4.1.ebuild b/app-arch/unrpa/unrpa-1.4.1.ebuild
new file mode 100644
index 000000000000..08b6cbe02bcc
--- /dev/null
+++ b/app-arch/unrpa/unrpa-1.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Lattyware/unrpa.git"
+else
+	SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ren'Py's RPA data file extractor"
+HOMEPAGE="https://github.com/Lattyware/unrpa"
+
+LICENSE="GPL-3"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND=${DEPEND}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/app-arch/unrpa/unrpa-1.4.2.ebuild b/app-arch/unrpa/unrpa-1.4.2.ebuild
new file mode 100644
index 000000000000..116e57d6b1bb
--- /dev/null
+++ b/app-arch/unrpa/unrpa-1.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Lattyware/unrpa.git"
+else
+	SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ren'Py's RPA data file extractor"
+HOMEPAGE="https://github.com/Lattyware/unrpa"
+
+LICENSE="GPL-3"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	python_doscript "${PN}"
+	dodoc README
+}
diff --git a/app-arch/unrpa/unrpa-9999.ebuild b/app-arch/unrpa/unrpa-9999.ebuild
new file mode 100644
index 000000000000..116e57d6b1bb
--- /dev/null
+++ b/app-arch/unrpa/unrpa-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Lattyware/unrpa.git"
+else
+	SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ren'Py's RPA data file extractor"
+HOMEPAGE="https://github.com/Lattyware/unrpa"
+
+LICENSE="GPL-3"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	python_doscript "${PN}"
+	dodoc README
+}
diff --git a/app-arch/unshield-1.4 b/app-arch/unshield-1.4
deleted file mode 100644
index a483ba8cbff7..000000000000
--- a/app-arch/unshield-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=InstallShield CAB file extractor
-EAPI=6
-HOMEPAGE=https://github.com/twogood/unshield
-IUSE=libressl
-KEYWORDS=amd64 ~hppa ~ppc x86
-LICENSE=MIT
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/twogood/unshield/archive/1.4.tar.gz -> unshield-1.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=022c282817b6a815c5a5b4914c5a4423
diff --git a/app-arch/unshield-1.4.2 b/app-arch/unshield-1.4.2
deleted file mode 100644
index 7cf234318b18..000000000000
--- a/app-arch/unshield-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=InstallShield CAB file extractor
-EAPI=6
-HOMEPAGE=https://github.com/twogood/unshield
-IUSE=libressl
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=MIT
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/twogood/unshield/archive/1.4.2.tar.gz -> unshield-1.4.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=844927fc7a9a4f67aeff062d4fc5bce9
diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest
new file mode 100644
index 000000000000..7329db5552f9
--- /dev/null
+++ b/app-arch/unshield/Manifest
@@ -0,0 +1,5 @@
+DIST unshield-1.4.2.tar.gz 46051 BLAKE2B 76e8e724916f5c43c84b17db34f2c5905f99fe424679b9c9fef76e1892d0a2f90e6c195f1a02a8446473860578c34678e395f65cf5973019ed7be5d3dea14e84 SHA512 3ddd5df47198adade66acf89644efe3a1c87d60fcdf511f8e5c1fb29bbb07e77a9abc57a05b161ecb54a26a2a86242bbcba6e90df770b1325965ff5aa8eddf58
+DIST unshield-1.4.tar.gz 37199 BLAKE2B 7f32cdbac3dca8e5e7dfca7e9ae7d12066b0484a8e75f611af173ec12dfd03dfd0ee7b79d05e3c7fb45a3285bbbfacf6020ad100907345a1501b3a8de81c81bc SHA512 b09c29fa8e5785f2ca90b40105304802d00d201dde42ef4f5e4b5504ca8edf10da426c7ed1daa8c0685980f085eb20437162812a2068a0c03c0dfd240edbf944
+EBUILD unshield-1.4.2.ebuild 846 BLAKE2B f9528f21ca70da097527aa4f3b7beb2d1c3f18dbb181a0dcb4f512d05ceaca4a7ba6e8c095507a0428c851ea84b3a5832a3997f8274284721ab7daf375bbb8bb SHA512 99f96f2328ae4efe4dc1cc78014b12d630b69413e0f98823d9ad895d45bf3a7bfd96ea132105786699d165440cfc64fa1352f2cbca472699947fb88e3b732772
+EBUILD unshield-1.4.ebuild 932 BLAKE2B bf19ee8b959311ca950bf81a1d518386614f26dbc5fd799a065fb67847a4c98b9b081a5df3c4624c9bd721995531e56d3b1b41cd5e6d36ec07778bfbf37665d8 SHA512 81c169fa18106e9a4bbebe63ac9f3f4e43f9d4750091a33f65336e36f2995fb1382d5a02bb51b17fb403a06a77ad3a6c0bf47fffa783205b1e53720fc35254a9
+MISC metadata.xml 224 BLAKE2B 39d3ea8455cb2158a24af3db4266dd569cd7765eafa967c5ae2a2cc9f9ceec9d0a8928b5e99d9e5bc5f610501bb6129f1648d6560e0a4980ef9e026dc821a164 SHA512 3c955bc3bb3a290848f9cc01472321c321ad63b98a10eb1a7986024db98c099e5a18c628c6398b37c42e69d333fe88d74cca5c22293aba196991aa317e6ed670
diff --git a/app-arch/unshield/metadata.xml b/app-arch/unshield/metadata.xml
new file mode 100644
index 000000000000..417ce2a21afc
--- /dev/null
+++ b/app-arch/unshield/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">twogood/unshield</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/unshield/unshield-1.4.2.ebuild b/app-arch/unshield/unshield-1.4.2.ebuild
new file mode 100644
index 000000000000..1410d202234b
--- /dev/null
+++ b/app-arch/unshield/unshield-1.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="InstallShield CAB file extractor"
+HOMEPAGE="https://github.com/twogood/unshield"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+# OpenSSL (or LibreSSL) is detected at build time, and used to determine
+# whether or not a hand-rolled md5 implementation is used. The build
+# system prefers OpenSSL's implementation if it's available, and OpenSSL
+# is common enough, so we prefer it too. Since the dependency is
+# automagic (there's no way to hide it), we require Open/LibreSSL
+# unconditionally.
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
diff --git a/app-arch/unshield/unshield-1.4.ebuild b/app-arch/unshield/unshield-1.4.ebuild
new file mode 100644
index 000000000000..44fa7c700751
--- /dev/null
+++ b/app-arch/unshield/unshield-1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="InstallShield CAB file extractor"
+HOMEPAGE="https://github.com/twogood/unshield"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+
+# OpenSSL (or LibreSSL) is detected at build time, and used to determine
+# whether or not a hand-rolled md5 implementation is used. The build
+# system prefers OpenSSL's implementation if it's available, and OpenSSL
+# is common enough, so we prefer it too. Since the dependency is
+# automagic (there's no way to hide it), we require Open/LibreSSL
+# unconditionally.
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+# Without this, the build fails looking for unshield_config.h.
+CMAKE_IN_SOURCE_BUILD=y
diff --git a/app-arch/unzip-6.0_p20 b/app-arch/unzip-6.0_p20
deleted file mode 100644
index d531a747e304..000000000000
--- a/app-arch/unzip-6.0_p20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-DESCRIPTION=unzipper for pkzip-compressed files
-EAPI=5
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 natspec unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-20.debian.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c4cb8e1105df8a892a2fdf16331040ed
diff --git a/app-arch/unzip-6.0_p21-r2 b/app-arch/unzip-6.0_p21-r2
deleted file mode 100644
index d2517635c439..000000000000
--- a/app-arch/unzip-6.0_p21-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-DESCRIPTION=unzipper for pkzip-compressed files
-EAPI=6
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 natspec unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-21.debian.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=171683d2c7e4efc6d4af89a3c7a00aa7
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
new file mode 100644
index 000000000000..f2041b45b3dc
--- /dev/null
+++ b/app-arch/unzip/Manifest
@@ -0,0 +1,9 @@
+AUX unzip-6.0-format-security.patch 4424 BLAKE2B c76ac7c9874238ff20c85e35d8bab809c4b668ff22eb93a3ac614653ab3843fbd80aebb552d285640b13f38f5bb264f6fe3c192b1d30128dfbd33fd9f28da40f SHA512 78340a1a16ed1951e5311fcfb76e38ec58ec0b6dcd74951624dc7778e41ae067d7dba38f394ed3a03436df197582f5d47c49e7c2d62d04c4fcd974eedb9bc726
+AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1ddfee1abc810e57cef52780482abd8c25950cf0da4d976d89745f4aa65b6269f21d0eac290230621b782fa1e0d06 SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda
+AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5
+DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
+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 2600 BLAKE2B cac4f2b6cdf5b50cfa84601e2644f0cd76210127f49da752755def5c468beabd6ec9f4856cc4a04214f4a3600367ee805fca0ca24b50154a485e56223f6a566f SHA512 2bb257106ef4f6c7ff0cfd4c0305565974ca89f127126b7abad9feb52745779e544950b524faead36e63437e311b4b09f50abfa0ed2ebb6997b6b02cc5f7cbe7
+MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/files/unzip-6.0-format-security.patch b/app-arch/unzip/files/unzip-6.0-format-security.patch
new file mode 100644
index 000000000000..c61c13596365
--- /dev/null
+++ b/app-arch/unzip/files/unzip-6.0-format-security.patch
@@ -0,0 +1,91 @@
+Fix build with -Werror=format-security
+
+Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=f7d80257afcfefdc85b6745328f2d12b957a848b
+Author: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
+
+diff --git a/extract.c b/extract.c
+index 7cd9123..25c5a62 100644
+--- a/extract.c
++++ b/extract.c
+@@ -475,7 +475,7 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+                     Info(slide, 0x401, ((char *)slide,
+                       LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
+                     Info(slide, 0x401, ((char *)slide,
+-                      LoadFarString(ReportMsg)));
++                      "%s",LoadFarString(ReportMsg)));
+                     error_in_archive = PK_BADERR;
+                 }
+                 reached_end = TRUE;     /* ...so no more left to do */
+@@ -754,8 +754,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+
+ #ifndef SFX
+     if (no_endsig_found) {                      /* just to make sure */
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
++        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
++        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg)));
+         if (!error_in_archive)       /* don't overwrite stronger error */
+             error_in_archive = PK_WARN;
+     }
+diff --git a/list.c b/list.c
+index 15e0011..0b484f6 100644
+--- a/list.c
++++ b/list.c
+@@ -181,7 +181,7 @@ int list_files(__G)    /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
+                 return PK_BADERR;   /* sig not found */
+             }
+         }
+@@ -507,7 +507,7 @@ int list_files(__G)    /* return PK-type error code */
+             && (!G.ecrec.is_zip64_archive)
+             && (memcmp(G.sig, end_central_sig, 4) != 0)
+            ) {          /* just to make sure again */
+-            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++            Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
+             error_in_archive = PK_WARN;   /* didn't find sig */
+         }
+
+@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
+                 return PK_BADERR;   /* sig not found */
+             }
+         }
+@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
+   ---------------------------------------------------------------------------*/
+ 
+     if (memcmp(G.sig, end_central_sig, 4)) {    /* just to make sure again */
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
+         error_in_archive = PK_WARN;
+     }
+     if (*nmember == 0L && error_in_archive <= PK_WARN)
+diff --git a/zipinfo.c b/zipinfo.c
+index 0ac75b3..1e7fa82 100644
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -833,7 +833,7 @@ int zipinfo(__G)   /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
+                 error_in_archive = PK_BADERR;   /* sig not found */
+                 break;
+             }
+@@ -1022,7 +1022,7 @@ int zipinfo(__G)   /* return PK-type error code */
+             && (!G.ecrec.is_zip64_archive)
+             && (memcmp(G.sig, end_central_sig, 4) != 0)
+            ) {          /* just to make sure again */
+-            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++            Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
+             error_in_archive = PK_WARN;   /* didn't find sig */
+         }
+ 
diff --git a/app-arch/unzip/files/unzip-6.0-natspec.patch b/app-arch/unzip/files/unzip-6.0-natspec.patch
new file mode 100644
index 000000000000..0cf87fd4644f
--- /dev/null
+++ b/app-arch/unzip/files/unzip-6.0-natspec.patch
@@ -0,0 +1,372 @@
+This patch makes zip use libnatspec to recode file names is national charset.
+Initially this patch was written for altlinux:
+http://sisyphus.ru/ru/srpm/Sisyphus/zip/patches
+
+Later it was a bit improved and improved version was posted here (in Russian):
+http://www.opennet.ru/tips/info/2494.shtml
+
+Gentoo reference:
+https://bugs.gentoo.org/show_bug.cgi?id=275244
+
+diff -pur unzip60orig/unix/configure unzip60/unix/configure
+--- unzip60orig/unix/configure	2009-04-16 23:25:12.000000000 +0400
++++ unzip60/unix/configure	2010-11-26 19:07:43.000000000 +0300
+@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
+ IZ_BZIP2=${3}
+ CFLAGS="${CFLAGS} -I. -DUNIX"
+ LFLAGS1=""
+-LFLAGS2="-s"
++LFLAGS2="-l natspec"
+ LN="ln -s"
+ 
+ CFLAGS_OPT=''
+diff -pur unzip60orig/unix/Makefile unzip60/unix/Makefile
+--- unzip60orig/unix/Makefile	2009-01-19 01:41:18.000000000 +0300
++++ unzip60/unix/Makefile	2010-11-29 14:25:58.461000001 +0300
+@@ -45,14 +45,14 @@
+ CC = cc#	try using "gcc" target rather than changing this (CC and LD
+ LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
+ AS = as
+-LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
++LOC = $(D_USE_BZ2) -DNO_SETLOCALE $(LOCAL_UNZIP)
+ AF = $(LOC)
+ CFLAGS = -O
+ CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC)
+ CF = $(CFLAGS) $(CF_NOOPT)
+ LFLAGS1 =
+ LF = -o unzip$E $(LFLAGS1)
+-LF2 = -s
++LF2 = -l natspec
+ 
+ # UnZipSFX flags
+ SL = -o unzipsfx$E $(LFLAGS1)
+@@ -121,7 +121,7 @@ INSTALL_PROGRAM = $(INSTALL)
+ INSTALL_D = mkdir -p
+ # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
+ manext = 1
+-prefix = /usr/local
++prefix = /usr
+ BINDIR = $(prefix)/bin#			where to install executables
+ MANDIR = $(prefix)/man/man$(manext)#	where to install man pages
+ INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
+diff -pur unzip60orig/unix/unix.c unzip60/unix/unix.c
+--- unzip60orig/unix/unix.c	2009-01-24 02:31:26.000000000 +0300
++++ unzip60/unix/unix.c	2010-11-26 16:58:35.000000000 +0300
+@@ -30,6 +30,9 @@
+ #define UNZIP_INTERNAL
+ #include "unzip.h"
+ 
++#include <iconv.h>
++#include <natspec.h>
++
+ #ifdef SCO_XENIX
+ #  define SYSNDIR
+ #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
+@@ -1874,3 +1877,44 @@ static void qlfix(__G__ ef_ptr, ef_len)
+     }
+ }
+ #endif /* QLZIP */
++
++
++char OEM_CP[MAX_CP_NAME] = "";
++char ISO_CP[MAX_CP_NAME] = "";
++
++/* Getr the default value of OEM_CP based on the current locale.
++ * ISO_CP is left alone for now. */
++void init_conversion_charsets()
++{
++    /* Make a guess only if OEM_CP not already set. */ 
++    if(*OEM_CP == '\0') {
++        const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
++        strncpy(OEM_CP, archive_charset, sizeof(OEM_CP));
++    }
++
++    if(*ISO_CP == '\0') {
++        const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_WINCS, "");
++        strncpy(ISO_CP, archive_charset, sizeof(ISO_CP));
++    }
++
++}
++
++/* Convert a string from OEM_CP to the current locale charset. */
++inline void oem_intern(char *string)
++{
++    char *buf = natspec_convert(string, 0, OEM_CP, 0);
++	/* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
++	   use FILNAMSIZ as string size */
++    strncpy(string, buf, FILNAMSIZ);
++	free (buf);
++}
++
++/* Convert a string from ISO_CP to the current locale charset. */
++inline void iso_intern(char *string)
++{
++    char *buf = natspec_convert(string, 0, ISO_CP, 0);
++	/* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
++	   use FILNAMSIZ as string size */
++    strncpy(string, buf, FILNAMSIZ);
++	free (buf);
++}
+diff -pur unzip60orig/unix/unxcfg.h unzip60/unix/unxcfg.h
+--- unzip60orig/unix/unxcfg.h	2009-04-16 22:36:12.000000000 +0400
++++ unzip60/unix/unxcfg.h	2010-11-26 16:58:35.000000000 +0300
+@@ -227,4 +227,30 @@ typedef struct stat z_stat;
+ /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
+ /*    and notfirstcall are used by do_wild().                          */
+ 
++
++#define MAX_CP_NAME 25 
++   
++#ifdef SETLOCALE
++#  undef SETLOCALE
++#endif
++#define SETLOCALE(category, locale) setlocale(category, locale)
++#include <locale.h>
++   
++#ifdef _ISO_INTERN
++#  undef _ISO_INTERN
++#endif
++#define _ISO_INTERN(str1) iso_intern(str1)
++
++#ifdef _OEM_INTERN
++#  undef _OEM_INTERN
++#endif
++#ifndef IZ_OEM2ISO_ARRAY
++#  define IZ_OEM2ISO_ARRAY
++#endif
++#define _OEM_INTERN(str1) oem_intern(str1)
++
++void iso_intern(char *);
++void oem_intern(char *);
++void init_conversion_charsets(void);
++   
+ #endif /* !__unxcfg_h */
+diff -pur unzip60orig/unzip.c unzip60/unzip.c
+--- unzip60orig/unzip.c	2009-04-16 22:26:52.000000000 +0400
++++ unzip60/unzip.c	2010-11-26 16:58:35.000000000 +0300
+@@ -331,7 +331,9 @@ static ZCONST char Far ZipInfoUsageLine3
+   -h  print header line       -t  print totals for listed files or for all\n\
+   -z  print zipfile comment   -T  print file times in sortable decimal format\
+ \n  -C  be case-insensitive   %s\
+-  -x  exclude filenames that follow from listing\n";
++  -x  exclude filenames that follow from listing\n\
++  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
++  -I CHARSET  specify a character encoding for UNIX and other archives\n";
+ #ifdef MORE
+    static ZCONST char Far ZipInfoUsageLine4[] =
+      "  -M  page output through built-in \"more\"\n";
+@@ -673,7 +674,9 @@ modifiers:\n\
+   -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
+   -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
+   -C  match filenames case-insensitively     -L  make (some) names \
+-lowercase\n %-42s  -V  retain VMS version numbers\n%s";
++lowercase\n %-42s  -V  retain VMS version numbers\n%s\
++  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
++  -I CHARSET  specify a character encoding for UNIX and other archives\n";
+ #endif /* ?VMS */
+ #else /* !UNICODE_SUPPORT */
+ #ifdef VMS
+@@ -692,7 +695,9 @@ modifiers:\n\
+   -o  overwrite files WITHOUT prompting      -a  auto-convert any text files\n\
+   -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
+   -C  match filenames case-insensitively     -L  make (some) names \
+-lowercase\n %-42s  -V  retain VMS version numbers\n%s";
++lowercase\n %-42s  -V  retain VMS version numbers\n%s\
++  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
++  -I CHARSET  specify a character encoding for UNIX and other archives\n";
+ #endif /* ?VMS */
+ #endif /* ?UNICODE_SUPPORT */
+ 
+@@ -803,6 +808,10 @@ int unzip(__G__ argc, argv)
+ #endif /* UNICODE_SUPPORT */
+ 
+ 
++#ifdef UNIX
++    init_conversion_charsets();
++#endif
++
+ #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
+     extern void DebugMalloc(void);
+ 
+@@ -1336,6 +1345,11 @@ int uz_opts(__G__ pargc, pargv)
+     argc = *pargc;
+     argv = *pargv;
+ 
++#ifdef UNIX
++    extern char OEM_CP[MAX_CP_NAME];
++    extern char ISO_CP[MAX_CP_NAME];
++#endif
++    
+     while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
+         s = *argv + 1;
+         while ((c = *s++) != 0) {    /* "!= 0":  prevent Turbo C warning */
+@@ -1517,6 +1531,35 @@ int uz_opts(__G__ pargc, pargv)
+                     }
+                     break;
+ #endif  /* MACOS */
++#ifdef UNIX
++    			case ('I'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Icharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					} else { /* -I charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case ('j'):    /* junk pathnames/directory structure */
+                     if (negative)
+                         uO.jflag = FALSE, negative = 0;
+@@ -1592,6 +1635,35 @@ int uz_opts(__G__ pargc, pargv)
+                     } else
+                         ++uO.overwrite_all;
+                     break;
++#ifdef UNIX
++    			case ('O'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Ocharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					} else { /* -O charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -O argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case ('p'):    /* pipes:  extract to stdout, no messages */
+                     if (negative) {
+                         uO.cflag = FALSE;
+diff -pur unzip60orig/unzpriv.h unzip60/unzpriv.h
+--- unzip60orig/unzpriv.h	2009-04-20 03:59:26.000000000 +0400
++++ unzip60/unzpriv.h	2010-11-26 16:58:35.000000000 +0300
+@@ -3008,7 +3008,7 @@ char    *GetLoadPath     OF((__GPRO));  
+          !(((islochdr) || (isuxatt)) && \
+            ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
+         (hostnum) == FS_HPFS_ || \
+-        ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
++        ((hostnum) == FS_NTFS_/* && (hostver) == 50*/)) { \
+         _OEM_INTERN((string)); \
+     } else { \
+         _ISO_INTERN((string)); \
+diff -pur unzip60orig/zipinfo.c unzip60/zipinfo.c
+--- unzip60orig/zipinfo.c	2009-02-08 20:04:30.000000000 +0300
++++ unzip60/zipinfo.c	2010-11-26 16:58:35.000000000 +0300
+@@ -457,6 +457,10 @@ int zi_opts(__G__ pargc, pargv)
+     int    tflag_slm=TRUE, tflag_2v=FALSE;
+     int    explicit_h=FALSE, explicit_t=FALSE;
+ 
++#ifdef UNIX
++    extern char OEM_CP[MAX_CP_NAME];
++    extern char ISO_CP[MAX_CP_NAME];
++#endif
+ 
+ #ifdef MACOS
+     uO.lflag = LFLAG;         /* reset default on each call */
+@@ -501,6 +505,35 @@ int zi_opts(__G__ pargc, pargv)
+                             uO.lflag = 0;
+                     }
+                     break;
++#ifdef UNIX
++    			case ('I'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Icharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					} else { /* -I charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case 'l':      /* longer form of "ls -l" type listing */
+                     if (negative)
+                         uO.lflag = -2, negative = 0;
+@@ -521,6 +554,35 @@ int zi_opts(__G__ pargc, pargv)
+                         G.M_flag = TRUE;
+                     break;
+ #endif
++#ifdef UNIX
++    			case ('O'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Ocharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					} else { /* -O charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -O argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case 's':      /* default:  shorter "ls -l" type listing */
+                     if (negative)
+                         uO.lflag = -2, negative = 0;
diff --git a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
new file mode 100644
index 000000000000..7973378704e1
--- /dev/null
+++ b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
@@ -0,0 +1,13 @@
+Make sure that the asm files don't incorrectly trigger an executable
+stack marking in the final shared library.  That's bad, mmmkay.
+
+--- unzip/crc_i386.S
++++ unzip/crc_i386.S
+@@ -302,3 +302,7 @@
+ #endif /* i386 || _i386 || _I386 || __i386 */
+ 
+ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
new file mode 100644
index 000000000000..564fd76677c8
--- /dev/null
+++ b/app-arch/unzip/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">infozip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild
new file mode 100644
index 000000000000..e97847b09501
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0_p20.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_PV="${PV//.}"
+MY_PV="${MY_PV%_p*}"
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
+	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+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"
+IUSE="bzip2 natspec unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local deb="${WORKDIR}"/debian/patches
+	rm \
+		"${deb}"/series \
+		"${deb}"/02-branding-patch-this-is-debian-unzip \
+		|| die
+	epatch "${deb}"/*
+
+	epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
+	use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+	sed -i -r \
+		-e '/^CFLAGS/d' \
+		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
+		-e '/^STRIP/s:=.*:=true:' \
+		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
+		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
+		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
+		-e 's:LF2 = -s:LF2 = :' \
+		-e 's:LF = :LF = $(LDFLAGS) :' \
+		-e 's:SL = :SL = $(LDFLAGS) :' \
+		-e 's:FL = :FL = $(LDFLAGS) :' \
+		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
+		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
+		unix/Makefile \
+		|| die "sed unix/Makefile failed"
+
+	# Delete bundled code to make sure we don't use it.
+	rm -r bzip2 || die
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+	i?86*-*linux*)       TARGET="linux_asm" ;;
+	*linux*)             TARGET="linux_noasm" ;;
+	i?86*-*bsd* | \
+	i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
+	*bsd* | *dragonfly*) TARGET="bsd" ;;
+	*-darwin*)           TARGET="macosx" ;;
+	*-cygwin*)           TARGET="cygwin" ;;
+	*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
+	esac
+
+	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
+	use bzip2 && append-cppflags -DUSE_BZIP2
+	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
+	append-cppflags -DLARGE_FILE_SUPPORT #281473
+}
+
+src_compile() {
+	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
+	emake -f unix/Makefile ${TARGET}
+}
+
+src_install() {
+	dobin unzip funzip unzipsfx unix/zipgrep
+	dosym unzip /usr/bin/zipinfo
+	doman man/*.1
+	dodoc BUGS History* README ToDo WHERE
+}
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
new file mode 100644
index 000000000000..475c481ec075
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_PV="${PV//.}"
+MY_PV="${MY_PV%_p*}"
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
+	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+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"
+IUSE="bzip2 natspec unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local deb="${WORKDIR}"/debian/patches
+	rm "${deb}"/02-this-is-debian-unzip.patch || die
+	eapply "${deb}"/*.patch
+
+	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
+	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
+	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+	sed -i -r \
+		-e '/^CFLAGS/d' \
+		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
+		-e '/^STRIP/s:=.*:=true:' \
+		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
+		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
+		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
+		-e 's:LF2 = -s:LF2 = :' \
+		-e 's:LF = :LF = $(LDFLAGS) :' \
+		-e 's:SL = :SL = $(LDFLAGS) :' \
+		-e 's:FL = :FL = $(LDFLAGS) :' \
+		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
+		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
+		unix/Makefile \
+		|| die "sed unix/Makefile failed"
+
+	# Delete bundled code to make sure we don't use it.
+	rm -r bzip2 || die
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+	i?86*-*linux*)       TARGET="linux_asm" ;;
+	*linux*)             TARGET="linux_noasm" ;;
+	i?86*-*bsd* | \
+	i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
+	*bsd* | *dragonfly*) TARGET="bsd" ;;
+	*-darwin*)           TARGET="macosx" ;;
+	*-cygwin*)           TARGET="cygwin" ;;
+	*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
+	esac
+
+	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
+	use bzip2 && append-cppflags -DUSE_BZIP2
+	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
+	append-cppflags -DLARGE_FILE_SUPPORT #281473
+}
+
+src_compile() {
+	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
+	emake -f unix/Makefile ${TARGET}
+}
+
+src_install() {
+	dobin unzip funzip unzipsfx unix/zipgrep
+	dosym unzip /usr/bin/zipinfo
+	doman man/*.1
+	dodoc BUGS History* README ToDo WHERE
+}
diff --git a/app-arch/upx-bin-3.91 b/app-arch/upx-bin-3.91
deleted file mode 100644
index 4335d2a56437..000000000000
--- a/app-arch/upx-bin-3.91
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Ultimate Packer for eXecutables, binary version with proprietary NRV compression
-EAPI=5
-HOMEPAGE=http://upx.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!app-arch/upx-ucl
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( http://upx.sourceforge.net/download/upx-3.91-i386_linux.tar.bz2 ) amd64? ( http://upx.sourceforge.net/download/upx-3.91-amd64_linux.tar.bz2 ) ppc? ( http://upx.sourceforge.net/download/upx-3.91-powerpc_linux.tar.bz2 ) arm? ( http://upx.sourceforge.net/download/upx-3.91-armeb_linux.tar.bz2 ) mips? ( http://upx.sourceforge.net/download/upx-3.91-mipsel_linux.tar.bz2 )
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
-_md5_=901c44952b92f2f98eae87a5f67788c0
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
new file mode 100644
index 000000000000..11642d6b1f41
--- /dev/null
+++ b/app-arch/upx-bin/Manifest
@@ -0,0 +1,7 @@
+DIST upx-3.91-amd64_linux.tar.bz2 373664 BLAKE2B 0c3ea873afc9b1fddce742dd231d4a8be49123aad203f2f868276dbd855db193c9db596b88c20061f2f07671ea3be5607df4a2abe9042d190f482478e744456c SHA512 7f57564c89baf1bad89d6038c17a83268a3f528d2cb3cc992160c6dd4842a6b3ef7123fea86480a491d8df7f7b099d8444effa6f677532f4bf756f72a51066e9
+DIST upx-3.91-armeb_linux.tar.bz2 363100 BLAKE2B 09960871176b4a3b9d12f8658b3c3ecb631ac35570ac1fde79092692b552fc6e71e54515ed3e34e09b0a10d28ac488598bf9c01244f88af63b8a2688ed1fef3b SHA512 730fcf1b8b2a81043f1c1ff611c94c8b4e26850c7dbbbd9fdcb6a6603878792873ef6a48f073feb12e1db3cdf0a7964f747ba4d7daa75cc2bfb8844b234b4332
+DIST upx-3.91-i386_linux.tar.bz2 366446 BLAKE2B 762f80fd26929e65cbab815dfa5c095d722ebadb1ffa4b70a686959dcd3b0b54d04d9d3d18e5efa2c9e3dc2e1bc3a0d89e437ddd876947c0e83943bf00455066 SHA512 b679fc54a4e4bbf1ed7bf11473b85ae33df82752815bdf7fae9499f6d1cb1df0251a284596d7303fcba8465b77c6dd233e1cff288806a73c84a50a48ec13aec4
+DIST upx-3.91-mipsel_linux.tar.bz2 530222 BLAKE2B 73243e4160ee05eaaeb3ccb483c04882fe8b132a0e1098d40eb9311301eb261ea42e6f67e123e61479ee9185520bb6da6b840c52e23b1e37ba9ab3b3ae40b8ee SHA512 66a256127104266350e32cffe6914790586c3f35b4aea49a12ce8c37a911f7b2195eeea72b9a9e4ad32e12e8efe16fda36f93cdff85e15983b496211c961f71f
+DIST upx-3.91-powerpc_linux.tar.bz2 474332 BLAKE2B 893f35220409b8d57c297528dfd1196818b13a7ed112205276a58b6a9643b38b0e8ef62a8c9fed97b7d8a11f15ee449c7be7a4849b5019ab97969e8cd47726a2 SHA512 1ea12baf9f8cf7a40fc58be7b41255f2e65044937faa44232f3ef5d4cfcc6d98ac1cbf7511c941df7610cf5c2378f9c9dfb323a6a1c5c59526b67d38eb800afe
+EBUILD upx-bin-3.91.ebuild 985 BLAKE2B a5632d2cf54efea3f2f6385a34a48b071a95bc202440b6f9e3950e7f153d753995ced164d59f5b5a0fa847e6654d012a75ea345e7c62f447bcae35876655b6d6 SHA512 145bfc6d92604b2cf3e8947f29aa1aadc51fe39117ef8f0632d92ceed290f33ad39042a076bf26d7117c188a43be963680cb17adba17945ccd043f80a068bc2f
+MISC metadata.xml 350 BLAKE2B ad0cbfa7d80f15a0b26544bd317f3c67c1c918d27ac924170e36825db579f7cedfdb779050fc3e914cd7af175a982a53e5836599e833188a8f9f07d4fc2121d3 SHA512 d46dfabc7ce88e5f377d658f33cf45bd107beacc479280d6efddf6611483a7729a038f9e9970e1194739d60fa948b3436493acdba7c08f0004306d715cd73448
diff --git a/app-arch/upx-bin/metadata.xml b/app-arch/upx-bin/metadata.xml
new file mode 100644
index 000000000000..2de76921550c
--- /dev/null
+++ b/app-arch/upx-bin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>UPX is a versatile executable packer with a excellent
+	compression ratio.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">upx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/upx-bin/upx-bin-3.91.ebuild b/app-arch/upx-bin/upx-bin-3.91.ebuild
new file mode 100644
index 000000000000..d0bd63bbbf48
--- /dev/null
+++ b/app-arch/upx-bin/upx-bin-3.91.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit pax-utils
+
+MY_P="${PN/-bin}-${PV}"
+DESCRIPTION="Ultimate Packer for eXecutables, binary version with proprietary NRV compression"
+HOMEPAGE="http://upx.sourceforge.net/"
+SRC_URI="x86? ( http://upx.sourceforge.net/download/${MY_P}-i386_linux.tar.bz2 )
+	amd64? ( http://upx.sourceforge.net/download/${MY_P}-amd64_linux.tar.bz2 )
+	ppc? ( http://upx.sourceforge.net/download/${MY_P}-powerpc_linux.tar.bz2 )
+	arm? ( http://upx.sourceforge.net/download/${MY_P}-armeb_linux.tar.bz2 )
+	mips? ( http://upx.sourceforge.net/download/${MY_P}-mipsel_linux.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="strip"
+
+RDEPEND="!app-arch/upx-ucl"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/opt/bin/upx"
+
+src_install() {
+	cd ${MY_P}*
+	into /opt
+	dobin upx
+	pax-mark -m "${ED}"/opt/bin/upx
+	doman upx.1
+	dodoc upx.doc BUGS NEWS README* THANKS TODO
+	dohtml upx.html
+}
diff --git a/app-arch/upx-ucl-3.91 b/app-arch/upx-ucl-3.91
deleted file mode 100644
index c8967a1dea6d..000000000000
--- a/app-arch/upx-ucl-3.91
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/ucl-1.02 !app-arch/upx !app-arch/upx-bin dev-lang/perl
-DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression and not NRV)
-EAPI=5
-HOMEPAGE=http://upx.sourceforge.net/
-IUSE=lzma zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2+ UPX-exception
-RDEPEND=>=dev-libs/ucl-1.02 !app-arch/upx !app-arch/upx-bin
-SLOT=0
-SRC_URI=http://upx.sourceforge.net/download/upx-3.91-src.tar.bz2 lzma? ( mirror://sourceforge/sevenzip/lzma465.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40f737661bd312095ee715342a3068e1
diff --git a/app-arch/upx-ucl/Manifest b/app-arch/upx-ucl/Manifest
new file mode 100644
index 000000000000..5e4a62927317
--- /dev/null
+++ b/app-arch/upx-ucl/Manifest
@@ -0,0 +1,4 @@
+DIST lzma465.tar.bz2 288122 BLAKE2B 93fa080e6539bef79d8d0baff781b9e41329f649724991f608cfa9ee651e79b20cf38d27efa96fe848e61111ff355f58dfde81f0743e1d5f0d701d72e512c70d SHA512 690f005cfa9d3a65db03baddad57cf8dd79f861ac72d2e1bc18a151f3673d5f8043e3331f5dc3fba713dfd7b01ebf0817a2c0b6a1b22e1f7d8255a42b85ea4ac
+DIST upx-3.91-src.tar.bz2 904747 BLAKE2B e9888368e5ddb62dc3cf14bd39a6101c31621c9a1ce2529957cb5c96bd70845db01a2e2f73a5b64dd7b33c9e18679f8e134fffdea41bc5b3663ff350c6de3a6c SHA512 7e9a392fe11daf7baf9632f2c448ef9936da7dfab215f86ba417e9f097770949acb653aaabe6cc5ed812efc486cb35e0c1e128c80026b02825713d8b12251cf5
+EBUILD upx-ucl-3.91.ebuild 1019 BLAKE2B 320d16cddd00e2a39c34fce980535075ab8ac6bfa66b07036992899de80bc78064350d884408c5495382c30e0cb461520f5b5d9d444ebdc875ef6ae740fa609b SHA512 fedea6f60f1360edc30fb28d47ebe373f81ca909d3a13a1b5abe866a6bd5daa63dece6dcfdd2a6dbe3ab9e99cef17e0725379b25abcd8a35fe71bddbd52bc8a5
+MISC metadata.xml 353 BLAKE2B 2a5fc5ef626a2615288b06340627b823187ef1b825697a546691814f3a3c1d410a3824fcf07e3c141d5e56000912c19130412e0252ed501cf3f0229d952c8b42 SHA512 b5aa861749330f58aebf8c047c68f43dae170612d140bbbb795fc79b6db5f625977debebb5f36dcd77c229d1e39b79089400133e0c35817ea9f78adb2fad44e6
diff --git a/app-arch/upx-ucl/metadata.xml b/app-arch/upx-ucl/metadata.xml
new file mode 100644
index 000000000000..a9b5374e66fe
--- /dev/null
+++ b/app-arch/upx-ucl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>UPX is a versatile executable packer with a excellent compression ratio</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sevenzip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/upx-ucl/upx-ucl-3.91.ebuild b/app-arch/upx-ucl/upx-ucl-3.91.ebuild
new file mode 100644
index 000000000000..6950dc176bdb
--- /dev/null
+++ b/app-arch/upx-ucl/upx-ucl-3.91.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+LZMA_VER=465
+#LZMA_VER=920
+MY_P="${P/-ucl}-src"
+DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
+HOMEPAGE="http://upx.sourceforge.net/"
+SRC_URI="http://upx.sourceforge.net/download/${MY_P}.tar.bz2
+	lzma? ( mirror://sourceforge/sevenzip/lzma${LZMA_VER}.tar.bz2 )"
+
+LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="lzma zlib"
+
+RDEPEND=">=dev-libs/ucl-1.02
+	!app-arch/upx
+	!app-arch/upx-bin"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	use zlib && append-cppflags -DWITH_ZLIB=1
+}
+
+src_compile() {
+	tc-export CXX
+	emake UPX_LZMADIR="${WORKDIR}" all
+}
+
+src_install() {
+	newbin src/upx.out upx
+	dodoc BUGS NEWS PROJECTS README* THANKS TODO doc/*.txt
+	dohtml doc/upx.html
+	doman doc/upx.1
+}
diff --git a/app-arch/vimball-0.5.1 b/app-arch/vimball-0.5.1
deleted file mode 100644
index d81086830365..000000000000
--- a/app-arch/vimball-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a command-line vimball archive extractor
-EAPI=5
-HOMEPAGE=https://github.com/radhermit/vimball
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e1388b4d1eb16b2fe04575ce9be35d5
diff --git a/app-arch/vimball-9999 b/app-arch/vimball-9999
deleted file mode 100644
index f35921968fb1..000000000000
--- a/app-arch/vimball-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=a command-line vimball archive extractor
-EAPI=5
-HOMEPAGE=https://github.com/radhermit/vimball
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4997b49d3f46c234746945f8b5493bf8
diff --git a/app-arch/vimball/Manifest b/app-arch/vimball/Manifest
new file mode 100644
index 000000000000..fa1d11e654b3
--- /dev/null
+++ b/app-arch/vimball/Manifest
@@ -0,0 +1,4 @@
+DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
+EBUILD vimball-0.5.1.ebuild 658 BLAKE2B ac4d3538759811de18516547558cc950907734f465abbbf43ee5335fc84174e69a8bf50213dea74f71ac72e73f0471d984643f805877f32666fc29d23c52d8cc SHA512 418b0ba38bc2f613c5ac8b6b008a9f07c0a55964fe106cc762b1937aae25792cea238eb49b729ee970dd27c0f84813b08b67dd3c25c1bc8f8f53a0cf02787738
+EBUILD vimball-9999.ebuild 658 BLAKE2B 64f54e6db0d0966ecffb54867ba699172f4da2f45418b30bbe44ac3880ee9e6d6eda1afc2912a393e2a35443f75d6c63196351594554ea6c69d0282e8202f723 SHA512 8b35615ce1cddeefb6b84c68d1dcc308e525883203d0fd08a5aef40f76578ae0b7ddbbb7b69f2f84cc542a1bf6fc9b2ee4d0b60596d0630f57d31054e83bc5c5
+MISC metadata.xml 385 BLAKE2B 5fa1db1263983a5d57031cb72bf9e2b7074faf2134bea6a8cc02d67f9e48ce198c2a8d4a478029d9e3303555c9d248f96e83e6e8071ea7b055f90bb25d38402c SHA512 7086cce11a9a20d93dd24741e060d289c90bbc3c20d5102452d4c987597921b00195badd68d916a64b03faa5dae1fa4adb68654bce5c70c2e1cfa5d8417b33c3
diff --git a/app-arch/vimball/metadata.xml b/app-arch/vimball/metadata.xml
new file mode 100644
index 000000000000..d32fca1cb55b
--- /dev/null
+++ b/app-arch/vimball/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">vimball</remote-id>
+    <remote-id type="github">radhermit/vimball</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/vimball/vimball-0.5.1.ebuild b/app-arch/vimball/vimball-0.5.1.ebuild
new file mode 100644
index 000000000000..9876af4ce01e
--- /dev/null
+++ b/app-arch/vimball/vimball-0.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/radhermit/vimball.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a command-line vimball archive extractor"
+HOMEPAGE="https://github.com/radhermit/vimball"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-arch/vimball/vimball-9999.ebuild b/app-arch/vimball/vimball-9999.ebuild
new file mode 100644
index 000000000000..b24f9bccd79f
--- /dev/null
+++ b/app-arch/vimball/vimball-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/radhermit/vimball.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a command-line vimball archive extractor"
+HOMEPAGE="https://github.com/radhermit/vimball"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-arch/wimlib-1.12.0 b/app-arch/wimlib-1.12.0
deleted file mode 100644
index f320064bd460..000000000000
--- a/app-arch/wimlib-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure prepare unpack
-DEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0 ) iso? ( app-arch/cabextract app-cdr/cdrtools ) cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The open source Windows Imaging (WIM) library
-EAPI=6
-HOMEPAGE=https://wimlib.net/
-IUSE=cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-3+ LGPL-3+ ) CC0-1.0
-RDEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0 ) iso? ( app-arch/cabextract app-cdr/cdrtools )
-REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
-RESTRICT=primaryuri
-SLOT=0
-SRC_URI=https://wimlib.net/downloads/wimlib-1.12.0.tar.gz -> wimlib-1.12.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=098cd8647d41ddcdf445006797258847
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
new file mode 100644
index 000000000000..bfe18a68ffd7
--- /dev/null
+++ b/app-arch/wimlib/Manifest
@@ -0,0 +1,3 @@
+DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
+EBUILD wimlib-1.12.0.ebuild 1410 BLAKE2B e8cd8d59c7535051260d2700f25dbcee7daeefaf400fde7b86e2e7d9ae076516251882486ba0a3b8997aa5f11371e72ba8dff681a0f4205afc7d39909fe3fe59 SHA512 fab7e339cc5291fe20d34edb2d0a6054aec70c49e33d8c2a5b28499968b5074a4b02618a05b1127551acea6ed360caa5edb405dc351bda71b230817b9b38c1eb
+MISC metadata.xml 684 BLAKE2B bc45d2b67f015842912d4fa5043bf31f2eb2ae59b29a9104987c6041282730491470fefd065be7ab49de230ea26dc10f64d4fd85591a1df6aec5a6ab408752dd SHA512 999d8b7bd11c22193d1e87e73b70fd750404e92c26b7916a4405c0bdd930a103ef8b809259e0c3ddfb73281f2622b284bd20ea73dff409cc8063406cf41a7724
diff --git a/app-arch/wimlib/metadata.xml b/app-arch/wimlib/metadata.xml
new file mode 100644
index 000000000000..0800647b3dbd
--- /dev/null
+++ b/app-arch/wimlib/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="fuse">
+      Use fuse libraries
+    </flag>
+    <flag name="iso">
+      Install app-cdr/cdrtools in order to prepare iso images
+    </flag>
+    <flag name="ntfs">
+      Use libntfs-3g library from sys-fs/ntfs3g
+    </flag>
+    <flag name="openssl">
+      Use the SHA-1 message digest from libcrypto instead of compilling another implementation
+    </flag>
+    <flag name="yasm">
+      Use yasm assembler instead of nasm
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
new file mode 100644
index 000000000000..efc6d34190b6
--- /dev/null
+++ b/app-arch/wimlib/wimlib-1.12.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pax-utils
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://wimlib.net/${PN}"
+else
+	inherit vcs-snapshot
+	MY_PV="${PV/_/-}"
+	MY_PV="${MY_PV^^}"
+	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	RESTRICT="primaryuri"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="The open source Windows Imaging (WIM) library"
+HOMEPAGE="https://wimlib.net/"
+
+LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
+REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	ntfs? ( sys-fs/ntfs3g )
+	fuse? ( sys-fs/fuse:0 )
+	openssl? ( dev-libs/openssl:0 )
+	iso? (
+		app-arch/cabextract
+		app-cdr/cdrtools
+	)
+"
+DEPEND="
+	${RDEPEND}
+	cpu_flags_x86_ssse3? (
+		yasm? ( dev-lang/yasm )
+		!yasm? ( dev-lang/nasm )
+	)
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ntfs ntfs-3g)
+		$(use_with fuse)
+		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
+		$(use_with openssl libcrypto)
+		$(use_enable threads multithreaded-compression)
+	)
+	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
+	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
+		econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	pax-mark m "${S}"/.libs/wimlib-imagex
+}
diff --git a/app-arch/xar-1.8-r1 b/app-arch/xar-1.8-r1
deleted file mode 100644
index 8a7bfb65d20b..000000000000
--- a/app-arch/xar-1.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=!kernel_Darwin? ( virtual/acl !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=An easily extensible archive format
-EAPI=6
-HOMEPAGE=https://opensource.apple.com/source/xar/
-IUSE=libressl kernel_Darwin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=!kernel_Darwin? ( virtual/acl !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://opensource.apple.com/tarballs/xar/xar-400.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=58de1a5288ab16b06cc54786c6870c67
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
new file mode 100644
index 000000000000..8055e2905e36
--- /dev/null
+++ b/app-arch/xar/Manifest
@@ -0,0 +1,6 @@
+AUX xar-1.6.1-ext2.patch 693 BLAKE2B c73338104f93aef90474f1d3489cb8655be2c8c19a9a9f27b51a61b12cfad5e30d51c69df312ccf82fdb036541117c377347e5956cb7d3c6a3ae2756feacccce SHA512 fd04b8552c85b0a4c40283b691746ef2a40aef17aa30ed697b8e1f83e10caa2e21b4c000197192e98a1ddcffd745a37ab592193eaa5120a7048b861ed1036c89
+AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047257755dd0fab0e1459f7cfff79f7eaa16668a67e99f52d56dc1637dba7ea29991bd29c4bf11f0ef4727768 SHA512 01de32828d30d9d99f338bb34747a5f978982dbcc2aefac9c5718b5283185fa5857cdd031c799e57607da5bff7dc3190bb4a93c737f2520c1034e959ee819377
+AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
+DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
+EBUILD xar-1.8-r1.ebuild 1207 BLAKE2B 44f0da7f911d02c241e3e025c1f8a2951b86cd20541e10d24d2f0ee954ae1e21debae67a31533b9a50f0dbed8c1f22879a292db268c5f4aaa9269528f0e02558 SHA512 2c44c17fa8e1d112d03a937af3f1f51e40efc6945d41b6ea6e36ec9b231403acfe2542f205ead1130948521405a9bf286e79ec2d105b549b678548ed023c6079
+MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/files/xar-1.6.1-ext2.patch b/app-arch/xar/files/xar-1.6.1-ext2.patch
new file mode 100644
index 000000000000..da413b03e522
--- /dev/null
+++ b/app-arch/xar/files/xar-1.6.1-ext2.patch
@@ -0,0 +1,24 @@
+--- a/lib/ext2.c.orig
++++ b/lib/ext2.c
+@@ -139,8 +139,10 @@
+ 	if(! (flags & ~EXT2_NOCOMPR_FL) )
+ 		x_addprop(f, "NoCompBlock");
+ #endif
++#ifdef EXT2_ECOMPR_FL
+ 	if(! (flags & ~EXT2_ECOMPR_FL) )
+ 		x_addprop(f, "CompError");
++#endif
+ 	if(! (flags & ~EXT2_BTREE_FL) )
+ 		x_addprop(f, "BTree");
+ 	if(! (flags & ~EXT2_INDEX_FL) )
+@@ -225,8 +227,10 @@
+ 	if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 )
+ 		flags |= EXT2_NOCOMPR_FL ;
+ #endif
++#ifdef EXT2_ECOMPR_FL
+ 	if( e2prop_get(f, "CompError", (char **)&tmp) == 0 )
+ 		flags |= EXT2_ECOMPR_FL ;
++#endif
+ 	if( e2prop_get(f, "BTree", (char **)&tmp) == 0 )
+ 		flags |= EXT2_BTREE_FL ;
+ 	if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 )
diff --git a/app-arch/xar/files/xar-1.8-arm-ppc.patch b/app-arch/xar/files/xar-1.8-arm-ppc.patch
new file mode 100644
index 000000000000..b2eec5a96e81
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8-arm-ppc.patch
@@ -0,0 +1,23 @@
+--- a/lib/archive.c
++++ b/lib/archive.c
+@@ -387,7 +387,8 @@
+ 			return NULL;
+ 		}
+         
+-		XAR(ret)->heap_offset = xar_get_heap_offset(ret) + offset;
++		XAR(ret)->heap_offset =
++			XAR(ret)->toc_count + sizeof(xar_header_t) + offset;
+ 		if( lseek(XAR(ret)->fd, XAR(ret)->heap_offset, SEEK_SET) == -1 ) {
+ 			xar_close(ret);
+ 			return NULL;
+--- a/src/xar.c
++++ a/src/xar.c
+@@ -783,7 +783,7 @@
+ int main(int argc, char *argv[]) {
+ 	int ret;
+ 	char *filename = NULL;
+-	char command = 0, c;
++	signed char command = 0, c;
+ 	char **args;
+ 	const char *tocfile = NULL;
+ 	int arglen, i, err;
diff --git a/app-arch/xar/files/xar-1.8-safe_dirname.patch b/app-arch/xar/files/xar-1.8-safe_dirname.patch
new file mode 100644
index 000000000000..eb2f5f071bb2
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8-safe_dirname.patch
@@ -0,0 +1,16 @@
+linuxattr: fix missing symbol safe_dirname
+
+This one was probably missed when they did a global rename to xar_
+prefixed variants.
+
+--- a/lib/linuxattr.c
++++ b/lib/linuxattr.c
+@@ -223,7 +223,7 @@
+ 	if( statfs(file, &sfs) != 0 ) {
+ 		char *tmp, *bname;
+ 		tmp = strdup(file);
+-		bname = safe_dirname(tmp);
++		bname = xar_safe_dirname(tmp);
+ 		statfs(bname, &sfs);
+ 		free(tmp);
+ 		free(bname);
diff --git a/app-arch/xar/metadata.xml b/app-arch/xar/metadata.xml
new file mode 100644
index 000000000000..3ddd51ed75fb
--- /dev/null
+++ b/app-arch/xar/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
+	<longdescription lang="en">
+		The XAR project aims to provide an easily extensible archive format.
+		Important design decisions include an easily extensible XML table of
+		contents for random access to archived files, storing the toc at the
+		beginning of the archive to allow for efficient handling of streamed
+		archives, the ability to handle files of arbitrarily large sizes, the
+		ability to choose independent encodings for individual files in the
+		archive, the ability to store checksums for individual files in both
+		compressed and uncompressed form, and the ability to query the table of
+		content's rich meta-data.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/xar/xar-1.8-r1.ebuild b/app-arch/xar/xar-1.8-r1.ebuild
new file mode 100644
index 000000000000..82aa18982ecf
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib-minimal ltprune
+
+APPLE_PV=400
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="libressl kernel_Darwin"
+
+DEPEND="
+	!kernel_Darwin? (
+		virtual/acl
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+multilib_src_configure() {
+	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static
+}
+
+multilib_src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-arch/xarchiver-0.5.4.12 b/app-arch/xarchiver-0.5.4.12
deleted file mode 100644
index 066f755f1fe5..000000000000
--- a/app-arch/xarchiver-0.5.4.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A GTK+ archive manager that can be used with Thunar
-EAPI=6
-HOMEPAGE=https://github.com/ib/xarchiver
-IUSE=doc
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
-SLOT=0
-SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.12.tar.gz -> xarchiver-0.5.4.12.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2074e58bcfdd2894888e1e6ba1f1564
diff --git a/app-arch/xarchiver-0.5.4.13 b/app-arch/xarchiver-0.5.4.13
deleted file mode 100644
index 8d1a18be1174..000000000000
--- a/app-arch/xarchiver-0.5.4.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A GTK+ archive manager that can be used with Thunar
-EAPI=6
-HOMEPAGE=https://github.com/ib/xarchiver
-IUSE=doc
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
-SLOT=0
-SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.13.tar.gz -> xarchiver-0.5.4.13.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4d0fa4efc38b4f82bd94464148f7ad7
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
new file mode 100644
index 000000000000..81a01614d559
--- /dev/null
+++ b/app-arch/xarchiver/Manifest
@@ -0,0 +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 1321 BLAKE2B 6f2287f0b02cc48a03e865c30558b288fad1276b6b8db3c9e2c84c885cf8b54f6c9335eb0cdec5d80d8eadd26ba4db62328d156e417332c768f3b4329637e5b9 SHA512 aac2eabd10d1767b8c809f7ba7dc50ec43b293af97aeafbe1124a5469f4d2e1b773e039a09a8d5a7af2c07504acdd6f1a9f88c7613ad1986f7ec5840ad91a56b
+MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/metadata.xml b/app-arch/xarchiver/metadata.xml
new file mode 100644
index 000000000000..a86ba8068b6f
--- /dev/null
+++ b/app-arch/xarchiver/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+  <upstream>
+    <!-- applies to 0.5.4 -->
+    <remote-id type="sourceforge">xarchiver</remote-id>
+    <!-- applies to 0.5.4.8+ -->
+    <remote-id type="github">ib/xarchiver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
new file mode 100644
index 000000000000..7a9f62c11b87
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver"
+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"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2:=
+	x11-libs/gtk+:3="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)"
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
new file mode 100644
index 000000000000..5c60b01c508e
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver"
+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"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2:=
+	x11-libs/gtk+:3="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)"
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-arch/xdms-1.3.2-r1 b/app-arch/xdms-1.3.2-r1
deleted file mode 100644
index 764049057c8d..000000000000
--- a/app-arch/xdms-1.3.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DESCRIPTION=xDMS - Amiga DMS disk image decompressor
-EAPI=6
-HOMEPAGE=http://zakalwe.fi/~shd/foss/xdms
-KEYWORDS=amd64 ~hppa ppc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://zakalwe.fi/~shd/foss/xdms/xdms-1.3.2.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bb550ab228f9d72bf6c9ae62222d49fd
diff --git a/app-arch/xdms/Manifest b/app-arch/xdms/Manifest
new file mode 100644
index 000000000000..f85402ae285d
--- /dev/null
+++ b/app-arch/xdms/Manifest
@@ -0,0 +1,3 @@
+DIST xdms-1.3.2.tar.bz2 43010 BLAKE2B 97118ce2052a93e334b02d1687e4c867f7158bdd99bfc4249a7a22d1eee57c6d6bbb26c640f0bdb61004997fcb6218724de40c759ae51f4b72da8dee0ebde48d SHA512 e29dd1d2373c635ba953ef526849e0b8fa645a0da91fff3a3512ce26eee43fb2c1280f27fae0a42a4fd47106494d6e44c5684eff3581661e538780927b851cac
+EBUILD xdms-1.3.2-r1.ebuild 657 BLAKE2B c6ea38fd2d477e585b6107a9f13b3a7200fa17b1f76e3fbe4ff18ace24017d63207c39c76e1364550c76b51faddd04bb2a1e40702eec4fa578ade1ea60cd7a41 SHA512 3ef03aac116b55f27d6b2251108da74671c0eba85ddf19c9b10b57b0fb13f58a0f00120015be1cb80e9b024bf88e1fb0fbe6a3dc96376b82dd70db5da7df8f1d
+MISC metadata.xml 864 BLAKE2B 209b2fd1290a35b6d372b5725bd9d297a2d9b86a56bc45bdfd725e81399f004ac6d4de87386d883e921bc6a34d2e45797d029d71ec317f7c3930a4d7faf991f6 SHA512 a535abd221a7ea350cfeb4fbb84585cc4f4d6ee83f607ae5d0eee73a709b8df5ed3cf9b3056dbd6b8a68ff06353c5c8b407f322a06a3bbeb5fe3d6d0cea4cdba
diff --git a/app-arch/xdms/metadata.xml b/app-arch/xdms/metadata.xml
new file mode 100644
index 000000000000..ec5a204b1712
--- /dev/null
+++ b/app-arch/xdms/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		Supports decompression of files compressed using all known DMS compression modes, including old and obsolete ones, and also encrypted files, for 100% compatibility.
+		Can test DMS files integrity, view file informations and show attached Banners and FILEID.DIZ .
+		Can generate standard disk images and compressed disk images, using gzip, if you want to store your files in ADF or ADZ formats.
+		Can extract the files contained inside the DMS archives, if the compressed disk is an AmigaDOS disk, using readdisk made by Bernd Schmidt.
+		Can process multiple files in batch with a single command, and also use stdin and stdout for input and output of data.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild b/app-arch/xdms/xdms-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..1282999e0237
--- /dev/null
+++ b/app-arch/xdms/xdms-1.3.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
+HOMEPAGE="http://zakalwe.fi/~shd/foss/xdms"
+SRC_URI="http://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86"
+IUSE=""
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	default
+	sed -i Makefile.in \
+		-e "s:COPYING::" \
+		-e "s:share/doc/xdms-{VERSION}:share/doc/xdms-${PF}:" || die
+	sed -i -e "s:-O2::" src/Makefile.in || die
+}
+
+src_configure() {
+	./configure --prefix=/usr --package-prefix="${D}" || die
+}
diff --git a/app-arch/xz-utils-5.2.3 b/app-arch/xz-utils-5.2.3
deleted file mode 100644
index 3b129d1be96f..000000000000
--- a/app-arch/xz-utils-5.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170422
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=5
-HOMEPAGE=https://tukaani.org/xz/
-IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-RESTRICT=!extra-filters? ( test )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-5.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=049938e0109aae2aa5fe56c718242336
diff --git a/app-arch/xz-utils-5.2.4-r2 b/app-arch/xz-utils-5.2.4-r2
deleted file mode 100644
index 748b3008b1af..000000000000
--- a/app-arch/xz-utils-5.2.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170422
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=6
-HOMEPAGE=https://tukaani.org/xz/
-IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-RESTRICT=!extra-filters? ( test )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-5.2.4.tar.gz
-_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e86b9ae398b26df98a52d8fb2386bd3d
diff --git a/app-arch/xz-utils-9999 b/app-arch/xz-utils-9999
deleted file mode 100644
index d6bb53550cb7..000000000000
--- a/app-arch/xz-utils-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2 >=app-portage/elt-patches-20170422 >=dev-vcs/git-1.8.2.1[curl] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=6
-HOMEPAGE=https://tukaani.org/xz/
-IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-RESTRICT=!extra-filters? ( test )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=16ad1a871c55f30db2d870cd2d716034
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
new file mode 100644
index 000000000000..14d9626b57da
--- /dev/null
+++ b/app-arch/xz-utils/Manifest
@@ -0,0 +1,6 @@
+DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
+DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
+EBUILD xz-utils-5.2.3.ebuild 2600 BLAKE2B 3543e5f2c3021c9243b4484359fefd4705d6f7cef894ea14aa54190ff07f7b75e63996efcbd7c809b3125084c572b0141902bda3afce0bffd004ca43912818f8 SHA512 1e60ce955c6b67554ba5e59d1d7eb7d4ed37b830c4ea2d039732232057039a6b4a5b626bc333f93fa61e63c967ba3a33514427466e7ecdbb7db8e12f289950f4
+EBUILD xz-utils-5.2.4-r2.ebuild 2723 BLAKE2B 6e7f66aafe7a6422a1652f824b23b279861d660a468eefa9fdbbd99c24802b0a7ebe8cad19f938d521b9f85ecb0ad256b9e91e45220849a096cee173c8d94eee SHA512 a8b47c2cb48f427561dc278280c569bb62b09c1f52102d55e4fe12c534a571b5901be1d899d6be93d1fe65a3d81a38b42a540caf873d4084ba6b4cf4b590e290
+EBUILD xz-utils-9999.ebuild 2669 BLAKE2B 78a6e7face7f1eb0eaaca0fcf483e92c8304571a082f14e9eb8b3593822bf0684a687949f10e63e88406e723d6d99ff7207a13a8b66a71c75c96a83adb56bfe5 SHA512 614cd4bc390b0f12c0859f1f60f008528a32ec02b15e95b3cffed30c921dacc937f3bc8536bd39ed0c2f43c1e3cfaba894fd325588f4ab7ef6ce5fa319511c3d
+MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
new file mode 100644
index 000000000000..fac09b73379a
--- /dev/null
+++ b/app-arch/xz-utils/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name='extra-filters'>Build additional filters that are not
+		used in any of the default xz presets. This includes delta
+		and BCJ coders, additional match finders and SHA256 checks.</flag>
+</use>
+</pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
new file mode 100644
index 000000000000..337c639f0bf5
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=5
+
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	rm "${ED}"/usr/share/doc/xz/COPYING* || die
+	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
new file mode 100644
index 000000000000..dd59406bd52a
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=6
+
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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"
+	S="${WORKDIR}/${MY_P}"
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
new file mode 100644
index 000000000000..6916173e206e
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=6
+
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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"
+	S="${WORKDIR}/${MY_P}"
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/zip-3.0-r3 b/app-arch/zip-3.0-r3
deleted file mode 100644
index 16f0151c741a..000000000000
--- a/app-arch/zip-3.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec ) app-arch/unzip
-DESCRIPTION=Info ZIP (encryption support)
-EAPI=4
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 crypt natspec unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~arm-linux
-LICENSE=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/zip30.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49b7569d08060e193ac495679d44fbda
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
new file mode 100644
index 000000000000..459a68bce3bc
--- /dev/null
+++ b/app-arch/zip/Manifest
@@ -0,0 +1,10 @@
+AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
+AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
+AUX zip-3.0-format-security.patch 507 BLAKE2B f595179f8267fc2866e21b8a943323e2146e118e44ed4dd6b03a65a2c433940efd5ccc98f72f8d85dd7291f9b0bcb8eb5068ad22b9bd6fa040265253e54d4b63 SHA512 172e842e1cd43006713f570ceb8bd4998595282b973569d0e264bd9599375668a4045d691fc952a75088ad6f17e6ff90baf22606388f73ad2f2c0ac64d250fa2
+AUX zip-3.0-natspec.patch 6800 BLAKE2B 6363c941894d7de7611392ea3e883ad724093bf6fb090ce84a4c99d36ab8688ef5083d09a83431bcc1f399327e1071d4b2c4cc03cef2c1548b776699ddb4763b SHA512 67cf89ad016d51ec99e153cb05ee150318c18b3243b04daad0a9a0c0fce7e908bf7ed6fcd6361029bdd4da68759c22abf02dcbcca704b45a75367b1f42ebe964
+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 zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
+EBUILD zip-3.0-r3.ebuild 1730 BLAKE2B 01d5169b8d3f6315161f0c2a6d2000fa72dcd96f91f381f0fa414a0d64a78f04dcb359835f937b01ce7f82ebff9b3aeb6e86f9589730e88d8ae2ef8ea7ac234c SHA512 8f0305fe1e428a310534adbfba75c500cc242c62c1027f686ba5c5d22970bed0d6e2b96784072099716dfdac9c178568b3bcc1d8ef228e276ca7af102b9aa148
+MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/files/zip-3.0-build.patch b/app-arch/zip/files/zip-3.0-build.patch
new file mode 100644
index 000000000000..595303cc48d4
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-build.patch
@@ -0,0 +1,36 @@
+respect build environment settings
+
+--- zip/unix/configure
++++ zip/unix/configure
+@@ -18,7 +18,7 @@
+ 
+ CC=${1-cc}
+ CFLAGS=${2-"-I. -DUNIX"}
+-LFLAGS1=''
++LFLAGS1="${LDFLAGS}"
+ LFLAGS2=''
+ LN="ln -s"
+ 
+@@ -118,7 +118,7 @@ _EOF_
+ fi
+ 
+ # optimization flags
+-if test -n "${CFLAGS_OPT}"; then
++if false; then
+   CFLAGS="${CFLAGS} ${CFLAGS_OPT}"
+   CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}"
+ fi
+@@ -220,13 +220,6 @@ fi
+ echo Check for the C preprocessor
+ # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
+ CPP="${CC} -E"
+-# solaris as(1) needs -P, maybe others as well ?
+-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+-[ -f /lib/cpp ] && CPP=/lib/cpp
+-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+-[ -f /xenix ] && CPP="${CC} -E"
+-[ -f /lynx.os ] && CPP="${CC} -E"
+ 
+ echo "#include <stdio.h>" > conftest.c
+ $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
diff --git a/app-arch/zip/files/zip-3.0-exec-stack.patch b/app-arch/zip/files/zip-3.0-exec-stack.patch
new file mode 100644
index 000000000000..80719c961298
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-exec-stack.patch
@@ -0,0 +1,22 @@
+add proper GNU stack markings so we dont get the default: executable
+
+--- zip-2.31/crc_i386.S
++++ zip-2.31/crc_i386.S
+@@ -238,3 +238,7 @@
+ #endif /* i386 || _i386 || _I386 || __i386 */
+ 
+ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
++
++#if defined __ELF__ && defined __linux__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- zip-2.31/match.S
++++ zip-2.31/match.S
+@@ -405,3 +405,7 @@
+ #endif /* i386 || _I386 || _i386 || __i386  */
+ 
+ #endif /* !USE_ZLIB */
++
++#if defined __ELF__ && defined __linux__
++.section .note.GNU-stack,"",@progbits
++#endif
diff --git a/app-arch/zip/files/zip-3.0-format-security.patch b/app-arch/zip/files/zip-3.0-format-security.patch
new file mode 100644
index 000000000000..1edc2d6a1b88
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-format-security.patch
@@ -0,0 +1,20 @@
+--- zip.c
++++ zip.c
+@@ -1028,7 +1028,7 @@
+ 
+   for (i = 0; i < sizeof(text)/sizeof(char *); i++)
+   {
+-    printf(text[i]);
++    fputs(text[i], stdout);
+     putchar('\n');
+   }
+ #ifdef DOS
+@@ -1225,7 +1225,7 @@
+             CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE);
+   for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++)
+   {
+-    printf(cryptnote[i]);
++    fputs(cryptnote[i], stdout);
+     putchar('\n');
+   }
+   ++i;  /* crypt support means there IS at least one compilation option */
diff --git a/app-arch/zip/files/zip-3.0-natspec.patch b/app-arch/zip/files/zip-3.0-natspec.patch
new file mode 100644
index 000000000000..1dfce09d1331
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-natspec.patch
@@ -0,0 +1,214 @@
+This patch makes zip use libnatspec to recode file names is national charset.
+Initially this patch was written for altlinux:
+http://sisyphus.ru/ru/srpm/Sisyphus/zip/patches
+
+Later it was a bit improved and improved version was posted here (in Russian):
+http://www.opennet.ru/tips/info/2494.shtml
+
+Also I've added natspec support to output of zipnote (thank vapier for notice).
+
+Gentoo reference:
+https://bugs.gentoo.org/show_bug.cgi?id=275244
+
+--
+pva@gentoo.org
+
+=== modified file 'fileio.c'
+--- fileio.c	2010-12-22 13:02:43 +0000
++++ fileio.c	2010-12-22 13:03:00 +0000
+@@ -929,7 +929,7 @@
+   }
+   if ((zname = in2ex(iname)) == NULL)
+     return ZE_MEM;
+-#ifdef UNICODE_SUPPORT
++#if defined(UNICODE_SUPPORT) && !defined(UNIX)
+   /* Convert name to display or OEM name */
+   oname = local_to_display_string(iname);
+ #else
+
+=== modified file 'globals.c'
+--- globals.c	2010-12-22 13:02:43 +0000
++++ globals.c	2010-12-22 13:03:00 +0000
+@@ -32,7 +32,7 @@
+ int scanimage = 1;      /* 1=scan through image files */
+ #endif
+ int method = BEST;      /* one of BEST, DEFLATE (only), or STORE (only) */
+-int dosify = 0;         /* 1=make new entries look like MSDOS */
++int dosify = 1;         /* 1=make new entries look like MSDOS */
+ int verbose = 0;        /* 1=report oddities in zip file structure */
+ int fix = 0;            /* 1=fix the zip file, 2=FF, 3=ZipNote */
+ int filesync = 0;       /* 1=file sync, delete entries not on file system */
+
+=== modified file 'unix/Makefile'
+--- unix/Makefile	2010-12-22 13:02:43 +0000
++++ unix/Makefile	2010-12-22 15:43:40 +0000
+@@ -38,7 +38,7 @@
+ MANFLAGS = 644
+ 
+ # target directories - where to install executables and man pages to
+-prefix = /usr/local
++prefix = /usr
+ BINDIR = $(prefix)/bin
+ MANEXT=1
+ MANDIR = $(prefix)/man/man$(MANEXT)
+@@ -61,6 +61,7 @@
+ CFLAGS = -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+ LFLAGS2 = -s
++LDADD = -lnatspec
+ 
+ # object file lists
+ OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o crypt.o ttyio.o \
+@@ -125,9 +126,9 @@
+ zipsman: $(ZIPS) $(ZIPMANUALs)
+ 
+ zip$E: $(OBJZ) $(OBJI) $(OBJA) $(LIB_BZ)
+-	$(BIND) -o zip$E $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2)
++	$(BIND) -o zip$E $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2) $(LDADD)
+ zipnote$E: $(OBJN)
+-	$(BIND) -o zipnote$E $(LFLAGS1) $(OBJN) $(LFLAGS2)
++	$(BIND) -o zipnote$E $(LFLAGS1) $(OBJN) $(LFLAGS2) $(LDADD)
+ zipcloak$E: $(OBJC) $(OCRCTB)
+ 	$(BIND) -o zipcloak$E $(LFLAGS1) $(OBJC) $(LFLAGS2)
+ zipsplit$E: $(OBJS)
+
+=== modified file 'unix/osdep.h'
+--- unix/osdep.h	2010-12-22 13:02:43 +0000
++++ unix/osdep.h	2010-12-22 15:45:29 +0000
+@@ -78,3 +78,6 @@
+ #if !defined(NO_EF_UT_TIME) && !defined(USE_EF_UT_TIME)
+ #  define USE_EF_UT_TIME
+ #endif
++
++/* Set Windows code as archive type */
++#  define OS_CODE  0xb00
+
+=== modified file 'unix/unix.c'
+--- unix/unix.c	2010-12-22 13:02:43 +0000
++++ unix/unix.c	2010-12-22 13:03:00 +0000
+@@ -14,6 +14,11 @@
+ 
+ #include <time.h>
+ 
++#ifdef UNIX
++#  include <natspec.h>
++#  include <locale.h>
++#endif
++
+ #if defined(MINIX) || defined(__mpexl)
+ #  ifdef S_IWRITE
+ #    undef S_IWRITE
+@@ -60,6 +65,7 @@
+ 
+ /* Local functions */
+ local char *readd OF((DIR *));
++local const char *oem_charset = NULL;
+ 
+ 
+ #ifdef NO_DIR                    /* for AT&T 3B1 */
+@@ -262,6 +268,16 @@
+   if (!pathput)
+     t = last(t, PATH_END);
+ 
++#ifdef UNIX
++  if (!oem_charset) {
++    setlocale(LC_CTYPE, "");
++    oem_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
++  }
++  /* Convert to internal encoding */
++  if ((n = natspec_convert(t, oem_charset, 0, 0)) == NULL)
++    return NULL;
++  return n;
++#else
+   /* Malloc space for internal name and copy it */
+   if ((n = malloc(strlen(t) + 1)) == NULL)
+     return NULL;
+@@ -269,6 +285,7 @@
+ 
+   if (dosify)
+     msname(n);
++#endif
+ 
+ #ifdef EBCDIC
+   strtoasc(n, n);       /* here because msname() needs native coding */
+@@ -289,8 +306,19 @@
+ {
+   char *x;              /* external file name */
+ 
++#ifdef UNIX
++  if (!oem_charset) {
++    oem_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
++    setlocale(LC_CTYPE, "");
++  }
++  /* Convert to internal encoding */
++  if ((x = natspec_convert(n, 0, oem_charset, 0)) == NULL)
++    return NULL;
++  return x;
++#else
+   if ((x = malloc(strlen(n) + 1 + PAD)) == NULL)
+     return NULL;
++#endif
+ #ifdef EBCDIC
+   strtoebc(x, n);
+ #else
+
+=== modified file 'zip.c'
+--- zip.c	2010-12-22 13:02:43 +0000
++++ zip.c	2010-12-22 13:03:00 +0000
+@@ -2025,6 +2025,7 @@
+ #endif /* ?MACOS */
+     {"J",  "junk-sfx",    o_NO_VALUE,       o_NOT_NEGATABLE, 'J',  "strip self extractor from archive"},
+     {"k",  "DOS-names",   o_NO_VALUE,       o_NOT_NEGATABLE, 'k',  "force use of 8.3 DOS names"},
++    {"K",  "no DOS-names",o_NO_VALUE,       o_NOT_NEGATABLE, 'K',  "no use 8.3 DOS names"},
+     {"l",  "to-crlf",     o_NO_VALUE,       o_NOT_NEGATABLE, 'l',  "convert text file line ends - LF->CRLF"},
+     {"ll", "from-crlf",   o_NO_VALUE,       o_NOT_NEGATABLE, o_ll, "convert text file line ends - CRLF->LF"},
+     {"lf", "logfile-path",o_REQUIRED_VALUE, o_NOT_NEGATABLE, o_lf, "log to log file at path (default overwrite)"},
+@@ -2289,7 +2290,7 @@
+   dispose = 0;         /* 1=remove files after put in zip file */
+   pathput = 1;         /* 1=store path with name */
+   method = BEST;       /* one of BEST, DEFLATE (only), or STORE (only) */
+-  dosify = 0;          /* 1=make new entries look like MSDOS */
++  dosify = 1;          /* 1=make new entries look like MSDOS */
+   verbose = 0;         /* 1=report oddities in zip file structure */
+   fix = 0;             /* 1=fix the zip file */
+   adjust = 0;          /* 1=adjust offsets for sfx'd file (keep preamble) */
+@@ -2859,6 +2860,8 @@
+           junk_sfx = 1;  break;
+         case 'k':   /* Make entries using DOS names (k for Katz) */
+           dosify = 1;  break;
++        case 'K':   /* Make entries using DOS names (K for Kompat) */
++          dosify = 0;  break;
+         case 'l':   /* Translate end-of-line */
+           translate_eol = 1; break;
+         case o_ll:
+
+=== modified file 'zipnote.c'
+--- zipnote.c	2010-12-22 13:02:43 +0000
++++ zipnote.c	2010-12-22 15:42:45 +0000
+@@ -21,6 +21,11 @@
+ #include "revision.h"
+ #include <signal.h>
+ 
++#ifdef UNIX
++#  include <natspec.h>
++#  include <locale.h>
++#endif
++
+ /* Calculate size of static line buffer used in write (-w) mode. */
+ #define WRBUFSIZ 2047
+ /* The line buffer size should be at least as large as FNMAX. */
+@@ -537,7 +542,13 @@
+   {
+     for (z = zfiles; z != NULL; z = z->nxt)
+     {
++#ifdef UNIX
++      char *oem_charset = NULL;
++      oem_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
++      printf("%c %s\n", MARK, natspec_convert(z->zname, 0, oem_charset, 0));
++#else
+       printf("%c %s\n", MARK, z->zname);
++#endif
+       putclean(z->comment, z->com);
+       printf("%c%s\n", MARK, MARKE);
+     }
+
diff --git a/app-arch/zip/files/zip-3.0-no-crypt.patch b/app-arch/zip/files/zip-3.0-no-crypt.patch
new file mode 100644
index 000000000000..2858b51ec2c9
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-no-crypt.patch
@@ -0,0 +1,57 @@
+fix building when NO_CRYPT is used
+
+forward ported from zip-2.32
+
+http://bugs.gentoo.org/238398
+
+--- zip.c
++++ zip.c
+@@ -3452,6 +3452,9 @@ char **argv;            /* command line tokens */
+ 
+   /* Key not yet specified.  If needed, get/verify it now. */
+   if (key_needed) {
++#if !CRYPT
++    ZIPERR(ZE_PARMS, "encryption not supported");
++#else /* CRYPT */
+     if ((key = malloc(IZ_PWLEN+1)) == NULL) {
+       ZIPERR(ZE_MEM, "was getting encryption password");
+     }
+@@ -3478,6 +3481,7 @@ char **argv;            /* command line tokens */
+     if (r) {
+       ZIPERR(ZE_PARMS, "password verification failed");
+     }
++#endif
+   }
+   if (key) {
+     /* if -P "" could get here */
+--- zipcloak.c
++++ zipcloak.c
+@@ -744,6 +744,28 @@ struct option_struct far options[] = {
+ 
+ int main OF((void));
+ 
++void zipmessage_nl(a, nl)
++ZCONST char *a;
++int nl;
++{
++}
++
++void zipmessage(a, b)
++ZCONST char *a, *b;
++{
++}
++
++int set_filetype(out_path)
++  char *out_path;
++{
++}
++
++int rename_split(temp_name, out_path)
++  char *temp_name;
++  char *out_path;
++{
++}
++
+ void zipwarn(msg1, msg2)
+ ZCONST char  *msg1, *msg2;
+ {
diff --git a/app-arch/zip/files/zip-3.0-pic.patch b/app-arch/zip/files/zip-3.0-pic.patch
new file mode 100644
index 000000000000..b4c53de694f7
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-pic.patch
@@ -0,0 +1,15 @@
+if our toolchain generates PIC by default, then do not use the hand written
+assembly files as none of it is PIC friendly.
+
+--- unix/configure
++++ unix/configure
+@@ -29,6 +29,9 @@
+ echo Check if we can use asm code
+ OBJA=""
+ OCRCU8=""
++piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
++echo "Checking if compiler wants to create pic code"
++[ "$piclib" == "" ] && \
+ if eval "$CPP match.S > _match.s 2>/dev/null"; then
+   if test ! -s _match.s || grep error < _match.s > /dev/null; then
+     :
diff --git a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
new file mode 100644
index 000000000000..cfe78f0a100a
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
@@ -0,0 +1,61 @@
+diff -dupr zip30-old/fileio.c zip30/fileio.c
+--- zip30-old/fileio.c	2008-05-28 20:13:24.000000000 +0200
++++ zip30/fileio.c	2012-06-12 17:30:29.794547493 +0200
+@@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
+   if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
+     ZIPERR(ZE_MEM, "local_to_wide_string");
+   }
+-  wsize = mbstowcs(wc_string, local_string, strlen(local_string) + 1);
++  wsize = mbstowcs(wc_string, local_string, wsize + 1);
+   wc_string[wsize] = (wchar_t) 0;
+ 
+   /* in case wchar_t is not zwchar */
+diff -dupr zip30-old/zipfile.c zip30/zipfile.c
+--- zip30/zipfile.c	2008-07-01 00:15:30.000000000 +0200
++++ zip30/zipfile.c	2012-06-10 01:59:42.571706181 +0200
+@@ -5406,6 +5406,8 @@ int putlocal(z, rewrite)
+     if (z->flg & UTF8_BIT) {
+       /* If this flag is set, then restore UTF-8 as path name */
+       use_uname = 1;
++      tempzn -= nam;
+       nam = strlen(z->uname);
++      tempzn += nam;
+     } else {
+       /* use extra field */
+       add_Unicode_Path_local_extra_field(z);
+@@ -5647,7 +5650,9 @@ int putcentral(z)
+     if (z->flg & UTF8_BIT) {
+       /* If this flag is set, then restore UTF-8 as path name */
+       use_uname = 1;
++      tempzn -= nam;
+       nam = strlen(z->uname);
++      tempzn += nam;
+     } else {
+       add_Unicode_Path_cen_extra_field(z);
+     }
+diff -dupr zip30/zipnote.c zip30/zipnote.c
+--- zip30/zipnote.c	2008-05-08 04:17:08.000000000 +0200
++++ zip30/zipnote.c	2012-06-10 02:33:36.372663528 +0200
+@@ -575,6 +575,13 @@ char **argv;            /* command line
+       strcpy(z->iname, a+2);
+ #endif
+ 
++#ifdef UNICODE_SUPPORT
++#define UTF8_BIT (1 << 11)
++      if (using_utf8) {
++        z->uname = z->iname;
++      }
++#endif
++
+ /*
+  * Don't update z->nam here, we need the old value a little later.....
+  * The update is handled in zipcopy().
+@@ -661,7 +668,7 @@ char **argv;            /* command line
+     if ((r = zipcopy(z)) != ZE_OK)
+       ziperr(r, "was copying an entry");
+   }
+-  fclose(x);
++  fclose(in_file);
+ 
+   /* Write central directory and end of central directory with new comments */
+   if ((c = zftello(y)) == (zoff_t)-1)    /* get start of central */
diff --git a/app-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
new file mode 100644
index 000000000000..71d52343602a
--- /dev/null
+++ b/app-arch/zip/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>Application that supports the Info Zip series of encryption.</longdescription>
+	<use>
+		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">infozip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
new file mode 100644
index 000000000000..27cba28e5c95
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+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 ~x64-cygwin ~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}"/${P}-no-crypt.patch #238398
+	epatch "${FILESDIR}"/${P}-pic.patch
+	epatch "${FILESDIR}"/${P}-exec-stack.patch #122849
+	epatch "${FILESDIR}"/${P}-build.patch #200995
+	epatch "${FILESDIR}"/${P}-zipnote-freeze.patch #322047
+	epatch "${FILESDIR}"/${P}-format-security.patch #512414
+	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
+		-D$(usex crypt '' NO)CRYPT \
+		-D$(usex unicode '' NO)UNICODE_SUPPORT
+	# Third arg disables bzip2 logic as we handle it ourselves above.
+	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
+	if use bzip2 ; then
+		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
+	fi
+}
+
+src_compile() {
+	emake \
+		CPP="$(tc-getCPP)" \
+		-f unix/Makefile generic
+}
+
+src_install() {
+	dobin zip zipnote zipsplit
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}
diff --git a/app-arch/zoo-2.10-r5 b/app-arch/zoo-2.10-r5
deleted file mode 100644
index 731c70917df8..000000000000
--- a/app-arch/zoo-2.10-r5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Manipulate archives of files in compressed form
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/utils/zoo
-KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://http.debian.net/debian/pool/main/z/zoo/zoo_2.10.orig.tar.gz http://http.debian.net/debian/pool/main/z/zoo/zoo_2.10-28.debian.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=02d6c8361ca2c1096ea8af2596eaf1d9
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
new file mode 100644
index 000000000000..c640b2dd2435
--- /dev/null
+++ b/app-arch/zoo/Manifest
@@ -0,0 +1,5 @@
+AUX zoo-2.10-gentoo-fbsd-r1.patch 744 BLAKE2B 76c60ceef76f9325ed6212b8a879da4b11808e0fa1445f765f8fd60b2627b7b1b9becb844bca43de5e9eb82dada9050a732971f48914a7e79f4670332e8f9140 SHA512 083e94a0ab2089b046f6ddf469ec21d0c9d31223a9ae109c360de368b815e551f1ad28b53fb2e1497290b231a8fc6d67e5716c5cf604b3e8088569ddc439a068
+DIST zoo_2.10-28.debian.tar.xz 14984 BLAKE2B e45ed5381e64d7ccac0e8100df12a8f55abbf7961e54a05ad6d3f07cca1a939f9320caa69196895a35dbea5d4aa82975ee2e5fb2202f793f33f4ebd7d5ff65e8 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708
+DIST zoo_2.10.orig.tar.gz 172629 BLAKE2B 9789f0ca53b2dd538e0032c31fa945f3f4f0fc739cadf536ec38621824cc89409d9def036e5df893a7cd4c5873302273d638c087a51cf7b1477501567c6578b5 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f
+EBUILD zoo-2.10-r5.ebuild 841 BLAKE2B 471a9eef55c1d2545b09450c315ebb546b83e1fe0256c93a53c028a225f83a80c70f9bcee5891a69ee15af64687d01252e7bd99b2068afae15aa9b82f6d83357 SHA512 caaa2b61e1b73e930d712186190efd990fb91c4f50239ad83e20ddc5d324ef9c1d4151c6df566714f3ca02edcd7f1987c9e0c15740482f31a5aa5d62475e3f5d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
new file mode 100644
index 000000000000..ba7d31e4a47d
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
@@ -0,0 +1,25 @@
+--- a/sysv.c	2007-06-16 15:01:53 +0200
++++ b/sysv.c.new	2007-06-16 14:38:38 +0200
+@@ -63,8 +63,8 @@
+    return (fname); /* default is no-op */
+ }
+ 
+-extern long timezone;   /* defined by library routine */
+-long time ();
++/*extern long timezone;    defined by library routine */
++/* long time (); */
+ struct tm *localtime ();
+ 
+ /* Function gettz(), returns the offset from GMT in seconds of the
+--- a/zoo.h	2007-06-16 15:01:53 +0200
++++ /zoo.h.new	2007-06-16 14:57:58 +0200
+@@ -95,6 +95,9 @@
+ #endif
+ 
+ typedef unsigned char uchar;
++typedef unsigned int uint;
++typedef unsigned long ulong;
++typedef unsigned short ushort;
+ 
+ /* WARNING:  Static initialization in zooadd.c or zooext.c depends on the 
+    order of fields in struct zoo_header */
+\ No newline at end of file
diff --git a/app-arch/zoo/metadata.xml b/app-arch/zoo/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-arch/zoo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild
new file mode 100644
index 000000000000..a9c59e5e1788
--- /dev/null
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Manipulate archives of files in compressed form"
+HOMEPAGE="https://packages.debian.org/sid/utils/zoo"
+SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz
+	http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+S="${WORKDIR}/${P}.orig"
+
+PATCHES=( "${FILESDIR}/zoo-2.10-gentoo-fbsd-r1.patch" )
+
+src_prepare() {
+	eapply "${WORKDIR}"/debian/patches/*.patch
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" linux
+}
+
+src_install() {
+	dobin zoo fiz
+	doman zoo.1 fiz.1
+}
diff --git a/app-arch/zopfli-1.0.0_p20140705 b/app-arch/zopfli-1.0.0_p20140705
deleted file mode 100644
index a91afef16515..000000000000
--- a/app-arch/zopfli-1.0.0_p20140705
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Very good, but slow, deflate or zlib compression
-EAPI=5
-HOMEPAGE=https://github.com/Hello71/zopfli/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-SLOT=0/1
-SRC_URI=https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc2b59ab6cce7.tar.gz -> zopfli-1.0.0_p20140705.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=3ca4c641070da20737690bd0bdbeac93
diff --git a/app-arch/zopfli-1.0.1-r2 b/app-arch/zopfli-1.0.1-r2
deleted file mode 100644
index 8dd60644009e..000000000000
--- a/app-arch/zopfli-1.0.1-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Very good, but slow, deflate or zlib compression
-EAPI=6
-HOMEPAGE=https://github.com/google/zopfli/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-SLOT=0/1
-SRC_URI=https://github.com/google/zopfli/archive/zopfli-1.0.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c449af5ae87b07c8a339ba3b23be78cf
diff --git a/app-arch/zopfli-1.0.2 b/app-arch/zopfli-1.0.2
deleted file mode 100644
index 6eda3955fead..000000000000
--- a/app-arch/zopfli-1.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Very good, but slow, deflate or zlib compression
-EAPI=6
-HOMEPAGE=https://github.com/google/zopfli/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-SLOT=0/1
-SRC_URI=https://github.com/google/zopfli/archive/zopfli-1.0.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ea7b520ee292d49041594ba95ef57cd5
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
new file mode 100644
index 000000000000..e0544a6d4330
--- /dev/null
+++ b/app-arch/zopfli/Manifest
@@ -0,0 +1,9 @@
+AUX zopfli-1.0.1-makefile.patch 1979 BLAKE2B 7210faf2c8451f42efdd236fc5592fda8bba9010fcfe85112efb79799835382382073021a8695167fe9bb3672f13bb256c3c90cb21ef1e9a13ac652392cc50c6 SHA512 f26b02d88df75d9ce9bf8d86ae5bbf3cdc548be14a81939d26cbfbb2b6b29b74fcf40a62dd4ad20650e7c147d8234f6a0d5d82ff8780c2a1d54ae59825cd43b9
+AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
+DIST zopfli-1.0.0_p20140705.tar.gz 125759 BLAKE2B 5bc052de7f8189605ec4e155c35413e5000ab1fabe7edd2877b9bbc04a0041c5f02fa67fe6a818f68eb4af15251dabf7e599615656956e315b5ece497e2afa1a SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca
+DIST zopfli-1.0.1.tar.gz 128178 BLAKE2B dfc410508c0566ba6ec948c2ed17b5ffa45338834c08991b5f2954b06b598f01a9c2cdba6526f324bd477e89e0ddb1ab86d4c2498ffe4cc573ba434b610fec14 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430
+DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
+EBUILD zopfli-1.0.0_p20140705.ebuild 677 BLAKE2B 9ab00361713213e8f01da29b9ace8e1761d70f08a2b7a35535848d4303f0309571852f54aac7b83193c8a323ec13d5e3fd2211416ac91187c6e62b9fa26c7ee1 SHA512 2ed577374b97e3bae087491a10b88d0967930a5de22663bf489844a0577f743bb6562d08b21c1df05396c82c5af0c16f843fde738a5eff37135cc8b2051b615c
+EBUILD zopfli-1.0.1-r2.ebuild 922 BLAKE2B f0ad60d9dd445277d41ef91cd28f329f6cb3d4297cf5cc42c89f27a0595778ff2e83e6050e3dd545796cbeac46756ffc8e279949b6c5cdc7bc8dd49d0ffda622 SHA512 acabf1c21f7d8f4c02fa5f6569f8bfdc1b4b5303a480bde95b762a84c04e7f67aba16761f358c65d14bfc9735e3157788b1317dc2e2b8b1352acbb92aa4a4d33
+EBUILD zopfli-1.0.2.ebuild 922 BLAKE2B 2d8c0b193c86c8f900810ef8748c730649892aa3031e7a85b5c6fb3a03ba8af759831341e9ca89532ea7033bb7c4cbc9f5b0966f5cb6ad39e4f3fec9b329bc5b SHA512 ae65b7cef4869bdb985374252fd036e14bae31de13c22e754d0a96fc0edd9e74058fd779c3a45feadf5be40dcf8b2be72aae9e5294cccbe4777aa14d3d8a2fac
+MISC metadata.xml 586 BLAKE2B 2545e2cc7e0f4737299f1e11472488e2a26f60c06fbca8ada9945ee4e4abb8a9ea9d4902367ed669ba74b82fac5a2da67b90517a2add19266fb73a634008c835 SHA512 9850711c420050ca6d7ffaff59c492a1a8ee606b541fb422f3e5f6f400540a2e9408a836b625ce645e0f327772c4613c95d9f4cdf20cf6b38eefdfd0b921cc0d
diff --git a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
new file mode 100644
index 000000000000..a4a7dc280912
--- /dev/null
+++ b/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
@@ -0,0 +1,55 @@
+--- zopfli-zopfli-1.0.1/Makefile
++++ zopfli-zopfli-1.0.1/Makefile
+@@ -1,8 +1,10 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ 
+-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
+-CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
++CFLAGS += -W -Wall -Wextra -ansi -pedantic
++CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
++LDFLAGS += -L.
++LIBS = -lm
+ 
+ ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
+                 src/zopfli/deflate.c src/zopfli/gzip_container.c\
+@@ -18,24 +20,28 @@
+ 
+ .PHONY: zopfli zopflipng
+ 
++all: zopfli zopflipng
++
+ # Zopfli binary
+-zopfli:
+-	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
++zopfli: libzopfli
++	$(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli
+ 
+ # Zopfli shared library
+ libzopfli:
+ 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+-	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
++	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
++	@ln -s libzopfli.so.1.0.1 libzopfli.so.1
++	@ln -s libzopfli.so.1.0.1 libzopfli.so
+ 
+ # ZopfliPNG binary
+-zopflipng:
+-	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
+-	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
++zopflipng: libzopflipng
++	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng
+ 
+ # ZopfliPNG shared library
+-libzopflipng:
+-	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+-	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
++libzopflipng: libzopfli
++	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
++	@ln -s libzopflipng.so.1.0.0 libzopflipng.so.1
++	@ln -s libzopflipng.so.1.0.0 libzopflipng.so
+ 
+ # Remove all libraries and binaries
+ clean:
diff --git a/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
new file mode 100644
index 000000000000..07a1c121032a
--- /dev/null
+++ b/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
@@ -0,0 +1,70 @@
+From 90221a4d79dcbf44239b9b07cb7c3ec7c090a4a3 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 18 May 2018 20:43:23 +0200
+Subject: [PATCH] Respect env CC/CXX, split LDFLAGS, use libraries
+
+This is a port of files/zopfli-1.0.1-makefile.patch to 1.0.2.
+---
+ Makefile | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 30b931e..bf063df 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,10 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ 
+-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
+-CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
++CFLAGS += -W -Wall -Wextra -ansi -pedantic
++CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
++LDFLAGS += -L. -Wno-unused-function
++LIBS = -lm
+ 
+ ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
+                 src/zopfli/deflate.c src/zopfli/gzip_container.c\
+@@ -18,24 +20,28 @@ ZOPFLIPNGBIN_SRC := src/zopflipng/zopflipng_bin.cc
+ 
+ .PHONY: zopfli zopflipng
+ 
++all: zopfli zopflipng
++
+ # Zopfli binary
+-zopfli:
+-	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
++zopfli: libzopfli
++	$(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli
+ 
+ # Zopfli shared library
+ libzopfli:
+ 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+-	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
++	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
++	@ln -s libzopfli.so.1.0.2 libzopfli.so.1
++	@ln -s libzopfli.so.1.0.2 libzopfli.so
+ 
+ # ZopfliPNG binary
+-zopflipng:
+-	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
+-	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
++zopflipng: libzopflipng
++	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng
+ 
+ # ZopfliPNG shared library
+-libzopflipng:
+-	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+-	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
++libzopflipng: libzopfli
++	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
++	@ln -s libzopflipng.so.1.0.2 libzopflipng.so.1
++	@ln -s libzopflipng.so.1.0.2 libzopflipng.so
+ 
+ # Remove all libraries and binaries
+ clean:
+-- 
+2.17.0
+
diff --git a/app-arch/zopfli/metadata.xml b/app-arch/zopfli/metadata.xml
new file mode 100644
index 000000000000..77292e2a3309
--- /dev/null
+++ b/app-arch/zopfli/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>alex_y_xu@yahoo.ca</email>
+    <name>Alex Xu</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>Compression library programmed in C to perform very good, but slow, deflate or zlib compression.</longdescription>
+  <upstream>
+    <remote-id type="github">google/zopfli</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
new file mode 100644
index 000000000000..13820f174c00
--- /dev/null
+++ b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Very good, but slow, deflate or zlib compression"
+HOMEPAGE="https://github.com/Hello71/zopfli/"
+SRC_URI="https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc2b59ab6cce7.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/1"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	tc-export CC CXX
+
+	epatch_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" install
+	dodoc CONTRIBUTORS README README.${PN}png
+}
diff --git a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild b/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..cb39213529a9
--- /dev/null
+++ b/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Very good, but slow, deflate or zlib compression"
+HOMEPAGE="https://github.com/google/zopfli/"
+SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( CONTRIBUTORS README README.zopflipng )
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)
+
+src_prepare() {
+	default
+	tc-export CC CXX
+}
+
+# The Makefile has no install phase
+src_install() {
+	dolib.so libzopfli.so*
+	doheader src/zopfli/zopfli.h
+
+	dobin ${PN}
+
+	# This version was erroneously not bumped to match ${PV}
+	dolib.so libzopflipng.so*
+	doheader src/zopflipng/zopflipng_lib.h
+
+	dobin zopflipng
+}
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
new file mode 100644
index 000000000000..9cedbfeb2e43
--- /dev/null
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Very good, but slow, deflate or zlib compression"
+HOMEPAGE="https://github.com/google/zopfli/"
+SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( CONTRIBUTORS README README.zopflipng )
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)
+
+src_prepare() {
+	default
+	tc-export CC CXX
+}
+
+# The Makefile has no install phase
+src_install() {
+	dolib.so libzopfli.so*
+	doheader src/zopfli/zopfli.h
+
+	dobin ${PN}
+
+	# This version was erroneously not bumped to match ${PV}
+	dolib.so libzopflipng.so*
+	doheader src/zopflipng/zopflipng_lib.h
+
+	dobin zopflipng
+}
diff --git a/app-arch/zpaq-7.15 b/app-arch/zpaq-7.15
deleted file mode 100644
index 0bc32cf10246..000000000000
--- a/app-arch/zpaq-7.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=app-arch/unzip dev-lang/perl
-DESCRIPTION=Journaling incremental deduplicating archiving compressor
-EAPI=6
-HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
-IUSE=debug +jit
-KEYWORDS=~amd64 ~x86
-LICENSE=Unlicense
-SLOT=0
-SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f16f69019a0c500a213d6ca36baa565c
diff --git a/app-arch/zpaq-extras-3 b/app-arch/zpaq-extras-3
deleted file mode 100644
index bcf663128626..000000000000
--- a/app-arch/zpaq-extras-3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=A set of additional compression profiles for app-arch/zpaq
-EAPI=5
-HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/zpaq-6.19
-SLOT=0
-SRC_URI=http://mattmahoney.net/dc/bwt_j3.zip http://mattmahoney.net/dc/bwt_slowmode1.zip http://mattmahoney.net/dc/exe_j1.zip http://mattmahoney.net/dc/jpg_test2.zip http://mattmahoney.net/dc/min.zip http://mattmahoney.net/dc/fast.cfg -> zpaq-fast.cfg http://mattmahoney.net/dc/mid.cfg -> zpaq-mid.cfg http://mattmahoney.net/dc/max.cfg -> zpaq-max.cfg http://mattmahoney.net/dc/bmp_j4c.zip http://mattmahoney.net/dc/lz1.zip http://mattmahoney.net/dc/lazy100.zip http://mattmahoney.net/dc/lazy210.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e3a0bfc5f838e817937b88dbf7a9c041
diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
new file mode 100644
index 000000000000..9d076c82cf5c
--- /dev/null
+++ b/app-arch/zpaq-extras/Manifest
@@ -0,0 +1,14 @@
+DIST bmp_j4c.zip 2511 BLAKE2B 1981df3f5fa41036955b3ee349c81e9718896f99f850f2fd38519ab07f31ab077281f51774132997b5435e0c60ef66280427f8303e97d63fd88acdaacaf0d767 SHA512 36e51f9ccef19069cb5bc93f3f8139e458406c8f1bd50b8e15440bed8808c43284248e0e2d436c613bb8afd1953703d5e9b681f95857b801d891e9497992bc6d
+DIST bwt_j3.zip 16535 BLAKE2B 7820b9c8cab697e3a21a43ff8a7cdfe2b0a9dd164bb2c04fbec0e88c41810133c65dcb08d46caf0258aae15ddd1f9867494d85c6c00f0f51b7f1a0062131306d SHA512 8a34909cd70cae76ee2c19b1d90895ab75422b7b2053cf6a4555250871a9ec1f585fe6d115abd6c0ea4cf092711ab71ab48906b4ec5b0230b4fe62b989177f33
+DIST bwt_slowmode1.zip 138176 BLAKE2B 03332e880e697698b9bcc1b9818c825664dcce7e1a03049cf734bbb306b6247a598e99670f567faf757eefcbeae79d080a4d27b8137f0079b77776e7e9bef23a SHA512 d415b049f284dc4d3d2211830db260489f26e6b1cc00fd60c16b6d138196299ce247fd0e20b58bef016451a3d5aaf9f55e53585ce97f95d1cfa5672735e4316a
+DIST exe_j1.zip 9828 BLAKE2B 1d0dcade3e169ff7913088a0504a3ac9d84538f5796d5afbbab84ff282dbcab7d9d59298df294c6a4945f9955d86effc9f0abe3fef077a301840de676033a90f SHA512 9b62486823a21b91ffefbf8de78e6fcd4a291c98549226b1e17a6a4c71ce510c678b71cb74cf9b38364385b3310f0b6dfecaf96652f82a0eab367a2122176596
+DIST jpg_test2.zip 12189 BLAKE2B bf639afa251d5111091f533c2ea079cfdf44f9b423baadf6498beb1fa2d6ef980053187b14f2cffa35803986cc3aa86f12321223cd3ec4b35945d405fed3eadf SHA512 a866812a9d9e77a777d06b6acfef4bd09e7af1b55e3d47eb75bd24d8f5b02ec455991efda7f7ee2a5db035602cf9843e01133fa8a7f75488cd94f1eeeac70bb0
+DIST lazy100.zip 14958 BLAKE2B 4c1da24f47b57b65baf6fc298361b07c2458a41da345c41196f9b03e8521d04c924ae37939bd7670afccb903f19f25a1885e484c7f2e379ca39a28810e0f1fa9 SHA512 2102d268bd15843773653fae8934b9f5ebbdb98a5c519a465c57ee58a6cd104228ab79b885f1c7a6cc127930b890c1ca14b09b799d9129d973c2cf83bd03be3d
+DIST lazy210.zip 15867 BLAKE2B e0f0c6097964cda9608df66d5743dd41d64cf9afce4cda415fcfc9397f9136e9a05f7ca845ce49c36f0ca2863e63574eccb29e70190c997609add61c4aad678c SHA512 9a45b281f3e0c2a24d2679b7eecfa9b5e8b5a13894faf23924784cec09f90edb17513ec3e13001ed283dc4ef2a56b764f32808c45443b5871d8acdd919a4f353
+DIST lz1.zip 10012 BLAKE2B 4cc8d41d5e27f8b695ff0987e77321164ec5c16e38021a7d63e42d9a2fa43f00397ff0db9b46528793fc343839f59834fa3c69f0b09b829fce538799965992ac SHA512 b03c84351a361531e59242904763f7cd13ec9b809bcbfbec5c270b139ab80ac1a99ccf745ba7a797587c0e71cb7dbc083f643fd62cd3b56906ff5bde8944a1a1
+DIST min.zip 9560 BLAKE2B 45eb51bfbfbc65506df34b0967068e318f1f1834504d2b3df9d3aff72d64de403fd51499cd2bf0e0fd0e6e37c67608fcb571a8624dd2c57de931680b6121c8d4 SHA512 e2ce1283438793abf5c8f62e6419249fb86f9d386a2cdc40acc72c4fbaa44469be2cb7c7271355af13d40070d386d87e12268aedccbf4cd6ec9feb91cd92e65e
+DIST zpaq-fast.cfg 359 BLAKE2B b441461e367f6d7e49da9ed6a23dfe8d4bd8d75f516cd47a8c46c04835267026558fec5890f46b0fc04c2bfcfc1c16ebe4c0e5a21fa0e3b671290b68185c812a SHA512 3f1118bdb61bea4c8df4e7a88a9ae079aecbe9f1dfc2aa7935334d330d374a248ab2327da9524857ca9c2b214ac32f3d2dad6ad420f0688b65384c2263147e57
+DIST zpaq-max.cfg 1754 BLAKE2B 5d522fc6afdfa3376d971fb57b94d1f2e916ffaf93cc7900472650ff928feb2c55e30fb92ff6e12b47266d17f47804fb4a223d57726c95740b9f636ae64b0326 SHA512 12758ea633cb37619c26753f8a4f368a1adc1b682a3ec738e36b8f39bff06f81dd9b37f9b58839ad43488d9b821690a9cb43e276da88f36d1b20f842cbcab70e
+DIST zpaq-mid.cfg 786 BLAKE2B 4f12176d42628eb85424490219509c0c272258ed260cecd34e772a4f42961af51a31ed8e9bd47cc8b0622673f5d3463742ac4d4f888b33af7f06e05bc38ea415 SHA512 ef08f70b5541396a690b7df630ddbb9fb3093b7617acb26394e9f7da40d5191343500bb0b6f0e66ed73fc840b7d5666cbc47a74f7eabba6abbe3743de7db7235
+EBUILD zpaq-extras-3.ebuild 1527 BLAKE2B 6815d1b6978320e47b4404b03d42f304b3c79283e1767cce68c77310794b68260266ffd71ee7614b96792af3190ae4a1e8ee42c6f44c268a805f50d5b392366e SHA512 5284467d1e4c8b9642b34f4230ed909999c719d0c58a7029666677044dbfc13ebfe062dd8241168b392d037a8d26b19d6996c170dac0714417809f2a3d2b9b86
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/zpaq-extras/metadata.xml b/app-arch/zpaq-extras/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-arch/zpaq-extras/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/zpaq-extras/zpaq-extras-3.ebuild b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
new file mode 100644
index 000000000000..7c98489f1949
--- /dev/null
+++ b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A set of additional compression profiles for app-arch/zpaq"
+HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
+SRC_URI="http://mattmahoney.net/dc/bwt_j3.zip
+	http://mattmahoney.net/dc/bwt_slowmode1.zip
+	http://mattmahoney.net/dc/exe_j1.zip
+	http://mattmahoney.net/dc/jpg_test2.zip
+	http://mattmahoney.net/dc/min.zip
+	http://mattmahoney.net/dc/fast.cfg -> zpaq-fast.cfg
+	http://mattmahoney.net/dc/mid.cfg -> zpaq-mid.cfg
+	http://mattmahoney.net/dc/max.cfg -> zpaq-max.cfg
+	http://mattmahoney.net/dc/bmp_j4c.zip
+	http://mattmahoney.net/dc/lz1.zip
+	http://mattmahoney.net/dc/lazy100.zip
+	http://mattmahoney.net/dc/lazy210.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=app-arch/zpaq-6.19"
+
+S=${WORKDIR}
+
+src_unpack() {
+	local x
+	for x in ${A}; do
+		if [[ ${x} == *.cfg ]]; then
+			cp "${DISTDIR}"/${x} ${x#zpaq-} || die
+		fi
+	done
+
+	default
+}
+
+src_configure() {
+	sed \
+		-e "/^pcomp zpaq/s:-m:-m${EPREFIX}/usr/share/zpaq/:" \
+		-e "s:^pcomp zpaq:pcomp ${EPREFIX}/usr/bin/zpaq:" \
+		-e "s:^pcomp \([^/]\):pcomp ${EPREFIX}/usr/lib/zpaq/\1:" \
+		-i *.cfg || die
+
+	local sources=( *.cpp )
+	# (the following assignment flattens the array)
+	progs=${sources[@]%.cpp}
+}
+
+src_compile() {
+	tc-export CXX
+	emake ${progs} || die
+}
+
+src_install() {
+	exeinto /usr/lib/zpaq
+	doexe ${progs} || die
+
+	insinto /usr/share/zpaq
+	doins *.cfg || die
+}
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
new file mode 100644
index 000000000000..0b30550e6c60
--- /dev/null
+++ b/app-arch/zpaq/Manifest
@@ -0,0 +1,3 @@
+DIST zpaq715.zip 1000646 BLAKE2B 3ecc69af7c14ca43643d54feac54647c82ac25e0212fc7f6e60821b76ba1976a2b2ccbf07e030ab6518c8643b452309d622cbea602fc4fe8798af7e4ecb2b027 SHA512 4cddcc04dff5e9dceb7138cf9e82b718b696048368ff494339f877d93e4423ed7959c0cfb2e30ba7dcbcdd6bbd59fa1021ceaca6d51e3180d8034b7a3997c265
+EBUILD zpaq-7.15.ebuild 1027 BLAKE2B a2f547c55086eb74ea44263eba9735519d7d096160b71e7dd5bc68533d571b957a19febc4d97db421cda9cb982265c69fc9fd04a7842a15190d146da1a591015 SHA512 6f8cf07a70e61b5c2faf5c15295a8d07467dbaa3542313290767783d41c151c7d2c2c9a129583e5461076e29aa50bd2a77804a9f46b42b0a66086ff30fef4893
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/zpaq/metadata.xml b/app-arch/zpaq/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-arch/zpaq/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/zpaq/zpaq-7.15.ebuild b/app-arch/zpaq/zpaq-7.15.ebuild
new file mode 100644
index 000000000000..e4c812dd9a58
--- /dev/null
+++ b/app-arch/zpaq/zpaq-7.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pax-utils toolchain-funcs
+
+MY_P=${PN}${PV/./}
+DESCRIPTION="Journaling incremental deduplicating archiving compressor"
+HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
+SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +jit"
+
+# perl for pod2man
+DEPEND="
+	app-arch/unzip
+	dev-lang/perl"
+
+S=${WORKDIR}
+
+src_compile() {
+	use debug || append-cppflags -DNDEBUG
+	use jit || append-cppflags -DNOJIT
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_test() {
+	use jit && pax-mark m zpaq
+	default
+}
+
+src_install() {
+	emake install PREFIX="${ED%/}"/usr
+	use jit && pax-mark m "${ED%/}"/usr/bin/zpaq
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! has_version app-arch/zpaq-extras; then
+		elog "You may also want to install app-arch/zpaq-extras package which provides"
+		elog "few additional configs and preprocessors for use with zpaq."
+	fi
+}
diff --git a/app-arch/zstd-1.1.3 b/app-arch/zstd-1.1.3
deleted file mode 100644
index a140b7178b69..000000000000
--- a/app-arch/zstd-1.1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/facebook/zstd/archive/v1.1.3.tar.gz -> zstd-1.1.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cbf239f5cf67838809df08d62471dfc3
diff --git a/app-arch/zstd-1.3.2 b/app-arch/zstd-1.3.2
deleted file mode 100644
index 7a4f7ee7013b..000000000000
--- a/app-arch/zstd-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.3.2.tar.gz -> zstd-1.3.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3dfa908fc733b84df42848c81d758bd3
diff --git a/app-arch/zstd-1.3.3 b/app-arch/zstd-1.3.3
deleted file mode 100644
index 021e48c46c1b..000000000000
--- a/app-arch/zstd-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.3.3.tar.gz -> zstd-1.3.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8ad583c689fd0a2d48cd24608a72cb19
diff --git a/app-arch/zstd-1.3.4 b/app-arch/zstd-1.3.4
deleted file mode 100644
index 71439794f782..000000000000
--- a/app-arch/zstd-1.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.3.4.tar.gz -> zstd-1.3.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8ad583c689fd0a2d48cd24608a72cb19
diff --git a/app-arch/zstd-1.3.4-r1 b/app-arch/zstd-1.3.4-r1
deleted file mode 100644
index 9cc32cbd31b8..000000000000
--- a/app-arch/zstd-1.3.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=lz4 static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.3.4.tar.gz -> zstd-1.3.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cc985c107e97a3debe5713c0fd5c5409
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
new file mode 100644
index 000000000000..2e006a279f08
--- /dev/null
+++ b/app-arch/zstd/Manifest
@@ -0,0 +1,10 @@
+DIST zstd-1.1.3.tar.gz 845902 BLAKE2B f8896d467c255dd0dfd348aee0d8b8a13b1551ee0e526db0f4b8939654ce5bd40f0a0273109880b27196d2b4fc4b381464f102fe1f736956f6c830205c601087 SHA512 6c025ca3899d0487bf2b4a9b333b47c6e2bb525ae3fc7328cc040f50d6f3c53a1bb9bd17e104352ddbc7b96b240c250c60d5be99e0a980332dbd3c518b2a81e1
+DIST zstd-1.3.2.tar.gz 1618939 BLAKE2B 1bb8c9ac0a521230e1507380afd5346e9cbd5b850c9a6516ef2fcf3e339e90ad1dc6adda13b7eb2d75630a788903ed12732a41fde065601ad879cca36c677125 SHA512 e2848d08b38d2fe98cd327611044bdac2f948547124321c8d63d5bdc2e6694d623c40c7bcc7d499fa83531f9cb92ddcb8be67614a49f855a9103f0ee6af0985c
+DIST zstd-1.3.3.tar.gz 1857232 BLAKE2B 45b737b8798fa6982b22163553e38fbe77143d5562032a8f5f5593225ea07fee277b27c06c00670196b59030a4919d819d562bf9e1e185aadc755d0563b251bb SHA512 72b63f96f65ca987cdc82c24354f7665c7dc3b2563cb0646f355c34bf8f090d8a0759729f8beaba8317272bdab34749f934055707b25cfd69c98a9fdcfbc59ae
+DIST zstd-1.3.4.tar.gz 2059958 BLAKE2B b1d332a35066fb00e32c6dccebd5ad1065bcc3c7d0dd07d8408e5a2c2641dcdbc388e053ce8d15f9e261255e80f018a172d6e103b5c2f5a2ebb555333ac5f15d SHA512 d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554
+EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
+EBUILD zstd-1.3.2.ebuild 1265 BLAKE2B f714674c9fec5168e389afd1733421bd91408f58ad7765bbdc5a461fe1ae3b584b452333d768031354d6f5b64f4fd7ed75df259c305cdad439f8f912083d4bde SHA512 4527e9019464671a27df4d76f77371e770a14d2e0420a433e63f77688146e5d2647cd95bbc38a5b0c05316c759f016eabef2a8b6338b406d83ee637b4497eea6
+EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
+EBUILD zstd-1.3.4-r1.ebuild 1328 BLAKE2B 52b37b7e23da5923675b7b13c5b1b14729a2430952dbe24c46903e0553a3a1aeda7d11671671711a1fb54f79c43206536c3b187ca77fccde3bf15b8575355697 SHA512 a5f53bdfd97426587fdd53fbe1b16e28662f037a51f95b9b15f3a453a3da7fb5fb5e0b413200870950e0c89a047a215ae2578b8b266d99c9f1b5d75045105956
+EBUILD zstd-1.3.4.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
+MISC metadata.xml 457 BLAKE2B d8251ae19e395d977bd88e72fc3c666e6d6a462a7a65db0f62fe3ba9831189f0f48e9457e04028b03dadbd4d099d0b051b313b626a3aaaeb1845cee636558b8a SHA512 801938d4394220ffe8df4d8198308b0d5651ebc198711a4af48d1e6dd9aaffdd7da030a8075bcbc7c3182403aea86e56a9ddc999dcfb2556496679d835a16058
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
new file mode 100644
index 000000000000..82079cb18aea
--- /dev/null
+++ b/app-arch/zstd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <use>
+    <flag name="lz4">
+      Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">facebook/zstd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/zstd/zstd-1.1.3.ebuild b/app-arch/zstd/zstd-1.1.3.ebuild
new file mode 100644
index 000000000000..09f6b558a73c
--- /dev/null
+++ b/app-arch/zstd/zstd-1.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
+IUSE="static-libs"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	einstalldocs
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
+}
diff --git a/app-arch/zstd/zstd-1.3.2.ebuild b/app-arch/zstd/zstd-1.3.2.ebuild
new file mode 100644
index 000000000000..6231db5a2860
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="static-libs"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+
+	emake -C contrib/pzstd \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	emake -C contrib/pzstd \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	einstalldocs
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
+}
diff --git a/app-arch/zstd/zstd-1.3.3.ebuild b/app-arch/zstd/zstd-1.3.3.ebuild
new file mode 100644
index 000000000000..63e5ab864115
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+
+	emake -C contrib/pzstd \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	emake -C contrib/pzstd \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	einstalldocs
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
+}
diff --git a/app-arch/zstd/zstd-1.3.4-r1.ebuild b/app-arch/zstd/zstd-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..b5e953cdda71
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="lz4 static-libs"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		HAVE_LZ4=$(usex lz4 1 0) \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+
+	emake -C contrib/pzstd \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	emake -C contrib/pzstd \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	einstalldocs
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
+}
diff --git a/app-arch/zstd/zstd-1.3.4.ebuild b/app-arch/zstd/zstd-1.3.4.ebuild
new file mode 100644
index 000000000000..63e5ab864115
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+
+	emake -C contrib/pzstd \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	emake -C contrib/pzstd \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	einstalldocs
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-arch
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)