reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-arch
508 files changed, 15834 insertions, 0 deletions
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
new file mode 100644
index 000000000000..2348240f6d10
--- /dev/null
+++ b/app-arch/advancecomp/Manifest
@@ -0,0 +1,10 @@
+AUX advancecomp-1.13-bzip2-compile-plz-k-thx.diff 3555 SHA256 e13a7d32e7ee6e35eecc8c74d9d2ae37fb5711d365d62de68c4a2bae13eadb09 SHA512 b23595378f58c918b207964fb723508f551517919c5fae797620ef2c77b6c1d19fdc76a7dc8212ffdea4696af2908e701648f89ea03dc9a43e085d3d7c5861f8 WHIRLPOOL e8ce79af8a10e92eaae3a7b9434ce20d405b052e8c92c5a261fc9dd3e6de90bfb768532cd629ba23381cf2f3bbcf80d3c617ffec272eb9f2e4e56df2e852b2e3
+DIST advancecomp-1.15.tar.gz 259340 SHA256 0d235c78224d450666bdd852a301159d53b9570e9cd28f015e222797ba4d5fe1 SHA512 18d6abb4c739c16e340bad2e87f89b545d0ecb660897a109a038b2a236bab6ce3d3b3ad572839fb4ce7981c5f150d8ed2447654291a8d808bbb85e70152e47ba WHIRLPOOL 34b44dd464092f442d5b9945e97abb4cd6fee1363c61df7573792d6a315cdab64197653b63c545b55587f37da7353e68d4cc3e26cbad961e700729b0a3f76aa2
+DIST advancecomp-1.19.tar.gz 1193228 SHA256 d594c50c3da356aa961f75b00e958a4ed1e142c6530b42926092e46419af3047 SHA512 9bce761f315e94ea9ebe59273cc810297e6227d914b498501f159f05c3a002236570c2d4248b397c5cdd3cf9a60565bb8d7f1470b079d5f50249031d3c78348d WHIRLPOOL cbf67f173d4cac1ef90266c5dfc9f8b65903828de26bdbafa467aada602d5858eb5eeeddaba08d665dad8a829d394e60d67bb6100322fa501c7d80144e74e91f
+DIST advancecomp-1.20.tar.gz 1198459 SHA256 590a447cfc7ab3a37ec707e13967a0046a81a888c561ebaff5415b1e946da67b SHA512 cf79e99d5075e17312e377d9d48a56495bd1a587761cbccab65e56188b1962d9097939685a7a3bb84c54b2a0b3d2f9ae2e18435e57b40b4219b59a4b2943b0d6 WHIRLPOOL 2a4a25dad6daaa1ea2b169a510f58425115fd3f7901876a9e9acd3948569a5a4562cd735e1d68142dafdb66fad20fcaaf6c193a56b354eeab68e6e013987322b
+EBUILD advancecomp-1.15.ebuild 916 SHA256 15046550b7631f00d0739c8d7e3cab70001361909f40ffba355e0a05f423f5b6 SHA512 d49408f239ea7f373d481ac6b1d8b415e0c074a019b4fb88cd792e8fc83749493f203ca10f8ca2e86c21c0f4f683666b489431bea6b887d1676d3b53c6c7cafd WHIRLPOOL 8c1878aed156c75e8d35ee1f54ed5173d81c053a1ed8c7ca0b32ac16ffc2e1f5be97d45ee6cd400608393968ab04d212be6b67255e5a4289fe4a3944f002c3a3
+EBUILD advancecomp-1.19.ebuild 913 SHA256 31902c7191943fbc1163e02c898f69be233b340f753ce8a97f6412639e8f167b SHA512 5733814a6f52562079652d6d8d526ea87c6164a96ff3398cf8078cf8ecbd31b4b8ecb1df82d8244a91d6dbd37a7c70297331d4ea12b781cc1d8240012fd50907 WHIRLPOOL 555c1393a9423c49777357712e901b001fd9edc7d11edc3e775e117b15ccd4001bad05415c3b32ae055616af49630c0f4bba018371264f1796d3a37945022cf7
+EBUILD advancecomp-1.20.ebuild 911 SHA256 19bbe3a74b5d2b09329ac684e9fc6ae068a3b6a1e859040cc8cec0bbf64686be SHA512 55c05a710ce98e09bea09c7abd4ba3c9b21a45f640033d20d77e1767bfdb56808419b18d6109da2a28de9b3004936307aa160094d8fdea014b23e4d01b876980 WHIRLPOOL cae463e77961c74fad183e9b8715810557426ea5b167cb891a8527fcd26a144620f2ebc8e5cb1e7f0c73d15f82b5c971ed7822c0e4c69e0b0fb33c27361d2c23
+MISC ChangeLog 2843 SHA256 e8ef9e8223e280e5cf8eee1d27369ba47c36152289c81d2133bf76ee9de4de41 SHA512 4dca07d0744596afe9bc239fa3c5cde3d41cdc76781043e03b711f607a5d270ae559b4a38aa16d467edab3cde78a6fa4399a8160b1f9f25b9ca1eed5b47c499f WHIRLPOOL 6e7ef13cd57cfd54a75204f08d66a3936e4c62e9861d8836c596534b8f49700139d5affab19d6e3cea9492f4fff06be9ec28f3c1eb5a645e2cac928e77cba093
+MISC ChangeLog-2015 5799 SHA256 68632cb40eee93aef8ee340d6dda0922e988ebdc8a87d172bd9b46cd6b50ceb6 SHA512 18aa1736c595a4cba5b993407d9234b07a9f68772d79c67eff86277f7c9d2fe0585f5dc666808ffef6fbaeb27496ca09a45f35eda22037ec995984ff72d74d16 WHIRLPOOL 75cf09146d2d0c263083bc33cbf17c8e4b6bbe65d2b269b4d31f1ccf297f00df546b3ad01183c253987f515343eb6cd998c33323569ea0cfaf7a0019c13ad042
+MISC metadata.xml 521 SHA256 bf57d006e12081d36e514128ef764ddbe19c81b05b94823b9a33f1049c6f423e SHA512 48bd30d199f5dae792a18e564454c3bf6707767a15a752aaaa28e2f8507e0824ccc348a9478531d03db839176742f00beabc95f532540ded145b734d2f4b3c45 WHIRLPOOL 43a61ff23e45bbd012b697cf1817d0905f3507147cbe059c00932608d5eedef478116b1117e04eb46b3ae6d56281f69b4eb53f8dc8d83d9831e5b2c4e402e888
diff --git a/app-arch/advancecomp/advancecomp-1.15.ebuild b/app-arch/advancecomp/advancecomp-1.15.ebuild
new file mode 100644
index 000000000000..cad4a21a9534
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-1.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
+HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
+SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE="png mng"
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" #282441
+
+src_prepare() {
+	# bzip2 support wont compile, here's a quick patch.
+	epatch "${FILESDIR}"/${PN}-1.13-bzip2-compile-plz-k-thx.diff
+}
+
+src_configure() {
+	econf --enable-bzip2
+}
+
+src_install() {
+	dobin advdef advzip
+
+	if use png; then
+		dobin advpng
+		doman doc/advpng.1
+	fi
+
+	if use mng; then
+		dobin advmng
+		doman doc/advmng.1
+	fi
+
+	dodoc HISTORY AUTHORS README
+	doman doc/advdef.1 doc/advzip.1
+}
diff --git a/app-arch/advancecomp/advancecomp-1.19.ebuild b/app-arch/advancecomp/advancecomp-1.19.ebuild
new file mode 100644
index 000000000000..7cae02575d06
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-1.19.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
+HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
+SRC_URI="mirror://sourceforge/project/advancemame/${PN}/${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? (
+#		app-text/tofrodos
+#		dev-util/valgrind
+#	)"
+
+RESTRICT="test" #282441, #523212
+
+src_configure() {
+	econf --enable-bzip2 \
+		$(use_enable test valgrind)
+}
+
+src_install() {
+	dobin advdef advzip
+
+	if use png; then
+		dobin advpng
+		doman doc/advpng.1
+	fi
+
+	if use mng; then
+		dobin advmng
+		doman doc/advmng.1
+	fi
+
+	dodoc HISTORY AUTHORS README
+	doman doc/advdef.1 doc/advzip.1
+}
diff --git a/app-arch/advancecomp/advancecomp-1.20.ebuild b/app-arch/advancecomp/advancecomp-1.20.ebuild
new file mode 100644
index 000000000000..97dde6b9ccea
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-1.20.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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? (
+#		app-text/tofrodos
+#		dev-util/valgrind
+#	)"
+
+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/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
new file mode 100644
index 000000000000..f20bba3373a2
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
@@ -0,0 +1,61 @@
+--- advancecomp-1.13.orig/compress.cc	2004-12-16 23:19:17.779774920 -0200
++++ advancecomp-1.13/compress.cc	2004-12-16 23:36:05.356599960 -0200
+@@ -181,16 +181,17 @@
+ }
+ 
+ #if USE_BZIP2
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor)
++
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor)
+ {
+-	return BZ2_bzBuffToBuffCompress(out_data, &out_size, const_cast<unsigned char*>(in_data), in_size, blocksize, 0, workfactor) == BZ_OK;
++	return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
+ }
+ 
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size)
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size)
+ {
+ 	unsigned size = out_size;
+ 
+-	if (BZ2_bzBuffToBuffDecompress(out_data, &size, const_cast<unsigned char*>(in_data), in_size, 0, 0)!=BZ_OK)
++	if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast< char*>(in_data),in_size,0,0)!=BZ_OK)
+ 		return false;
+ 
+ 	if (size != out_size)
+--- advancecomp-1.13.orig/compress.h	2004-12-16 23:19:17.778775072 -0200
++++ advancecomp-1.13/compress.h	2004-12-16 23:37:00.178265800 -0200
+@@ -37,8 +37,8 @@
+ bool decompress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+ 
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor);
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size);
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor);
+ 
+ bool decompress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+--- advancecomp-1.13.orig/stamp-h1	1969-12-31 21:00:00.000000000 -0300
++++ advancecomp-1.13/stamp-h1	2004-12-16 23:37:46.906162080 -0200
+@@ -0,0 +1 @@
++timestamp for config.h
+--- advancecomp-1.13.orig/zipsh.cc	2004-12-16 23:19:17.779774920 -0200
++++ advancecomp-1.13/zipsh.cc	2004-12-16 23:39:30.099474312 -0200
+@@ -39,7 +39,7 @@
+ 		}
+ #ifdef USE_BZIP2
+ 	} else if (info.compression_method == ZIP_METHOD_BZIP2) {
+-		if (!decompress_bzip2(data, compressed_size_get(), uncompressed_data, uncompressed_size_get())) {
++		if (!decompress_bzip2((char *)data,compressed_size_get(),(char *)uncompressed_data,uncompressed_size_get())) {
+ 			throw error_invalid() << "Invalid compressed data on file " << name_get();
+ 		}
+ #endif
+@@ -247,7 +247,7 @@
+ 			c1_met = ZIP_METHOD_BZIP2;
+ 			c1_fla = 0;
+ 
+-			if (!compress_bzip2(uncompressed_data, uncompressed_size_get(), c1_data, c1_size, bzip2_level, bzip2_workfactor)) {
++			if (!compress_bzip2((char *)uncompressed_data,uncompressed_size_get(),(char *)c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
+ 				data_free(c1_data);
+ 				c1_data = 0;
+ 			}
diff --git a/app-arch/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/Manifest b/app-arch/afio/Manifest
new file mode 100644
index 000000000000..72ea41434467
--- /dev/null
+++ b/app-arch/afio/Manifest
@@ -0,0 +1,10 @@
+AUX Makefile-r1.patch 908 SHA256 87ab99c04e85f9903e826b09f6fb0d935a21258007590bf1f93aad8c9e87008c SHA512 09303ec59ebdefa0b5033e55b635c0451f176696c64bdd7e06dbe68efdf3cfb869da4896a09be1e9730da0350ea88fb47302c36b516d45ecf8ca178cc648938a WHIRLPOOL 595755ee94910e0cf3379bd35b8b89e91f5d94f5044dd764eecc366f802188f0c3ec898eeb9b9709d8341345aee2987a29b042c76fea85208ddac29b0653b0aa
+AUX Makefile.patch 350 SHA256 901b92bb68d63b8d9c488aab81510929c45325c52b4bbbcff136a6f45cf586ab SHA512 39431930173e0a2eb6b771623d15aa70bdd0bc90cb01b2d64893ca4fec0d0019d4900b39e4a31c09524d921d9f1f0aa6f0312bb50bd430d6950dfda78455b5cf WHIRLPOOL a950f68bc9dbfc4937aa320bd10c157646b6d8b43f772752457255f9873f7c12e2a0cdf6b8a5299aab1a9d81469bdc00cdc29fb881b35132f8060bc22c3a2e5b
+DIST afio-2.5.1.tgz 191765 SHA256 363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864 WHIRLPOOL 15ad4ec743a2b4ac1b9ca37a5680f2f08fee7dd9cfe22d7a1b1949b4958447365e67096c8123e82a0f41f106ec6e73024152cc05121855a1c5d75589a734a764
+DIST afio-2.5.tgz 179184 SHA256 e7801a0f0a8dcbae41f4156dee5dae2a34a558d6c3ceac517efad4fed610ff2e SHA512 8e8fba115989b60284d09fb37b8f4782b6adc4a0887a05544615a38e62c6b3a48c3194b53ea4496fea64b25d420ff89cf6faab31646998f3612082118fcbb052 WHIRLPOOL 9ee08583d4e64ca6984b66e81eda5f422b89c3da13e130d1c9c7f8b2f78090f37b10fbdbfdda6e0dc30c7183813912d4021ff74d198bdf7203fc516425c40df5
+EBUILD afio-2.5.1-r1.ebuild 628 SHA256 88bea88133d2a9f4a67f86eda101c1a3d98e5e8557417487f0f27875d4745ace SHA512 52cd8fc80ae15e986707b844229a3f3a0d9c5d0ba018b9a9086d57198a5bd3b3e2705ed4684e115da4b9ab35f2b7a27ab0a555374eb630e9a377dac5804ff28c WHIRLPOOL 17568e36bbb795278d1f7a4cf1451cdf0b71e6c50538edf696b90212ad165c058a7fb6918d77e8e186dda881e967f6403cc0e532b39bad1c784c15a69adc028f
+EBUILD afio-2.5.1.ebuild 673 SHA256 145e037330f1ce36e1b078ca46a5cedca9c9759a45d5a3cb16a8a6f20ce63381 SHA512 e3f3cc8b97c53aeb0ba14d6435fc82401ad8a48db85e1f65e7baae4a498e4b1d6801231ad3aeead31e496967f494423d21c3f0885a383e54c98ac0478f0a9435 WHIRLPOOL b895c1ba3683f77e19f8dcf75ff136cfa0550f07e345bcb96b9dd753de050ffd46bdc99480ac00fe8da6adbb2e913056f838d07ab25248729c04ea6bfdae34a2
+EBUILD afio-2.5.ebuild 927 SHA256 2e69b7e2c162801e208450871558913784720c4bda210a6c82f068536d5bf9d3 SHA512 6ecf5514eb1fccb27869a7304abdd0b12a6f6fbd9317958f7450c4352f5c8bb90fec8d17bcd98953fca22e8499d5a3bd40807b49098f51a3175dbea9813fb07d WHIRLPOOL f25817441fff18180fe2f6578dbf162ae7305db23a9fdda0838e2835b027e81a14304de28cdc683a8b2e3b1f60d99f5aefa0b303ed87698b6f85f64261af12bd
+MISC ChangeLog 2606 SHA256 774b5f1bb76963bfc0bfd3440b505ff8ce233f26fb4620bc8efd67bd0e2a8004 SHA512 202bcdcb5a69422e83f40778afe866747e1437f4f98f73e79bc9c6d31cb27be91a9ba564956d2d5d2fe8fce83e501ef6af7ba19a6c627a82387bb07df86ed3e3 WHIRLPOOL 90fa6f529059e003e3835392513ad2489da188d3835a68de02e46872a32751ad0c28ea07770d568fa049159c9e389304d2fa7361d9bb41f194830093cc526327
+MISC ChangeLog-2015 2625 SHA256 9549cce4adc55b405a11ba60be147e44d73aed365e6170973a356ee91aa563b1 SHA512 ccf194fb1b5423714b4d6df08e95a42e5377e934f2e704e8ea9331de658ae8a56914f49d12d141fda7e1bc95e3861a769ae67fb048a5a9b541c296afc29ec705 WHIRLPOOL 144e82e6f0598aedfa85e69860fa886e457b006ef5794be055ebd0feeff26c7ab0137ebd2611bad16e5ba30c0a7ebf36a9015efbc3da6b5b3cf24513d2a0fcad
+MISC metadata.xml 580 SHA256 e46c4aa9273c9a646d757ba7b14cb14a72703a5815bc403d3671048267e25f8f SHA512 b13cf166120b3dff08a5977e1f72b3e14d689b893b055892c86c9060cba94ef0b640208a00439dc377432d0d2d2115462e75fb0883a7566895770674faacceec WHIRLPOOL b5d9c671d681bafcc95fb5c660aec33440a7fdb370ddb2f39d12d1c6af88a59592a28a0d3d77bd49e5ca6565e64f3d540c98e30a72dd59b039654c9f560d2b65
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..e885c29a4304
--- /dev/null
+++ b/app-arch/afio/afio-2.5.1-r1.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="cpio-format archives"
+HOMEPAGE="http://members.chello.nl/k.holtman/afio.html"
+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}"/Makefile-r1.patch )
+
+src_prepare() {
+	default
+	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 "script$i"/*
+	done
+}
diff --git a/app-arch/afio/afio-2.5.1.ebuild b/app-arch/afio/afio-2.5.1.ebuild
new file mode 100644
index 000000000000..45ade45c2dd5
--- /dev/null
+++ b/app-arch/afio/afio-2.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Makes cpio-format archives and deals gracefully with input data corruption"
+HOMEPAGE="http://members.chello.nl/k.holtman/afio.html"
+SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/Makefile-r1.patch
+	tc-export CC
+}
+
+src_install() {
+	local i
+	dobin afio
+	dodoc ANNOUNCE-* HISTORY README SCRIPTS
+	for i in 1 2 3 4; do
+		docinto script$i
+		dodoc script$i/*
+	done
+	doman afio.1
+}
diff --git a/app-arch/afio/afio-2.5.ebuild b/app-arch/afio/afio-2.5.ebuild
new file mode 100644
index 000000000000..d7c76737bf2f
--- /dev/null
+++ b/app-arch/afio/afio-2.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Makes cpio-format archives and deals gracefully with input data corruption"
+HOMEPAGE="http://freshmeat.net/projects/afio/"
+SRC_URI="http://members.brabant.chello.nl/~k.holtman/${P}.tgz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/Makefile.patch
+	# use our cflags
+	sed -i \
+		-e "s:-O2 -fomit-frame-pointer:${CFLAGS}:" \
+		Makefile \
+		|| die "sed Makefile failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	local i
+	dobin afio || die "dobin failed"
+	dodoc ANNOUNCE-2.5 HISTORY README SCRIPTS
+	for i in 1 2 3 4 5 ; do
+		docinto script$i
+		dodoc script$i/*
+	done
+	doman afio.1
+}
diff --git a/app-arch/afio/files/Makefile-r1.patch b/app-arch/afio/files/Makefile-r1.patch
new file mode 100644
index 000000000000..70ec6caa4b90
--- /dev/null
+++ b/app-arch/afio/files/Makefile-r1.patch
@@ -0,0 +1,23 @@
+diff -urN afio-2.5.1.orig/Makefile afio-2.5.1/Makefile
+--- afio-2.5.1.orig/Makefile	2012-02-05 14:52:24.000000000 +0100
++++ afio-2.5.1/Makefile	2012-03-11 14:02:16.267636685 +0100
+@@ -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 -s ${LARGEFILEFLAGS} ${2} ${3} ${6} ${8} ${c} ${d} ${e2} ${f} ${g}
++LDFLAGS+=
+ 
+ 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} afio.o compfile.o exten.o match.o $M -o afio
+ 
+ clean:
+ 	rm -f *.o afio 
diff --git a/app-arch/afio/files/Makefile.patch b/app-arch/afio/files/Makefile.patch
new file mode 100644
index 000000000000..537c29939fa2
--- /dev/null
+++ b/app-arch/afio/files/Makefile.patch
@@ -0,0 +1,25 @@
+--- Makefile.orig	2003-11-10 00:11:50.000000000 -0800
++++ Makefile	2003-11-10 00:13:47.000000000 -0800
+@@ -1,4 +1,22 @@
+ SHELL=/bin/sh
++1=
++2=
++3=
++4=
++5=
++6=
++7=
++8=
++9=
++a=
++b=
++c=
++d=
++e=
++f=
++g=
++M=
++I=
+ ##
+ ##  I wrote this Makefile, based on comments in the source.  -rich $alz.
+ ##  Define INDEX to use index() in place of strchr() (v7, BSD).
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
new file mode 100644
index 000000000000..b232df5209c8
--- /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/Manifest b/app-arch/alien/Manifest
new file mode 100644
index 000000000000..9ceb30548e9e
--- /dev/null
+++ b/app-arch/alien/Manifest
@@ -0,0 +1,5 @@
+DIST alien-8.95.tar.xz 56940 SHA256 37a22587c33810feab323474bdadbf969fda2eb4e720b2ca01b40d82d6f71a17 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c WHIRLPOOL 15c9044c8842058f847257ab9663b05cbcaa0e122bd056858c10befc3bcc118f5634323c50d6bae55c76e38df9f1dc287e1e19bb4f77862236148496b2270e41
+EBUILD alien-8.95.ebuild 697 SHA256 5ccc939257cba01d158c3e488a00d55fbb1452859621463e225a0ae2a8557a39 SHA512 0b95e1e9168c109d4398191a78fc8946f5f93b91dd4c16a6f15d8dc9c8e92979315b82f92e8ec79c9adeada792bd094cbcae0dc76b1c0e91c37cacc20839e894 WHIRLPOOL 3739c821c866449e590678a9a8ba40e512d51f1941eb430f0018d5bd3e9744f4f5bc8705e2b8006e1a54321c60fe6007ea7bfbf9ef5751be65273a85ddbdefd0
+MISC ChangeLog 3573 SHA256 5c6c9011191373b3a1389a3d4c536f245231257c304479e332e2748ad059f6bf SHA512 dbdd610cde604bae970524ef07a8248d812f686474263d8841f60142f4ee679edfc767eef9de75cf8e7f46d77ccaf1fa591c3f7ef7473e11ad8d0295b6715042 WHIRLPOOL 1b135c73ca46074d7747491e64873ff0e200114f5c9b6b3097e40bedc074883cab6cf66f285d9c9465b8bf3d9eb23bb6e1a4dff63207f4642393c4778f311b58
+MISC ChangeLog-2015 7538 SHA256 5f38791fbc7d3e08393676b65bbcefccd657d384f22bba20fd792d281e856179 SHA512 07b6a96541c17921091fb1fd3caae993d8e5f7915440452202a344af83fa08dd275af1042abbbf21ba681b09c3bb642646243955e5c49277126dc14f132a2fd2 WHIRLPOOL 4bc6b4e9648f9561033b9fc255fc2723696a3c0f5fdb679e81e8ef17f5c77ff029e35c315b8f5e53eb29bafddc3a7ae023020ae7202b79dc801038b78da761de
+MISC metadata.xml 299 SHA256 db2dc7b5a03291d2ea70e855e0994b263f13814a6839e23fea9ec12708976cda SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b WHIRLPOOL a64e2e82bfc10b7ba700bb80516e9e613ef09b97ad06e8a3adc670b9076d032e5edf16707bc15cdcef69277584176b407d73a8fda9037bef6e498a49f391cb94
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/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/Manifest b/app-arch/arc/Manifest
new file mode 100644
index 000000000000..8c203be74102
--- /dev/null
+++ b/app-arch/arc/Manifest
@@ -0,0 +1,8 @@
+AUX arc-5.21m-darwin.patch 268 SHA256 aa52c66e2b01a85fd0add7bbdaca12e25b29c05ea77925f5275a57507d24c9a4 SHA512 1250a494f793d899286989f6715a504f22b651f60019149ad1b4b4d423ad2d59fc948bdd317e773ea99bb4f52f79771450a9e69263c994c7cda79bd3bec5e94f WHIRLPOOL 9ca0b9fa79d2acb3143597acd0eb3c7d8af52870376fecd59996976266a4561042a093d98c0c740b020e0477daf940bcd0ec7dc902a7adea6084753c059f7515
+AUX arc-5.21m-gentoo-fbsd.patch 268 SHA256 7f6d5661768486a8d541ad321f5e9f069c9dcceed585d0c74dad15d5c4fb01c7 SHA512 252e57b2391e2487a4be411133da12e53cc52611b1d30ef74c7cce2d926fae08a72e4f3989f13d36eaa9dcbd44ac37d2ca5add3a438a35a662cdef02aefcad73 WHIRLPOOL 1cbde611f7aaa87b677c8250ed21f67388c5cee26e93495101ec8a0327fea7e6d129f66b7f8d7bb02ad931f8ffe4384d671c1a9ca54d3cd2dac9ec68bcc65ec1
+AUX arc-5.21o-interix.patch 341 SHA256 23b65db06b533a78e3fd6f4a94da2321c75074aa2ee502c7aba9b57195c6e797 SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8 WHIRLPOOL c41ce241c0d73a7b2e13f0741439d5f433b74c72eca78787c788785b37f65d83e050ea1df46ded0e787758f81e32a99a5e81b0d86f0322841c36346e17f74873
+DIST arc-5.21p.tar.gz 84791 SHA256 eacf870a245f155a4ba8c6f8e0fbb2e8a267aafa157f56ba7a8cb1d74fd8b5a1 SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c WHIRLPOOL 307cb7fc3b3760f39c2746ba755f256bfebe615159dc0f4401ea8e54560d8c8d17610731a8475e8c9497d52341012a8c13f14737f89847bb7d78fa2cc2c42a8b
+EBUILD arc-5.21p.ebuild 858 SHA256 2fd72b7652cd28cfedeea458b22c20910160f17ebeedab9c821d4755ceae72b6 SHA512 056a3c4746a45801bf41066fac10d343e8313e961af3e738b4cec4537dac414038e58e7c064a9d061f8926ec85766de69dd63f9694c064e6a72d7503d44d84a5 WHIRLPOOL 3a9e260bc6cd6bf5ab54da20ef5237b29ef09aab2238ed7474cb8bee98eeb5bedc280fe0b9605f5e87b1e067efd95916a8afb05cdf1d5867adeb14eaadd19125
+MISC ChangeLog 2611 SHA256 16d0951d6b34e3ecb2448630a4d5787b1ca3f294c72704191d74f554bfcbedf4 SHA512 8b3f422896323e79ebef3ca903fa86ff20354e56f96ead8418cff639aea068452e78ee65d81e8c8d284e9fe50a0588756596477368bbff9ae1cc15b409514d8c WHIRLPOOL 3fcbf8df58be8ea0972a9d5dd53330bc2f7bba8b723075e8fa8e8ce011efb52b6ffd886e312ca6fef72bc0f20301e43c2f60d599dd27f9728be9583b41c7e0a1
+MISC ChangeLog-2015 4967 SHA256 89485fe4f43809f0b2ac4ab9fa5e9c1669427809dd85894c7707220eb7fc5549 SHA512 f3a7876fd300d3c59f5d109be4faea4bf9cb3deaf4408db0eb4d22b1a5b72d24b691d4f515bf32e3e6d052706a279bac4dd4d3a9f94507bd918046f10451d907 WHIRLPOOL 9394ca564d2fed5f6ce2cb84cda26cb7dbc184acdb9b8c79ac7f81e541aa1062c2c8aaad0fbbfe5e7e734aebfdf517027e6e256ee89e979540a9e3f3555b135f
+MISC metadata.xml 356 SHA256 4ab00884ec8be42741256c63a89197ada3ec7e4eaa363faa9aa62cd6fc203478 SHA512 22f42b35b8c8ad43bac261820902eb8fc9835c2ed1a96e75a56fc97e0732060e6354e9485458f928177f201f7f6ebd9e75c7cae9a1cff4b376b997d3c3f20d18 WHIRLPOOL e3d07afdeb8333160344d053ee4fa8f9a413e899069fdccd23b8632f1004ecf554354753fb87d15f223d3de66c3c63f6fa1b7ca137645fc23fd7df5bc9b49409
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
new file mode 100644
index 000000000000..5cc46fabebae
--- /dev/null
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils 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=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P/p/m}-darwin.patch \
+		"${FILESDIR}"/${P/p/m}-gentoo-fbsd.patch \
+		"${FILESDIR}"/${P/p/o}-interix.patch
+	sed -i Makefile \
+		-e 's/CFLAGS = $(OPT) $(SYSTEM)/CFLAGS += $(SYSTEM)/' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPT="${LDFLAGS}" || die "emake failed."
+}
+
+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..552bfd14edd7
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch
@@ -0,0 +1,12 @@
+--- tmclock.c	2005-09-21 18:39:57 +0200
++++ tmclock.c.new	2007-06-16 15:58:26 +0200
+@@ -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/Manifest b/app-arch/arj/Manifest
new file mode 100644
index 000000000000..c33d493011dd
--- /dev/null
+++ b/app-arch/arj/Manifest
@@ -0,0 +1,12 @@
+AUX arj-3.10.22-darwin.patch 825 SHA256 cc67a0983aa29ffc3248ed36004cf3885f0315a9616e7e085fd33466682362ea SHA512 55dab1fb23a51c810f1875677e4741b1e3164551042976951a186e8bc7ab5e96069c4effcc86670d2aee37910cec7ff88ddae09854f65456e0bdc460563a9de1 WHIRLPOOL 56ce1fb5edac4d71201a8a256512f7309a441fb4c22957804fcb43f464379d27602ba0b300b55d2d58f6f3ab8be00db5fa12ce88d4c41b3c588f839561ac4ba7
+AUX arj-3.10.22-glibc2.10.patch 515 SHA256 b4b4b4a774620cd9ec79dd26201f4b64cfe7c8f2f117221c0f8091bd35c55508 SHA512 b72221d751c37ce3d9a2c1493dc34bcb987ce7090e0a16c249beef57e172d947cd007191f8c329bbe71dc88f39a732bc9c53e55df60937097eb18396a77476aa WHIRLPOOL 321c815f5df72cb677bac02d91a1e6e96451ccdddc3b2d7b0a696bece712ea7b7d650d28afa8a0ed8fbaf12e240f86080557dea3d22fb5b6079bd61a63ddee14
+AUX arj-3.10.22-implicit-declarations.patch 833 SHA256 016de0f1ab252081a13bfcc3d73161e2fea87812d7fa3411b3a8fb5608ddf860 SHA512 c4655473d39d8d1fc3014fdc501c6e3d712ac86105d1b00ca2a2dcaf7e78bdaf590c8715c00e189c7b851f8d23b078e17b25ccf41ad26b694e9428405494264b WHIRLPOOL 5c7455b596d9e3f266ffd3be601c8f5d60e961c12aa71caf1a9d525a1897b6de819ce2952cd50e7858d00a99ed75aa68a73bc891b8f90f05fab83a442d89074d
+AUX arj-3.10.22-interix.patch 1257 SHA256 167a3a2aa02bd95c346cf0bc859b0c0327901c5616dbd761f83065367c761feb SHA512 0ed64bd6d37dcca43651b32623881aaf94525c8dde82515f03ef748a642945366fe2da732aed7ac7c1f6165a6b03fd3b50f078afc135546704d06179d99227cd WHIRLPOOL 0afdcfb30a036965ca8a9235ab375c0124da30826211bf3f63bf8216c083dcc95d488628392dc8b548be814c77799715281f0a46a2694314e8132f468558a1cb
+DIST arj_3.10.22-13.debian.tar.xz 15904 SHA256 d74588f13a2de780d762d3405b0216a02cf4e55bda4ac4703cab94310ac3ea46 SHA512 670f9fb69f1f4363a4d277151bc99286de024764a99ca5276e9f46d560718a906657ec6e2898290f57fbf1007c9190959d38de14ecd1d3205fb26323eff6795d WHIRLPOOL b1111dc6dce1d3810819d6773a27b5d9642ea421e571fe1fa7eac0f4dfb16625769d57a4378613ca7f1b58531593f55044ef6efcb41a56fc4afd2a65c290c53f
+DIST arj_3.10.22-15.debian.tar.xz 16756 SHA256 69d7f2a94c0a7c76e276904cae98a977fbc5275b3db6e020e2a414b5d91f422f SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688 WHIRLPOOL 79c02a23b9ea47cf91c0f8d6441c5b7a7e11c165fb833b8f39e2ee0aafcfdb4c2678e066d27fc7b387efbc190234997c302d9ca58b38b93c14ab04a516e223f7
+DIST arj_3.10.22.orig.tar.gz 431467 SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76 WHIRLPOOL 86223959a938898126c544a75cbc0c4885777fe2eda3ccad2bbae47f8e3a31a409e2dca0dbbde8333e8c2ac77a1f350c7d95bbcba002f88ee94420f31d957319
+EBUILD arj-3.10.22-r5.ebuild 1238 SHA256 ef1e94ef11c2fba48e9e2f5ae77699df64768c553a45a0bfe1ca541f8749163a SHA512 83445b8b7137fec38fd62cc534c94f69fd10463953396f35dd64070e7e7fabaf41405a8570743061d2a986c6c837daed23979f2468be84fd2329858b80dfaa66 WHIRLPOOL aefd9ed4f3c1ea9f95384669b82c4bd6781620951336865ac9a0d73037d9a9268b6613fb745cfc951ffe85eeb29f61714b7e1cb716b0f6a8037b788c15a1a16c
+EBUILD arj-3.10.22-r7.ebuild 1217 SHA256 8731618b13950ca82c12ee4c3795c63d9c66d995cf31bc19c6ec657ff92b4cb9 SHA512 d21c7c20de99ce0b1101edaecb820d82ecd03d3d2f737713262e2f37f4203d589980853ca2b4713f8c09562be899ae6b68147ac8f41ad49f4a99b1e92ca49f48 WHIRLPOOL c2a653330ce332faf96e272c31cf19d02170de0b1820da5e444e4457010f953a59acb7cbac74e374c4dbf7a40324a0719a97cc985d56ba69446c7a4a7f816046
+MISC ChangeLog 5715 SHA256 5843ab2080d8775796179f7a5f8ae945081eae256848f432b1c556a51c155b31 SHA512 57f05ea4f45faf4d75d8be6a59bb32ecbc52bd2bb2a0452f0ae8527e9c5c6952ae7040353cf2fd0eb302ea72c9f97e077db9300410c10638e5e4785de3f9755b WHIRLPOOL da9d49910ef6ef685f43b518356c8fdd0e1966294b07a754167f053f208b678f6185395cfd94e43aa91ea1b224d06053a3da7861f7a34dbc4b4534c294330d53
+MISC ChangeLog-2015 7009 SHA256 571f2022e61267dee27f7fa556fbcd4e3cd4734c43d14748bb4ee8b5c501de88 SHA512 72990bda2835d645afc4328fdd49fe583f9d25c133391181a5bd6b2f0fd48e77a4f7ca29b8e26b2d0349d8cdccc220843dd5fa3ac507fdc6e0fc7a5c38bb1a7e WHIRLPOOL d13180b38f9c76b2788eb28beb107ccf73be77bbbd11dd223b7c3f5eb6568d112c8ac5c65da59d1970dda0388370163dde2820ed09afbd902576fcc56d3acb9d
+MISC metadata.xml 240 SHA256 b9a07c6f768e7e02fa573f38383101253c39f078951a3796dd31ac8b090c2bad SHA512 64457fffc601ed1e5d4a9154d0fc977a489cc0f2dae35b4da56c78deb66e42e1f9ad33364e13472c33fba0769ee8908bf256a9568c448d3bc895a6a2e2aaffca WHIRLPOOL 49c237982008fc65ee28ac01a607ea0f8331f237262b73642b9eebdd7be50e5314b5fb381f270a4e31fb9333a4d423d3b0a023568fca0d28b20fc82fcbc1bdf3
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/Manifest b/app-arch/atool/Manifest
new file mode 100644
index 000000000000..30a114acdf3b
--- /dev/null
+++ b/app-arch/atool/Manifest
@@ -0,0 +1,5 @@
+DIST atool-0.39.0.tar.gz 119307 SHA256 aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3 WHIRLPOOL acd6b5635bdf88770738a8e7bcb8c1286b6d666226f8d55c03ce20a7a9235cf3820812b5c3422b318795c775b13a84ededc3daa195a00a1a3904ac4e1154a5cf
+EBUILD atool-0.39.0.ebuild 410 SHA256 232c28ff5740358e498136c6a39758a884ee11e937397ed31c19854c1114c86e SHA512 630c0dfb9ae06fefa5271a00e0d23ab029d9fce70b82f7958f046165095d598b9d8687af81efa94e69fdee8d3600d00f8b04ce73eaf873ab84ec91be75e90319 WHIRLPOOL 58bfb280dc00bd9d7f55d6103100f0871fce638785bb741e2fff5863fadee6cf6297a582fb647b6a8acdb43e3cd48812a44ccdb599c8e22a68c50572e51e3839
+MISC ChangeLog 2401 SHA256 f61e11f3060f637d5ed9ffa8caf40f30737b368ae5e8f2beea575c7ad216c000 SHA512 a3f9b717e0e7d08030c2197c6ef7bc5c2285f1d45e23f3dbd53297507d918a6ba615672a2e41091f3ed713108eefcc50a9a08c05c8c0b2155ec290b68e96cd22 WHIRLPOOL 5f8019c4535ea27dc7920017f6120718fa5541d9df258b00f351a6096d847be12636e87d138b13b1b8a3db53d2fa807eb83b959d33b8b862e9ac06ad03df2b33
+MISC ChangeLog-2015 4991 SHA256 9ef4cdceb50c3f430ec6c21f21e687dae18f4dcf7ea45d238517c0eaa4309110 SHA512 146206d072311982dcff34b2cd9754e029a2584bf6155bff4ef2fe90aafb9a7ebb1d2fa69b892ca641d9ebc493f0036f572d5001d7da7c76108142c0ddbb5695 WHIRLPOOL 856581eeff7f2630064cbbc72e12276c8ffe0be63d54875cc80e738952f273735b6f3d393b44fc37d81361c9590689e1f32807e3825c1150cc9ea3feeb4a8d1a
+MISC metadata.xml 246 SHA256 92d5540a2f0904365eafb8ce96e6320cfc14e08f22e124d721521ef77ddbf6f6 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6 WHIRLPOOL d15a33750d6ada278082c675223992c98cccf98af92ec04ab5b908816381ab6965714988fac87a795265973c6fb81a588a08c385ac6fb66046d14d119e0c236c
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/Manifest b/app-arch/bloscpack/Manifest
new file mode 100644
index 000000000000..ab3858156719
--- /dev/null
+++ b/app-arch/bloscpack/Manifest
@@ -0,0 +1,9 @@
+DIST bloscpack-0.11.0.tar.gz 89839 SHA256 8c735ca961ca01141f741a23320d2acb7c1191863b26505bc8fc8e53110ac33b SHA512 68e6c05a4404fbb2554acc0a5a93500c5fe3eab4d91621ba0ffc290383873509d38fbb5b9c5733640a2cc58bf3c508067a411ba16e563dbd4e485f3036a5ebc7 WHIRLPOOL 96c4b0a751bae9dbbdd946d75551285c20ea9c54ca0715b5ba54f7929034e360befde076b1605660b6f93b8a76da800ef45e7f68a748efd7527caa303a8ce202
+DIST bloscpack-0.5.0.tar.gz 45171 SHA256 9889ad1a79434de8adb49ad6a12c40ac542850e0a133ed1376cdbec27462f7f8 SHA512 3a3ab351e9ab77409b8f5774c4ede533e2393bf49065d52cb60018268f448d1cef5ba2b24d0d25ec86298f6ff55bbb9075af3b302558a0e2e7343344b002b8d1 WHIRLPOOL 1700d778fdc21f5b247d5ac97ea58e15511014cdbab666fb2691d483de9cbbe2c1aee5dc59bdb3a42c3859330b236ca817e62dbc81848a22e894fbb40d472afd
+DIST bloscpack-0.6.0.tar.gz 60571 SHA256 a704bea04cae765e6f0be6e5b656803c6ead46ea4489c382dcd55cfd804a8aa0 SHA512 cd0b6e67d90fb8e320bfd5ddb41ee5d437543826f85931eb4cf3abbcb5eb6bc9581db88c2454b82b333ce2555f18670100f8df018299ce621eccd2e7c9e7d099 WHIRLPOOL aefb00c57e26cd90d23b9221c012a4ae3c821970782df4d2bebfc83ff6e0654ec1d91cf811a3969c33d4dd4e8ebcd6897fab1187f94ff1829f0a10aed64ef5cc
+EBUILD bloscpack-0.11.0.ebuild 755 SHA256 fe82d978f4564b9bb73e65d78f6f3e84d2933ef8f244e3961670be2a274ffab5 SHA512 27aa34360f4b7b69cd4a41564645b252fc9da305246c6e567678354f97ea61e391c5e2de35051645eda8b46589f8454f931b6d28cf22782928ded04f25b47e74 WHIRLPOOL d894df0bfcb9dd0903d705f105fa171fb12fe49f0ab0c6e3e91f905d13a11cef66befde52177965bb070069fe211193b875d4a37aa81e6220799c21ce29c969d
+EBUILD bloscpack-0.5.0.ebuild 548 SHA256 4f0b9d0fdcb67e5adc40144bbbe39c9e2b7ab290ba9fe4b7d16f4dad9b8fea90 SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e WHIRLPOOL 2153f66be853ef8d8ee4ed8b5c4ea5961c284f872ed9977c0b3fa43d652b8f072079d4edeca9931f8caa90557110a3aae346136435b304cd3b73e2374a3adc67
+EBUILD bloscpack-0.6.0.ebuild 548 SHA256 4f0b9d0fdcb67e5adc40144bbbe39c9e2b7ab290ba9fe4b7d16f4dad9b8fea90 SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e WHIRLPOOL 2153f66be853ef8d8ee4ed8b5c4ea5961c284f872ed9977c0b3fa43d652b8f072079d4edeca9931f8caa90557110a3aae346136435b304cd3b73e2374a3adc67
+MISC ChangeLog 2489 SHA256 a6a41f62849b44b2c019910d131d964270b9516d67aea09952a1aef2543e14fe SHA512 46264b51779a0bdaf88185f18cf4c6a9327e35a59d5ecb69fe246cb37ed9b33bc0f35c129e5970427a7377767385622761a638c22ff78bdf19f4d152ddef06ea WHIRLPOOL 047fe0246f679af0674ce91596e65dbfaaecfd5bcb6ec4a145c79b44312c4ab7b63f6d99c6bbba16f800ed1b37a422387793abbeea7c217b6c4cf69c8b1fe1d1
+MISC ChangeLog-2015 824 SHA256 79e2d95877a8e2b446daf50f2da20cf3abb0f9ec16595e0ab3ace725464a2bb8 SHA512 515e56096851aaf9a8e5726f4f513293f57e253df40de3a66407b3f7aa7b219a2f1c8f96fc446031f7efe4829828d65de68db85d132ce47b0b3e1f72c096b4c9 WHIRLPOOL 92b14fff46465e20f8d5943f36245d743c1bed4884e29315751ad3235e29f05d256c04f9f76c49333e88940ce2a660fce8965d95ff21ee6e8fd13ab476e65157
+MISC metadata.xml 640 SHA256 9ebba0ef94b80f91e23e8e0cfb1ccf6de768796c1dfb84a01f390f70e6bb3cff SHA512 82a640c36ad2ed771345c93c35da111589b7c57ffb9074e6da062c7ca84ae9fd76f9f5978abeb75362c8145fc1625ca0bb3f9fd8957688e75dfbb5cef6568c4f WHIRLPOOL dbd4010d3216f779e2d7a6f81a61d7baf4404fc155955e1226236304bbdf7a86b86aa971dae470970e5f3c722da57251ea6072015c5d0d746ffef6359132dfcc
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..e19782373426
--- /dev/null
+++ b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+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/Manifest b/app-arch/brotli/Manifest
new file mode 100644
index 000000000000..89659ee7a097
--- /dev/null
+++ b/app-arch/brotli/Manifest
@@ -0,0 +1,4 @@
+AUX brotli-0.6.0-no-rpath.patch 1196 SHA256 ae159a8592fdc78d7d9fe53ee643c3fac7e04f658a02eeb0f93234046f6017f7 SHA512 8dddddc2d44bc9af9c4bbe277ece69ac22e6e77661d3982cc67b2a681ce01c03afb63e6796ae3a6c81cd6495bd39e64a0955c189dba1cc4bd43335ab3fc70123 WHIRLPOOL b247c43cde8b521b86c76e6522735de6eff830fb42f3f93586668291445228f68561e89df32beb5f9b0cb080b23ac681286eb2ce5ca57829bc82bce77e27c15b
+DIST brotli-0.6.0.tar.gz 19838761 SHA256 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f SHA512 36caa277790efeb5bff0fdc090cdcf00fd9995c4e81a60ed31d36af2e13848ec1afe5d84e6926eebbee013525191e9404e112cb7fbede16097221c5bc3dfb5d5 WHIRLPOOL 2ffe1213ca430821dfdf1b21ae4cce91060a93a4a8ff4f867e48c4108373fe319abede11f9a524634997f8789cede11f30b2c7143c254b1da99f00f50b0817fd
+EBUILD brotli-0.6.0.ebuild 1259 SHA256 df496fa3d89312c7e32bdd2c12172f900ae82a0fccf12fe16ffe5ab71178ca34 SHA512 e35ee2605f957fcca40cc892d097f1f80b361fb1b651c1e037fb3f50b6cb6a9ab294d3908066c9d6afdf5511244fed769faa8081a3b8023025059936d7612eda WHIRLPOOL 66d18f5c5b6047b96d03131563b14749343c17b6bae21294bbf5b74b1bb82fc921cdaddd14b20726eae4c17d33e5bbf7864ebe4cfa8ecc8c246069ed513b38d8
+MISC metadata.xml 690 SHA256 c968e1228318cb0962986760204b2ed14151942d1936a6dbf03e4f9a65eb3047 SHA512 8d98e22ce2ac4f69876e378773415f65ab8c5846e6d4952a6ce104b07343a5486abc9b88c49b54a3187bdedf880e0b2a3b6d06448fdd8c10f692718de6355dba WHIRLPOOL b76216d167f825ee1873ccda2676f9406671b9869e225bc940dcb7c6b4208e3eaed5f632526ae4ac87e10db86e0dfecc90a25499e09c6e458f7aa87357116dee
diff --git a/app-arch/brotli/brotli-0.6.0.ebuild b/app-arch/brotli/brotli-0.6.0.ebuild
new file mode 100644
index 000000000000..91daf8320a8c
--- /dev/null
+++ b/app-arch/brotli/brotli-0.6.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 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"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+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 )
+
+PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
+
+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-0.6.0-no-rpath.patch b/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch
new file mode 100644
index 000000000000..28e70d7acfe7
--- /dev/null
+++ b/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch
@@ -0,0 +1,32 @@
+From: Tomasz Buchert <tomasz@debian.org>
+Date: Sat, 24 Jun 2017 14:40:16 +0200
+Subject: Do not set rpath on shared libs.
+
+---
+ CMakeLists.txt | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca612d1..bf70d69 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,19 +27,6 @@ CMAKE_DEPENDENT_OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON "NOT BROTLI
+ 
+ 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
+-if (BUILD_SHARED_LIBS)
+-  add_definitions(-DBROTLI_SHARED_COMPILATION)
+-  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()
+-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..0a0fddcd4ed6
--- /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>bicatali@gentoo.org</email>
+    <name>Sébastien Fabbro</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/Manifest b/app-arch/bsdsfv/Manifest
new file mode 100644
index 000000000000..c2b273df9b92
--- /dev/null
+++ b/app-arch/bsdsfv/Manifest
@@ -0,0 +1,6 @@
+AUX bsdsfv-1.18-64bit.patch 2388 SHA256 6c51c25eeb444f9a5c599f22bcc3ed8b62c6b0e6a0b19318c8e1b4b16f3b4692 SHA512 5831956791b03972b1fdd3199687b10e7a55d562e815f94b863fb75a549eec14b85488bb0a9c9e5d2fb3241a95846f710dd5b19547ce33c425da756c685c18a5 WHIRLPOOL 8e8b600c0ff7be5c16f738d1773254da5a7d894ce6c7ff740d2135a7adf6faa5cccaa4057894da31026312f59e55bd36b0714e23d6e17638ae9e1fee35bdaee8
+DIST bsdsfv-1.18.tar.gz 13301 SHA256 577245da123d1ea95266c1628e66a6cf87b8046e1a902ddd408671baecf88495 SHA512 f2742cfc5c56c915aff7534eb07025394c57bebf74d6505dc1d7e814e5ca098b474a718ae1c2aeb993cf95dd55fc792c56f9ac80344d112738da2f20157647e6 WHIRLPOOL 4f0ae0c17b6907d99f36d442ffaa8afc197a06fd8f99d75a1023dc44f7531f5639d1e13cb4125e3596b19310e190033dcf2a71a765d8953e5bedf04d6879561a
+EBUILD bsdsfv-1.18-r2.ebuild 582 SHA256 ca8fcdb6688aeeff0a7de82085d166c53637b585cc9792adf03020a7bb180156 SHA512 bde8f6f8622c1d7e0ce9091a880b6294ea0f5ec9220378cae97477009eb71c5e033b70b5917fcb5e2641b8eda833c977939a0af40f00e2e824e47cac38bba388 WHIRLPOOL fec371562905d587dfa2e62270d793d3809842fa8bf7b9abfa6b4d93dbbf94589e90dd7371ea72ff07fb63755e793eccee61624ff9a754158b78d43cb5a977b8
+MISC ChangeLog 2330 SHA256 1cdc9fe34696c1cd4041c00efa4f33c21b7dbb75cd481f50def19192859a5e55 SHA512 b688e176845a83764516ba3db4291ab97d8b59d929f181c5bb9b548ce77a4e7bcda3533f795d03fc7a40dca71cf92ec8f59d6c254b0e5877ce20b0a04d0a2cc8 WHIRLPOOL 82c8360a55ed3ab20a11bd8dbc9e1f27eb2456753d3dc3349d5eac01b6ae5422809cc783f11f195a0bfe74eaf27ff71b32358b86a04cc2d12f9ebd2d31a9c040
+MISC ChangeLog-2015 3615 SHA256 a32b484f365e7efc82854ceeb81a5bd0a90d3e4dedc4d7442a3ed455a2da305a SHA512 2c06c9d09da5888fc0dea2b3c475d5d30855cb1672dd9f2cd279e9995fd1460f25e3d66284343d6116f71a82cbda179c880c462d7105cbac8adcec594d521e6f WHIRLPOOL 2a4a5cd3115cf157736319fbd95013a327749ae50a32cfe956f51308c3f578ccf79e4f6d4d953e8076cb2d9935a5b68e99ae58a026c7e2ca78de29efee1a28af
+MISC metadata.xml 282 SHA256 6694bfe2a45763a87d1e7131693899ea9480aa711d8b8281c7a82605d3cf5b42 SHA512 49b0ecc9bdba3c6b9a5fb98b41f0a1b4f2f17a9d2eda12c7bfd26d90552237106dec26ba5ae159b4b3e9a1e06e6e0d62be934fa2c01e36df95fc11be8b2506e4 WHIRLPOOL 258c8fb0209079e8e3a1876792c35e75f9e5f115a8d29ce2a71ba8a67ff5f68748956450400a6d3b1d909b44b1e3b9048d8772ce47d0c5bba3ba950bf8727888
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/Manifest b/app-arch/bzip2/Manifest
new file mode 100644
index 000000000000..8e12bdc7f07d
--- /dev/null
+++ b/app-arch/bzip2/Manifest
@@ -0,0 +1,14 @@
+AUX bzip2-1.0.3-no-test.patch 161 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49 SHA512 a07f04189bce8a53980f324769cc8eb79eed9e42cbed223b74f566802e61eacb45e677c122266689a654d4fc946cba4a2171c72be87f98e4996c6cde5cb0c462 WHIRLPOOL bf32302ea76029ca01c07e70024460ab8cde0c4db84ebad1b0fe66717f465f515b96c70fe67fb7d0f48233e3bd883f77dc83c489e8a0418c982ff416e66c1c11
+AUX bzip2-1.0.4-POSIX-shell.patch 672 SHA256 34bc42c1d6c980e0970a517c9602b904efb2f676ec191e80fcbcd185ccb6b1fe SHA512 7fc5e34ac2fccb7e096bafa6dd934fb72375c17e0cfa3e0549648ecc82ec44521eb8f8ac3ce49a4064ee67fa9319da9e52db86a971443956f71d11c056289d19 WHIRLPOOL 42d9a3b0ac26fc59ee74fa5fb1b7f74a6c4cebab13100ed1165e6d8d40bddfc58425b0a3018f6e6216789fad498e25419199c020df24197a8ca5730ccb2d8e36
+AUX bzip2-1.0.4-makefile-CFLAGS.patch 569 SHA256 853621ae207f0115210e06f738d4e79861110712823419707875116cb45b105e SHA512 5ad3ecad8b577737386f0e5fc6f9adfd72334598b6dc76755cab6e38611b048c5c6b97462cbca48237a95802e1e2ac0de34b03d579d737edda8eea3e6a31346e WHIRLPOOL f4906ca56ce15b6ea18fccbc745c18858458ac2ecf6d2f1cb57de710ce5888d567dfed1dc34048cf1909d3d9f66a7c3b356bec0ee02674924669e7d717e2e6e2
+AUX bzip2-1.0.4-man-links.patch 422 SHA256 03e6ba8a87a8abcf6bb02c0e44186e4b20b8dc871ac2d4921cfc3c9ea616e971 SHA512 7c650620dc11522c4d8bd17a55da18ab3f8556cf83452459e86bceecf33a5de39b8e05e23eb11c4c8dffa79cc8d23d54741ccc8bc715dea2e108f5f3c8dde20c WHIRLPOOL 33a67aec4d7f668f401e920a9c97d9715535bbe774d0fb4b0baa12f023215081904995a22dc8eaa5708c7e1b736738164055c9e77d188650ad61fe99abcaf8d1
+AUX bzip2-1.0.6-CVE-2016-3189.patch 619 SHA256 2ad8ead7e43cb584ea5c1df737394a8ca56ea3cac504756361e507dc5a263325 SHA512 ec8ec21ff795f4caafc7dab727280836894058a7c85e2a094033d71d4b0cdced108a371f15d423f49248707e3eb95303eeb40cb50c96cd136fe7cbf038e628a8 WHIRLPOOL 66d25f99b071ebe97b8ca012a8c40b5895da6a793254bcebc0058afdabac009d65a4f2d4bc42f45bf74695908bbb65e7e53a8070f623b61f6ad521f0d8d8c924
+AUX bzip2-1.0.6-mingw.patch 556 SHA256 8da568f1d7daac4ac6b9d7946dd3b807e062b5a1710a2548029cc4f158e8d717 SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 WHIRLPOOL 66cbedef7eef3b4890a56dd0aad28529960c2e205fc7809ded96dd7ece17cdd3f18d92eeca25e009f2ca3689f9ad2d2bf81238562078d4147d87124107ac41af
+AUX bzip2-1.0.6-out-of-tree-build.patch 2121 SHA256 2dd4db48de0a3b1a927725640ad4f56e90d68c33ea3cea9ff0dab7bdb8f7ccc1 SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e WHIRLPOOL 18491f4d99ef866154379112d4c0b840bf6960a116cb03c338aa132cb5440f8cfec8a0933460794902e11b2c0cc13edd99aefc424d3d0f91e4b30d221230ff56
+AUX bzip2-1.0.6-progress.patch 5756 SHA256 f93e6b50082a8e880ee8436c7ec6a65a8f01e9282436af77f95bb259b1c7f7f7 SHA512 c3f5959027346a471182fbcac72fe3b755d9327557ac31fd8d36746c643afd418f5a59bf434493109af4536b90e69220e985a25eb3ce7e3d05029583a9d0bcdc WHIRLPOOL 830dab52ec0efd50a0266863dec0180e40db7ef519cd5c02991bc12fb978bb5df5d0329ede896aff02fc2abbfa09c4380949c8f5eb48a9ccbb562675fa5d2003
+AUX bzip2-1.0.6-saneso.patch 439 SHA256 8345a9fcfce28a459a12126748ac27480a384e80974c31d9fae752d818ea05d9 SHA512 4f5d499227e3381e87c43b4afa48b5cd1f796142805dee19bf7f9f3a8547ca5baaf0b1d1f42079a61b63e3c279650292cca119e7d177ad04425c93e23f1bbd88 WHIRLPOOL 35d83bd455116a1121c87675bf0ceda0e37ac48a76a1379d0455e39026b1445c3d90493923ee1c4c49f3cc388c8344b8a4379d6c44e01564d658ebd22c3a5a10
+DIST bzip2-1.0.6.tar.gz 782025 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 WHIRLPOOL 8e92c24f77c3711f5103a26d6fefbe61fe49a7d1e46879d259d46347c606ca956b7228ab011aa88007db771f86a500d4954057c7f9c70bd8380ca6c9430bd81e
+EBUILD bzip2-1.0.6-r8.ebuild 3028 SHA256 a63ec5bf15ea68ed8e1d344960013efd8ceaca9ad99735f97dcd4f0d0c92b739 SHA512 ac44c1e7919af1e855f191260e520133d275c07139c9bea74bbc289e2bd818584a4f2132826b9b99829ad199f6b10278e764e0e62d76c5eb791672ec9eff2ea8 WHIRLPOOL 70df293a937d6b3738ae9c5e14685c365cfe3ce59a51cfaac20363750594d2bb8632c15cf5a0ab797c906564149af8f1001b1a01bb994d9dc4aba3828cb36a9a
+MISC ChangeLog 4457 SHA256 bf4140b18998985ad2ba1549e40a5b8459264e460849e99c0646bd6bb6c3d8b7 SHA512 df831d1a011429a033ad40f71ba909ee12a6eb6222b4862c75bda2fee714bd7a8cfbe8577fa212a6382e032c15753bbdc1b7858c1bfa6787082a3f790a72830b WHIRLPOOL abe5cf62a84af9b533bbf3a9e51d4937604edc955326f78072db8176fda9f99d754e08e0a0525bf46e966d33c5dd9fb6e8ed7db025ab5f29988c5be11566d794
+MISC ChangeLog-2015 18677 SHA256 b21e44cabf4e85755a407d69b76a5887bb6634f4ff1597f93d7c6cf67c92f7d6 SHA512 c32fbab48cf636d137ada557532fd70d62fc907be097001f4d4e86bde2e765654bf3aae56d4fb97d6a8e98a1501abc58e665291666d655b926ff5ca4a09a6efc WHIRLPOOL 5a4e135b0a86975c193d7984869e7d7d5b57ffa56ed4895f7557541945b8b60cbec65ea1482b3bfc4f96727cc3b3dccf0b74f00c78244a74cdf2c43d550daf2d
+MISC metadata.xml 332 SHA256 6167ecfa860cfcb3d79a8191ca49affd1b7bbbe399fa9857865a5268861a504a SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0 WHIRLPOOL ea4e55d4bc5f7518feef174952bee5e77c59f7eaf79e1b27b74e57ec042a121b477e15ca4f0669c5688b377e31010a7d2c6fccd59e5e2f060621a5beaf4d7674
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..5b555febf72c
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 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 ~sparc-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/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..672c89dfbd20
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
@@ -0,0 +1,9 @@
+--- Makefile
++++ 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..b31cc061db6f
--- /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
+
+--- bzgrep
++++ 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..5a95ed68b2d0
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -0,0 +1,25 @@
+--- Makefile
++++ 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
+--- Makefile-libbz2_so
++++ 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..308f5f9b3e89
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/172986
+
+--- bzip2-1.0.4/Makefile
++++ bzip2-1.0.4/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..1d0c3a6dd34f
--- /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
+===================================================================
+--- bzip2-1.0.6.orig/bzip2recover.c
++++ bzip2-1.0.6/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..7691d63e27c8
--- /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
+
+--- bzip2-1.0.6/bzip2.1
++++ bzip2-1.0.6/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
+--- bzip2-1.0.6/bzip2.c
++++ bzip2-1.0.6/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..9c4ddf05307b
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
@@ -0,0 +1,13 @@
+--- Makefile-libbz2_so
++++ 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/Manifest b/app-arch/cabextract/Manifest
new file mode 100644
index 000000000000..d2f7da060c2a
--- /dev/null
+++ b/app-arch/cabextract/Manifest
@@ -0,0 +1,5 @@
+DIST cabextract-1.6.tar.gz 241731 SHA256 cee661b56555350d26943c5e127fc75dd290b7f75689d5ebc1f04957c4af55fb SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8 WHIRLPOOL 5816e3f6ee3a3caad574bbc3d8aeff55bb99383a4ce80a40332d59696a1d4fbaba6823e9a77023e7cbbc257a0693a35f7817d7ff20383b30898de5d4e50eb1f2
+EBUILD cabextract-1.6.ebuild 1113 SHA256 62004024a1586e702a3d5f3ec15f555b46552c863b2c931904e459c55bc3be7a SHA512 663e8abefed38e1a9b7b2b4ec27a95f0269ff0ef2591c0acf8bd04414a5248ade8dbb7600089bec0c0ff1c99f4b22bdb954a90d12b1441e7c2e14fc71eef0702 WHIRLPOOL d313503f594de7dc0cd5e2dff3dcecfec0b189e3b0816fa58e26483534f18467d6c3dd8d00ab0ac643ae71031618bc7d53ac9c93e0be8c1a804f75b3dbee3098
+MISC ChangeLog 2618 SHA256 fa6e5434c38cc6ead2cb2d51a0d489dffa51d87874b79f633139aaf7c1edb482 SHA512 026f1ce6ac19125f3f253c132451271cba5cf79e18a82d0c31fa7b862ea7f4d79eb17d482df63ffb168879355e884c07f9021385f506a647749c95347eb2ce62 WHIRLPOOL 16868a277278c621c26c441557a84ae8edb9618e2cf0f772d1ac6ccd8be79bd3efdfeefe906342b3aac982fe6c77f20a52553a5263ed4e0d20f2df70efbfd40f
+MISC ChangeLog-2015 11493 SHA256 2d65d02c88f0d78e72cb128fb702cb63d9e25409e46df7f29be6716dae114acb SHA512 d58d8acb00eb15b8ef5e5257231c5430127e5289606e00b0bcb2b4066ddd8b4be3d5d7880bd7fe610f2a7ad6068e22ce9f130dc9d724d97985b6d29813987eb4 WHIRLPOOL 6385b56422ba1f1b486046f7fd8ea33b3fac65bb5f2cd01a8fe28ae8d02db9d49ea31105cb29d04b966d7292e754157a0a215f75d739d6d9a9d79923d46edda6
+MISC metadata.xml 497 SHA256 a90f554dfb4e02c8a9f7c2d55c4e424c7349f18451ba4dc39817c8a75bef8e1f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3 WHIRLPOOL 054a86e7e24e5aa86e695fe896fb747980a113e6221f863e963b17b01095e00946ca5d9dbcae3728c8e675eb886b972b9b1e208569709c8db9f53376b6498a97
diff --git a/app-arch/cabextract/cabextract-1.6.ebuild b/app-arch/cabextract/cabextract-1.6.ebuild
new file mode 100644
index 000000000000..42b906cd2bf7
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 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="http://www.cabextract.org.uk/"
+SRC_URI="http://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/Manifest b/app-arch/cfv/Manifest
new file mode 100644
index 000000000000..9f6a581dacc6
--- /dev/null
+++ b/app-arch/cfv/Manifest
@@ -0,0 +1,5 @@
+DIST cfv-1.18.3.tar.gz 68030 SHA256 ff28a8aa679932b83eb3b248ed2557c6da5860d5f8456ffe24686253a354cff6 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71 WHIRLPOOL 895211c61ff57068f28945fd374d3b9e2f00dc2739e1b884bbdb7cfa0a799d50ee36ff6791bb6457e2eba5f613a8b57b77bd1b3bacc7c4a329f0326d58375b13
+EBUILD cfv-1.18.3-r1.ebuild 810 SHA256 f57c39578068a72e2a6be6bb5a644a55ddc7e035ce5090cfbb95e4381e725796 SHA512 a88789502fc23d53ca977d7afb043a720a3f48d42e0da5e0d2694956c074d8c4b6b58749ec81fc88360db3d14a240bfc01e5a7cbf46de608d6e9b70835ebcc66 WHIRLPOOL 1d40a1e0d1b56b6ebaded049a81747cc90bb0efb88d282972b9f3c5f810e67ff54dd8e2044ed687df633d4481c2ecd2de2d1ba1806fa909de9671d52d8263d04
+MISC ChangeLog 3470 SHA256 93e88c0e5768750dbde5ab807fbc262c2bf8a55b467dead33695f74e6c45c9a8 SHA512 3105698bb01d831f218b5aaaf7c3dcd118c4eb16eb90279856e4145b766c39dbcdbd43c295bcc362f5162c6a72d47e8ed68eb243ea2d517a5f28b4cb797a75b0 WHIRLPOOL 5aa00656bd64c5de5852225a0518ab5e8a72e99a473f74c08219ee5ada3546428f9910839be9dea4f480ccb0f7305cdd1971fcad7b9fe45f488634dfdd1a287a
+MISC ChangeLog-2015 4683 SHA256 1de7b98d39506aea11bd68c15ab42991ef75b2a6c1bb37f33c887f918b92f8d9 SHA512 5ca48517248ef47a3fe4c1ca2b2c7cbc5f37887b6b2400b1a8fc2584ba5acb4c5e76325785d1328bb95862843d9510a4c20be037e41b24b4759a4f397f18f5bc WHIRLPOOL 44df6bb5913690ad0fb02c732e5ed8c11e1462230ffd4aef7740c5503a1e4d97062aa44ca0befe412378930260cf430facbbb648cb5e88df82fc7b926c235634
+MISC metadata.xml 581 SHA256 84d1a0f2af80250f1dc1cf42c20c800b3e299228be2ba4dc50ee0963d3bed07b SHA512 ac57bc554978a1f62b0ecef157853b66a00aa7098be0f5e42e01e5cf9546a8aec259dca9037d6698defea3e2e265ef7827e9e9cc73db98d6584896a3755b9d56 WHIRLPOOL 9de01a791271505ef85d76017566598e54ae44e988ea55599bdb6359922ac962e9f38b8fa58124e75081c0f87e38915d58cd6c2bad69e299c7828314ed5cb22f
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..a83d0cfdaf2c
--- /dev/null
+++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+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/bittorrent[${PYTHON_USEDEP}]
+			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/Manifest b/app-arch/cksfv/Manifest
new file mode 100644
index 000000000000..5f30fd84cb70
--- /dev/null
+++ b/app-arch/cksfv/Manifest
@@ -0,0 +1,5 @@
+DIST cksfv-1.3.14.tar.bz2 26114 SHA256 8f3c246f3a4a1f0136842a2108568297e66e92f5996e0945d186c27bca07df52 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519 WHIRLPOOL 15d9daa70a37e14a05c0d07b0389dfb9502d5418418601822d74a3048776d25d0f9afb5df448abc67c0bfc1042b3330a1efff4c7a53a7a0d96e64c2528d8d8f1
+EBUILD cksfv-1.3.14.ebuild 736 SHA256 a3ece35cd75724e90c764553fc15fb948a50ff4b027d2e82bbaa751ff9b32d33 SHA512 c5320fab648755b5c2d5bf553f771109f88b8923f5c9b62ed0054ba4b3daad43a9a2c275cc5139f689ccaa65a9be98164135c5dba6e6966ce28f1cd46c67f451 WHIRLPOOL bfb531b9c2d761baecb8defa14aa5d7e9cd3921c6773f458e86aedc8b326af14693d878a23012299ad1e0f336347bd2395f58d080372fca4d488cc38ba52b2b2
+MISC ChangeLog 2415 SHA256 0535cf7def15123ccd93590563842ae2927025d50f4060b83170f95132ef89ed SHA512 2bde15363fc4000fe753be62b4afdec6f8cd4c7c43f61588678de2aec54851674d1078528bf144fd8cab6b8fcf0d14993121d824edae3a52d5cf91d0b3d24135 WHIRLPOOL 30034e7451d5cfed69e2af37b09cc9384ae2dbbd8f7d425c6b9fc934a54af8d64cf4691ee90c88755ed414260050d1d9bcad5b447764a5d553340ebbd2beab0d
+MISC ChangeLog-2015 4886 SHA256 2afb4fa076df407c47418c1f12c325605f1af812ab6e3a9df11f54339499a45b SHA512 3b96cdb16dbed145a4ca640907aa755613721f1b8c069ed65d903462d1938cdb29a734e0a916c0d6e6c7a19f358e7fd022b37df1565ceb349eb2074807ed8048 WHIRLPOOL e2ee607680dd90c6577560422008befa89afb289b94cad4379205ce815a817d23806eb5eed1d9fdd069fb0e4919bccdbf1f36c03b222d65558fb0f6097795f17
+MISC metadata.xml 350 SHA256 224c48daabdfebd95315d26d2177c2c83f517516b774c1afa71fdd4b46239531 SHA512 e258e8a3cd1fe7a630c0bb45f8553f94e80031d76c135256ceadd6face4436cfcdceab7afe2c31495cebda9482742abc73c85d49ac99e7dd3fdccffce44d6792 WHIRLPOOL 831beb422a12c19b37e3aac5f76d77df40a9fee7c9e6f04a08a8ef334e7374daece023b0489128aabb403d5a60b50ab24adee67d7584f6561a2a46789aee35b3
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..c2a628921b6a
--- /dev/null
+++ b/app-arch/cksfv/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>vapier@gentoo.org</email>
+</maintainer>
+<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/Manifest b/app-arch/cpio/Manifest
new file mode 100644
index 000000000000..05a2e9e8707e
--- /dev/null
+++ b/app-arch/cpio/Manifest
@@ -0,0 +1,7 @@
+AUX cpio-2.12-name-overflow.patch 404 SHA256 2340e462aa5b2e36cbfb37a4230280cd632a392f2b3b7af2f938039cd2f11678 SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a WHIRLPOOL 7ef5ec91d2c53c24c627e3dcf71676165ccfb30b4d847abd43eccff1da040ba7b4d1d2832f0b8008fefc2bca14a7860ca744c51f2e5eed5e1b0417a67979478f
+AUX cpio-2.12-non-gnu-compilers.patch 223 SHA256 d208a7921cdcb07bfd5bd95378b4bcec323bea780a8456b71f366872fdc0456b SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03 WHIRLPOOL 041a0920b26e1c69d9efcc4594af2801c68aa8e0b8d67c214867770a1e4fcd172d5e725d8bc0e9c117594420ccd86e0b30746b2e34510b26ec873838299a16e1
+DIST cpio-2.12.tar.bz2 1258605 SHA256 70998c5816ace8407c8b101c9ba1ffd3ebbecba1f5031046893307580ec1296e SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120 WHIRLPOOL 2990d54b0832e36239737fbd71f197b28703ec22de8dbbab57c7b97dab88a6107cf5464e4dd0bbf208f2c3d49839c7c2abe8ef68c1f2318ff7018d0b07f179fc
+EBUILD cpio-2.12-r1.ebuild 882 SHA256 844f2fd1b8b415d2edbc63bd44dc8551381d3f6d9eea55b3de4e8099c1c7749d SHA512 40a0fd47774f56cdf99c77b6d0118f122b8dde7ed66c460577b0d2bb2035abe936cf2de9474595dbcb3a5b5996ca1ad15be7705fce0c6ab2017da2936cadd224 WHIRLPOOL 1627bb29292c165ee360121573bf4171801ccbca1d6856f7e7264245ca457fbba91f6027483f837dde74436e3f641c7ff04a268322a64b5ae1f5252e35ca33d3
+MISC ChangeLog 5514 SHA256 1dd025f4c9fc7f8ee25a304281d0f74c867fc42e4f7331fecec7b62b8e81d18a SHA512 4fad638a142cbc94317270f5d06d7e20eeca1905ad3fc83ff0a86a865737a6f0ae81300d4eb2fba36335540699514ef84d693aa4b0be680cf2993ceac97bff37 WHIRLPOOL c824bf14febb72f332dcc5fdb7739fe0236e8c95962011933d3b3b3b3cb720402f7a9a93d90cdf7d88a806746f85db036f8108bf78cf444900e413a8c16e5e8b
+MISC ChangeLog-2015 18440 SHA256 94ebd0f69a0d63e636064bfc7a20915f3f13aa6a5c74cb0ef308f1ae1d83893e SHA512 5d05ce3971c456b975bf1fb0ed70cdf1049d90138c46e3980f6365500190428c7a94850999862684a1e4b6498a5302717e9f36cc7dbaf82b4a09682a663e1c12 WHIRLPOOL 1e3d90d55fdbb354b2ed1f7da2690befaafe779945484e0e9861533630589f5be550409dcbaae15c0de47a7da4de9cf3fb0a608401d3694189b5c6080541857a
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
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..91efd5e4494c
--- /dev/null
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="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/Manifest b/app-arch/createrepo/Manifest
new file mode 100644
index 000000000000..594eabca0c55
--- /dev/null
+++ b/app-arch/createrepo/Manifest
@@ -0,0 +1,6 @@
+AUX createrepo-0.10.3-ten-changelog-limit.patch 525 SHA256 aa8cd656cd5c0244e89399fdd00bd1956599e2a7bf9f25f9e967154d9ba8e8e0 SHA512 3ff54907d22680c5e617fa43b3954f533d66cf6f00a67e628ee4e6828871fce71cf200a562e8557a33e66cba09e9b76c12aec4c1dc7e7bc31589add9c71a1516 WHIRLPOOL 12230e6e0fc9a13c8b8fd878691446bf0d85ca8523445a40dd77768f2ec31767cdce39a129d6d21067ef4dd1b2b8c8cf1c4bbad0f3258047191cf4b0c9930c03
+DIST createrepo-0.10.4.tar.gz 71186 SHA256 f850504a3ec7e556aaaa626d487e8b0def84ffea666fd30774cbbd575c128261 SHA512 28858d7d886e1132d001bb1bd847657502eb132133e39a4d19a4c8a080728c6b6f344283bc6ee21ce8def5b7980cbca7ed78299adeb71ce1012751268f6740ec WHIRLPOOL bd75e04ac4b04cb32d9359debff0413352abbddd7ea248a401eea353cb6fccbaa9d9a79e15ac2e81cd3e0d56fbd0f37b25f44c5cd94238ddf4a8cb9f6277a774
+EBUILD createrepo-0.10.4.ebuild 1165 SHA256 9b9cb8a87064368fe0ab415713d6cb72ee60cc029fda086daac6066103ac8426 SHA512 5ec521bea3c40a4d572848b17204f2db0e831e00b5eda695320578c1d6d972d9ef585e6cf0583aa4d3245189a0809812f948006e2aaed87106e8fc15ddcb6e36 WHIRLPOOL eb9fb867d9f08a9ab2e351c36f45bf508e8642e01cb972d1d20141d5ce695a6dafae30b620f87d09c1c7c331b0d7919a7c00b97342d1f9e5176e427e64d06ea7
+MISC ChangeLog 2469 SHA256 30d756525211609059043af3d6aadc86459cc9e426034ae3bc66bc6bf10ccac2 SHA512 f21f127480506b1854dc2572b480928b6ad945f58e42427302c7b53e4c82cc82f98b48d6849704222287e84069ce6fa0254f6d4529fc6c49206c30f8ce029c3d WHIRLPOOL c11638fc059b0e89ddc5cf7151161cdffdbe315f8f3a0c1b0f2ee77d4adf03fe342d350cdc0dd504584fde6e4b3a062440a5e4d4c77f596a60d4def6baa24f9e
+MISC ChangeLog-2015 2087 SHA256 4c55faa31f7afb56e8788eea77467a17580acd8b92ca7a28ed7effd7cce62e43 SHA512 f0fc9f29a68b067f33ffcfa46ceb023de35d64506f34c238fb1fe4e42c5cc6c525b192dac49b7695d669838baa7cb270afa2d9f4e69cee7dd9a19bdbfd4bdf11 WHIRLPOOL d2c8d80ce7773d02b949c6432bf5044240ac3513d183bd076cc4a536178fdaf3a124904e1c03b880d2dde2665b25411dd0274df8ffd7f0fea195857d70b51cf1
+MISC metadata.xml 241 SHA256 2cc0ea86dc696af5b3956d5e7afde4c34a59c908917c0565046cca4b8c663585 SHA512 d0c9844a236b2be2bb08d8aecf429dca028b0199db4c5c26c5a9cc2d9e13e21214ae110deb2b0d56e1caeae4ba0367effacbb542890e599bf4ebc6ffb4a369d8 WHIRLPOOL 6bd284e26a3fa79a33adf6d456fc708ac7fc07a51b6018443d7ad0174bcaca1c00893511a86eae69f39d3bc8160fb1e4ea3034db26d3131830274973d0377a7e
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/Manifest b/app-arch/deb2targz/Manifest
new file mode 100644
index 000000000000..bb1f7fbb7c9d
--- /dev/null
+++ b/app-arch/deb2targz/Manifest
@@ -0,0 +1,6 @@
+AUX deb2targz-any-data.patch 598 SHA256 f4a5404ee9f98bba948e83201832332494997b7e0b804c6f7572aa6f5c31a358 SHA512 e3ed1a570204049db4d484fd6b5a2a0099bf12071bb03a9aae6ff34fdccb2c9923f239ce2a68929fdf62c3ee3dc164da313c31750a8eb984dfec3f7bfc85a406 WHIRLPOOL 9367b441a758bc7c59ef6dd6aa91acd46dda9dce83ec0c95bfff7f987595ef305c9992cb53c5b8fe9747eca78092edcd868364a991ec0be3498e1897debe3678
+DIST deb2targz 1947 SHA256 f597319db098a9d6b5199e39b8a9ced0973d9ee84927286de4d5816d8e76a44b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c WHIRLPOOL 5cc4a40a88b4ce084ffac88dd0b66619de6b764f8a7125e8c0502525f74993e8fd47ea0d2269263dd0ea54d0bf4293b59569ef2a727dcb14553e84a6227c3973
+EBUILD deb2targz-1-r2.ebuild 646 SHA256 ac1efcc8c8d026a4f5dcbbb0ddf22a0090115b0a8895af37765a61fca917d39e SHA512 496a8acfabeff21f0f0e14dba5242d23f1cd1820c7b0bc2ebb2cce8ac5ab12582a9d1dfd75966f2ca915303064ff06962e4b48da89bc2b7ff4101fca0e2dee2b WHIRLPOOL 7ea1f381a2a4b17bf3ae7aa1e13e28203b126fe14b9723cd2efdee84d1d706e191b31a758ad65740731231eb89817f7fccf290dd188a59c233a011efa253138a
+MISC ChangeLog 2213 SHA256 8fbe2436ad07c3e1d51bd6d458dd2b61ed0323f47ab7e6258c0cfca4343c30c4 SHA512 9b0ac14efad41835474e8b6ccf4cf76ca41b0fabfc5b8fe9b68270b26be3f6f94e896191b4bb14bb1c8b50c6e7508111d753942745733c5b4b6fb0e4efe48445 WHIRLPOOL 7956543009833dfde8a86ab09a5582179ad3faffbf1b54aa0520832175384ec70897542fe806382a17e74e590b3ec4f0a135c936c95e10d891cd38f26fda9694
+MISC ChangeLog-2015 3047 SHA256 4c9a4b0128df85a2dbaef2c2d8c78fc8f1c11d28db73d4786eafa34e933dc3f4 SHA512 18f0f25a4f092dafa692c12d118ce62595e764c34b1b95ad0038b0d1b78e3d0b546d13bc1928e586691816652afa8fd9401c4e196b6fb8ae6b7724b4915865a7 WHIRLPOOL 0034afaa52562c0d6057fc3d48bfffcb24d8eb5de3fa95f585f4b3fe75f7917b450575c1d270a9d2396809f9bba1b678edbd329c6106333c6215871ee10098f5
+MISC metadata.xml 213 SHA256 bed602a2dc9acd5d719e3bda1b0cdceb5807dd0d6649ac7b6e67d268a6407658 SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380 WHIRLPOOL 9335d6918695459b4c9c95a10f76044b1630ae9a478a05ce85125aaa61250678f68b4d0930c0e228a5546f703dfd912fa5f3c36fe18713e0c8c7b7af4bbe2edd
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/defluff/Manifest b/app-arch/defluff/Manifest
new file mode 100644
index 000000000000..104ed197a258
--- /dev/null
+++ b/app-arch/defluff/Manifest
@@ -0,0 +1,6 @@
+DIST defluff-0.3.2-linux-i686.zip 14258 SHA256 582bade12c2462d6f9370b5cc4139619ca9f0ff7451d298353d406e805db0256 SHA512 8befa4c0f4daefd1adbafeddcec65bb808859df6df9c8d43d6a0aaa797a395e3c18b682b955d7e0271dab84da0ce8323d8dc7d17efa2978db7b94e1467fca3f9 WHIRLPOOL 8b57c07f99abdc9a7b4a9e318710c64478ed76f1e28e0cb4d8218cb30d1797f161e19f8b6b83217305676ed18154079fc2333eaf5a7174a40b136195c1a3f9d7
+DIST defluff-0.3.2-linux-x86_64.zip 15601 SHA256 a9c6cbc2c0df8401e6bd694d635a5dae9cea07458239a0da814d35c8b90388f6 SHA512 15c0355eb926541a7b9f55880c9e7196fdab1da7117d3dc8fb392c413a09938e759ec95b1759ef870cd4b6c005f110245045a1786e5a4accfa5be83342485f67 WHIRLPOOL c861f3848bfa15fa6f839e5d1ddd2c67c7e74a1502cf5deb8319043b7e2a9120676e47e85531394584110741a224c83c86e988183e41a32fef345484f1ff393a
+EBUILD defluff-0.3.2.ebuild 671 SHA256 638542f7b87248f26b5bce74e64fb739edfd0d8550ff7b8c4d323c547d71aee0 SHA512 67693cfee49fa680d33802db62f5652b524b44b9885e1e8ef7f4d48a5ef2a6c70f456dba3d4ff158ee3ae03d365ccdd0a09b873c9e5599fb861bbd3226ea5929 WHIRLPOOL ecdfe4aad6659a924b148687e1703fcbd930fa4fcdd211b22ccc4aeebf15710435fb042b823950a549435debbc75333edce802b285643203a69effac075bd1b8
+MISC ChangeLog 3135 SHA256 e5647bd4ec32fbd90c509a9e32199751e5c8f1cc9bc68bded084e60c976144de SHA512 b6be900d6be0e59f61bfb4a3ebb6553084f7dbce155d790240318a728e89c6667a32f21dc2ccc47ea7772039dc494e247270a9539287278a6a5959f43c10e32e WHIRLPOOL 7de940e374a3a7bd2db0e2df1e6086d765b32f010960f326ee9c03d1740f769b17ed5a6a2bf7ce2da14552e09f1bd0674551ae7c9a08612954beac111f1906cf
+MISC ChangeLog-2015 576 SHA256 dd6f7c639c64c11efbe449cbf3b0f5194187add1a4653c354ed59e04e49f15f9 SHA512 ab30c97c8e0b2d04a40b127149c3afae39cbe67e1c77fa617ededa44ab78e384093dc1e3afabed4a9759d2848f885d8f38f42e88d4dfc4d12f4e8e29f9e27588 WHIRLPOOL dae91320521dee399cf4aafa6fc2476b06f084973edbe935e665aa99c19bc23bb2e2a7eb7b42b44dc48a3f4f11ffe3783935f33bb8fdf25b51a70b222a2f4b01
+MISC metadata.xml 514 SHA256 5238a66db27706a27b97afbcc9781ab02b1f80657d8304a459d52977fb78275c SHA512 dea2f532c568da8dc7b34f2a7f67ec9a9da7bf7e75bb9faf9dbd8aa268af52902815c96fd2deb8d155d194209cbd689ef568df0213ef2974109e55eb4848b80e WHIRLPOOL df640341f8156c69b0e3a914d742c218fa6bcd2e963e3cf3b00af6c03b7a2d7854bf123f695c4995e221434ab68ea18c09eed8a5b659d1400eaada26f8607e94
diff --git a/app-arch/defluff/defluff-0.3.2.ebuild b/app-arch/defluff/defluff-0.3.2.ebuild
new file mode 100644
index 000000000000..34237978956a
--- /dev/null
+++ b/app-arch/defluff/defluff-0.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="deflate huffman optimizer"
+HOMEPAGE="http://j-o.users.sourceforge.net/
+	http://encode.ru/threads/1214-defluff-a-deflate-huffman-optimizer"
+SRC_URI="amd64? ( http://encode.ru/attachment.php?attachmentid=1523 -> ${P}-linux-x86_64.zip )
+	x86? ( http://encode.ru/attachment.php?attachmentid=1522 -> ${P}-linux-i686.zip )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+S="${WORKDIR}"
+
+QA_PREBUILT="/opt/bin/${PN}"
+RESTRICT="bindist mirror"
+
+src_install() {
+	into /opt
+	dobin ${PN}
+}
diff --git a/app-arch/defluff/metadata.xml b/app-arch/defluff/metadata.xml
new file mode 100644
index 000000000000..11f44c748913
--- /dev/null
+++ b/app-arch/defluff/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>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">j-o.users</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
new file mode 100644
index 000000000000..53af89e03a00
--- /dev/null
+++ b/app-arch/deltarpm/Manifest
@@ -0,0 +1,5 @@
+DIST deltarpm-3.6.tar.bz2 500420 SHA256 fcc35db53e9913f12cdc013bdf922614ac8ef6fd5e7187e75203be8809d177be SHA512 0ef89d8d3e7c9d3d9da06542f293b434e42d95e18616aae1de95a66a77a5937142060ff405356869454cbcf8a7bb52f64c462641e52af0fad985105af07351d9 WHIRLPOOL 1ae76d6120aadf8dcdc978b2d7ac328080e10b60737557b91009da2cb9ab4fab497f5798cf49624dc914f0e92965cf567204d3114c631d9f8b703b99e0f5753d
+EBUILD deltarpm-3.6.ebuild 1122 SHA256 47f8ebb5767b92e756a6c28998857c56a53e70ae88285218f05b9de093d5e168 SHA512 6233e6ccdcb1cfca10c752a47a29dc2fa62d34e5b6b91f9cff9222393f99959c9ed961fe21e6622e535b2878a43737532df9c4ac350f0e87cbd114124e1cd65a WHIRLPOOL 9794eec7203ee00cc0fc8adf2e7b0644d813eca9480c030fb3b06cb944cf09b45eddf8b0657ad1febee10e823049ccb5d6d7f5f743b9fbb48eb3bcc8d4d4195e
+MISC ChangeLog 3933 SHA256 bc626f28057cf5bff28eb96892e26465853cacc2c4b9e35f62ecea8667a300ff SHA512 79ff6b3012135283414249b551c6bbba3fceebec4e31b09fcdf1e75be69cde0dda5739ca1dd9998e480713e539c7a1ceb6390c5a0522d8c50bc8cfc3b8a7c804 WHIRLPOOL bb91e17148e5ccfadbe0f589a0328d3755d88d5c951a2d3f91777673a09ae13ee831298a0d0a078b179fc4a78971b128eab5d4894c7f8a10730231e5d61607d6
+MISC ChangeLog-2015 1992 SHA256 953a4b0f003c797c1f2aa36fe724396bcc304defc0cc478c155573c4cff2f5d0 SHA512 b87d21f3ca84e778453f2507d430192fdb42fea96343d8b77d958994d9f789ec4f7601604732c894b7b3b0d15455f95067a3bf71394c1a55754a69738ff95cb8 WHIRLPOOL 944b37f07263e7acecc907813b1eb77cb9bfc988b253f62d94ad4926bec13cd7190b8422b341dbae1165000b30577f202b445178d058cfbc694bf61fdf72a219
+MISC metadata.xml 486 SHA256 9ddc0080fc0eb0e4448fa94725b02583a9d5ffd300024550cf82b1f2a5a62957 SHA512 8a0639d669a83a3a33f58c2bcb0ef57a73e315a01353732fa70060d6a0d7de608d60010f42b9d18b8c9fef8d5c62d89d416a5192578842a0067227ee4917e246 WHIRLPOOL a29daee0a9fc31adce5f5c2364e49a4e086b26ac43488d8da9c18c134bb2828f8119f2e9befa0a1bae088412f231076095fe682ff50f5c1e1ac1617610772f81
diff --git a/app-arch/deltarpm/deltarpm-3.6.ebuild b/app-arch/deltarpm/deltarpm-3.6.ebuild
new file mode 100644
index 000000000000..9b3d7f88baef
--- /dev/null
+++ b/app-arch/deltarpm/deltarpm-3.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 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="http://gitorious.org/deltarpm/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/Manifest b/app-arch/dpkg/Manifest
new file mode 100644
index 000000000000..710ac8cc01b9
--- /dev/null
+++ b/app-arch/dpkg/Manifest
@@ -0,0 +1,16 @@
+AUX dpkg-1.17.0-gzip-rsyncable.patch 291 SHA256 653215618c3713f0a03efba0d4606e6bbe0e51c02ccffae9caf988b0b6500b2f SHA512 c7e0d0f1417afe9bd76bcac7f1f54a775a2a328db558a4431580a4854a436fe1a054840284fb92d22bdcfd266cf5cca71a00e94f47379c9a1862eadad908ed5a WHIRLPOOL 5c4be3edc74fef092612c529e0ff4a8fed6ad96c929d2494afcc2d640ce2e2bff8826cea359ad1515320afd215d6d71394a1f7a0cd928d992937eb9517c41e66
+AUX dpkg-1.17.1-flags.patch 300 SHA256 b0be51022f576bc0867570192ce5871a0da4ca2a66a4e35bafe167d063d84723 SHA512 6dbede2fdde0e28f5e66d77f694a8aabe55b1395ba6a8d26a4808bbe2909cda00946c21a513bbe60b68e76f5669ef08139c72c036f9a16c095e7d702483ed9f4 WHIRLPOOL 66fa84b14d4e26778205c774929c1ef28e3f2ad344af236fecb2a53b1ec409c2a051368febc572f707cc6d18f2b6506d9f662763278b301f0b75fab2dcdaccfa
+AUX dpkg-1.18.12-dpkg_buildpackage-test.patch 215 SHA256 58705f5a1d046ea99dbb162008dcc966741f029b26c8d9d477b31d995c6ca2dd SHA512 c31aa285a9d896ea313ce7d04a959767811019781fb747714630d91b56c631557ea64716e6c0ff20f6f60da67ff8c143cc8697d7b482a2e387ca4712908d9154 WHIRLPOOL ccbcaed8624f96ec4175827c8db253ffba14a943970615d82d097d3aa0052c7dd646ff45d6ad40d367a30bcfeab2191868e5f36ec3a14c16dfc103597d62af58
+AUX dpkg-1.18.12-flags.patch 416 SHA256 fb772f46a4aa82a46eb8ea9133db71e9dda5cf2677990af54449e6f681c9043d SHA512 6c86e8519ab4a05a2c15a658f41c0da14429c4fba0fcd364426afce7db03cd886a69de3f04f167d0f7b6d36a05252455864c11b14f58baab0a4536249331369c WHIRLPOOL f7d266a6ec4f89d79022ecb1643a28a283ae260b625d657972cf13eb4c2149978348a7f4bdcb3673cf5cea2d37b053428e961926a16905641cc02168ebae7067
+AUX dpkg-1.18.12-rsyncable.patch 1245 SHA256 a8ded4f7cc0ce9c2874a93f5838ff2989a3a085458e07e821afbaa76f6669472 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae WHIRLPOOL ba830eee1892b5a310d2458dca6ea53c8b2db365eb01ed6aa4b8d505bb683f5bba5f3ae2f3e963607cebefcb72827803e0065dce22383e2b929fda74a18da322
+DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23
+DIST dpkg_1.18.18.tar.xz 4501988 SHA256 c88b61e3d4660500753142689e8ddbeff1c731f29549f3338e6975f655936ff5 SHA512 7682c8ac523ff710acd6742b9a884ed8ec8537e3b38496f871f112fdfd2f874af6d676cfef2d31d2474c5637df043838c814ef4038097b009cf06b3d4e66029c WHIRLPOOL aabdc0df8e07fc5190e3bfa3ee29537b655410f739f5c7930086aba8e30745aceccbe671963b045d74acb2ace704a846b650c83c8fb515abbbccf5d71d70dde8
+DIST dpkg_1.18.23.tar.xz 4516252 SHA256 cc08802a0cea2ccd0c10716bc71531ff9b9234dd454b83a59f71117a37f36923 SHA512 4f9bed1fb0558fa6b003601b7be8d67eb592140b7f9ac4cf0bccb394e14b42a822cdc692c8c6e27ad2929719fe78659f21c128cb17618733d344fd3489f42be7 WHIRLPOOL 711083cdecafe9a54ad4fe13b804730ba56a3bc7e8c396624b6a87a8130d5151e7ecea8b518f8eb3aaba9dc64544f6a766b89500a517dcca8a585f7bc74af7cf
+DIST dpkg_1.18.24.tar.xz 4530444 SHA256 d853081d3e06bfd46a227056e591f094e42e78fa8a5793b0093bad30b710d7b4 SHA512 74df36a49a1b6b2243db14bd7ee0b69e50c2f0e79fc87e86e9b3cba2261fb717e421f7190a3ba54b4680a2f83855e5857dcb2625aa56847133258567392f1d42 WHIRLPOOL 94406a061e39aa755e8bf9a4ec2584a117676b4309b2b94442490571fa1c0a91cc2631083630bf5c701fd9a894891c7658ac70e583ef89be16a2776f941445f0
+EBUILD dpkg-1.17.26.ebuild 2367 SHA256 c0cb845d3de6a978bdd4ed0a7340a5c01368e496db120f4df58d06b71c21a26e SHA512 12eb71a9b9c8922a156b51a415fd49e38b96625743a3afdeece1a309f2fe7b79d5f4db6e5fed5dc1af448364ab91b4cd4b01e03436167f40ed771044f1a3ec98 WHIRLPOOL 8ecaa19988f68c00ecd3fc5e62e0fecb5004f7b44bc22b83bd4696eae768bfc2987b7f4dfe644f4de013317142911a1f871e66a26f9245698651aa996640932e
+EBUILD dpkg-1.18.18.ebuild 1847 SHA256 68201f0a94db5fdd539a812cc83caf44a9fa95d0655a72cda79cf98f1b9a52ac SHA512 ab40891a8f1d15425e587fca9998ef2ee6ad5fce5ab8cf28f1cdc7325e698aee922631f01dbd0c10de124f0223d50fab667eb40a478356d8856d9b09028de1ab WHIRLPOOL 36214977faa140773b1a51d64f8ebb50c2032bc933998a6dfe0b522ac9e26d1e6904f3559e6b80011802aaa7e46b99d89a4bfb2d7e9476ae73bf358bdd6b4669
+EBUILD dpkg-1.18.23.ebuild 1854 SHA256 1e910b30b686d8a3af908abab23263bcb7df695210037c60f1dd6c18737304e4 SHA512 8e33864cf024978a2c1dd44e9e3cdb8ef24d75a0e13e74964737ffc788555f8ad0d51cbeec91be2b2ce1f11c329d7d9355899119133d47e930a5156cd4aa4492 WHIRLPOOL 24fe55d3d6e87cde65a430404fc5b54115e4aabf95fc1d2400dc629381cecc51bcddfc9b64c1d2046a640d3a61840b6ce99aa000bddfbdbf850e9592e956228e
+EBUILD dpkg-1.18.24.ebuild 1854 SHA256 1e910b30b686d8a3af908abab23263bcb7df695210037c60f1dd6c18737304e4 SHA512 8e33864cf024978a2c1dd44e9e3cdb8ef24d75a0e13e74964737ffc788555f8ad0d51cbeec91be2b2ce1f11c329d7d9355899119133d47e930a5156cd4aa4492 WHIRLPOOL 24fe55d3d6e87cde65a430404fc5b54115e4aabf95fc1d2400dc629381cecc51bcddfc9b64c1d2046a640d3a61840b6ce99aa000bddfbdbf850e9592e956228e
+MISC ChangeLog 7721 SHA256 1e1c36cfd01473e82c9cc67664f45558e45b8c319f517890e9436b63d9c39d92 SHA512 2683ce4a540924cef2c096b3793bc0f453494aff39d52ab4a080d43a994e1215e546bc761be915af1fe9331c468f192e65a75d728fea298ac8fa7db83b28119e WHIRLPOOL dd7cf86b9ef389d004008c114af04e7095da91a6e4ab666f031f3b030b599ec606570b32891b6a4600ba4fd3718aa2d9e45e46fc03390a6bc297a91d9184eb59
+MISC ChangeLog-2015 41705 SHA256 f7f0188c3df33ab1fc331c9ca695b1eecd4ec0cf3b9e5b3ed08df7b754ff80ce SHA512 8e1c6d6fec58f5fda0a2b052ab7854b6251032d68e2f594c638d6d7978b248ae387ac1d178bb9e4d9dd2587386c2ecdadac03d0df81b9847dab03f23ec29d1ca WHIRLPOOL ad4693ad3c953fcb20ace7db867b1bd293a51a12ee37a0beab170b93be9503b780b023fd17568e9579cc4ca72bc030f19e044fb8ea09989880cb087e7f0937b3
+MISC metadata.xml 339 SHA256 7e03a6012cee00c3a0b649654cec8a24311ed416b5061f351a2a0af841b43292 SHA512 c3fbabc925c3e99f26c6441cdea9626dc93520f2a8d3c5e45bfa7e51d42095295624f0f82377240f0c11580a9eccc5b5b15bf149ce6cfa36960e52f8c77aa61b WHIRLPOOL aab452f864ee87d0b3477c03b4299b89d61fb0c1d23ba061993f729d9f44b0742611fae0c3d9b0cfe88ed4f4dd0d4d7a8e74b5cf84e71acdfab1c0b696204358
diff --git a/app-arch/dpkg/dpkg-1.17.26.ebuild b/app-arch/dpkg/dpkg-1.17.26.ebuild
new file mode 100644
index 000000000000..d744e23e45e8
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.17.26.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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.6.0:=
+	dev-perl/TimeDate
+	>=sys-libs/ncurses-5.2-r7
+	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/DateTime-Format-DateParse
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+
+DOCS=( ChangeLog THANKS TODO )
+
+src_prepare() {
+	# do not expect Debian's gzip --rsyncable extension
+	epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
+
+	epatch "${FILESDIR}"/${PN}-1.17.1-flags.patch
+
+	# Force the use of the running bash for get-version (this file is never
+	# installed, so no need to worry about hardcoding a temporary bash)
+	sed -i -e '1c\#!'"${BASH}" get-version || die
+
+	if [[ ${CHOST} == mips64*-linux-gnu ]] ; then
+		# Debian targets use custom full tuples.  Map the default one
+		# based on the ABI we're using.
+		local abi
+		if [[ ${ABI} == "n64" ]] ; then
+			abi="mips64"
+		else
+			abi="mipsn32"
+		fi
+		printf "gnu-linux-mips64 ${abi}\ngnu-linux-mips64el ${abi}el\n" >> triplettable
+	fi
+
+	use nls && strip-linguas -i po
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 bz2) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux) \
+		$(use_with zlib) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-silent-rules \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+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}
+}
diff --git a/app-arch/dpkg/dpkg-1.18.18.ebuild b/app-arch/dpkg/dpkg-1.18.18.ebuild
new file mode 100644
index 000000000000..dbbc738effd6
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.18.18.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 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/dpkg-1.18.23.ebuild b/app-arch/dpkg/dpkg-1.18.23.ebuild
new file mode 100644
index 000000000000..88cfc19ca527
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.18.23.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 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/dpkg-1.18.24.ebuild b/app-arch/dpkg/dpkg-1.18.24.ebuild
new file mode 100644
index 000000000000..88cfc19ca527
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.18.24.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 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.17.0-gzip-rsyncable.patch b/app-arch/dpkg/files/dpkg-1.17.0-gzip-rsyncable.patch
new file mode 100644
index 000000000000..f956ca590ce7
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.17.0-gzip-rsyncable.patch
@@ -0,0 +1,11 @@
+--- a/scripts/Dpkg/Compression.pm
++++ b/scripts/Dpkg/Compression.pm
+@@ -52,7 +52,7 @@
+ my $COMP = {
+     gzip => {
+ 	file_ext => 'gz',
+-	comp_prog => [ 'gzip', '--no-name', '--rsyncable' ],
++	comp_prog => [ 'gzip', '--no-name' ],
+ 	decomp_prog => [ 'gunzip' ],
+ 	default_level => 9,
+     },
diff --git a/app-arch/dpkg/files/dpkg-1.17.1-flags.patch b/app-arch/dpkg/files/dpkg-1.17.1-flags.patch
new file mode 100644
index 000000000000..9517714fa41b
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.17.1-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,8 +104,6 @@
+ # Checks for the build machinery.
+ AC_DEFINE(LIBDPKG_VOLATILE_API, 1, [Acknowledge the volatility of the API.])
+ DPKG_COMPILER_WARNINGS
+-DPKG_COMPILER_OPTIMISATIONS
+-DPKG_LINKER_OPTIMISATIONS
+ DPKG_ARCHITECTURE
+ 
+ AC_CONFIG_FILES([ Makefile
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/Manifest b/app-arch/duff/Manifest
new file mode 100644
index 000000000000..b6d38c349100
--- /dev/null
+++ b/app-arch/duff/Manifest
@@ -0,0 +1,5 @@
+DIST duff-0.5.2.tar.bz2 174545 SHA256 5615ce50f971d29f6a13bbf4d4ab2d5a7134aad157741515c51d3921aa1b755d SHA512 5f64c28ab86523dd4dffaf26dac67d10bea71bd5cf7b4eaa3dfa27309cf8e7cf37a74ee62b5f3df3cb0114a847711b3147a083cbdd72ab8e4b5f9a45c908f333 WHIRLPOOL 4c212872dc07757b2b14f6a1d3e5c69f62c787ec6f3df3d4bcc15a7ca7a56f6c50eac218c8797d42e8e24cf6f429e5581d35a877ea1784512a91fc52352a0cb5
+EBUILD duff-0.5.2.ebuild 504 SHA256 4306abe6930dbe6dc12fe08a6f90e5bafc212c54c4b879b78e24c0d00a0b76df SHA512 08c7e4819ee8975fd5a5e65176356d822630384d711bf7b7ee9350231d7170c1b13badf2218c44a9111288c87d952a1af102253084b1110e6fe88f1742bed577 WHIRLPOOL 9d489a5476e2537bfac9c8672d61ee6968af3ce61a2e412b91d0c95bc5a0f72f2f1a8fd3e7588a1ddc42f616b1793ce0b3048d4e226eff368366b4a92dc2cfb2
+MISC ChangeLog 2167 SHA256 b82435b0c22dfa417d2a9e789ae4422a253424e285cd87b79e561de15ca81f9e SHA512 b5a3998d1fe6fff2188844f7a15e690ae48f5a633d5a08673f86e016456990669195fe7ba71cd01b38a5b8a3cca2355d6129aa9d6c0b2c49ff57b731173869ba WHIRLPOOL b32d28b3ce703443af9eda7f8c000bde5d3193a1bc9469445a93e04bf362a13dca5c9235251dc06a6ad0bffb57b2e3e317a1a89f51de3596fac7761d449ccdc0
+MISC ChangeLog-2015 905 SHA256 f4167f7aa772a836ad2eb82378b18aabb91f6ecde308c58c463b22f310793d1b SHA512 92f7fa492f9c72fd9762862985d37b6ea725b4e52c9bb0c4e2266d9911d0fbd5b0ff729c00a1c8ea5242a24626093c2a619537ee85a3f9a8e122b0b89c7e1f7b WHIRLPOOL 3ac433b76188daf3d7c0d42e6395a59aa67a12fc487d61627134815592413d3f2e2f19812746c71a7ffca20ad056f24eb3192671ee544bedeea3e7f2140b6119
+MISC metadata.xml 300 SHA256 32601341f9af138822e548d9216dc82091564b5bc635ae643f51d28b6785efdc SHA512 ef8d27bfa12bb1eb3a821a400c6fc897b5e387d0b99b4c4d5d03d472ca9ad3ed02a13657a9cd627cdd87a01fb7b709640238c223fb7123d5781dae7e48e9fa2e WHIRLPOOL 12c989769d19d8617bb3cebbe522e046b8e265149d5772cc3b9a2fcb7a80eaadb04420e3bc8d1ffef4c78a5627ffa2e977e662233c7f8ec9165248a9243c38e5
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/Manifest b/app-arch/dump/Manifest
new file mode 100644
index 000000000000..3a293a2ff8d7
--- /dev/null
+++ b/app-arch/dump/Manifest
@@ -0,0 +1,5 @@
+DIST dump-0.4b46.tar.gz 578200 SHA256 8061d927dd1ae98e0a1bd70406cde5ecbced154507460629be174c55822f2f97 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d WHIRLPOOL fb0b083e1f6f0904b1f5d433c47f0d25078637719a11542efd7d0d166609e64a62afaf94056dbec5cd93fa61f690ca3fdd5ffe16c9687263d08a3677b4617e31
+EBUILD dump-0.4.46.ebuild 2113 SHA256 20bdbc12ee9b69a4909b1e1c768476038783fa9015dc13c2174f9f7cd8ce2135 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90 WHIRLPOOL f61caf65de6c040ec8bffabae925d83437367348529d4701e6331f9449f09cc53c36629715a6e528a7549152fbb77547de28a75fb90967d64101934a9f7d9adb
+MISC ChangeLog 3945 SHA256 68327da6b52197c381bc5f578f0047ed738830a02a2a5cb6a820cabb4e4ae8de SHA512 224fd2efd4778cf3cf8bbae9b25b0de0474791ae7428a3d037e2a2efeab0126a7f7a1df9bc3c1ec2c2cb24d219ee343970a97680b7c00dff20dfa92309d826e2 WHIRLPOOL 1ecefcc778f5dabc5e17a37df0209397755df1eba61d1573a9344f39d4f8759d7695af455c6c45df1d2475eefe4755322887c19a5a4278c9fb98950e437f225b
+MISC ChangeLog-2015 10106 SHA256 64096df8ccab1428e89d80c07226645107a6e14699ff604a24f32b7733e51490 SHA512 dec8b0a491c456a558c9a8b8fbbba7680f248998ea8291c49df0c05bc7ffc40317d79fb847e2928809e546fe80327abe5d47b92c4696adf12bf21bebadc01118 WHIRLPOOL 8b8f7896376cdedda925a65f67571535a24e0fd7c56724cbb64dc56dd19cf4e37a23dc8564a36d9fa146ae76c0d926ad98591ec9088e30dec81dc97d67bdd123
+MISC metadata.xml 542 SHA256 c1605b18342b922ec015e1e6cd40159463721cea6d290e45fdc758626a6fd570 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d WHIRLPOOL 0f1e7393dbcb9f09373ea16e5ff48f471f6c78fea2a371481b2dc7b426ba56f39f85c6d5173c62b859871d93dffd12619a72a5dbc99e5cba97ac9a517451a220
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/Manifest b/app-arch/engrampa/Manifest
new file mode 100644
index 000000000000..65332dcf221e
--- /dev/null
+++ b/app-arch/engrampa/Manifest
@@ -0,0 +1,14 @@
+AUX engrampa-1.10.2-p7zip-15.09-compat.patch 851 SHA256 16ed37cc4f9d8237f1bae0773c7f3d6d235e4055ce68aaa61551fac4870aea71 SHA512 a6c11311b15647713a93ec20c52d228cb828ac15767b7dbc2ae1cffef50b73d06ff5e36891763f715a67a8b06dc1d3a6e2bf30b27abc3376baebe390e7a54c27 WHIRLPOOL c4865aefee58b739988fe2c197f0f19498e730f749a1f15e2a254851d49fba28ad8b2c4a2dbca8b4dc4f8451d6caa1d8263c15f46875c8a6a91394067b11a555
+AUX engrampa-1.10.2-p7zip-15.14-compat.patch 1225 SHA256 600fc831d847441cb9ae626a35356e6d43a86d6883ea284310679804f7b256a1 SHA512 e396976cfce32b4ac48205c0c72a342d713c8798926a2c56855f4083e3f7598b6ce1e3df3fb03ee8b08c0bf18657a2c750389b465a142f4261eb03f12f4a8a3a WHIRLPOOL 8779e461f60e1075c7867caf21e14ce410f3102040db09b0d8b8c6bb917016f990d496e6e680e0c2b75051250b099775b0406be19dc8af593c004673da25eaf2
+DIST engrampa-1.12.0.tar.xz 1380144 SHA256 4f1f8b0829000f6bb2d8a53a8da098dc5b177638c6d8e5b3fb52402a4541759c SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec WHIRLPOOL b1132440b2d02fd2bfa9c903794113cf7d36eb7e67b4dc3222635dc7c33c459a87885ce1ec7bcdc623db8c75a6d33015ade6faaf3cfa8fd85fc85631d87366da
+DIST engrampa-1.14.1.tar.xz 1417444 SHA256 43d882e772c53d13856f02e44454927e3bab4c5d77094057572be6972e0310d8 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763 WHIRLPOOL 6793b07c57d91ce73c102fc59b4e18141532f895814b4879547b10db4dec24029185d944cce5f34e8a880e9da2a2e229dfc44cf3d6d95ae264b2207ddcbedb8c
+DIST engrampa-1.16.0.tar.xz 1430028 SHA256 dd7f11d60693cb77691a589551bcaf4050d4921d996fbbbe3a61ed7fc4072efc SHA512 d0bf44040b4aa8298137605b632a1b022a69c665cc0324a3358693e7151091f1adba0f6eb01ee04b8ada09977f979ed3c3ed8b3f5314b06d96fede0c4ff37ce2 WHIRLPOOL 1f759fbec85e073d156b6f539e23cb3f610bfd38007e88ec640e37e14cab01743adc7cbdaf53ab6776b2ba1886a6b4a6dad6f0a4cd5c735c0998bfa72632242f
+DIST engrampa-1.18.1.tar.xz 1427140 SHA256 be7218078f13d715e35580d231c0b5090fac1210b9de83f93311079f39b8aabc SHA512 9b39783f508a0582a2e77ea6a2cd3665b6054274bea8ad14f78ed37e20533e78554eca23fc171e090bd881468d630d5f644d687bee8bb282f5a106c80b1daf17 WHIRLPOOL 5aee31a84c2fb3f098201cd5f1f1974ed601fef261adcf369be293e1daa94644a0d40c90a0130e6db52a2568d95ea1b212ed58c53c8c5fbba1e5b97dd4e488d5
+EBUILD engrampa-1.12.0-r1.ebuild 1943 SHA256 0c9a3d6e5a871d0d65a19980e91bd2936d70e9c58af13f8fc7690a2e7b73421d SHA512 624884bbbc2a2a7c9eaa9f84c4ab7189ed70079f26535c5945eb2c5a96543fdf249599805ac538f304e316ed882645a1b3592b5752b1ba05f6142b356b60eb8d WHIRLPOOL 023ebdbbfc8a9482562cf60c47bae26639bb83fa329e9a2d7d44732e6e7d55503db37601bdb18ff1584ce85b70e2abcc046e38f7aea6ba155271ae6d1152575f
+EBUILD engrampa-1.12.0-r2.ebuild 1948 SHA256 4a7f27971e10c76911c01fd3f89d00fe5c5bda6fe8c1210a5eee6a1f4b06abdc SHA512 0de7123927b4b41fd04606a1b11649ae2ed1f9250bfe6dad32cb8138fcaed7c5271eb9aa30fc921c8134ebbb7f867b36d0b867520a3defa63d1d31e36bd20d44 WHIRLPOOL 11875f1d905dd53528df2290ffe2b99f14b997ffe8be9be6651fdc73a487554d0c529c31d21c29ec841b6d40c2d8569eabc2597355beea7b9bea46cc122e0ecf
+EBUILD engrampa-1.14.1-r1.ebuild 1934 SHA256 98a5d87ad68ca2cd58a2c9ed2b38d1c690ab39bbe04cce0728ec3de51414996c SHA512 48a85e45c15b8d21f9e11e992efcf0fe24f8b6fc3934e26fba77221a8bf568a1f185eb584171d3a16500ab35ba0bd15d4a7d83e2d4dc9030c0a76166ed2643ec WHIRLPOOL 5cbdc0bb0ab08f21b1ee48719e08ea9522d38392a1c5dbfcfa67fd54a1f0a2e024008474f3fafa4f05f8168723367e789b1b47151a29ceb24e9a1a6195a12a2a
+EBUILD engrampa-1.16.0-r2.ebuild 1774 SHA256 4586876934a88d56707d673025a469b1eec7119a8b1718f41567fc46bc117360 SHA512 ae360e7bda00b5cfef8846f459848b25b5b89fba6bb4b829ba99aadd1c90160d48fb3158cc2d6a4c4a3e1382ee711b16df68cde0f136da3a47a2a2d4949be3c7 WHIRLPOOL e79531a8bb2f7ea4bfd12e6bae7b1cbfe229e77aeb046c70c7eba746e6b9c2f5f1b08b187e9b99f455fd7407023a027f289301f9cb41df86f8f0281c747ebf19
+EBUILD engrampa-1.18.1.ebuild 1748 SHA256 b634e5a4bbafe65afd9a5dad72008570fd9a25fd17ef5c8d33b9ebdda724b0e6 SHA512 c7f3b18a3b2c8d358ab8be3abd825d093e8da94eea63cf411de791a03a4ac9abacc05d3000d94cc58866b8e4c1de094999604a7334d224e215935f9fe7ee22e6 WHIRLPOOL e7de02eb02844ea0fa2e330dc0a7e194a0974cdf3e148345e3744c70ecae236658e337f0c1ed7375b7e48f14a4cf584aba886a72d73c6319a3d57b039d9649e4
+MISC ChangeLog 5818 SHA256 c373d4224b1d34475280069ebb178e8dc7801818ee29da83e899bc5df68e6a34 SHA512 c56bdaaee52b60c9b37b7f52e07cf873961b03f4fbc63527fde5e0308dcbf0245cfc2a2e116d6db251898fd41704a684d36e721b12778a2957075874b580fc8b WHIRLPOOL faf033a5c919a63ec5f951b90fe0eb446fd0faa95b8a21008a338d743d77bf01f6de5aba2704a0007c828d5e8ead08c284a7dd7ce7857e1155292c5277fa02bd
+MISC ChangeLog-2015 2138 SHA256 7452b01e61e3b8a03c46375934d98005e41f07b442eebc7be46736d5dfc88062 SHA512 78b952ead6e59f37af235bcae9fd70a2b9ca0367b9ebdebed1f69e739800484d6610bf3097ce0f5fe0c6ec9c9c3beeaee0504ca976fe7e0ca40ae4c8d20be7f5 WHIRLPOOL 104075947bf798b22c7918e23e0d5027df6152682a9060f07fd37152557cc565e57e7a7aadd074d08c6d54c377ad539d46e60a0b5a357ddf29233a5500b0a917
+MISC metadata.xml 763 SHA256 f1f9d9866c9f4ca633337a2068337de02071ef5075e614b8f6a77adca5bb64cc SHA512 fc5a05da5bf07067fc598b9849b068b497d3b9d107eddbe8d38bc15afb9b3df0e1071fae57e9c0a05b9813c03873581e66b0212cd126f14ccaddaccd85a57a96 WHIRLPOOL a1c64d7b5b44be85b7f2bb53bd392b19acd4c12898ba1db3961768f07a3279e48b23f329f191854edef3af221c599db2deb37c5cc6a7216c21d9126bfffe7139
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.0-r2.ebuild b/app-arch/engrampa/engrampa-1.16.0-r2.ebuild
new file mode 100644
index 000000000000..3cf6e95bd41f
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.16.0-r2.ebuild
@@ -0,0 +1,71 @@
+# 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 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.1.ebuild b/app-arch/engrampa/engrampa-1.18.1.ebuild
new file mode 100644
index 000000000000..408158541234
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.18.1.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 ~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/Manifest b/app-arch/fastjar/Manifest
new file mode 100644
index 000000000000..2d94c71b689a
--- /dev/null
+++ b/app-arch/fastjar/Manifest
@@ -0,0 +1,7 @@
+AUX 0.98-traversal.patch 3010 SHA256 8dab968b23684cd2ea5d5d876bd6e35c8e4aec7be52c2fa00c85635dc620984d SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311 WHIRLPOOL b46fbff1a62a5170929536005507b419e9bbfe870b0dafe1021d0e32d38346dffe9b324604f3c6382df1a8b6d650099cf9f887d9bcbd534c72cac547b78a66c1
+DIST fastjar-0.98.tar.gz 717984 SHA256 f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145 SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903 WHIRLPOOL 6e1053713995532aa58b935f2935cc6d81331f35c1c6870f4758f7abd856d9976082553e74bebc43476ae48f64d6b7154264cc1bdcd0b9bee0230a5c07a6be3e
+EBUILD fastjar-0.98-r2.ebuild 518 SHA256 8ab3fdcaf65e939c4f63ac34cf29b73616df8b295cfea0c981a6e4373b9cddc8 SHA512 7ef3b44fc6a5384666c9d5b36f38dc2f2c128b7d57f968f16f6c5d6f332ed4f9d80e98a946b4a9120993d5e89996c5e875a5d9d5cf44ed56434d896fab3693ce WHIRLPOOL f40d5e36754c67c6beb6bf8d1048c75150bb1d169ce3c514e49fdca5aa20f6831c1197b275c22376f7e37ed3bc1ec581ca2161a766aa0ce51368c8f37b4eff2e
+EBUILD fastjar-0.98-r3.ebuild 522 SHA256 a3f635e6229cbbe3aeb9a103baec4b4f220c88d981497d7170f61dff641210cd SHA512 4026aea676b408699769ade56ce8a107199429afc8d68b3de6b5d60b8552b57ca8f1098223c9f71e99bc5b66aa4a1e86859cf89518b00c3e4feb9210c5fdfc2a WHIRLPOOL 8156a053fcc3762d9904a5fd3cac40d462b703fff31a987a7a112b2ddbdb77417acca7243835fa4b1b604a11dc9a88e1e433cd2dd88b870e49df86d86d8936aa
+MISC ChangeLog 2516 SHA256 c18790feca4968a8009bf1ca7f7c89ca84a876cb68eda25c59085d1ced9cf4fc SHA512 ad9f6e937f8c73c253dc955bf96e60afc8a79b4fe17918c09354b4ee4a25fd349da4970c709392af06b5e4caf8ca1622f2be2e8505e3d44c5c849fd4a770d5fd WHIRLPOOL 3d72967b67beb48323dda75a1aa23a4566dc5f5b80d5d25d343e3234589f513a85fab80b85c5f4c0f7d4139f36105f197b93307f3523791376b91f5714497465
+MISC ChangeLog-2015 3760 SHA256 f6a152d23b41972f3816fe2e363fb38bcc1b51d9595fbd4c45816a7a9750ebc6 SHA512 73913d65c6f33f5560ee5044181fee3d4db3729435eeeaaa7b10dfddb6280b67066a0098c4ddfa310004ae4081c2692eaac931ae6d0253bd0e47b001277f6fdb WHIRLPOOL 59018d13dc361895c4894089b2279069f4cb6d4e5a0338e9034932db1da7c3489e4690d04cf77c78ddcaea1067d677d42f595ab1a99e79e16c97e5309a4f555f
+MISC metadata.xml 478 SHA256 3d831c28c05f5245ba70c268d530ad5d596ad7c1daae8c9f0f59e829187a9018 SHA512 3b1f8a2998d8496947b8e6c60698db4311ca1afe7ddcd0fe9d4f7ae762acf4204a87f8ebcb9e0b0677727eb82fdda22a299cf3cafcdf83bd348d98ba16ff4214 WHIRLPOOL 9df19b5ae36e3d9bbb77df05f1d9a3163e84c1ad019de4436a22e7bcef285a5fa3f433ca7bd15f5b36ed429603468a1b3bca931ad57748165131fc10f589ca75
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/Manifest b/app-arch/file-roller/Manifest
new file mode 100644
index 000000000000..b05602cc5851
--- /dev/null
+++ b/app-arch/file-roller/Manifest
@@ -0,0 +1,8 @@
+AUX 3.22-packages.match 589 SHA256 b45c289ef89c54f6b3f056821f7bf10a4e7bc2fbc4115afbad861014dbbcd97a SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62 WHIRLPOOL bb06d1ee9e3dd8fb24dedabeb2a0709655efaf9812e78ea84803c8df3fee169d9987b1eb867e861bcd5b8f8578eaae80c806546654df4729ce47d20fe598c276
+DIST file-roller-3.22.3.tar.xz 1423048 SHA256 de858640632a0e22769b6b73d5b98527f3cfc2c83f99692063e352e41d533505 SHA512 f234388686cf539fc085866322083199176f94043e4c2c888d5806a2efa0dfcf5a090f64240a3d08aae39ed3d34d6b281e1a06d748c56b0f80508a01fac40b28 WHIRLPOOL 9729c333d9d42d5714aa1fa9905f87f125e40c22800cd9cc85af67c31a90aad9863bd5a73aa659a0a5a997aacf638a9c974afbbc04541e90ee7d6c011e66e802
+DIST file-roller-3.24.1.tar.xz 1428216 SHA256 011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268 WHIRLPOOL 1d8c0d5fd1c2e7cc9cec0e02b44b252df2b3076bb83f553bf87cd89b7ffb9e116f320e52694413cbc80a1fe6287ff77b794b1af0a032a8687d0e22941813c34c
+EBUILD file-roller-3.22.3.ebuild 2126 SHA256 d376f59d0150292336d5d4f60ac964ec3c1364f2622ed3d7cc73f80d53ff6d2e SHA512 c223592cde7621cf2cbf619a38c3b39f2ea0447a28c8dcb5db6de560487dfe00fe9b148bb784aa423a3a54f7485474b7e12b005f91ac6d60b25bc49fb8e17fd7 WHIRLPOOL 9715f8bea8cfa4aea1af65db5375468dc99988248e8dd68c8208148f18917b63b09158ab48bfeb7da50c53ee291228b318ce969ed842a09cf8dd45c49213b3df
+EBUILD file-roller-3.24.1.ebuild 2225 SHA256 58d322d006be422c06397d1383357e78feb75d399ac545d33cb79426821c53f2 SHA512 4243c0dcc76757053d0da00851d4050e5d89b12c6eb56965aed296362dc9ce18a6795a99efeb92d1ab2a32eefe1142bc864a8853e79b60bcec2da5587406c055 WHIRLPOOL 1f137fa225a534c6872933b5e297490546edf93dcef771695f9605ef358a2434fc0193efabcb45b58966128eee2e81867ede82a6bebae9cd1b591e11d1e43e27
+MISC ChangeLog 7430 SHA256 35f1b49e798f2c0aa7c4c796ffa6361ce5fabf81c4c03ef2103b604e1d127d45 SHA512 c4f51cf659383c678dfcbae88c0ab1afa1dbc6a20d415d01a6ffaa0e33cf13349d1139489c0eea5073e7d57e5306bafa7e6a4332366e45831e8d7c11b39b0829 WHIRLPOOL e39aa0befda814f54e2dc788b8e9dce027c7f55804bee482179b4ddaaf69c1e3d50e5d41db790f1962693df716345b95196dea03837fde2da51409768dd91b4b
+MISC ChangeLog-2015 47425 SHA256 62b7f5233197eb852bd80e6569be6b4ea513370877a761f4ea85a82178cdef73 SHA512 a665f34bc08f4e5519c9d7e9de42a9ba42ce64abe448388d0cdca2d5b6e6e5b8000a875fdfd2391257d3d83313150c032aa6a8973c13b3e07f92cc949ee907c1 WHIRLPOOL c2f3cae41f1607dfc7f6fe24913465f57bb1cd0a777076b7ce4a9f4536b215f2a37feb022d800dd3fb25972636e08eead1589a152cbb477820cef5db5b23e33f
+MISC metadata.xml 648 SHA256 40a214ed14ce2e23aa965bb1873573b308d201a7051ed88567651c696283ba50 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f WHIRLPOOL 7d967c8aa05c8e6825585f1c1aefc7c1dc1b455399f46dc2380d2d209b526ba88b151fc45b3dbdcd1700069c29689060848d6d61638ec31c89364149a9c305b7
diff --git a/app-arch/file-roller/file-roller-3.22.3.ebuild b/app-arch/file-roller/file-roller-3.22.3.ebuild
new file mode 100644
index 000000000000..277c112093cf
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.22.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 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 packagekit"
+KEYWORDS="~alpha amd64 ~arm ~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:= )
+	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 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/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.24.1.ebuild
new file mode 100644
index 000000000000..d0ee0fd3d696
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.24.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 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 ~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/Manifest b/app-arch/freeze/Manifest
new file mode 100644
index 000000000000..3af9958b1d90
--- /dev/null
+++ b/app-arch/freeze/Manifest
@@ -0,0 +1,6 @@
+AUX freeze-2.5.0-gentoo.patch 1541 SHA256 7d2cad942baf77912799542db417a637bfb57fec89bf01e12d4731b4169c5c41 SHA512 be93f27959405bb7ca0f7407e32e93d9b1bf5f202ad6100e7a8aa18fb8b978402fe5293714a116c6eb7599c84c2186eaf518025c1dd8cc8f6184d346ca54eeac WHIRLPOOL 5d91adb1c5ea4f87be0b34a4fd38da792b15f084761cbda46c3c7d82d1ada442bcd2347d99f48ffbb100058aba70efb6485e93ef22aa676598b29d7e87a9961c
+DIST freeze-2.5.0.tar.gz 36010 SHA256 f543eb18bd7de8893a3c0bac0e4fa5fea46a4e10f5d8182cebc40c97b8593863 SHA512 2e0965e1bb772a829763b99c623b3dfa062a624ed2bd5f658c9df0e4040a9c914aec5a85602340fe994634b82d2fac3250030b35ad3d5f5054b0a6f4059469e7 WHIRLPOOL 8415350c9ad833ceebff515922df947a54c1400cbba9606ef283068d6453cded3a6b674c4940fe0260a085834dd7b5b0a5cf3cb0116bbfde9cdd59d26323f0f2
+EBUILD freeze-2.5.0-r1.ebuild 929 SHA256 3278eeef1b3a96fdb0f4f7dd54186c45a529b8794db2286eb702633fedacc4b5 SHA512 7e49c0c0487795b89d454ae4feb8043ba99d98a1c89600dade03b914bb74db73f03164bc574ff1852a6709819cea5c6fd4b5b4efb90478626a4dce78a3fcc159 WHIRLPOOL a12f123c943b0aedb71bdb579af633e6c7376361895dc735c938ecbec3e268285028c3f069a2f00f13eaf6a3c1f12fd8691c894b694df266f668b497306186bd
+MISC ChangeLog 2559 SHA256 1da3bf84a1145a9097a68af56e23ecdbdff1d5d576c6651d69092bcb4941ec5a SHA512 6e00c37ddd00913d06140a080ec44cb05d40b03784932a36862dbaec2a3a21c504f844d7d225f7bb709a6ea1f435fb1a85b5c07244431244932622185952178a WHIRLPOOL 0aca65a4aff41b2da8e13534f4701763c68a312939dfa9e85dc43e6232583a401ed37cc9d6c0ac28bf69a74c45b16c4f7e300b72a3ca3bd47a5731b0794dfaeb
+MISC ChangeLog-2015 3491 SHA256 eba4b7de77c0c1e9548671b8cb39005858e897f2c36c5c74d7a25307e7581d78 SHA512 a15721c04d29a14803db2e827020fa2f62d5e1f5650606839c0c70340807d5b43eff1e00d1d3eaafa2ab646cc590f1628f30fc340650e938c268a338a428a6ad WHIRLPOOL 6a6a73c54efff5469dd812f2935715d32a8b215a0e3eed2652b1b95334336e48ca7ef59f52f303befc494a3859e33bde0f00d6af6b344fffbfdbff5adc406674
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-arch/funzix/Manifest
new file mode 100644
index 000000000000..111e2191d160
--- /dev/null
+++ b/app-arch/funzix/Manifest
@@ -0,0 +1,5 @@
+DIST funzix-1.0.tar.bz2 10792 SHA256 edea686fdc733a8af4573ecaced35985b0428caa1b9f788a78eefa5b4218868c SHA512 30abf29571df7be4a1e92270cb3b4949244f5e50b088bc128c8ac63da88c244f0fe810b4d05b76c68220576b06a1c47e84a3f3339d82a4f0e35a841b29ec4c2c WHIRLPOOL 39dcde893592c56b67fe231e390772760551f2cdc0c41db17ab4e1a20181b6288e6b73aecac13c2c541558510691211442fedebfcde1301b0ce2bac42ab7e088
+EBUILD funzix-1.0.ebuild 456 SHA256 47e56966ef086d11c841f1ae53832f710e6bfba74d0554edfe032a409e793a4e SHA512 48815f2f4cd6b6744fb0c7ba86b403b5987369176f87f60d26d0125f1c42703b5128a71d4a2bb2a86db0e2c24e6290a38ef2d3f17294db65696ab3d8989f2d20 WHIRLPOOL fb648306909d19ffb194ab0a153f04f498fbcdde11ac108aab4669b9c8d863b746b7e8c5307c4695b65d6cb70e3d704d2197555dc10179a10380d89d15570b7b
+MISC ChangeLog 2169 SHA256 b34a5cfc43c40c6470e07e18202daa0bc18e1f57083d231c34e83349ba09adc7 SHA512 b27f17e725829846941778056b8a9c0fd186e79af88f378ce790b622b5aa41f591a98a39f01c76149274c1a08031916466e38ccd504fce864b946a6b2bd16c6e WHIRLPOOL 8be25446fcdb394946b36b769b18b37b078f65c4c53ebfcedcf4fd06f397063bf1e6b8ed7b88581e0b43ef462d8d5efa1f5fe439c8b109f9c0f6a9b1663e7d52
+MISC ChangeLog-2015 733 SHA256 c3057c0ee96bafa412a3e5d163339cdd93471d760d5a4b566b68cdd842c03aef SHA512 6928ba0da0a673286e426a4a05ab1f11481d0abb34c83ea5a66b9ea8b06e9c487529404b83e7f771571e34cd6b6de611c48f56be47691790a545ffb245279c34 WHIRLPOOL fafc56e6fda6507a5f08a04e36132e24f53d8e02c2ffd0eaae8038ee3ae4cb43700294cd05c539097821e322be44a6e8fc4eeb0e6be29c922106074e6581a13e
+MISC metadata.xml 293 SHA256 7e3a0c402eb915491e38fa65142cf4d4da5c4bb45d7681a90c6a7f4ebb094402 SHA512 10b2528e5e4305024dd8416d98a7804ec0655ddf79cd43d96496d792cd9b133faa1f3fa0a87edd4e7fc91d04031e31132ae91a2378f228be208a84f6848ef3b4 WHIRLPOOL 9110e92576101e6eaef5861f579b6ba23653e3492b60ebb786ba7dd48d1b41b76610958c93c10426fbf3d587d1f1c001fcd2e22a259d79589ae1b1316c8eb5ab
diff --git a/app-arch/funzix/funzix-1.0.ebuild b/app-arch/funzix/funzix-1.0.ebuild
new file mode 100644
index 000000000000..9d479a6c8eff
--- /dev/null
+++ b/app-arch/funzix/funzix-1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin funzix || die
+	dodoc README
+}
diff --git a/app-arch/funzix/metadata.xml b/app-arch/funzix/metadata.xml
new file mode 100644
index 000000000000..6e64f69cd171
--- /dev/null
+++ b/app-arch/funzix/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>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">funzix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
new file mode 100644
index 000000000000..5c354f31c28d
--- /dev/null
+++ b/app-arch/gcab/Manifest
@@ -0,0 +1,5 @@
+DIST gcab-0.7.tar.xz 332248 SHA256 a16e5ef88f1c547c6c8c05962f684ec127e078d302549f3dfd2291e167d4adef SHA512 db8c0b4ee2bc75b8bb540b4fe0e9304782b9848b3ab0ba3077638d13cdec652f6178206ec6474af036fba90e952ef0052dd9d19be9eb72bae97d98f8f18a0c02 WHIRLPOOL e634309e142f2e5772a8a1bc9f6e8cabd4df8d4590c5b9867c6125d287c8fffb0f07782c3c0c418d91e632e88247f7ae48540891920f99587afef1ebbdadbea5
+EBUILD gcab-0.7.ebuild 941 SHA256 d7da563b31bbb04b3e21b545415289b76224ef95ae264c2cc1a892d5e7208a21 SHA512 e7cd50ae66c96e9d671ea9fe72074c7b0d0031efaa2819ec6629079de12abde02e12e13117f22d728cf642e653a5a4be974173fdff599c3aa7eb75442c32e729 WHIRLPOOL 25e49e6ead25ba84c5f786a9510785ebb8236e756acc27198d283e5a08a999920525aa017b92adebf73f1d2cc06453597261c119e0e3b2a6b8f219a3ef5c72cc
+MISC ChangeLog 5365 SHA256 0256f4c0a5cafb97fa487d592a997f5b2e6e275f311ed6ea1894990cdb70b1a5 SHA512 e914c4114cef254a35cda85b4796a783b8b5a00d2d564e63c7c0a6420de9e6b8e7a7412abe0b05ba2b15bcac6cdbeedf16f5431a439205511d8b04aac6a87f35 WHIRLPOOL 6cc13e68c47d12a2edfaee3eebdf8585c894a58c6b0be505ff9783746cbeb0a20be6e10b84d9dea4d60d41ece7bc61284b9434e9629bd58c97074699730f1451
+MISC ChangeLog-2015 739 SHA256 c8da0e3d0d1f017f5570e88e24266a97bcd549dc74409a30fbcfa5e5512304ee SHA512 53e7e332f6e3e15d141b962ed677f55ac1ed1e1352f3800562c9b5c3f6111adebf675dfa5da067a9683de4374b153b79d50de4c63745e7abccdca4c8346d2250 WHIRLPOOL 545c9264ecd4143084524367db7007dc9edd82ef6dab95c0fea9179c2f057aecc44f483b9011241a9e656e3342df654507a3a3ca35b29f0a26c2e97be425e517
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
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/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/Manifest b/app-arch/gnome-autoar/Manifest
new file mode 100644
index 000000000000..7e7c34b92b8a
--- /dev/null
+++ b/app-arch/gnome-autoar/Manifest
@@ -0,0 +1,4 @@
+DIST gnome-autoar-0.2.2.tar.xz 295488 SHA256 e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62 SHA512 78faf8f82eeab4cb5f1f364d6e9caa4d24f21f9b81a79ebde4404253f3e7ae120f44600f236612859810afc6fc6f1a8c6f2e065db98be79103255642139c10a2 WHIRLPOOL 84de57d7953a4653b8ee9d8d710b14566017b09bd63aa38843ff02ed105a79b5d7c5bda6af6610ddb01ce2f6de76ad279db94a7c8e3fe70c5d9ab4cce670b4f7
+EBUILD gnome-autoar-0.2.2.ebuild 931 SHA256 22b28394dc472693414abbbd0f0486f9a3d04b247f73a798041b3f0dfe808ca5 SHA512 ce00119281ddbf44ac670cb69ebc5ca88ae8e4c726ccb8a546c1fa303f0f2e23fc9d1a620a02b15978f0ebb2886495b677ea3e49a41a09b78b71c9c52fe18fc6 WHIRLPOOL 4139fbec5eba29f14b196f6e6e30d0c345f9d55d643b8011c43fa11e931a63b39feaf790db1a213c55f67f954b4b3629aec0563398451af47189daf1512896ce
+MISC ChangeLog 466 SHA256 9d1e6cf1d4459c6555b1f413ad711d065ead18a18c738582c8dbfdacacf3eeb1 SHA512 48de4e8a1231d8a7fd7017d5453125f0e3f1530c4e1d1d1be4a96060a8f4d25f593f2b020a5259d20ce3bc7711eae962f043f4e60e81406007ca921fb1cf213d WHIRLPOOL 63baa0fdd491b590bda8a952463819451cfb43ae341b68c56a7e6ce578b65763a5043215f373380036ceed19da576ac6ed75d7e982d5c09699670d2cb5bb7cfb
+MISC metadata.xml 464 SHA256 939e72194cffe26b956b568dd479be0bef839e5edcd2918108841654be1500a7 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c WHIRLPOOL 0fa818814c1ddbdd30c7e8fefa24dcb20777d4a731ee6b5b205b619355a47922fc598ee6bce8c4810994907ad38807ffec9d61d85f534ba618b62be9f5907c26
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..82eba921fa02
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 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 x86"
+
+RDEPEND="
+	>=app-arch/libarchive-3.2.0
+	>=dev-libs/glib-2.35.6:2
+	gtk? ( >=x11-libs/gtk+-3.2:3 )
+	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/Manifest b/app-arch/gtk-splitter/Manifest
new file mode 100644
index 000000000000..3eb542f79399
--- /dev/null
+++ b/app-arch/gtk-splitter/Manifest
@@ -0,0 +1,6 @@
+AUX gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch 325 SHA256 ffd10689ab390ceece024dcf09895ba6b07935246eecec33e776a437af721c57 SHA512 19beddfab6ec199f013f4f3d12a5921df49267ea3ee851e2bfb4ec043f899015ffde7bd45308aca8734d735b203a822dede78c785212e45c49351ae7f501c49b WHIRLPOOL b2087f41ad82df3dc4665a6c957ed591481267ead2391d68d1a5b442ec012b61328fd3a579804d761be8b5e6b5aa61e0d7db26d9c993d838c487f886cc65cb70
+DIST gtk-splitter-2.2.1.tar.gz 93515 SHA256 4f485c78ccd3d2f6353d751db3c1fc6cbd8f8ca4e99d2db0b284804acd3f37a9 SHA512 c84e43dddb5f1eef5a4fed7db7541012374d7e6bed760835adae20fa35a4685cb7a1a866ad02cbaf36ff3ee4d5bd3872a154e46ce9692603a3273859d2eb36dc WHIRLPOOL c3142aea941633f470aa6b3ff5d9972f8b7059277c9fe4ed1a839813c241d961f150f3f8fb05e370809bc1f4828bc6e1023a455e22cd45f5873218f721c6c986
+EBUILD gtk-splitter-2.2.1-r1.ebuild 813 SHA256 c952d77e1825807f2966160dfc5d5f84fd000dbdb8ed25cc5585c205cb5825a8 SHA512 3128262c80ef2fb38a9858439e481f341427979d6ad4b372fe1f6a1df174ff387690765df439cf4a4cabae9a604bd675e7dcb24a1439a7f16a3774c2cf6c0d96 WHIRLPOOL 32a893e138ec0cce2d84d7ea5e137298d7a58d9979f8cc79bd2d9ced98c37f63ac2be1f608dba3f1066c3214313291c24e05877e1159bb0283d8edaae63f5066
+MISC ChangeLog 2598 SHA256 07f0a6b3b11b546694dd0ea3a533e59957165c3c59a6727ab8ec445fc5645e8e SHA512 53aaba7b56ba42ede460d220f09253debaabbc6a1f32fec1bec3e4463a98928e30c78349309fd0aa5da9737e51693f7ba8f4f4e49cf00a158e38ab569831b6e8 WHIRLPOOL c055e3e8bb338b6c574ce1ceaea97e07dedaf4dc9253fcad8b91d2df2b93ae6066c64ab4a9b23a5d1907b835d5136a2e82e91734bcb03aafc3a22b7841b9e513
+MISC ChangeLog-2015 2531 SHA256 a799003f14bc16e3a4105354646f644897bc5ad1bccc9e874ec2da80ea5d0e68 SHA512 b80305dc2159beb1402f23937508abb372663354f71489582610d00f350b5f59b8076613241d55bbf99266a035de9cb1d09e0d865581310e76a8527716a25f47 WHIRLPOOL e99856b3e35bf6038261871d4266e781975f700cc796640d83a879fb1a06bcfdd44aea627c416f7a58cf9751e5c725b2eb05773016b4cf0bd76c2d1b10f7fa86
+MISC metadata.xml 362 SHA256 48b92453e55536bc400fc6defbaadc3129f21c4bbf51c7de9e7d30248abf9408 SHA512 236e11a6730b01e5fd611674c32fa0ca9a8cbff16f4f000766d4104c04ba9c1120e1a0ebe279992487fb2d0102a7d1ce152781132c7d1876dba17c0eef2e91a6 WHIRLPOOL bbbed934552b66e8bb73cd649639f8cc8e342c1ca4f13f617b99964c4dc3e8c366d2f50f689e4cb559eedcf7fe48ca9f0c7761a5ad1b1485e663f7d38824fcd9
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/Manifest b/app-arch/gzip/Manifest
new file mode 100644
index 000000000000..f8d930fa03ab
--- /dev/null
+++ b/app-arch/gzip/Manifest
@@ -0,0 +1,11 @@
+AUX gzip-1.3.8-install-symlinks.patch 280 SHA256 f8b8c8548ae32975ba8e5bbc79add0f951954e1b4a21de55575274de177925d1 SHA512 b804a4d4ef9294a8f241b75a06ee6464d932330824dc95f2fa1f67bb6f22f4d66287e4f47dcafce4e59e68fa3d11ac61cdbca55ab0939747d8a17464d2aa29c1 WHIRLPOOL 13a5806a61a565a5a1de4d07b7aa252743016e559fe72752f2e7130d414eba0c6167608f3485f2fadf21a592cd15aa36c8e58682ca5309aa28ea874a8b7bdcb5
+AUX gzip-1.4-asmv.patch 702 SHA256 b065aaed488c6ed1930e93e99f9cc94cc9da8b355337b2a82c2cb168eebd122b SHA512 34ab638432a690e1678a1754817d65f5e0258a50ea4f308f4a26ae48a2829537ae23a252ee08540c486931c617e634e6a0fc5712d8c337099029c7b3eeb3b408 WHIRLPOOL 17a8af8bb17c88988822f0aacba738339cede8a764ab3ae04a1f24904d68fc592acacd1bb1f9da8dd66e702a6a973aff0e6ddc6811aa428f21be0dc38ab2f415
+DIST gzip-1.6.tar.xz 725084 SHA256 37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847 SHA512 06da599fc38b459d7e9a3f43fdd06d1a0d7b29ad14cb7b6552176bab584a1135bb47ba37a4eb377e6c42c4934d557079ace1e289a252ae192ee154079a62ed01 WHIRLPOOL 7c639d9a57d5f9a820972275c7813ccd76df7a87ad68b00668696aec251b84fd7efb1129205e8a7cd51e40706b718ce3ce71dc9aa6626acf074bcea6f0fe5c39
+DIST gzip-1.7.tar.xz 764056 SHA256 fb31c57e7ce7703596ef57329be7cc5c5fd741b4a0f659fea7ee6a54706b41ab SHA512 e28f23738f0d2936773d9b50ea9e46c59945e227a90ca7d8e953fb5a774b8692a3341b744320e924da2d5825117dab730affce506f6fc8e65f0af372f3082539 WHIRLPOOL 5b9b3ce8cae2ec46d9114faf3fcaff03e6ffa1c32a21ba6dc0c58ed2e22191207b484ebba3a407624d6337f47ac2e11110430a703d163f1c7c6378c4fe0ad005
+DIST gzip-1.8.tar.xz 728116 SHA256 ff1767ec444f71e5daf8972f6f8bf68cfcca1d2f76c248eb18e8741fc91dbbd3 SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55 WHIRLPOOL 490a1f0c157c880a68758a60cc460df525145d6a3bd7567666f194759b471001a29bf409e1628eb86c8d8e598d0c2a0bdd713ed31e5bd17719511aef93361605
+EBUILD gzip-1.6.ebuild 1156 SHA256 95c117c1a4c453771a545e82bc11b72d9553dcce1c22e27e83a18bbc77ebe7f6 SHA512 e20603abfd88a283b228fafa8765f84bcab7460af0be95d82304b4fa45b6683651de1dbcc6b153fba519fc65f93b1142e9efcde18511b880588355b4c8738f00 WHIRLPOOL bf1fcb41059205155f657f85e2a505ec639e34967b0ee1eb4043c4fb3636498114c8ebba8785b3003ebbc2aec359cc8a92a3351433965d76464ef017d7cfbcae
+EBUILD gzip-1.7.ebuild 1190 SHA256 7ec1f5cb6b3f97725911a97df5ed6f59b057f132d593e359bf52d91fcf100358 SHA512 9c48f878e7953e012253ab5465a656e0eac6d41d33a401ac8b43562f374a1c2ad63dd8f1f0a6d8caf4701d558de8082dd83bb3ee8682ec367d6e03a2b01272c5 WHIRLPOOL 9ce164538c10f92db8ac8a773ae7fd86334bcda1fd9f6f00e89e085fed81d33883ee0e65b948774a1eaed24b3cb4210595d948d6b9e338e6376cac9ea676bfaa
+EBUILD gzip-1.8.ebuild 1189 SHA256 d582407dc1899c9e9dcb7038a1e39d8555d6132620c721fc964c42764a7ab409 SHA512 857d78565eea8c432ed26852c89ba0b9a45c3145b843e9f5804b8ebc4715c7e386a8c5089fad8a89f7e7dcb2c1151f056b09b00a50f6481c7a2e2704b7cf632e WHIRLPOOL f87968b14af096afe4ffd85514a56696d960833a633e68967909c71132cf6d7239620ca0efebc149882290c67de058f21aeeaccee48f0459a05ccaee9510883b
+MISC ChangeLog 5323 SHA256 6a3510696b85faf2a1c57e0c1a004f56349df759e35baf02919f193139fa4902 SHA512 a06492ab878a858173aa4aad9e7ea42b8c5840bc0b8b4bb7f2e8d47f0c447e0f193da96e9a0bc0ea879943a9ef3155ac06a0bacc1025d2f9932250053ce18f4c WHIRLPOOL 25a5bae0f7d5392d37cb7cc8e611efd0d3d7aa7ecdda8e6cca5579d3aad31024e48fd370f34dee6bc7c4d7180beb19e1f60af2e59ee520b868a2da6cf320f719
+MISC ChangeLog-2015 18561 SHA256 83d36beb3c201e26e4201fe066279bcca3e7d07ff25d01f6615be4dc34256212 SHA512 1c68d5e9c0924b7c6a2168b606affc839fad039513b9ab96f1826978b9acdd1b3bac1e70cdfd14035769ac2056b7b65751ccfbb39f3db67c619c4a8905b79b16 WHIRLPOOL 873b3a8aee5801223498bbe971baa17858e03da85ed640f5d61dfc836f14a6529b9ade5a8af4bdbdc0bc265a093f96871806b21af599f3e03b326fec52d8d41a
+MISC metadata.xml 421 SHA256 b6ac25e811553ec98f086ee74395fe5eb899a2478627f44093686201e1057d3d SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96 WHIRLPOOL 78705b4221d37d5047a640d4340d550aa49c7a4a0f2ece81157ef2ce480a82916936594e26e01c717422fb1ee2b618fbaf3cf40dd7d52fec198f70b5e4b5f295
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..8d92b609b5dd
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
@@ -0,0 +1,11 @@
+--- Makefile.in
++++ 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..c87855018cff
--- /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
+
+--- tailor.h.old	2010-01-29 11:13:02.000000000 +0000
++++ tailor.h	2010-01-29 13:18:15.000000000 +0000
+@@ -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.6.ebuild b/app-arch/gzip/gzip-1.6.ebuild
new file mode 100644
index 000000000000..f843d530c868
--- /dev/null
+++ b/app-arch/gzip/gzip-1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
+	mirror://gnu/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 ~amd64-fbsd ~sparc-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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
+	epatch "${FILESDIR}"/${PN}-1.4-asmv.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/gzip-1.7.ebuild b/app-arch/gzip/gzip-1.7.ebuild
new file mode 100644
index 000000000000..910bb04b7dec
--- /dev/null
+++ b/app-arch/gzip/gzip-1.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 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-alpha/gzip/${P}.tar.xz
+	mirror://gnu/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 ~amd64-fbsd ~sparc-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.8.ebuild b/app-arch/gzip/gzip-1.8.ebuild
new file mode 100644
index 000000000000..1fd065eae9c3
--- /dev/null
+++ b/app-arch/gzip/gzip-1.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 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 ~sparc-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/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/Manifest b/app-arch/hardlink/Manifest
new file mode 100644
index 000000000000..f1b8c555ced4
--- /dev/null
+++ b/app-arch/hardlink/Manifest
@@ -0,0 +1,7 @@
+DIST hardlink_0.2.0.tar.gz 12478 SHA256 7dbacfaaaa6bcc090f75511b204b73ca8f9da7816c4e9ea384eee5261aaef8d1 SHA512 963fe90aa09e2bd548722b5c7f047fbd54fddf37967333e86251d7e5d1c646108ce90d78e7efeb8af6b9169b9a0bc5bc8b744afe1e813390f3e0bd535ce22005 WHIRLPOOL 81b4e8724ef5a3a4399546ed3340034babcb77f089599b6d941fba20b993fa5dc5e522805cdc5cb0a57d7481146d72e0b2d164a6a0ac3eccb69ede2ea707b4d7
+DIST hardlink_0.3.0.tar.xz 14440 SHA256 e8c93dfcb24aeb44a75281ed73757cb862cc63b225d565db1c270af9dbb7300f SHA512 22a8945ce5dac74b05bb1231959823aec0cd364d6db9ad808df4acf232d894170c006ac1e88509604ce1859d41bd4a5d91e2b12c8010aa7fc7e19a77922c4486 WHIRLPOOL dcc1aaf3c4e8ac89137d4bb33d03d14689b4d8b193654e66614a99f551977401c406f29a4d903d61f82b9db51402fa6b7e3eaf88c965ce5d0a22408d58b6677a
+EBUILD hardlink-0.2.0.ebuild 947 SHA256 2c87140146ecb2c6db84e1ee84a74150f147ee624c750da80a244f5abc0da9b1 SHA512 55d1a806082a726d826f3c8fd44806d009a9efaa9cd7ddcd9ec25b16980aeb86b98f12ca756df7f3190480ebe39cda4e67d36240ce4ea6f41d9dfc10681c9ff2 WHIRLPOOL ce1f758e0792ee20ddb8321e72f0816bc3f1bc63feed4663843bc4792a076661734c98acd97234f1912486e7c5727e580e4677691f90178db0bd61aaa2cdb716
+EBUILD hardlink-0.3.0.ebuild 951 SHA256 2dca30b82bcd166b3c01a983f28589f553e4e51edddb3988629a9d42cdad312a SHA512 ab20f75ababc3f64f3422f4dad0cfdaa4646aeb118382813c83c17ffbeb3f5577c0f2aec26c16d01b594aa91be7b3072026b37f9680af1e18bc1d485213bfefb WHIRLPOOL e0c9af2d0fd288b53cd0b335c5b5f855fe35a22dec15bd87408da72e1e643370124dfb13742f733a48d8504da995263ae778c7cb9d67453fdd5f8545217e0083
+MISC ChangeLog 2926 SHA256 b63c475730359da5cdffcec7cda7b68bfef276a73b222cc27e34f27853a3ef28 SHA512 ea3fbb3707b88970b0484ebee123dbd32e5f2b30b8c4f480049392896e1a6bc0792c602c87b75b3d73e0ffccf3f43f844bb0cbdeed03d482ef8be01d947384ef WHIRLPOOL 793a702f6d4930a066a0e0520844bc8cc0857f68faeca0a07e8fb578833fff2ad4c79178aead3fb590e31e553fb4243abbebb1753f4436b79e5c5287567b4243
+MISC ChangeLog-2015 1796 SHA256 35ac089e00a02481f1a853479589bdfad05ca26d638a194e9003cdc6f2dc4358 SHA512 457c218a2ffc0f8efcfb995df0e0f76dfcb4994a6f02b16b4587053e2dedb2c15d0485cad40573576addd5b9672d84040d5dbfc24838194d9ce70ad82b99dbbb WHIRLPOOL 340b5fa27428f8a1146b5f14a75de18106eb5eb536fcc21f78f857855f016c3809dccb28a189ce051b7c6dc7c264adf5905fd98bf0f3a592859deb69e406f567
+MISC metadata.xml 375 SHA256 1c0c6169d7d5a7049f3139704afd0dd5880884791d21f24040e56bdc50fcb649 SHA512 1f14b085ab758738cc521af00de93bd47ca037f6b59fff96352c72e8f4acae7fa2bb5a8aa2df9eb865d992035a9c57c0b976cbe5f6033e4a77250e9101b22b7c WHIRLPOOL f3d24011ed50ced9d16c9fe4a13cc9be9340b7c46bfd4f506968a364002dc3e5bee3b83640107dd1f1b36051e72c18544a8c3b2c328cf48b7dd4283c164875af
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/Manifest b/app-arch/innoextract/Manifest
new file mode 100644
index 000000000000..60f63f730f76
--- /dev/null
+++ b/app-arch/innoextract/Manifest
@@ -0,0 +1,11 @@
+AUX innoextract-1.4-cmake-3.5.patch 872 SHA256 2fcc798ea3dce17edadf23bac3f0635e4d36c3758eefe0fa50b1f90642969c85 SHA512 e285d052c238baf66ea9e8b3236a1b4a4596c3376ff0e53ba417e9c629cec71256e56e9aa80b327208824939a25b567520384d3c437d493764431a41daabfc5f WHIRLPOOL d5f2118dd74a60fc38f9217715692b4eefc1b8edd5a4807bcb1c11b5b7066f2f6e7a73c1b6a5b1037d44bad24e6723e6850c562dd233cd58e3cc22e006d15c6c
+AUX innoextract-1.4-cmake.patch 1027 SHA256 2066e6f4b34b7ac2febca22a48e6497b06ce774634ca93b07f95d8375936793a SHA512 914af5af319165927e539996ea760737498547161a46a885c7f5e99c03bc0508d02fdac48b83f3591b3345fdba61b509e39998879802546a941aa2967a8a0d30 WHIRLPOOL ff60b6b4efa18f6341941a86776aa6b0aa2ca847d6e0f7294e778f685611bf1093e1447129eb4314e7db15772bf8820b77c35d7037354b4da256b825259a5c10
+DIST innoextract-1.4.tar.gz 151230 SHA256 5a494b5ae1e41043574096761d31695ed8b1d39dfe64895306d0d92623901cc9 SHA512 60700ef05ff50e3409b92571ebfc7342c0eadc8add5d1262f7e7740e1a14cfd186a8a9ac0ecab85f01ae50f21edb48f49ba9428369131f7cd46c4b07214838ea WHIRLPOOL 26b38b5c8fbc5c1f79c3d2b3f9cabbe439140ee174d31926ee6c1507815417dbab02632f2aaaf8681c2755ba6907f0a67ef91f2672deab9b2bdef16e3bd323fa
+DIST innoextract-1.5.tar.gz 179582 SHA256 f2594e992ccf2859455475794803b29a67393fadb69d4df1eec34c451ffa48cf SHA512 759c319c1f0737b9120ed4613bcab4bebcbb28749d9bbfa46ccb7b4f7640352b4ef01a03ed142c61f67188a83635d4e03e7b0708b913e1f47c09e5189bb56dd6 WHIRLPOOL d9601659b50836b69cdb74f287a4c8abfd489f47da619d8c95b6613b01f9ad85c53efa34b8fcdd1c3fe975325d351e1ea843dc3ce4b745ca8c383b6ff44b6489
+DIST innoextract-1.6.tar.gz 183380 SHA256 66463f145fffd4d5883c6b3e2f7b2c2837d6f07095810114e514233a88c1033e SHA512 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62 WHIRLPOOL 5cf9a732d2754a09475576d7cc4c40dcf9406425afba02247f074f66719c4b79953869eaa206e9c082ac8476e9c7874acb208a082189e669cf38943ae233f8f5
+EBUILD innoextract-1.4.ebuild 1757 SHA256 772afc8148725ec8560ddba6842daae43a8e8fe036ee091636cc9f201313ef87 SHA512 3ce6e89741ba21d99ae51b5af825f4792f75bff55bf3e44392ec1cf9ffb1e83e7c5a588efde0e87b7aff72e1d5e0b96fd4779da66884dd46f42288229e0dbc05 WHIRLPOOL 5b34dfaafc6e8f338ac3c450970e654384f6c1b3899c35f36873d3e9a73011c8c239f09ab59e9b09423f88385bd1126aff86764bc1c5f34cb8a8eba2178d422b
+EBUILD innoextract-1.5.ebuild 812 SHA256 14bcb74588c939be54fda024198bbf75e8f548ca33c0205a07eac0aa4a44e217 SHA512 6ca3e1d8b725d9f67b49f7b9c7556052aff007a7dcd25219d161b87b017b74c11700a4c3761c240db679c8ae8d73d23aee786b128f2707e74a350b6c93b3d244 WHIRLPOOL f00b60221e17a7db884b70922e9227935dd347b2072a1035ca562266c072c79dcad793fe8e8359a4fb335c376763502a59ac9abfdfd917232ccc5622e6ec46a7
+EBUILD innoextract-1.6.ebuild 751 SHA256 9d9043f56b682f271ee28808b11c2be163255f4c873af84a0d40376f6e602e5d SHA512 354b5f01e2b7dc8612ce06bc50be11962839994bb3e350e6739e59e1b10dbd02c477276c54cd432de64e54ed9ca582a12f1b9a4d51ec05ec239e3a5b25c13a7b WHIRLPOOL 4e648fe8afa63bf7b2fe2ae44177c42c86d9e36662ef606e947c6bc585e3c39d8b985108f9d93fb9a7a0fbda4254e3964cf83cea62ea07889fe05172ff7f33b7
+MISC ChangeLog 4918 SHA256 27b329b03e5eb44902fa662b283b75b0b4f80653e27056eef8faa51a9254ea9c SHA512 063286c7995dd0526fbde21259edb6691f376ed15bfee04ccbc271b61c3969ae8858cb4f8a2e6888be06e40690b61c235d973bd557353ae7d58c40d907865151 WHIRLPOOL 4dbfa2de2118d60a80b0f8eb644112648d78ac28a38deda04d40ae3b63b3b0565b8986f49e676a588a6df34207731b724264fcf0cbc5c4910eeb98827da43274
+MISC ChangeLog-2015 1572 SHA256 23d21fa4ba96f2342dfb62e2429ff5f38e9356d3ead34c007df1800a289f82fb SHA512 c323db54ee4544bf085da8b440d5ce909c5a3c0f49878ab6ad7266c2b0f3cba51bd857fe03d8e76500e85a53ea2403cf993ef2cb5f33e7db5a811717cce1e1a9 WHIRLPOOL e8f8c7dea36f6fbb4a0d66af37b3e7693713faa40e78a8fd98ba9d5ad1d86577788e81732c64be13b6a0984d5d593d376babe267e4bed7bd20fd1dbefa64cdc0
+MISC metadata.xml 1085 SHA256 0fdcea240c2fc67b7e44785922120552fc924000431b238633683a11150d2014 SHA512 70a1206093add6fdbb82f471bee22a0ffdb85da9c8558838e1a4488f72c4c6b2898f77f1b2e1b8c96a640c9e0fd1b49877e2bd8ca3c64ac420897753e76fde31 WHIRLPOOL 977fe6c84342b32d6ef2d643d23bed3ddcc26726af7e4e70da3086188ed92b998b7ccb644f81551d0e5c7bad0da114ffb70ecc750007d0515c9ed6fa9a87c59c
diff --git a/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch b/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch
new file mode 100644
index 000000000000..0b619ac3810f
--- /dev/null
+++ b/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch
@@ -0,0 +1,31 @@
+From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Tue, 23 Feb 2016 05:45:50 +0100
+Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
+
+This makes the build system more rubust against stray variables
+coming from included CMake scripts provided by the system.
+
+Fixes build with CMake 3.5 (tested with 3.5.0-rc3).
+
+Fixes: issue #50
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 02e0308..8653b93 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,11 @@ project(innoextract)
+ 
+ cmake_minimum_required(VERSION 2.8)
+ 
++if(POLICY CMP0054)
++	# CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
++	cmake_policy(SET CMP0054 NEW)
++endif()
++
+ 
+ # Define configuration options
+ 
diff --git a/app-arch/innoextract/files/innoextract-1.4-cmake.patch b/app-arch/innoextract/files/innoextract-1.4-cmake.patch
new file mode 100644
index 000000000000..199a10e14fac
--- /dev/null
+++ b/app-arch/innoextract/files/innoextract-1.4-cmake.patch
@@ -0,0 +1,30 @@
+--- innoextract-1.4/CMakeLists.txt
++++ innoextract-1.4/CMakeLists.txt
+@@ -6,6 +6,7 @@
+ # Define configuration options
+ 
+ option(USE_LZMA "Build lzma decompression support." ON)
++option(WITH_DEBUG "Debug build" OFF)
+ option(DEBUG_EXTRA "Expensive debug options" OFF)
+ option(SET_WARNING_FLAGS "Adjust compiler warning flags" ON)
+ option(SET_OPTIMIZATION_FLAGS "Adjust compiler optimization flags" ON)
+--- innoextract-1.4/cmake/BuildType.cmake
++++ innoextract-1.4/cmake/BuildType.cmake
+@@ -8,7 +8,7 @@
+ if(CMAKE_BUILD_TYPE STREQUAL "")
+ 	set(CMAKE_BUILD_TYPE "Release")
+ endif()
+-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR WITH_DEBUG)
+ 	add_definitions(-DDEBUG)
+ 	set(DEBUG 1)
+ endif()
+@@ -64,7 +64,7 @@
+ 		# Specifically, the need for libboost_system depends on the Boost version
+ 		add_ldflag("-Wl,--as-needed")
+ 		
+-		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++		if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR WITH_DEBUG)
+ 			
+ 			# set debug symbol level to -g3
+ 			check_compiler_flag(RESULT "-g3")
diff --git a/app-arch/innoextract/innoextract-1.4.ebuild b/app-arch/innoextract/innoextract-1.4.ebuild
new file mode 100644
index 000000000000..e4531fe7db0a
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs cmake-utils
+
+DESCRIPTION="A tool to unpack installers created by Inno Setup"
+HOMEPAGE="http://innoextract.constexpr.org/"
+SRC_URI="mirror://github/dscharrer/InnoExtract/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="c++0x debug doc +lzma static"
+
+RDEPEND="
+	!static? (
+		dev-libs/boost
+		virtual/libiconv
+		lzma? ( app-arch/xz-utils )
+	)"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.8.3.1 )
+	static? (
+		app-arch/bzip2[static-libs]
+		dev-libs/boost[static-libs]
+		sys-libs/zlib[static-libs]
+		virtual/libiconv
+		lzma? ( app-arch/xz-utils[static-libs] )
+	)"
+
+DOCS=( README.md CHANGELOG )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-cmake-3.5.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# not sure about minimum clang req
+		if use c++0x && [[ $(tc-getCXX) == *g++ && $(tc-getCXX) != *clang++ ]] ; then
+			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 || $(gcc-major-version) -lt 4 ]] ; then
+				eerror "You need at least sys-devel/gcc-4.7.0 for C++0x capabilities"
+				die "You need at least sys-devel/gcc-4.7.0 for C++0x capabilities"
+			fi
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use lzma LZMA)
+		$(cmake-utils_use_use static STATIC_LIBS)
+		$(cmake-utils_use_use c++0x CXX11)
+		$(cmake-utils_use_with debug DEBUG)
+		-DSET_OPTIMIZATION_FLAGS=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
+}
diff --git a/app-arch/innoextract/innoextract-1.5.ebuild b/app-arch/innoextract/innoextract-1.5.ebuild
new file mode 100644
index 000000000000..42b83011c099
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils 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 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-cmake-3.5.patch
+)
+
+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.6.ebuild b/app-arch/innoextract/innoextract-1.6.ebuild
new file mode 100644
index 000000000000..518add0ed456
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 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/metadata.xml b/app-arch/innoextract/metadata.xml
new file mode 100644
index 000000000000..35f36acfcc7a
--- /dev/null
+++ b/app-arch/innoextract/metadata.xml
@@ -0,0 +1,25 @@
+<?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>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</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>
+		<flag name="c++0x">Compile innoextract using the C++11 standard.</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/Manifest b/app-arch/ipkg-utils/Manifest
new file mode 100644
index 000000000000..d0c1a786c046
--- /dev/null
+++ b/app-arch/ipkg-utils/Manifest
@@ -0,0 +1,7 @@
+AUX ipkg-utils-1.7.050831-hashlib.patch 614 SHA256 1f4dc0c84d080b3c89fbd956eb1d5e1fc7db2b1fd7ead0e237b8a7858fcfb35c SHA512 919773062c52d4f5474d75a0b603d4d20c11936db1c3603695caa3d7d9793715ccca6b90f272bb9cf1ba74052fa160df03cebc7e1d189f20832b482d46891736 WHIRLPOOL 72898b07d0073c917fc83e5c1b90df7affc4880246e21727e70d572551fb250ea020de25de4a97cfa99ed79b97b49d707883af5299bf4fc71e8daf04c70960f6
+AUX ipkg-utils-tar_call_fixes.patch 1500 SHA256 b0183d519f886056d7f79b65182aaed557d5e86e8f5d7a3911235e661d40e79d SHA512 8b16b81241e9634696917b9c24dc890e1b03ea37d1130f5894b72d0e475616d6ac9e03cf299243c426651af1b45e29b38ef355905cbfab92c614f32c54964b3f WHIRLPOOL 3486a7cdcbcd5d4fb045230ef141ee4ca34c0ceef094eb6256f64781a1134590af9c5318f2de41397df38b65708f3bdf55c9d20d9ecb2b319ca168680a8c9e38
+DIST ipkg-utils-050831.tar.gz 29175 SHA256 1dde1111fbca85977855db9acb557097a32a5133d8764a05ea36a89a1205394b SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa WHIRLPOOL 7bd8b42aad219862c0211006954e027dd5b933fe13953932fa767f9fb35745d715c982f93c7ea636be23c5a27d7a460c2fc636963724e06547a4f093594355c1
+EBUILD ipkg-utils-1.7.050831-r2.ebuild 1442 SHA256 10ed2643e68ba4443126073f8d91c8aa9c859e0ee1f5bb62ad849b2dff089980 SHA512 a34676119df3073b7f0f3b53d852e7e9404adf99278205d052bc06a72a4f13a3eac95c2fafbd6c97e22f83b3217c7fc8efa3cd95f1fe7e6d64ddca3a28ef223c WHIRLPOOL 6383adb38e04d872de5fb29d7fda0bcd937089adffdffba36c128594c6b21c23b534374d1d3b2ee019e9a7c4087a487c1991003e8716c29a6a1ffa1db33da6f8
+MISC ChangeLog 3043 SHA256 7809d1b3caf833b6ee9cfb9341a0c23b8393c96bc152c3385b99d526bc4142c1 SHA512 e2ef3c49fed25c662b41f75a7c37e729d47d4bc945689b880efc86cb804cab5dea8b10324ea73f49b5ffdc45999ebd405adb3b57dbc6ddde2a5fcf06450212de WHIRLPOOL 83d363042b0ecffeddc571ced9a8a1ede4032d91adb1c3c9542bfc27db974610e4f809f4a5e6bf394f5d454e107757391f9800afdcc7b478763864a3f2161f16
+MISC ChangeLog-2015 3093 SHA256 afe61f9256371b2dbcec1f28a4a17c28f4a6bf8ab2b15014f270e9c5ad52ec66 SHA512 cdb14f96f835db26fe22c7eda8dc1e60949afdc8e162dcb89789a785c156eec47109f17c8a068067a71a34daa7ce7b46cea2cb3c3eb2965f8a8049e215c2aaa4 WHIRLPOOL 82e6d54c68a02b679b33f45d2d3e71b3ffd5460f99bb9af0efbe2306c9706415df9166730b2018c8fe42aa10ac32be4ea0aa6bca2f2a0e9e8a63d3057d960474
+MISC metadata.xml 517 SHA256 50b63f64073b8c832729db381d60fd25363bb27d16056f2cf99b14b0e021c18e SHA512 afb20c89d817a0f8c27d022b6f5fc810f9747ca270d81cd9ce396a41d9edcff09ebe1cb987371f441b1666576f13dd9734030c96627fff5fe2bb8366fb48c4ba WHIRLPOOL 5d935585d182370757aed15259ac880f52b9f1c8bbedb4620159bd5226d2b9a11d4b523b988c9d7e98b78533d6b73c2ab8d61583a80316ce9c4ec49d26ce467f
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/metadata.xml b/app-arch/ipkg-utils/metadata.xml
new file mode 100644
index 000000000000..4ee7c3da409a
--- /dev/null
+++ b/app-arch/ipkg-utils/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>jnrowe@gmail.com</email>
+		<name>James Rowe</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</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/Manifest b/app-arch/lbzip2/Manifest
new file mode 100644
index 000000000000..445baeaf6bc7
--- /dev/null
+++ b/app-arch/lbzip2/Manifest
@@ -0,0 +1,8 @@
+AUX lbzip2-2.3-s_isreg.patch 500 SHA256 10b815ddb705e8d12a50694174b1c1020a3ac64203ea8c253e6b2a0f0cfe71e0 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04 WHIRLPOOL 94129a224b1b68d0de839aa8d98ba1ccedef41291b4848368c5e2da49af4d0415bda5be594a788c1b19620d791bba8b33549102ce2332e1ab20ca0dea1ec70a2
+DIST lbzip2-2.3.tar.gz 630226 SHA256 d3110a2b9e19da277dec899f7a3f435cc130a518f6a43094ec4e31ca15f93eaa SHA512 4f694445cc90377bf8dac5046b952ff174db571f390c2d7b0aa001f73c76f3d3f048ff8e7297c2055ed1f7b210174496dc31d6628e1cbeff63146a36a442ad4c WHIRLPOOL 781c9e07eccb633eeb713a9e4f821e0a75102e182d6a6ea4dfba7e33aa96afbfd92fdd5d0e9818ec4c41cf86733fe0396bb42071aad7a47c5e4cdd6426812527
+DIST lbzip2-2.5.tar.gz 651399 SHA256 46c75ee93cc95eedc6005625442b2b8e59a2bef3ba80987d0491f055185650e9 SHA512 76e96cfa75b3ed515b2f891349dffc1403daab2dd0a2a614fa0c811cec6ca25faa395da08ad68a9b6ba4069332c4571f70fb7424f06ef3d800c3082c08d7d3d7 WHIRLPOOL b64e70239d89782499cd59731130258d0432dbd69f84d1bed2adb7f573f706ab635a80bd2e2331231f4aad0c92b51151a0c45f192f4fcea9579fb1eef2fa8708
+EBUILD lbzip2-2.3-r1.ebuild 806 SHA256 8f6b790889bb957d9a8e375fae7cc7cbd0d1230892efc03accbe98f0d15678f2 SHA512 ce7cb5acd3357e7ad80c782c90c6decd8a9ff6041064988ceb454d559058c1f531c92a903324a2b0e64560119fae3f03f54c6c8fb9b00345382220b5c52338b7 WHIRLPOOL bb8ffd895c4f4dc81d142032ab80223743c3d4869c19715fe03511c0bf01ba2f662d4b73849be93a9b2bab8d906abcd5469762ee773fd6dc493fb5bbf31fb2f6
+EBUILD lbzip2-2.5.ebuild 826 SHA256 00ec47665ebb8c31322821216951467a9bb9d42c7cf7d1812a0aeef2d784a207 SHA512 f63095d9320ab1ba66a8142b13592c5444e79315e1d765da3e47631df79e3b98ff6ab325725ab1dd00990c92190e05c9cc3d098b2b79340568435bd6033b03fa WHIRLPOOL 925b074f2460d7cc1a0dab38cb5745ea5d0986542efe9ed34c6775ab21e3c9c9142dd1991ea12213dce95927ee3de119e4a33b7c9031516281d7fd0659323d8d
+MISC ChangeLog 2609 SHA256 c21aabf947f70e6dab0fb0d8fbc246b6c4e282d763adb7660f8eceb8b3eb62e2 SHA512 f371e4ae51b62c4b3b262f4fe2aa79f721ee7fd25741f5830c2621363601a50413a291d1b7da1b86d1be395db2facace78f02bd4061af68f53d53930783c8221 WHIRLPOOL 47f1a8b6da7eb8609631c32996c360529f772b8d828dd833a40ea99fdc131657f20123d76343a9da9e859e99f0adacb191f18f0cc0dc32b013e5954d78ca4050
+MISC ChangeLog-2015 9240 SHA256 bc1fcf75a15f16e43d687f2063c1f65993749f3a481632835a99a1a76455571f SHA512 f5dd73ff1358b6b8cc792d51d10a00472ecb4f0aafbf4434fe2722f8ecda04e250a001f1e8f6448ee4d51521d532af9c1c44e1edff4d30f279f70071ba39fcb9 WHIRLPOOL 7c57229779b1c41f56625a26c8357855488d221b94eeb1b1fe73273dd2ab37262b5dd25766877ebe44a2f3cbfb24b8e382eb31723f7797b3545fd74b8ba181e2
+MISC metadata.xml 544 SHA256 e3747415635a82c67ebcef4fb09bc6846c435bc067cefdecf5962a65df355fab SHA512 1e8feee62245ecf708787955fb4fd1dff60922ac7c165783fe0f3636afac000c808407656c06ee5ed166ef787365e15b5ca6b1f87ffcb851adaef45b04ff5bd7 WHIRLPOOL 0f7c1a9e52324a300a973ff53e16f7c009b36cdc8b377de9e678d27991cb72e4264b5e08e38719001b22c7670c48306aff45354041f076a9767fe23608da066b
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..b2cb1790e34b
--- /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/Manifest b/app-arch/lcab/Manifest
new file mode 100644
index 000000000000..c17a950361cb
--- /dev/null
+++ b/app-arch/lcab/Manifest
@@ -0,0 +1,5 @@
+DIST lcab-1.0b12.tar.gz 74907 SHA256 065f2c1793b65f28471c0f71b7cf120a7064f28d1c44b07cabf49ec0e97f1fc8 SHA512 7aeb1b2aa0b9171963b771cfbec13d1a6d4b2519f0f6f2705b505d0ec7a7425764996de00ed1d2919d08c525617d029035a586e8c7e2fad2f44945fddd2afbcf WHIRLPOOL 4550fac41b3b990b0e9ae31f98b85e1e931c4a0508e64b14f0f0b26431d3afef74e479df5dec7051e539b796747637726652a13a49ea1767d3b8ead09f09ff68
+EBUILD lcab-1.0_beta12.ebuild 510 SHA256 7f427d94b4ed0a98c1cc07cbc5e8098b5ddd99de23df32f551180b079cb74694 SHA512 2e8a844f3ad6aa5d13083420fc569f901d1998304e446b8cbceea18a213d79847ec71753bf42b00d70cd7eba22913a9609836b1c18de3bf0c95af7e3d5d002bd WHIRLPOOL e0e155058f4044208f28210b42d056b84639833ca268c47c2553132e1745ffb30c9413e964450b27724a70b98feb54643b9a27699cfb4835422083f7661e9256
+MISC ChangeLog 2298 SHA256 ee20955a9ae366ba4d65ccee6d07e8aae0b82aee94af4e70636b41b0934c2db2 SHA512 0121bca9daa39b5eb1b08058b6fc1b121f4b5ad97e9a04f758c818985a25d23f8b670b89b570ce17742aabdd372402d19822bb775c10e3a159cb7691723aa629 WHIRLPOOL 85b295db6a3d5326363ba25b58f907bfc924e58ef9c1ca82a311806d6ff46a9f0c1d7bfc512743452d15eedc917116311a40cc6f5db0b37f5a431ec9884c683b
+MISC ChangeLog-2015 612 SHA256 ea0e59370248764995d6297501c8b0aeaf1c97f834438205495f95b839d11876 SHA512 c524582f8f76b811fd64d4494313becee9023bef4ffa01a37909abdd65e6758f27dc6b02b312b0959e7f5fa13050e5f46ab2dfb15b332f376dc98eebc1383942 WHIRLPOOL 4b920cde75ed47ed0285c5b38955c6dafd9e26474251c04271217f19126281d15fd7d6e297129349a8715e647d4b313ef489b04c4a7ea089c2114bdbbde8a855
+MISC metadata.xml 254 SHA256 0a313097cf0b8e7ab4515b874a7be66d0bc00a72dd515be695bbbe759d5391af SHA512 4f49e274a25d8374ea5c0ee60853e97bbc8fabe1204ba596a513e4b30317b16e21826ddf4afa35c34e71bc0d99d086f2f89088242641df76106f88147bdb112c WHIRLPOOL e28fdd23fae66e1123a05f238b9a3425366397bc36ccdb1dd4502956489216c0cfd0901805cabb75e7159fc2c053dfb9ad9742b6e18e4aaaca0b4c5dfcce17a6
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..97f89a99b884
--- /dev/null
+++ b/app-arch/lcab/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>vapier@gentoo.org</email>
+ <description>do whatever</description>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
new file mode 100644
index 000000000000..0ecc1bf83882
--- /dev/null
+++ b/app-arch/lha/Manifest
@@ -0,0 +1,8 @@
+AUX lha-114i-file-list-from-stdin.patch 991 SHA256 f54adeb588365f50ec81b590254260254e58100a936e0a096c5f25964f9afd8d SHA512 fb3e112ef592b7542cab4cd34759407b5bace3ebc83af0aad52daf9d8584ec897e26ef1e0d4cc3656c1b0bfbd5eb242dedc6fb0a8fedce765ae30735a95b79a2 WHIRLPOOL c667324d271a79c7da83329e98044b64f41f2d6c99cc4411f37bf6a073cfbccb614875484d72af09f2fcce6e5c12f445c5d0f176d59f2a104194a973b2357466
+AUX lha-114i-fix-getopt_long-declaration.patch 267 SHA256 ae54c105caf6ed48f32e2331d5c900c1234ddceca004c3af8ea5f9141d800f18 SHA512 c0e23d742a4e37b86f69e7096eba95e0c41619e2a459d526f5ede31ec73d2cfc14b3660fd1741c68e40d2ddb9bfd7c4250f275edea3965e1077b1a482a788f10 WHIRLPOOL 6a223ac3d5bebbb2b2e39165a38462f449f469ea9f5cb4ac8fb51635e72afffa04b3ae9e9076d334da40efbfad78f119ec643caa252c25a92e5cf28e860ed369
+DIST lha-1.14i-ac20050924p1.tar.gz 285518 SHA256 b5261e9f98538816aa9e64791f23cb83f1632ecda61f02e54b6749e9ca5e9ee4 SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f WHIRLPOOL 2aaa99fa8106423fea381b4ebe72e7a454008032be88420d9d92d8cda0c9e4f38857909d5e5f6fb0303db0311978eb2ca64ee0465beb9dc780a9f5be2218e774
+EBUILD lha-114i-r7.ebuild 991 SHA256 528d5afc6bb90c134aa43c577a0e0d3967fe88edc9fae2bd7d7f699e53fe056e SHA512 58af6daefe2f32f9479496811c78e0b224196da43f798d9734ee2bb4e78fcefd143bd2b01b409c8aeb1a736e6eae3548ef483e4a829b0a5a8d52dd226426a1e5 WHIRLPOOL 2390524cca419755cdedd9d6a10c87852108eb5e6fde46f0f008a454f33e970b8594f13c42ad3e508a6684de78f39c1c1c772dddd3d606dd0c0c844ceaceae56
+EBUILD lha-114i-r8.ebuild 1147 SHA256 3830bb93c8f7374552c98139ed8e00fcf5944b0f52da50534a58f3b1dce49bb1 SHA512 fc3be81aba9e9f7d9a27c753ea187790956dcec389a890e6d06e939c0aafdc88a0b7e579f05f57809950f88bc32777b10ad3948b95fe27a41cecfd149ef08544 WHIRLPOOL 8d51976543a2a06ff2a981a35d3d8c35d62c2a0921b8cea4e1f0257d534cee18b0c3d4dec363207b4061cf38e5573d0b27166670d2f5bfb6de80e9fecb8879b4
+MISC ChangeLog 3230 SHA256 eacc813dc4ea6e3c56bfbf3fd4ff47bad2298da0f4c21cedc93d0e5caf7d0824 SHA512 d13066ea248ac5821b9bc89648bcab082892b900c6c3087c1e790d338bd3e655c416a70f5550964346e346e4ba84bfb0ae1921ca57306b6b5284a216a10976bb WHIRLPOOL a5269bf24d718228e5278b3c053463f1b9126d35208e1406a973fa1d7974bdf41aaae937d9d60bec2623d8fbb90239dd61518b066aefa9ac17fd112582672c57
+MISC ChangeLog-2015 6744 SHA256 49a22c4dc6c5b9074d627c0345b4e8a5ebc540be7e0e3050d985e0de4fd26776 SHA512 9fa30fc4e14d7d0931ca5ffdfbdf89fff4f1caf7ec68c5f4ecb1b64295715c22f7591a3d27e467126e07cc1d467b21cdf961fccd4138caffac028d3c3d9891ba WHIRLPOOL 1c6e2be6e8d8256e5f269bb1184285642ce28f85413e496a7cfd1c111b09e18da28a2ffb90237cdfd3db3c50eccadcd8f68d7fb339f85d8fa342d08a89dd37bc
+MISC metadata.xml 534 SHA256 8dbe9ac33d531a9762089736045595ae08b6d68206330d4a12c3bdf7c6fade56 SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f WHIRLPOOL 4e68d174914fcad590e2e783a7d1a29764de64554d9aa4e9aa914ee3e3a762f0cd17ee981820788e5dfdfa0d2ee90e93abc188fd025109a177b862fdc90fa780
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/Manifest b/app-arch/libarchive/Manifest
new file mode 100644
index 000000000000..ec3ca9d873bf
--- /dev/null
+++ b/app-arch/libarchive/Manifest
@@ -0,0 +1,11 @@
+AUX CVE-2017-5601.patch 979 SHA256 e6177bd052090a2111d62c7c68157df71cebf4ad359aad02ce89d5585c9e64a4 SHA512 a2c8507698166b3d4bbd197323a15cb82d53a647f2d0c74e17e9b229e4f1fd44c3f0468b674c0dfb693ddad7fc7c5cc4f00fbce1e607d0c02fb90d59cc9e09a0 WHIRLPOOL 032ecd55d3464bd39751f906d2ca2b3dd3d95a8dad8020ab474971b7e013399faa9089c3ca728627e309b96b51e6839d35e558ebb05425afaeecd043bb6ebcd4
+AUX libarchive-3.3.1-libressl.patch 825 SHA256 78eb2693cd7d8b3a8e942f41a5485541bb93911e05364ae02f4355aac8aac4ee SHA512 2418a281562ee5f0e4f54ca181c68265f6b72a80786d17f45547222a3fde83597a17d88075e5f9c5d52a2688d8890006f592a129ddc634397a9160d16724a12c WHIRLPOOL 1f1a6d98cf9f5d639e4630b002f2dcc3ea50a027ba1a08b461173bac3254b9f7fe4f0f70a05e944ca736c9121cf1e02a01670d3bf99a5c645b1a35f423cefb70
+DIST libarchive-3.2.2.tar.gz 5458241 SHA256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 WHIRLPOOL 8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef
+DIST libarchive-3.3.1.tar.gz 6219943 SHA256 29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164 WHIRLPOOL 07a8a5f700c62d61e82d6bb123b5e720041b1ea296c17f189d4494ef4dab58b2c4d428c12fe8221602c7ec5d8eca859f8c288fc9b9a51d8a511fb01051dc17ca
+DIST libarchive-3.3.2.tar.gz 6236562 SHA256 ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 WHIRLPOOL 6afc8dfca6474933383619e15c750b08ecd1553f3ff244c60cd43502b3d177be9633a2d2c80d9ea7846af21ae7dc59f32fd79cface4258a1b7b00e60e3a5f7a9
+EBUILD libarchive-3.2.2-r1.ebuild 3429 SHA256 bfb49ef2389a9d6f7dcfb0b889b01041b088a3c9013ba3fccd6aa08e7439580b SHA512 0b3e1059ff5b1118934591f2a8c9c00c36c4104c72eddc9d831a66e6ce0254db04513c05e3856e53b27e5ba422b6e5ded6238da56f9d9c23f66dfa7f4907feef WHIRLPOOL f1ca36937cf1d53ad000a034b49a95b81c09901ae441a13bf2bf31a76f1a16c0b14a69ed400603aef2cd60f3dbc65d242f0c1df2f27c4dacb225845046510107
+EBUILD libarchive-3.3.1.ebuild 3301 SHA256 0861967230ff5fbab418f7fe0f885183660ccb5eb07ae30782f284df8e53622d SHA512 9ca60ce4e691485881875f4ac3f00798e3e055a2524f67d0bdc02d86a62951efa8db6a35b5b907c9cb54882cc1a986dee5883ca47828a39e4edfe5a6a7eaf4ab WHIRLPOOL 60a80c9af648a4ac2a5a01931cd840a73b12099bb192299a5b96ecae82ea9424cc04ed1b75328c767cb103a389a509a47902052a94d6a630db09a826512fd678
+EBUILD libarchive-3.3.2.ebuild 3314 SHA256 4058bf6b9e1b49bdd8583f20dade4ad04b6c56bb44bcec3d0c7241ea8481053b SHA512 465cedc1ad9b10c83a8a218af0b4fc50207dbf9593a25bb0292781a8b7f141950496b1909ce355174020a97c63b88322c41806f9215765b7a8e5fa6743bbb5e2 WHIRLPOOL 7455e915a3e1d5d053d547dd39c8a941bc6a8b1fe8a2043811bb9d3c969f61b57c200d391eaef84affdefa298a6415319b960bb890a109a040fd3a9875a63dc1
+MISC ChangeLog 11118 SHA256 d4ade993917b5c234392da6ce565f0a2a74e60ec197c1ed09cfa82f58cc3fedd SHA512 2b972dbdf28111b28d188aabbc5c5362892ebd8882b3e2678efd603a7f0b438d2873bb98cdabf72b8089b4c4ec1f1bcef31af1b928ce93f361cfc5f16d6cc466 WHIRLPOOL 6d1efe322aab7c029ef0db51a2c6105f1e93c582465240da9471dca97dc2fa50149eb1acc84c8de80bebc4f2f81bfb76089dd9ea5ef6237ca162eac86e044cc6
+MISC ChangeLog-2015 35658 SHA256 5d6739081fe3df492178d0522b91f02761d0956ffe6cff8ea716b93519bd0310 SHA512 28edd8ebd92704e8e6388c261b82cbac5ffc33185c8b8666b44cc06b75186036c7e04cde6c7637411f717590aa41350dd588932c1474ceda1c5b9ad23828b02d WHIRLPOOL c7d02fd3c18ecff0ecd32d7865080c096e9469e07b3810c74c5d8894044e8df4088cc8ef8d898d3452cb86d760f59715bb41f58286b8cd4292fb2d8699f8202f
+MISC metadata.xml 1382 SHA256 7e969629dbfb9592985ff032f0c1beabccfc026c34a61a4541dc4bd234603c10 SHA512 2fc0f4507ed02a226dcfcd174026c55ddcf3d22b2ca59c5a2bc5b7e9e9f2943089196267aab7c4292d1782d954123571656ec15c5d24fe19d5b01557c18013b8 WHIRLPOOL a11b206a996385d7c538736655f347019ef4410b12701cb00b77292cd8d8e03a8db81949a3e4c1ae47616044b58a98a593bc0832a4f6ff072a629ca11de7ee8b
diff --git a/app-arch/libarchive/files/CVE-2017-5601.patch b/app-arch/libarchive/files/CVE-2017-5601.patch
new file mode 100644
index 000000000000..4ba85ff9072f
--- /dev/null
+++ b/app-arch/libarchive/files/CVE-2017-5601.patch
@@ -0,0 +1,24 @@
+From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin@matuska.org>
+Date: Thu, 19 Jan 2017 22:00:18 +0100
+Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
+ Fixes a heap buffer overflow reported in Secunia SA74169
+
+---
+ libarchive/archive_read_support_format_lha.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
+index 52a5531..d77a7c2 100644
+--- a/libarchive/archive_read_support_format_lha.c
++++ b/libarchive/archive_read_support_format_lha.c
+@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
+ 	/* Get a real compressed file size. */
+ 	lha->compsize -= extdsize - 2;
+ 
++	if (lha->compsize < 0)
++		goto invalid;	/* Invalid compressed file size */
++
+ 	if (sum_calculated != headersum) {
+ 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ 		    "LHa header sum error");
diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
new file mode 100644
index 000000000000..8078bc09210d
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
@@ -0,0 +1,22 @@
+--- a/libarchive/archive_openssl_evp_private.h
++++ b/libarchive/archive_openssl_evp_private.h
+@@ -28,7 +28,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #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
++++ b/libarchive/archive_openssl_hmac_private.h
+@@ -28,7 +28,7 @@
+ #include <openssl/hmac.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #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.2.2-r1.ebuild b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..34485b16533b
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/"
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/CVE-2017-5601.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=()
+	myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+	)
+	if multilib_is_native_abi ; then myconf+=(
+		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+	); else myconf+=(
+		--disable-bsdcat
+		--disable-bsdcpio
+		--disable-bsdtar
+	); fi
+
+	# We disable lzmadec because we support the newer liblzma from xz-utils
+	# and not liblzmadec with this version.
+	myconf+=(
+		--without-lzmadec
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+multilib_src_test() {
+	# Replace the default src_test so that it builds tests in parallel
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
new file mode 100644
index 000000000000..a7a6d960e76f
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.3.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/"
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.1-libressl.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=()
+	myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+	)
+	if multilib_is_native_abi ; then myconf+=(
+		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+	); else myconf+=(
+		--disable-bsdcat
+		--disable-bsdcpio
+		--disable-bsdtar
+	); fi
+
+	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..880de9e8b234
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.3.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://www.libarchive.org/"
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+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..9ae27e81711e
--- /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/Manifest b/app-arch/libpar2/Manifest
new file mode 100644
index 000000000000..82d717a084c7
--- /dev/null
+++ b/app-arch/libpar2/Manifest
@@ -0,0 +1,5 @@
+DIST libpar2-0.4.tar.gz 516613 SHA256 316d6f0eb31eb896f5546171c2e86801aeffe5ae5e2decffc17f0018346796d4 SHA512 36d6f91bb3ea94dca1c4c45be41d37662a928bed39edace1a38ae0ad167804308d252a9fe49c2babb194b297fa4671654532add3758b7d7d528161cdceb278e6 WHIRLPOOL 759e9b4b211e1680098f7f61464ca6b75c6177ecdb7897f3f926db4479cb9e1a8e5f3888db24a9cf89218078cbab33f52dd7c69ccaec412074eddc06b70dfa2b
+EBUILD libpar2-0.4.ebuild 673 SHA256 c1d3bcae96b0424b609368da28407e3c9caea10ea5014efcd91c00ba9a66163a SHA512 756949f83e667ca42be78185128ceb7183c9dd1010f1efc37d7faccdfac9872acfbcff1bf606e0aa80d319a66dc725734dfbe78371e515f1117fe89455fd741b WHIRLPOOL a7f91ddcc4a715961363f864dd847191d0d4a4f20c4ea0f47012ef08eac5c6a27f396c11498a0f1dce49f9826b458153f5ec4adfbd4020eb7b9f1045c065b966
+MISC ChangeLog 2328 SHA256 ddb5542edd2edfc888c7fe9426411fa3c5eee0521da48807cf7b89cf34fdd2f6 SHA512 7f3e713b01676c161a141e0c726c09c481ab62e99ab74e044d5fac94ccb8c94e68f8778abdca7c8fe2916fd9eb48d65b40e08707f48bc852508abe164077ac30 WHIRLPOOL 99e43111ca7745920e573a0e9f8d6266a81ef5d66ff8d5d025e6e11caa91ff7b3f24bc6ae0892829dc0dc96d53f405886d547846c12bc4b59b48896dd04c29db
+MISC ChangeLog-2015 4377 SHA256 50f7e3dfb9bebcfde085ddcecbbba109b1a6bd71b8a6e426b48821f1d8515767 SHA512 a80d894b0da28e6052d0a74bb39828b3ef8ec8b097cb69f975d4713f24ae6f2a62624c8cd44e0a9363abbb1183bdebf054b6d8e6d303ad41d821c9a0643b0c58 WHIRLPOOL 7cc221797912c1da5daadc4d44c3cc34f0ce29e3f8ce85ef2e22e5582b0f9610cc14ce6e3cf2ad860383b226bcebb6c10a6c291d025321a33b77e74058e7c047
+MISC metadata.xml 331 SHA256 2abd007809180ae36c4aad3be2afa48253d25effed92dab8cbcaee356757d859 SHA512 4f615121ef89e72ea1c0a9a38e197ffef0edcd9603ec716e56c933acb24e5958f574a911319d389d94b4faba8fb4815aae7dbe46979f9d922cb71e2352162191 WHIRLPOOL 657cca3eaba577594dc97c72f8809d5efc370dbf25be83b5fcafddb20287ea5cf6fce867d30b593dbdf5ab6113ae7b23bc23f25bd58f8a8c3190ec808799401c
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/Manifest b/app-arch/lrzip/Manifest
new file mode 100644
index 000000000000..461ca13ada7c
--- /dev/null
+++ b/app-arch/lrzip/Manifest
@@ -0,0 +1,12 @@
+AUX lrzip-missing-stdarg_h.patch 259 SHA256 36f6479bd9155d811c52c2afcbf9a2756e6b4ed1bf8d8448cbc6058a03669611 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8 WHIRLPOOL 83ffb782b84f87b744ac6bf823c668875b1715b2b06852e7ff5e2c01255b61b468015edbd2fcd715cdb252382fe080d0ce4510f4a654d16451cb945583e80cf3
+DIST lrzip-0.614.tar.bz2 491995 SHA256 65024d69d1773f3ccf84508a481d7de128c03d1cf9750b5803aead4a24522763 SHA512 6c82d7b4cc6081fb4f102a34f3a5ecf834b3fa3d222ac9dd4f3f0615c83610c08315eae9cc98291bd5e3eb71453cf391cdad4db980012e4368d16d80f34d2bd8 WHIRLPOOL 1669d9e551786f81c3849b2bfb813422cccc21c9d00104b58d42a0470ae9b8633339ef88ead6c5956eea92ac6800ee9b259fbfb15d1b22aa45fe92db7040cf68
+DIST lrzip-0.621.tar.bz2 503286 SHA256 31c26fbee8b9b0bd413ca214862dbc0d9e6d3477f23e9839774936bf140ceb6b SHA512 be94f54c3d84c93e3c1ab7b08ca6d2a02bc343983785be4884f42521520d2babc31db3abbec4b77dc9f710d18648adcc3d24b203289d8d4728afb3ef0fb90c0a WHIRLPOOL 41bd08db70f30ff183f3e82e784a40b08070a3a728eafad50b64c7ce453ed2c379721be64d0ac0ee04e1c66b6ad528d0210977624a8c17f90775f70b83921ae7
+DIST lrzip-0.630.tar.bz2 521517 SHA256 2461f6bfa3231a98a76548741cbc64a2389e94eb5c3de152df8a118e23edd307 SHA512 fa46a2e9cb2574086d24296b7376865ac9f998724041c00e69f28d4984a6b8f7441de7d7fab2820e6cd6d6da4ead8ba66d0eb18f0381e8438db09301fb009460 WHIRLPOOL 41cfbc661d38fcb183107dedd4a03fcd740ec40adb040e79021cda97172e20ce76a83ecd1e53da0a498ccc5d3a093942f85a33ae39d87297adbbe80cf3786e3f
+DIST lrzip-0.631.tar.bz2 522158 SHA256 0d11e268d0d72310d6d73a8ce6bb3d85e26de3f34d8a713055f3f25a77226455 SHA512 6420cd465ccd4581066408482335a82089f84f0aca1b05249b9fc6039b7e67df94457a7c871859e363206df3a40e93cfde576388785113f6c99b31d34c00a307 WHIRLPOOL 1973c0d6c046ed5600ee092e35acfe0f52814b30312d33baedf2c30dcb1727c373b2e42c4bee4831ad2e6dce67792379d081df2b987f7915125272d101132645
+EBUILD lrzip-0.614.ebuild 752 SHA256 4a5b8cdac8751e224b091fba751a3147e9def60f8c06a886a1c1751d9a8f5ba1 SHA512 6dd539c3a4c9753d9905cd3ab8a61bf3564055a0903e41812c891da156d55672a4978ec05dcb05481a321c94859723bf6cdcdbedd55929d624d6d165eb61b19b WHIRLPOOL c39ec3a77196f3e835c46876a97838ab55f4343d7d5a166c4cfd1c5153bd0b0164331b51e2dbff58adc65409c11d8d8215912d585c0991f68bd444c77b3db929
+EBUILD lrzip-0.621.ebuild 764 SHA256 c78787fe5c28c289df690067757773a2f9b6a719beb106e6962580be0f59acf9 SHA512 8fee8f421ebdb8e7e6f66cebbce65346a82f18a8e290fda9dc6295545c9132bbb2f48c1f30f2af880a939ab60f3ed58f74a15bb7939dc8390788bad0f84734b8 WHIRLPOOL ce1e3e2b64b37937a3b8f77306724670b3db312a2d5e27217e17dab9f92c497a09823921a3a742ce5f5308cb5818fb6c63a8dcd8df342820b759b566cb736368
+EBUILD lrzip-0.630.ebuild 746 SHA256 af7d3bb2db32c1dbf23b7a668c3473ff3f8a04f842537683878d1542d5bfbf7c SHA512 4737636d13d31d93308c2dc7525de24e2ae02270927d313b822e59adb75dcae8a16d66a5084ce1b1dbb9b694545fd2a1c6889781f8d2a0bc31d406a1142be6d9 WHIRLPOOL 40d88ee668f606e627f6775cd03ec14750951de37fc5754e090a1fed05abb1f13c9a01e5e38d73e455107665b7840ea47afdb037fb4ed306cc6071eff98a7726
+EBUILD lrzip-0.631.ebuild 746 SHA256 1816f84b1780b001e4aff2987895d6284896762cf90a1b0df7f52ea13a777704 SHA512 595169597839add97430c60e01af629f25b474f460ab855d973695aacf2e77bd5228dc188419d87550b48c942e74d56ef2cdc9f48d397863338aca0eb5e69378 WHIRLPOOL d12742309629be042af6f44e1b7de07900273f55ba2d1ed25859c8c8a8188278fc2378cd238f5f581d5fae37032e9ffbceed49a74947e42d771b0b523147e42c
+MISC ChangeLog 4414 SHA256 87795b1813e98040123aedaf434e6b590758328d2ffafc1a5450461169d63c98 SHA512 f395d7ee50267f3530237f13fd5e047aa6c3c1cd106b150017245d348361953b6edda21660b596c105728477b68ffab5f724763d8f6dc7c117746adee0d27c39 WHIRLPOOL 9d8470916c94371b183018d94539e28edc9a74fa215c783f80d3045928c23dfa771312a8cdd8395e532fe5c80be99a017cf0e133eaf74d1d27e51f4871228d84
+MISC ChangeLog-2015 5014 SHA256 ae4461f73234f90fd9184102be7fe4ddafa0ed0c8919215d7d4e21a55d4f1d8b SHA512 efd7b993928409e4b205f722e772cbdd741573f6d37e9d3d23bd8204072ede3997f16eb39ade3507a14e1b60b343cf6dd7509d358b14bea172ecc6b82cd1d5e7 WHIRLPOOL d02b776e83406753d612670d1495f73a534d10a90f8089f9594da58043f7f66204c17e624c909c0428df2f1256e6565d1f9977fca4e0b4363eef470a4d99d34e
+MISC metadata.xml 581 SHA256 faf0bfe169736984198681c84ff5f75adb3bd5b9da295dcd22611cf8c1addd01 SHA512 392a7bd77026e5e4726390c4fc649805234b6fe2803115f205e22f7669675cb404bc0f1341f16ba59c622e1c922300b3a4dc0466b8c420da69a941cd49954c9a WHIRLPOOL 0a500ff9f611eceb9e0a97a8204ad7e94614d43f2b0aa7e9f7b7257dd5671c4221dcccfc716409bdff77472fd8fd48f68c3caf54499c51ba80760ca4d2e267e0
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.614.ebuild b/app-arch/lrzip/lrzip-0.614.ebuild
new file mode 100644
index 000000000000..9f1b6ec91236
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.614.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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="amd64 arm hppa ~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.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..d3b839bd266c
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.631.ebuild
@@ -0,0 +1,35 @@
+# 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"
+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/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/Manifest b/app-arch/lz4/Manifest
new file mode 100644
index 000000000000..3a346984a6d3
--- /dev/null
+++ b/app-arch/lz4/Manifest
@@ -0,0 +1,18 @@
+AUX lz4-0_p106-cflags.patch 630 SHA256 fa5a2e429ff7bfc5ff3fd02e5e8078d44f7c704c402d259546c00ad497d445c4 SHA512 0c7cc51229fe20ee0c5e5cb3d933f924750fe3aaa0e97ac78f1f74e4810bf4d9d431990cf12992f25f29dfaffb9dc66b42f3ab6d49147ff881a5cbe49990a89d WHIRLPOOL 754ab3e1cc255ff5226771edc9e9fd977644cf887c49048f4ac1df4e07a347a9dd707aecf952c6223f9b23944b5051fb0032a0605e00964d3ab6af91cc7d93a9
+AUX lz4-0_p106-install-to-bindir.patch 2141 SHA256 3799ef8a56f5cbeecd5f6ceb8716454990087965136322ccd99c6911e60dc924 SHA512 853be770173b46188c4f293f13c263053fd3837c23e959b2d19e36c5d3c8c04798b619224fe02b20f414494baf4db4235b7c223ce665b9b90f14a655c8303f8c WHIRLPOOL 6aac55ec15e8b82a16b06faa50bcb362ace5100bab3788d81ed3618f6efae787664855db14bd0f5393624647d13df40214f873ee7da24d505f9aa4fb371bcdf5
+AUX lz4-0_p131-static-libs.patch 1515 SHA256 62b9f3fb9aa0b22d7aac8ce6fb7aa9acdb83c5eb8dbfce719fdd43e0ca939e3d SHA512 caa55637529c3b723d95965eb1c3ece4551abac6bbaa16cd8c6eae05a41e8be2cde9d67c2099d47a4d62f4e9edeeaf87e532e11fce94bfea953132b5bd7a4732 WHIRLPOOL bc5e7da4bb35c482ea62abfa77a65826427e835509741880ba7f28d005dda3c8c9ae51bed1fbbf4fd9f9b405580c1ba55fdde7b60195e0173f7dd28ae7612c47
+DIST lz4-0_p106.tar.xz 129352 SHA256 a9a09c4ebb962995d10e7e4f7d9224aaa93f308899de18a414948a58e87b6f22 SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6 WHIRLPOOL fc5bb47b73606b125d8e155365d1fe101083e68e684ffd6014440e0f1416f1f6ecc64b797083e6939bd3e8cd42018e46a1864ae4542160c96933a47df9421a42
+DIST lz4-1.7.5.tar.gz 208019 SHA256 0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e SHA512 b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295 WHIRLPOOL 961c56f36a78a4703403a95b54efed8fe859b7ae6327a1318112e322052655aa379e37c34a1d9e8f11397e4f3e14b5f1dfe60083e253dbf20fbbbbb753c28c1b
+DIST lz4-1.8.0.tar.gz 222840 SHA256 2ca482ea7a9bb103603108b5a7510b7592b90158c151ff50a28f1ca8389fccf6 SHA512 aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535 WHIRLPOOL bb32fe1dde5466e4dc9a9144dba305c6bf57dc0b824063e14f87ed900e87c214598dc18562e4555cdca75d7cca705413c7458b1d0bf449cc3752fbfa1fdea009
+DIST lz4-r120.tar.gz 161950 SHA256 fa02b1bcc26529c27cff0883d830914bdd1ba41a87035313e1050302f17e4b07 SHA512 8b27c57737ba4c2c8e4f00f7ce13f6edc91f74885bad66dd521dfe85d427e0fd78a300896d599bb8642a34fba78446daf207d1b2fd8e91543d4c093e53694e86 WHIRLPOOL 6a0cd7f8caf9799130b13b3f282197b5ef20fb987f0f5f6911f71a0f5d5d37c542976be5f13bdd2e21a8edd0a6cc8408fcc0f69f6354a0fbc7df75b22fb9de91
+DIST lz4-r131.tar.gz 133784 SHA256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5 WHIRLPOOL d605dbada1d4eb84eb6f3f45417eaa35433b1e3e875af560bb5fa06f0465f1652fab74c094d0d743e0034abc0067c83114827e21baea69d5c3d6d95062d0f660
+EBUILD lz4-0_p106-r1.ebuild 1271 SHA256 fb2df96be7f4bc701a992c1e71cb271799756c19c6cc12331f8fdd3cabf9d168 SHA512 7bfd1129e14b73a28c8970c3ec93a9fa81725e89ceb6fd65f31e0a6885acb260d76fc8185a1e44d66861d83335eaa3ba8dbbb52e0a3668b9114b72e5f9ff597b WHIRLPOOL bc7e50c59580324d6cecebb33c12f3e011769d8d88a20d4cf6c773a5c7f8c803f34149cf5906c44ca9ca345697dcbbd518f75e73cef2e9650e9923633791972d
+EBUILD lz4-0_p120.ebuild 1179 SHA256 b3a755032e9d4c497a5b3af7236c73c80b223552e7504336d400f3366a56d40a SHA512 fc9390f7feea6763cb8f75713154b01f3e2b97acf0d0964d3c38644ee38d97bd46a474780254fb44315c0561f2191cfa2bb86387e9e2704afc989480726888db WHIRLPOOL 325aa596fb1d061177e5019f54e4a4ada87730f3f0af1f0e65bb8584785af74b1ede06ad8d00ed8ac3aad8437027ef94331db525da4eac76ef25a4114d1fc16d
+EBUILD lz4-0_p131-r1.ebuild 1665 SHA256 72f6cc147039298a6fbef3b2351a04b69471ae2b47f63e508902a6d6fe935f32 SHA512 f146c7c9202873973b676e197141618439a4b20253715284a0a2cbf0ee3193e65cc80157a5da152277b21fb188e89be1704dbf176e2035d0c39e7c2814bd6d73 WHIRLPOOL 5723ba7250d6407008098cbd857c617ec3e14b2373bfc731572f40d97c7c1469eb6146c35b226c3173bf83b7022b7ae5af16ae58cfbe0f347596059670fc853a
+EBUILD lz4-0_p131.ebuild 1521 SHA256 dc330af4207f4d6c93b58c6a57a502667a465b9d82191d2c29cf029afe9e0bc3 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c WHIRLPOOL 4d82d332b6e195ab0fc4b7a1a87266c001f009dec587602641254d209cbcf4549d282bfc49c0df4c9f88e98d217d2706a9c61a6032dbaa82de71c639afa7b187
+EBUILD lz4-1.7.5-r1.ebuild 1033 SHA256 1bd93283b697ea419de4f157f0c40e3e1da5b9643f3c19d176b47213c087ebc0 SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee WHIRLPOOL c90044e2f9456ce98f0e14c266c81eea3e7ccc9896a7e16fcc7a66d165b6b7ef5fb79844c660c55038b9a3aa26f161ca7dfd5e03c7130a74e9b2e74ced05cd22
+EBUILD lz4-1.8.0.ebuild 1056 SHA256 7dd33e195ac05e42424a1e785b3b8c0477ecddc80ae86529cebb630e5755cf84 SHA512 86c066c80879f0eb335aafa5c5c86d081bb96e3c68f07d644ad2ee124fb82c978dcd01a73f6232ca453a929f58235ec92e1b4a2b56680aab6d34699011f32736 WHIRLPOOL b009a5f58cc723fa2a0380ccdd032eb392d155de9820695d2aeac7c4b38889b5ac6bdabd8b814de5e64bda5035c3b49141d37f152378899bbc29a916313e6e1d
+EBUILD lz4-9999.ebuild 824 SHA256 89a4e69f60bfb8e54a6c14544213f4a950429ede79b57f8cfad79c35c43661af SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9 WHIRLPOOL 2d4a59de834095e6a1161de610ed80a81d5c7ef2160fdee1d9010e75d7f019cd5e7c8b8ae6e194d4196bb5c061e09c9f3c98f257d32fe3b57249c72cba291493
+MISC ChangeLog 5889 SHA256 45088ed2b789596971f0e6e989edeeac080288a41fda7e5b83c9c257b00fc1e3 SHA512 3319133a34670593097d5436bf7a9cf72b55cfa2e3356d87e9482b065e42a444b9a506aa94d9055acabdb6c9a6dc366b110b95586c39bc3087a7453737d5643b WHIRLPOOL 5cc271fe5333d27db38ae24175bdf7b34f4c0cf02b269568921f2201b78c1952d0742e4be68a374087f5a77b0afd888bbfa76570f50a1af7fab7803827d6f941
+MISC ChangeLog-2015 5612 SHA256 c14d88245bbed1a6330d366fd32c7036be040dc2f5dda355d76657f034343453 SHA512 c5e96dc8ddf42733be0273c2f48dc2c58a994fbb467752b396118f6cfa32c9528e377b0e731dea340a2adec33b1b1835bce9c0f5e0b201f9a7880227eb29a4a6 WHIRLPOOL d66ff4e7b636b62d7bcfe2ee8a22412b2bbe6f2c1c757c5b73b9253391cdd29e6e0b09bb3b64f99cf88c2d3cff77400f779fd373a2b3ffae49aefd3325c870cc
+MISC metadata.xml 516 SHA256 f55e831a8af90be1cb9e4c0e1fa634f287fa9ca0439d4a2886db5949e9836137 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8 WHIRLPOOL 24b90d31f4728b01fb8899362ed7719a48f6f0921062d1d6c3f7a221e55c8cd9ef7c4c33ada9643246c30f29a161d01b057e70dc93a735de5623b147cf1e7f14
diff --git a/app-arch/lz4/files/lz4-0_p106-cflags.patch b/app-arch/lz4/files/lz4-0_p106-cflags.patch
new file mode 100644
index 000000000000..6fc0fbb47dd8
--- /dev/null
+++ b/app-arch/lz4/files/lz4-0_p106-cflags.patch
@@ -0,0 +1,22 @@
+--- a/cmake/pack/CMakeLists.txt
++++ b/cmake/pack/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ ADD_DEFINITIONS("-Wundef")
+ ADD_DEFINITIONS("-Wcast-align")
+ ADD_DEFINITIONS("-Wno-implicit-function-declaration")
+-ADD_DEFINITIONS("-O3 -march=native -std=c99")
++ADD_DEFINITIONS("-std=c99")
+ INCLUDE_DIRECTORIES (${SRC_DIR})
+ 
+ 
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ ADD_DEFINITIONS("-Wundef")
+ ADD_DEFINITIONS("-Wcast-align")
+ ADD_DEFINITIONS("-Wno-implicit-function-declaration")
+-ADD_DEFINITIONS("-Os -march=native -std=c99")
++ADD_DEFINITIONS("-std=c99")
+ INCLUDE_DIRECTORIES (${SRC_DIR})
+ 
+ 
diff --git a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch b/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
new file mode 100644
index 000000000000..521b1bfc58d2
--- /dev/null
+++ b/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
@@ -0,0 +1,51 @@
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 496c076..ce3fab1 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -41,11 +41,11 @@ endif()
+ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
+     message(STATUS "Build 64bit executable binary")
+     add_executable(lz4c64 ${LZ4_SRCS})
+-    install(TARGETS lz4c64 RUNTIME DESTINATION "./")
++    install(TARGETS lz4c64 RUNTIME DESTINATION "bin/")
+     if(NOT BUILD_SHARED_LIBS)
+         message(STATUS "Build 32bit executable binary")
+         add_executable(lz4c32 ${LZ4_SRCS})
+-        install(TARGETS lz4c32 RUNTIME DESTINATION "./")
++        install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
+ 
+         SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
+             COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
+ else()
+     message(STATUS "Build 32bit executable binary")
+     add_executable(lz4c32 ${LZ4_SRCS})
+-    install(TARGETS lz4c32 RUNTIME DESTINATION "./")
++    install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
+ endif()
+ 
+ if(BUILD_SHARED_LIBS)
+diff --git a/cmake/pack/CMakeLists.txt b/cmake/pack/CMakeLists.txt
+index a9b0557..e85416e 100644
+--- a/cmake/pack/CMakeLists.txt
++++ b/cmake/pack/CMakeLists.txt
+@@ -48,16 +48,16 @@ set(FUZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzz
+ # EXECUTABLES FOR 32 Bit and 64 versions
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
+ 	add_executable(lz4c32 ${LZ4_SRCS})
+-	install(TARGETS lz4c32 RUNTIME DESTINATION "./")
++	install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
+ SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
+ 	COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32")
+ endif()
+ 
+ add_executable(lz4c ${LZ4_SRCS})
+-install(TARGETS lz4c RUNTIME DESTINATION "./")
++install(TARGETS lz4c RUNTIME DESTINATION "bin/")
+ 
+ add_executable(fuzzer ${FUZZER_SRCS})
+-install(TARGETS fuzzer RUNTIME DESTINATION "./")
++install(TARGETS fuzzer RUNTIME DESTINATION "bin/")
+ 
+ #target_link_libraries(lz4 ${LZ4_SRCS_LIB})
+ ####################### CPACK PACKAGING ###################
diff --git a/app-arch/lz4/files/lz4-0_p131-static-libs.patch b/app-arch/lz4/files/lz4-0_p131-static-libs.patch
new file mode 100644
index 000000000000..f8c5c2de1e83
--- /dev/null
+++ b/app-arch/lz4/files/lz4-0_p131-static-libs.patch
@@ -0,0 +1,49 @@
+fix from upstream
+
+From 43b631223b2d0425a0970876974074934f89c450 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 22 Sep 2016 23:59:02 -0400
+Subject: [PATCH] add a flag to disable static libs
+
+---
+ lib/Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index b5352a0cb372..27b35c41b693 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -40,6 +40,8 @@
+ LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
+ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
+ 
++BUILD_STATIC:= yes
++
+ DESTDIR?=
+ PREFIX ?= /usr/local
+ CFLAGS ?= -O3
+@@ -71,9 +72,11 @@
+ all: liblz4
+ 
+ liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c
++ifeq ($(BUILD_STATIC),yes)
+ 	@echo compiling static library
+ 	@$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
+ 	@$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o
++endif
+ 	@echo compiling dynamic library $(LIBVER)
+ 	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+ 	@echo creating versioned links
+@@ -104,7 +107,9 @@
+ 	@cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
+ 	@cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
+ 	@cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
++ifeq ($(BUILD_STATIC),yes)
+ 	@install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
++endif
+ 	@install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
+ 	@install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
+ 	@install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
+-- 
+2.9.0
+
diff --git a/app-arch/lz4/lz4-0_p106-r1.ebuild b/app-arch/lz4/lz4-0_p106-r1.ebuild
new file mode 100644
index 000000000000..af0720e31f37
--- /dev/null
+++ b/app-arch/lz4/lz4-0_p106-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+CMAKE_USE_DIR="${S}/cmake"
+
+if [ ${PV} == "9999" ] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://lz4.googlecode.com/svn/trunk/"
+	ESVN_PROJECT="lz4-read-only"
+else
+	SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/Cyan4973/lz4"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [ ${PV} == "9999" ]
+	then
+		subversion_src_prepare
+	else
+		epatch "${FILESDIR}/${P}-install-to-bindir.patch"
+		epatch "${FILESDIR}/${P}-cflags.patch"
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(-DBUILD_SHARED_LIBS=ON)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dodir /usr
+	dodir "/usr/$(get_libdir)"
+	ln -s "$(get_libdir)" "${ED}usr/lib" || \
+		die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)"
+
+	cmake-utils_src_install
+
+	rm "${ED}usr/lib"
+
+	if [ -f "${ED}usr/bin/lz4c64" ]
+	then
+		dosym lz4c64 /usr/bin/lz4c
+	else
+		dosym lz4c32 /usr/bin/lz4c
+	fi
+}
diff --git a/app-arch/lz4/lz4-0_p120.ebuild b/app-arch/lz4/lz4-0_p120.ebuild
new file mode 100644
index 000000000000..85a4e4542a82
--- /dev/null
+++ b/app-arch/lz4/lz4-0_p120.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
+	EGIT_BRANCH=dev
+else
+	MY_PV="r${PV##0_p}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/Cyan4973/lz4"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+IUSE="test valgrind"
+
+DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
+
+src_prepare() {
+	if ! use valgrind; then
+		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC AR
+	# we must not use the 'all' target since it builds test programs
+	# & extra -m32 executables
+	emake
+	emake -C programs
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
diff --git a/app-arch/lz4/lz4-0_p131-r1.ebuild b/app-arch/lz4/lz4-0_p131-r1.ebuild
new file mode 100644
index 000000000000..47e496da8698
--- /dev/null
+++ b/app-arch/lz4/lz4-0_p131-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
+	EGIT_BRANCH=dev
+else
+	MY_PV="r${PV##0_p}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/Cyan4973/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# Upstream has trouble keeping ABI stable, so please test new versions
+# with abi-compliance-checker and update the subslot every time ABI
+# changes. This is the least we can do to keep things sane.
+SLOT="0/r131"
+IUSE="static-libs test valgrind"
+
+DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
+
+src_prepare() {
+	if ! use valgrind; then
+		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
+	fi
+	epatch "${FILESDIR}"/${PN}-0_p131-static-libs.patch
+	multilib_copy_sources
+}
+
+lmake() {
+	emake \
+		BUILD_STATIC=$(usex static-libs) \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		"$@"
+}
+
+multilib_src_compile() {
+	tc-export CC AR
+	# we must not use the 'all' target since it builds test programs
+	# & extra -m32 executables
+	lmake -C lib liblz4 liblz4.pc
+	lmake -C programs lz4 lz4c
+	# work around lack of proper target dependencies
+	touch lib/liblz4
+}
+
+multilib_src_test() {
+	lmake -j1 test
+}
+
+multilib_src_install() {
+	lmake install DESTDIR="${D}"
+}
diff --git a/app-arch/lz4/lz4-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..17840895424d
--- /dev/null
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@@ -0,0 +1,37 @@
+# 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 ~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-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/Manifest b/app-arch/lz5/Manifest
new file mode 100644
index 000000000000..ff7c1f87acb5
--- /dev/null
+++ b/app-arch/lz5/Manifest
@@ -0,0 +1,3 @@
+DIST lz5-2.0.tar.gz 207478 SHA256 9d26494da492a9fd79b3baf93512a543f450b169bae01067354bd0179a5e3ede SHA512 be304d4fe95ff237420cdc054ce7751c5b51e9b438f6cfcb3189e138909331175201cf77615d289d4ea016d66118592794b961ea07c318f477a27263eff2b82e WHIRLPOOL edc1aac3b63fd654783ea8d50f836e0c5faf331a136bdf257a279582db7a144058a99f5434c5cb6bc6b80a75808c1efe246277e5ff12a085a88618bcc225e6e1
+EBUILD lz5-2.0.ebuild 832 SHA256 23c41593eb8173b9bff1cfd7cf8b6dc1f2d89866ebdd8b214d2a1c01c1891f67 SHA512 a5df64cee6f516ea011bbd88fdb941367d29a6b6a6068e99ba108217cb40e57ff3116961d0da188e66fdb183232e1f8ecb7f222767b99f086cd7ab7dbbc62637 WHIRLPOOL db5679b31380fce2d7ad91db7772db3aba214433b11394f8de38028b8dc1e049feafdf2cd10bffe423cbb60725e27043e3872c47432bbfa5aa3e2fb6680b5c52
+MISC metadata.xml 242 SHA256 1a3eec5e968b056853c354554efa7dbeda64a2a27edddee62134298e2e25b9fb SHA512 8f5562898c2a92f16bfe6b66dc5fde18195f65dbfee8719ec2a3653006046c42867207f60ba682a34229aee5dcc940496eabf783ca213b89c7f96fc20f81e8c2 WHIRLPOOL 0d8539888b00bc33411d5b4e9e39ba3af9eaee0c1e1728ecfa789f34dff567b807d471b6fe466360e7cc5c6f0e2225dbb4998345c7c7c71f1550b68cc08b8474
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/Manifest b/app-arch/lzip/Manifest
new file mode 100644
index 000000000000..9c60f214fc7d
--- /dev/null
+++ b/app-arch/lzip/Manifest
@@ -0,0 +1,7 @@
+DIST lzip-1.18.tar.gz 95569 SHA256 47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd SHA512 cf24756bd657ef48f48304be94bf5c6c18baf7dc4fce276e79c3abeab4c4f801e901ccfb12841fa4b2402e687aeb95f2e537695442f53c45f7cb9081c3062674 WHIRLPOOL 61a76a55afdbd685aa8b16c0cb2f1ae1629d488ea087df589cd96441db9ab6d64caf08b8ba116daaabadf62a37858dc82a03b18b61595c08e0924f51860eef56
+DIST lzip-1.19.tar.gz 100277 SHA256 ffadc4f56be1bc0d3ae155ec4527bd003133bdc703a753b2cc683f610e646ba9 SHA512 513525c2731334fae99f7a17b1211e7a018446dc211e6ba52a95054e771c9577333a131608cb06a5279da16a4e4877076402b97e97ff6a145c3626fde22d3392 WHIRLPOOL 45b787d6467fade895a51bc968443e707cf36e4f46aeb7c0ee3091b0fe16eb511f56bdbaad278b9d6ebd16e721df95c08389b7e9c53f9486462072db50d7759d
+EBUILD lzip-1.18.ebuild 796 SHA256 c591d00d556caa88b71fb72e954b77ad1a857a9f14ea1dc3663584d7d31fba73 SHA512 33517c0018dd427d0ffe83457c58d745082d2c1650756c5c8cb47c059b8938d0652d2e531d2559ad093d6e7dad0544220284a2d099bf65bbe68dfb1c5158a8a7 WHIRLPOOL 000ef1f26dd8b715a9640e6bfc1309a2bd8cb6a3d19f5762d978323f856f2f1300d2903109193d2e4d8c91ed0909803c408445dec301344098d4a16892753fb5
+EBUILD lzip-1.19.ebuild 870 SHA256 14e5cab584e2e38a62f15e25bd75cc798d08809130762b5b8b789bcc52672ec3 SHA512 4894b7b1955ed706c2ff42f10b5a9afb51ba3b328e66bc83abaaaa23a8f15eb92e0d7c8935b509b9ce15d564254ba2d93ca4b19750672e5b78bbec31c2cbfa4b WHIRLPOOL 3fc15d2dda3af44808a1390313f0bb7e4b4d3c6ce090614bec1b618a3039b73a63633ae051b47887b76e9b22f93e0d2c50eb4ed0669b13e4318c545b7e103610
+MISC ChangeLog 3141 SHA256 5c77284b87f576f9b50201da83ec5772f4648ebfb9212796063e1544b1850933 SHA512 3aa08652d31aa7b194366e81c4059131ea131077469b01f24514b6b1866391b360c5ff46c1f1f02d0709c3567be3841f205924d3704eaba6693c99e21ca08c03 WHIRLPOOL 000e393621b65d62ffcd10e4967998e58571424263b3cac0264490c3e7904b1b7197c87d3d1d0d782794489b358fe81f508952ac54c36dbbbea0e0f4f199397c
+MISC ChangeLog-2015 7344 SHA256 3fa39733380f51259a9384e8ce6f449a6442a0e1b2169aa2167e8c6e491d8dfa SHA512 8a220cefa75f18dc1938f27c478744c7beba3f26985295a6721afa2632c76296a1490500c01aa4df03420484e4859649fc5b7ad45bea3b84fb292689377e193f WHIRLPOOL c09bd826ed1dff8eeea050c17399f7f75156aef2612fe5b4f6bdf0047f696bc3cb0ca9482bac5e06356cb802bd1672cfcd9915bcfc778169276474dc826ef9fc
+MISC metadata.xml 357 SHA256 eba9b599e4fa818003eb07f06df89f5cf7d3be567f5e4c169178114de47b25c6 SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9 WHIRLPOOL c8e96df3e63c6fff9e7a811d1e39c18134ecc158f2cd8b7c851ffe98ffff49cd9401365c2cf8790f004a806bfc63e5f2f46ff4de1213c21edcea755922d67ee9
diff --git a/app-arch/lzip/lzip-1.18.ebuild b/app-arch/lzip/lzip-1.18.ebuild
new file mode 100644
index 000000000000..03a2a056d8bb
--- /dev/null
+++ b/app-arch/lzip/lzip-1.18.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="lossless data compressor based on the LZMA algorithm"
+HOMEPAGE="http://www.nongnu.org/lzip/lzip.html"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${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.19.ebuild b/app-arch/lzip/lzip-1.19.ebuild
new file mode 100644
index 000000000000..ead377f888aa
--- /dev/null
+++ b/app-arch/lzip/lzip-1.19.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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="http://www.nongnu.org/lzip/lzip.html"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P/_/-}.tar.gz
+	http://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/Manifest b/app-arch/lziprecover/Manifest
new file mode 100644
index 000000000000..0277e51e9fbc
--- /dev/null
+++ b/app-arch/lziprecover/Manifest
@@ -0,0 +1,11 @@
+DIST lziprecover-1.17.tar.gz 75941 SHA256 a539b86d282a4bb154e01b04c3e09eaf7540b2c2be72d6b2110900c076bf3dbd SHA512 409a3634ef15238f8c87e6e69ecf0cf83c48274cff6c54a901a4f80bdc3d475b6bf03215cfee762ac64ca41b3e8a805ab620ceaaa1bec7fc22ffafad049b5f0f WHIRLPOOL 1b97ac140cdc190fdb3ceec5337576c775166bf4a30fbd8f956208095898411bd9ee7cbd99bd4e44aae11d67e9a6ad52ba60967d87c9eb057830950ede23aefa
+DIST lziprecover-1.18.tar.gz 86584 SHA256 08c00b4009601b94aa32a96285b979f491bda2f112447764cfe36d489e45f3db SHA512 60febb52b5dde8e1fa1e4917c48bb09112bcd3a43c5486a234fdcfa3db1d5049977df306ce66ec0821e812676886f5fa214a3479649cb977151b5cf82018b6b6 WHIRLPOOL 33a9199ee20e8849b4a2139fd968498527c99b2c40cecbd1475e97c82ff1c55911c2ff2dc3cc05c613bc8ce6391d2c68154571716e810d4c627b230b43aef882
+DIST lziprecover-1.19.tar.gz 96987 SHA256 8dfa5f2b734a5ac8f274fb8f40eb0772c568ad7a78f6799cbc3e5f0cea5cae7c SHA512 2fc12c7fbc08fab45f97e01d97504258e77d9ac8a49e03a5099e6ed569523eb129898e5f9e7325e23e105f1ba171edf6628f5f03d8723daae1b1b4116d89c2f7 WHIRLPOOL c73444fe7785ad95fff5ea8213dd0eabbdee2593ffbbcc3876c1d764e35cecd733885720aba673fe8f4687cea14111dee1a795abcbca0bc5c13dc2922d81dbd4
+DIST lziprecover-1.20-pre1.tar.gz 99623 SHA256 aa53621ddf53138be3a92959d18a058045d628602ec30088dc2fb4168f7f429a SHA512 a63ace33624c50caf960545c3e28d01b9d9d107d274301552d1f3f6ff6f5069e159e5bd67e37c25af46d1a9410de6bd384ade575232c7e77a8c946095275fb34 WHIRLPOOL 2cf00aba241bbe6110e33e5b99a3fcca5d92caf6e74000db7c99e65d54c86a2baeec31af3b4b950989e68b43b4be73a77721cb4bb52960594889425c7caefd72
+EBUILD lziprecover-1.17.ebuild 655 SHA256 d35b161bb1be4bd69cbdddf4b57035b9182bbd44aa0a52ef9b5ffc0169a2b1a0 SHA512 0bdfe46c55ad1416c454091b228b39130e7cedb624a3d08eb6a05309f219304874628fd6874464a8832dcda7fc7c607c98374ba7700eaa7d15a543e4d60a504e WHIRLPOOL 2ee8a948e4c700089125d844856d98a0b1a7697e6f5bff5f704de242250f1abb395a948e186af3a499977012c7a88474137d36bce93b6eb94b63d982a52b9a0c
+EBUILD lziprecover-1.18.ebuild 657 SHA256 0c5605d7e0779e637cacf5ba2310969836d3271cb408102c4947e93e4c2b22d3 SHA512 9655473dc568ffb079d9f2d925fba768d0c67e37a39ebd984ac62ff5030244e310ac4f8b7ab45c46cd6377cc9af4de6db0650017e6db801c7708e613b3ecf209 WHIRLPOOL 445cb0d5e60e0a18fbab04899fb099cbc7c60f7b468c4393dbc2aa920dfb84f25086bdaeef40979f7194b7528f2639999a61cb3217904bf578ef2ca1dbc3e311
+EBUILD lziprecover-1.19.ebuild 727 SHA256 f81bab2226188f120d9de01c2d3c59fc694c98c574408afed7c8d7f79c2120a9 SHA512 2535ae81e4c2a91a2e8f47a859a15d3c98f14d914d49882721c95c5ded413309022b312e78d951b8a8e7ff124402e56e001046216e2d7c084be8a995c9f317e3 WHIRLPOOL b723cbdfea7f0a92f0ecde316ec1155b5c06c36b7c229c65f91fb46df8261b8dc66ccc9eca5da7c354996640d219b6f82d0de34fdb6840c438fbae38431eec8e
+EBUILD lziprecover-1.20_pre1.ebuild 727 SHA256 f81bab2226188f120d9de01c2d3c59fc694c98c574408afed7c8d7f79c2120a9 SHA512 2535ae81e4c2a91a2e8f47a859a15d3c98f14d914d49882721c95c5ded413309022b312e78d951b8a8e7ff124402e56e001046216e2d7c084be8a995c9f317e3 WHIRLPOOL b723cbdfea7f0a92f0ecde316ec1155b5c06c36b7c229c65f91fb46df8261b8dc66ccc9eca5da7c354996640d219b6f82d0de34fdb6840c438fbae38431eec8e
+MISC ChangeLog 4021 SHA256 8194ba739020b5e5604cc7217a2fd58e217784a72289367f2cb4909b3f59f2aa SHA512 8351bd646dc9f325484e976b4886759ff3dd4c5f65495a4cb8ed75818b628c055c5c3885c354b84f995fa4910d7b63e91cef628c9b735d3f48b439934893d9ce WHIRLPOOL b623d5716e142f9e8fb33430f133c5182b5a00456589d029277a78ab27a6603897a74d874e260b55c0b712b1b9107d15c68617de30a9777264898ca580b1968d
+MISC ChangeLog-2015 1738 SHA256 1f0a80aaa355ac71e8299c4c4c9ab4f72c8533974b940c35beea0bd27b7eadcd SHA512 a67d481cf2ba664fc49eddcceb6ccbedd1edb58c81c982c7c624af7de3ee73346486f318550a953f5a129c04131bd76f23ac03dba6a1b4723f0bcc90c63e8c81 WHIRLPOOL e9ddf5cd893628d65552834659e0b8ab39e405c8ca8e5e3796f4679e12bd269eb8f99e066ec3f910ee228dfaa1de89e2c59cad1ec4aa0931316766e42c567346
+MISC metadata.xml 2713 SHA256 a4bd47c4f9b191901c0519080e84a2f23aef1b7eed88457291d107df9b271f30 SHA512 6a7bf75132134e5140e2f0714c4e3a76aa1270501ee37b1bbde90b482b3665e40ceada699f8649c3efc38012456925eee335d3844997c16d6b112ea527c15242 WHIRLPOOL 331c84bee4b0ee0d04f5e61ca30efe59292f46cfb1cffb76417304f92ff75431cd91304273ecb7a7fe84682ab5908c0dd022c6bd847ccd7b737e92a356ca90b9
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.18.ebuild b/app-arch/lziprecover/lziprecover-1.18.ebuild
new file mode 100644
index 000000000000..735ad623fc7e
--- /dev/null
+++ b/app-arch/lziprecover/lziprecover-1.18.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="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.19.ebuild b/app-arch/lziprecover/lziprecover-1.19.ebuild
new file mode 100644
index 000000000000..fe902d995592
--- /dev/null
+++ b/app-arch/lziprecover/lziprecover-1.19.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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/lziprecover-1.20_pre1.ebuild b/app-arch/lziprecover/lziprecover-1.20_pre1.ebuild
new file mode 100644
index 000000000000..fe902d995592
--- /dev/null
+++ b/app-arch/lziprecover/lziprecover-1.20_pre1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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..1d78b6514ce5
--- /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/Manifest b/app-arch/lzlib/Manifest
new file mode 100644
index 000000000000..bc9481724e51
--- /dev/null
+++ b/app-arch/lzlib/Manifest
@@ -0,0 +1,5 @@
+DIST lzlib-1.9.tar.gz 96147 SHA256 2472f8d93830d0952b0c75f67e372d38c8f7c174dde2252369d5b20c87d3ba8e SHA512 2d36e0b27f544fdab958dbf7d966b41e44c134382ec9f792d94dacf60355eadc25a1cf2b8b7049287995fa5bfc27aec0f3e4253304e3b10813c96b0609408278 WHIRLPOOL 3da26a40c4c9bbe932c28615b257b4b99e835975cfc7e6c25e6864e3eb9511353273427a6ac6990aabd51abb15c534200072d45f9ee944f751a0db6ba151bf57
+EBUILD lzlib-1.9.ebuild 725 SHA256 697655343f8bae6cb18a435ab2bf9287b1f4714c5274c84d35bd4d09c7bf91cb SHA512 c1bb9e14b7402262e738f190f989f8b2ac637bed38fcb293965ec836f3397bd556ddefc0876db5c27cd90b53cb85f486b29f4a340f465ea4331a7ba5b7a38825 WHIRLPOOL 48a2a10fbe0e72183eb75e9c7bd91d2f1902943dfae6be985919adb0c746393007b7db24a2de9b54af56d6a3ab30e38f2daea619dc7df5ec02e6e691cb7cb5c3
+MISC ChangeLog 2452 SHA256 9bf3cd6c335baff37937c75b0781a82610463f3f26a6e4498f99e538d7464c63 SHA512 3ab697fc8df4e943c57524d10979927e5884c3f01f0b30c91d3384320056ddf996fc2ba8b811f04e614d4c35cdfee46d86465783d1afa677d4139e1144ae9a46 WHIRLPOOL db1796463de22f7b46d36b50ecc011a4c5e2b01ffc4c2d671794d841801fa0fb54b57dd1c839ee34b6580684c0517fc08cee416bb5b43912a88dff3b9ca72884
+MISC ChangeLog-2015 635 SHA256 5a5f67fca57b420083d29fa7e3fe030955f8ba964ce941bbea8084c228cf51d6 SHA512 ffb4869d0479bfdfd3a754b30e9df810c9050160cec53389102055ef1280d9f80cef54d4dc37a1022344d0f3f50997bc09391d47522d87f6f864cf1f13419615 WHIRLPOOL 2b58c6deafa620af379835c83e12ac5131ff76f4e5f6de95e45fe3742d14371d4a61aa891e3a7f254af9fee5fc0310f580fa816538a04bf72147ac5389c88641
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
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/Manifest b/app-arch/lzma/Manifest
new file mode 100644
index 000000000000..b7731c6f4d06
--- /dev/null
+++ b/app-arch/lzma/Manifest
@@ -0,0 +1,5 @@
+DIST lzma-9.20.tar.bz2 534077 SHA256 8ac221acdca8b6f6dd110120763af42b3707363752fc04e63c7bbff76774a445 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35 WHIRLPOOL 5ae0d8ece9d3d753ee3efa1b6422c15698a7f20d3783381cac7c5e10422ab532919018f44bac3050329745474c34b1115bc2006e70f4c6287600b89edca99db2
+EBUILD lzma-9.20-r1.ebuild 886 SHA256 fef605f18428ccd416cfa723a5a1337a5342e15e6c1bd618c62c54879b46f9b9 SHA512 d63eaeb77bee1cc2c356741126a83c13438114704370e956f1bffed20f317717064e79205d17c5a5655202ce55e38769272abccd11c9a6a6bacc94d18b0bbb2d WHIRLPOOL 66d0dfedd6414523aeb9862d188b74e4c0779b5438a212cb9527c39daaca13bfba5d89fccca7f19b4396a0dca8e2c01b9b221256badb9bc73b233046aed1ab2c
+MISC ChangeLog 2792 SHA256 7512a4b2c603fa829c1b55bee978eb59d2e5e19c0073a927bfa106281374c97f SHA512 6f78024bfe674284d4663f72e3c73aa18179de37d23f4796322b644ddc73df77cf62665c73f294cb68629986f2272096a056dc08fb483eea0a456c6997a43829 WHIRLPOOL 0e87ead0e1a7dcc9b7bd0662be8dbd8eac828ad25be3536cd0e041b7ca8a08df60a10bcab6a5454e9ebf53d12b74f07106c9d9d41c22195f925db611256535eb
+MISC ChangeLog-2015 2421 SHA256 5d3f28b147963188ef27bc74e9871ba9ff8423bc2fb8100880c6da8e0e1cd285 SHA512 888e9a166f04079085c12ff821f861024df58b6e8bf36bf443ff7fb263f87e620e574926af52a9a9346fcd8c48e0d9fb6a30bef1ba9a3bdbd95112c6f22e4f1c WHIRLPOOL 9ffc9e0c0d0022c4377e6b56890ebeaa6eca986d0d291a8a92bb88bd802ece695d7fff88cc462cda79ddb69fc6d27241b372636c5eb5b69277860810b2a04fce
+MISC metadata.xml 250 SHA256 d5ae706965cd00c100a1c2b7205596cd91219edbc9f8858b10b82f81dd0faa26 SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb WHIRLPOOL aedc462fb1268703df612b2ac16fb118cb56ef58ebdda9fc2735a83ecaff705f27b8ede3d5fe067782ada9c0e83634c0413ba8feea4c77316037942283a48934
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..1b40d09b37aa
--- /dev/null
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 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="http://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/Manifest b/app-arch/lzop/Manifest
new file mode 100644
index 000000000000..0ba15590ef65
--- /dev/null
+++ b/app-arch/lzop/Manifest
@@ -0,0 +1,9 @@
+AUX lzop-1.03-gcc6.patch 1127 SHA256 eae7df428100c0642a74e49e6b37da45a6c8ddcac55a04d8163cb7122ef1e1e9 SHA512 9d93d728bd3c1c53ecb63ab3a47c9457105a2ce768fd1c1823ab237d2027532945fcaf845b5dbeb6ce5e04bf08d4bb1cf5d35f196f30fc8de1b68ab495391d40 WHIRLPOOL 1e2ca80c9f5dc8866123279c277f78ce64289dc34bcaab7b1929eb8496e9a20b2c4de6cf761f8cf7bcff53b1d72779548a5d5c50f3cee0fb266824710d4743bf
+AUX lzop-1.03-x32.patch 1345 SHA256 ba55e6bb0cb37bb273f1d69c0adffbb0a5cd717efdcba09f150c1dc1bde6f7ad SHA512 fb479d430cfdde965d0758057044566ed55411af8e79026fa7fc1dbaee61bb3b440229a527f2ecf619be21dd379e05ae01014fe0afb29c9e74e1361ed917033f WHIRLPOOL 3cecbdf09c20c4c6c802cad7baace0a8deaae65465aab40f06a3d2bd194cddf6efbb4ba63ff692fe96c3207c01d178e2827c3f853931502de43539ea4a62ae50
+DIST lzop-1.03.tar.gz 370775 SHA256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 SHA512 a7a46793e060690f7da3e9dcae8e19f9c3633b84bc6e4a9a7fbf7791361fc7795e00f1d820978b20df8731c165b37244f11203a2936640688e4ade0cc2f5f3d7 WHIRLPOOL 3590d424447290aeb102a7edc7baf2e3ca90cb5b0d34339cd501f90f3e3c4b41a94b530790e7ba06ca28d044dbf4a05973a9fe976b5d1356019e0302b376c7f4
+DIST lzop-1.04.tar.gz 393483 SHA256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e WHIRLPOOL e258fc23f6579b5bc3198dfee612fab51f2f9e04aa08a97f68e6103f4900f01ac32b3552001960968b7297b22da20e1740bf7e02733d5a66536c35e162eb872e
+EBUILD lzop-1.03.ebuild 986 SHA256 04887f5f541f99581a4de40ceda9faed651b43a521851f13897f37ada9e33413 SHA512 b03d4165485a39768547b2104a7d116b8e14691dcf6acf72a5b4b48ab340d548a917663af992d042c182cb3dbf0d70f47aff8ba9650e154bdb21a2fdbc44c96f WHIRLPOOL c38f32ff6bafe6762b45c4e3f62d5d291fdebab70561966219a785110cb7e5d629f3606e8e474d74c52133603c6b4a44ff643ccb99fbdf8003bed18bbab9012e
+EBUILD lzop-1.04.ebuild 981 SHA256 6f17f0f9d2a910610c0f3f9d125ee8bcb5b6a040649ff2365fcecf072967d196 SHA512 15e2efb80a7340ac396364a2706bd77f18f97677c6b91631b840d0f52c7347f020c22919358e6cd336ce35f80860b170177e8c6cf0d79eb0112456b118913afd WHIRLPOOL 143b8b6abd8981919320aa938c2da268c10a8c7686bdbdacb9f0e9c8f357c2c8bf6823e1d41e4bd520e52633a81c874c52d6cfd08606009f0d7d8f4a982286cd
+MISC ChangeLog 3007 SHA256 666a5e792ce9e37396ed674998829cf65dc894db3bffccb6b94f342e2b620443 SHA512 480dc1925014d0ce41c9f2b380871769af8c1394e4096d56d8a9b2f3f5343ce6391d6823365dede26e1d768ffba37863819e697d74128ae50cda86a34bdb474d WHIRLPOOL 1602969bcbc0f93a41c1502ce1e2c09a5c2e817c5c880e5d6e0013218f72e6a203f5f70fb9627584c8e7b27354d15193d806a156a489495bb6ac0f6373bf4853
+MISC ChangeLog-2015 4037 SHA256 58df240925e26a0bbe1bc34d942ed627455876cba4d5d4cdb50ccb7bfdd3ea1d SHA512 698e366db0f6f64e890ef00368eedd727a7ede3f8aa4678f6d6be5d4e0ed3a1d8ea6562decf731601116785908bea1e65cb36b69abd97cbafa9e763b11977699 WHIRLPOOL a22783d22ffc66e7f0382ad69dff0d69ecca982a8b0a97868bfcaabc24d7e25d0891a1c33a3a86de0bd4922dad5189a568ee1fa3b91477a763529a6a32501fa2
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
diff --git a/app-arch/lzop/files/lzop-1.03-gcc6.patch b/app-arch/lzop/files/lzop-1.03-gcc6.patch
new file mode 100644
index 000000000000..0826bc1f521f
--- /dev/null
+++ b/app-arch/lzop/files/lzop-1.03-gcc6.patch
@@ -0,0 +1,26 @@
+--- a/src/miniacc.h
++++ b/src/miniacc.h
+@@ -4469,12 +4469,12 @@
+ #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
+ #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
+ #else
+-    ACCCHK_ASSERT((1   << (8*SIZEOF_INT-1)) < 0)
++    ACCCHK_ASSERT((int)(1u   << (8*SIZEOF_INT-1)) < 0)
+ #endif
+     ACCCHK_ASSERT((1u  << (8*SIZEOF_INT-1)) > 0)
+ #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
+ #else
+-    ACCCHK_ASSERT((1l  << (8*SIZEOF_LONG-1)) < 0)
++    ACCCHK_ASSERT((long)(1ul  << (8*SIZEOF_LONG-1)) < 0)
+ #endif
+     ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
+ #if defined(acc_int16e_t)
+@@ -4703,7 +4703,7 @@
+ #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
+ #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
+ #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
+-    ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
++    ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
+ #endif
+ #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
+ #  pragma option pop
diff --git a/app-arch/lzop/files/lzop-1.03-x32.patch b/app-arch/lzop/files/lzop-1.03-x32.patch
new file mode 100644
index 000000000000..e261f18123a1
--- /dev/null
+++ b/app-arch/lzop/files/lzop-1.03-x32.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/575450
+
+Fix get of FLAGS register in x32 ABI,
+
+x32 ABI requires to have 64-bit variable to store FLAGS register
+instead of size_t that is 32-bit variable, this fix operand
+type mismatch when try to pop previous pushf value.
+
+Upstream-status: Submitted
+
+Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
+
+Index: lzop-1.03/src/miniacc.h
+===================================================================
+--- lzop-1.03.orig/src/miniacc.h
++++ lzop-1.03/src/miniacc.h
+@@ -754,6 +754,9 @@
+ #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
+ #  define ACC_ARCH_AMD64            1
+ #  define ACC_INFO_ARCH             "amd64"
++#  if defined(__ILP32__)
++#    define ACC_ARCH_AMD64_X32      1
++#  endif
+ #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
+ #  define ACC_ARCH_ARM              1
+ #  define ACC_ARCH_ARM_THUMB        1
+@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n
+ ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void)
+ {
+ #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
++#  if defined(ACC_ARCH_AMD64_X32)
++    unsigned long long r;
++#  else
+     size_t r;
++#  endif
+     __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER);
+     return (int)(r >> 18) & 1;
+ #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
diff --git a/app-arch/lzop/lzop-1.03.ebuild b/app-arch/lzop/lzop-1.03.ebuild
new file mode 100644
index 000000000000..ad00dfc6053c
--- /dev/null
+++ b/app-arch/lzop/lzop-1.03.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Utility for fast (even real-time) compression/decompression"
+HOMEPAGE="http://www.lzop.org/"
+SRC_URI="http://www.lzop.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/lzo-2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-x32.patch #575450
+	"${FILESDIR}"/${P}-gcc6.patch #594472
+)
+
+HTML_DOCS=( doc/lzop.html )
+
+src_test() {
+	einfo "compressing config.status to test"
+	src/lzop config.status || die 'compression failed'
+	ls -la config.status{,.lzo}
+	src/lzop -t config.status.lzo || die 'lzo test failed'
+	src/lzop -dc config.status.lzo | diff config.status - || die 'decompression generated differences from original'
+}
+
+src_install() {
+	default
+	dodoc doc/lzop.{txt,ps}
+}
diff --git a/app-arch/lzop/lzop-1.04.ebuild b/app-arch/lzop/lzop-1.04.ebuild
new file mode 100644
index 000000000000..d34d3ce61064
--- /dev/null
+++ b/app-arch/lzop/lzop-1.04.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Utility for fast (even real-time) compression/decompression"
+HOMEPAGE="http://www.lzop.org/"
+SRC_URI="http://www.lzop.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/lzo-2"
+DEPEND="${RDEPEND}"
+
+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/Manifest b/app-arch/makeself/Manifest
new file mode 100644
index 000000000000..92c5e4a6ecf4
--- /dev/null
+++ b/app-arch/makeself/Manifest
@@ -0,0 +1,9 @@
+AUX makeself-2.2.0-help-header.patch 6728 SHA256 81a174702c496fc0624c6ed7c69a0cd7df8d1c673a411bba019d2d55cc4b4efc SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c WHIRLPOOL a2aa84ed6d7bb804b12073651bf2d4fcfc03176a0437a86aac04647dd9d5683fd701e3e5c3e9e9214039ecb00e31c374e24e852d7f3382fc127854390848b5e8
+AUX makeself-unpack 2814 SHA256 2dbeea9bf230e5beaeefc53cc436d0b7c91654780c1544eec51dad80e22ed90c SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3 WHIRLPOOL 8c98a70fdfb30625570637c4354135531ed6dc7b04b1aed6982c0782c8da113191d65c9ecc3c39d4299076408bf2a32aab0afde44f90375c3df6707acda291aa
+DIST makeself-2.1.5.run 38210 SHA256 8227668bb35c34d86e6f0fe69c7bf4bd2813f51edfcbfc227896b4787b0a1a4e SHA512 c556770deea504573c50bc7c15340ed91c65d372e93c47dfc10fd6e8265b2462842da12b36898d4291cbac9e954ec12f2f6972bcf40e97ed82dbd22af21d3a91 WHIRLPOOL 6e6be1c047238280f737611049af7daa0902b52e7d065033f7ead665614da809bc1f5903b6163c768f191bf7e0ced566ac6168ab6fc5604bc1d2fed8dac72e37
+DIST release-2.2.0.tar.gz 21640 SHA256 9c9d003e097d9c198433a05926e64d9b7cd330c7f10cb4e6048877d0a87de341 SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73 WHIRLPOOL ec9d7caa4ffed938e61e756636af04cf793158761c3a2b41e7ee4c18a415d6a41a4ed4499bd0b867dee930f281f901a80082bed75d9e9d7e237f3f85ad7ea590
+EBUILD makeself-2.1.5-r2.ebuild 611 SHA256 50c0f0fd480038529861839dcec414e1533d9a7d930768ae629e86345be00814 SHA512 15fe5dd43cc8ad08ce85839797acd99d17e7ddd2981eb13a05e266c4f90c232e72990186daaa78e81e6795a9fb49cff86dc52ff6d18569dccb6be5c4c235148b WHIRLPOOL 53121ce683b80a47418cbb1ec882a958c32f01343a3ac308507eeeb46c33a154878364cba802f7818d8064f5e3a078b66d6572478d42f9fab8a8901e01d03c59
+EBUILD makeself-2.2.0-r2.ebuild 717 SHA256 a0b4d7f51bd74e50ab301a71c26ec93a9d90e45efd5c851bdf1edbd737f46230 SHA512 df0e06607383abc05b0f3c2be8fa4cef9a597574501c7e1f8baea8feda55144448d6dbea52aa107c441dc6d2acfb80872dbe206e797d7f9b1a3de6ad2d8400a8 WHIRLPOOL de1a325bb5ac6713a7f24e41831958a5ea76d01452de383d6fb8eb86018791e0ac7420ac8caaee21916d9702e7486e525d9f8d11268eff12336516c1e805915e
+MISC ChangeLog 2782 SHA256 3282071cf86c35bad372c2a942e796f58d5b99614af4209fede12d2ce4035217 SHA512 33f44aa2a27f03f09d66c038b6af8222ccd38fbcaea5c7eaba86777b9b7e3acf3b1df9034af8e59a4739fd47c3d5286dd0b7f5772600f118325aa9ba4323d3c5 WHIRLPOOL f8c18a284b7e65299d1e53ec4beac3af4c47130098e71838cd055e0072d7e330b41d47a369f4370160d4c98e8551b37b750b3a911db8baacdedf2aaf7a774d62
+MISC ChangeLog-2015 4348 SHA256 be81bdc761b57828d99ca78b43d329cff6cfd370d63acdcef51c2a4e43dfe35a SHA512 d772655122645a53b66b2a492f4e1f89d2b8e43cd658c7497728f068ec2dd95b04af359d8af0fdeb11a526c137e8d8cbb9a3b04c8cd0180207986e86b58b8e7d WHIRLPOOL e521160ac3ae08b0d98aeae76fd6b2b601ce2127d091e3b289ed085a8f67570abe4da9a320eba618544aa8caf13a5eebcdb6f7941ebaf73a31b32d9ea38fcc36
+MISC metadata.xml 254 SHA256 aa57daf14790f6494b0c488977f1c3cd0fd8c276da99e2b49b43f692e165097e SHA512 fb782a70e1be3e60d1cc5465b54e05eb5eb3956d281d0951cc53a7b0f320255bc0ec62ffd08b18c765dd6ee0ad3f8c364c93c52ea884375f2782a1bcb90fb9eb WHIRLPOOL bed6ca6a7881aca9662f650aa0c946435e5ab2ad94abbfbd584b48dda0bdf5338785bc4f4bf46503d1d2e9fe83e0ea5a22924eb882fb884274e66ce2004d52cf
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.1.5-r2.ebuild b/app-arch/makeself/makeself-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..c3e4733b4ece
--- /dev/null
+++ b/app-arch/makeself/makeself-2.1.5-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit unpacker
+
+DESCRIPTION="shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="http://www.megastep.org/makeself/${P}.run"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/gentoo-functions"
+
+S=${WORKDIR}
+
+src_install() {
+	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack || die
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README TODO makeself.lsm
+}
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..cdbdf7c7a640
--- /dev/null
+++ b/app-arch/makeself/makeself-2.2.0-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 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"
+IUSE=""
+
+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/Manifest b/app-arch/mscompress/Manifest
new file mode 100644
index 000000000000..c5a170e3d59c
--- /dev/null
+++ b/app-arch/mscompress/Manifest
@@ -0,0 +1,7 @@
+AUX mscompress-0.3-amd64.patch 613 SHA256 28e63bb7c1e0a23b88add0dd3d400b797ab9df6c2f1d7bc5a7f58423c360db92 SHA512 94d17fa87a0ba7029569da65e8f22af834b557db1c0a4715afe3afcfc6cee63e7bb604bc37f700729c2efe08b38b46a940b4ee8fd426e293747fb4003d7f53db WHIRLPOOL e481081f093d8445d81dff48ee77b8bb1417af03e11b70d0c7ac505e2556fc373b887d6de238de2238eb8ce89db7976e0d8a427691e644dfa746f4d304aa5bc8
+AUX mscompress-0.3-makefile.patch 467 SHA256 d9baf9ae4cf0f50de2b23f40b4f9ce870d9b67e9f64d6d383caf0a2c4c346dff SHA512 d633867a102ba099576c6671967c802bca293a81896ba6ecd5486ad025dfa66220dec9ecc4615c97db22deea914183d8dbedf5ab75221abeb5a65e0c7e949669 WHIRLPOOL 3b9131f9353b5a3f8eeaab81fb6c11d15880c8614a3d77fab8bfd1f5735ff90baa533993808378fb7239f498d9e576561d26fd562d2b0c6bc015f9e0b2a0c590
+DIST mscompress-0.3.tar.bz2 40989 SHA256 cdc3bf66865da9700d5f52a06602dfe3f9a6510bc53b97342957b1d71f026b77 SHA512 e69a95e9c12979e852227553028b578f324ec38472ead11f9c0cce85b77bc817ea39d5ecf74599c7935c692eaac537456ebefe110400514a3c834b12597dde14 WHIRLPOOL 9481d1ac9b3a211f578e41f6e195604bb691488aa9567f33c8556cf7b3d1ed620d189040c6b4990b2960b2a3899076ff375b6584ce358bd60aa66ca711f64500
+EBUILD mscompress-0.3-r1.ebuild 799 SHA256 7a5a00998cadc13cedd1a540e4be09e81f312cc1b460b83b78b7500ac37f2101 SHA512 4d095c633591ea3182f4910674e72cdf8532a4f894cbdae7ede263719c371936a080f18a8669396ccd542fd8595e331da484dae13cfcb097d1ee44b8ed8b2bca WHIRLPOOL 8ba8c44a17fa2061d6da82c31228ca95425c2340ab4735dc76a3a5dce036d92aded30f5a689b854f1c3fa618a22317aa2c1983370ee1b3d990ed9b5ca8cfe7f7
+MISC ChangeLog 3154 SHA256 c0bce381bdd0d5c287d8962fe2aa9747aa34d8cc9ea93af2733b22c74aa7b80f SHA512 410f319e94f4653050f04fc98cf995991c448591f56cae6bd8400578f1e2f88b33dd78b0dd438f3617164a2821b576950b7266b3ebaa3a81e95ec263076e1a06 WHIRLPOOL 09649b49febf836fea034b06f78ad1a3e85a6de4184cf48c3ab4f1af10364f4d43381d6fae67181cfac062252fc7e977c2eea32e7c4bcf3ccf2d74f521f01e2a
+MISC ChangeLog-2015 3099 SHA256 745134037d8d4c4ec20e17b8027b1eea77cb9e7a8e6b0460a189f57fcb7c9a75 SHA512 0e70af240a8c7a9d3d7fd37ae542415b77d81a5231fabcf78177552fc9528b95c68574d3f55bc2ff8d18c2599763e8fd56e01f2e6be69087bfa759c446623aa1 WHIRLPOOL 0638959969b7503b0bf039aa01012cc6865b74d12a66a504a0d550228bc18ecd96ce699974821fa4d63b9f963d63f595e0532fdd7c796a0fecce25f48b1f4160
+MISC metadata.xml 368 SHA256 34ca76084f431de46b790a726785b4a11d18db54750805917853b3020f3ef036 SHA512 4e24e69033ec97407b9b9f7a496762b76a54ed9e9135f71c34d5575c8b604c20054fe34d189a54172af48c5f2ab26f167ac1b7b3852a481e70aafbe2d2298f20 WHIRLPOOL 4a8afcb12f8a15219591cba6b24e3f3d33e935de76a03a9f6543aba285d7acd78aa74fa809b5a91ea850272646cb889526877e79f0d1e73e81ba54f1fa913720
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/Manifest b/app-arch/mt-st/Manifest
new file mode 100644
index 000000000000..8c12ca9e3e72
--- /dev/null
+++ b/app-arch/mt-st/Manifest
@@ -0,0 +1,6 @@
+DIST mt-st-1.3.tar.gz 35341 SHA256 b552775326a327cdcc076c431c5cbc4f4e235ac7c41aa931ad83f94cccb9f6de SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820 WHIRLPOOL 2987539dc307234ea195e7d9b23623ff907117550a878ba794fd576fce31c3c37593f071c2ef0154e8d9891d14c12e9bb8c7c84c2060a858b377dc7e3335e1cd
+EBUILD mt-st-1.3.ebuild 553 SHA256 8633ea21452c22eb843f3adf36ce548591ac91610f6361de3e57315de0c15c59 SHA512 4a03eaace0857dd917054aab4a5040872bfee230cdb5b3b5560d3b2982c31a3ba235ed821920faf78c93b69aa31e9b48b97e57d0975c51f59363fbdc61e410bd WHIRLPOOL c0906af1a19453b5371763fb3cbc49b4882ca041c740873867475324e5106da648b91afaf839354e6cd723ecd1760bd0cc744ea05a005fd9c3627fef382fe44f
+EBUILD mt-st-9999.ebuild 483 SHA256 d7fbbb1f37d96eed70c6fcadc686c3d045814b1cbc64fdc94d6cff3fbcddf0fc SHA512 d10eb52475d7b3cf4068e819e40241edbf23e3b0f973428837318898c339616a894468111c5d28c188f6ecb8b2626d7aaf419dc89300036c5694fc04a1078c76 WHIRLPOOL 2f08fa49470dfdbf027694447745a553da34518d86ff07a48004d155430e5b383c49722dfda5a96d2e6693ac227e5a29f8a0d3bb9fc77ba55fec4c1d8ab87dc8
+MISC ChangeLog 2480 SHA256 ace013bb5d4fe275052e02aacdb2e79df68ca358fef06371f4973d54e935d7d2 SHA512 aec767c584cab19a7413f0e9a1156c165388ed9429c3b0ad5ba70995bfdc41a18f9b103efc898373381c0c3a340ee1edcecafc795d83b266a2e7db18c781d2c8 WHIRLPOOL 20d26804b0e596086b5f1a83bc39883a2c0e6db24bbad989536e83cf82e4076648a6684aa73ff160b51d78aa7d54a70dd911b10e19e89d5bc1a2cca60f59146a
+MISC ChangeLog-2015 3879 SHA256 94738c721e369b871970506588613e5dc2a0d877cc6177ec997dd95b78b3117a SHA512 8518396c75fc601dbad7f775df818ea5eaedbbba7f6923bac4f066d3b36b229758e78b5b6628d6f93982dbe7b1cd71e475189c3f58a5c79b1515a6fc5e9949bb WHIRLPOOL 797e9ebaba6382ad36aa68b59ae59a3967d495657003d12e52eb23f8976383ae9d06642a326f59ea4eac2d74bc1850ead1435cb72e2e9893ec7c2854ddbdd3c3
+MISC metadata.xml 321 SHA256 f0ed616f5f63419f869139af8f9fdb2024a8a0784b9cfeac2157acd4fe0140fc SHA512 79dc941553281909153cdda8422d4ac5da172a6d782936986b581a1300dcf4b4781704bb7c730f48905f0dc487f5ce781bd96abde16691d67bf5da220eb94471 WHIRLPOOL dbda93157c10e613227897cd083357ffabbe98361531e204e8bc439b0d6e5001e703612514915cb42475a194ba7410dc336b744548313d709078ad572ad6d723
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/Manifest b/app-arch/ncompress/Manifest
new file mode 100644
index 000000000000..908bfb796f3e
--- /dev/null
+++ b/app-arch/ncompress/Manifest
@@ -0,0 +1,5 @@
+DIST ncompress-4.2.4.4.tar.gz 32571 SHA256 b00ba28d3f332b38aa75478a15c1b789957aa6c02d6453471f452c0ec3e6517a SHA512 abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be WHIRLPOOL 8050829ca7010f9a8cd777e9d628c2d1f12205325db3aafb4d11eb9efb9839fa026366803306907fdbfc9fbfc29693c47317535ede220c784fc934fbe121c42f
+EBUILD ncompress-4.2.4.4.ebuild 717 SHA256 b3e92d7a9d969a72fcf20c0a8dcd4caaea5278c9c6ea9e37e2ba535b98d043d6 SHA512 b7190ac40d5e63ee28697cc49f9678195e189efc1f23fefe088230b82b314bfba274dea7fe2149b84f87fedf7f04e38676f1f9293690e358682fbc002227201d WHIRLPOOL b0a4ad5461c873b28cecb9cd492c64154b84077ddc665ac59c6e5febae0a6fc8684b33bd2845beae4947d5762244c57e7b5f883091a58aafec9c8fa35383f515
+MISC ChangeLog 2623 SHA256 6099b2fef91b12d4e464cbeb3e4a33499c5dcff0e702be629b9b0d72fad60ab8 SHA512 de7c7d9a1d4ebc367bb1858ea383bc91f29ed204dc9a35bba030014e3c17c674abd645f3464ad1d4ed9311ba2f0cb592808fdef6aaafad791c408bb60b83ea5f WHIRLPOOL 804dba9bd55ba45c6fe01504500d3089fb9e664362c4241ae4f8b8fb22b446bf785f32b1c0b293c4523647c2e8c083f89c4cb43093d60b493b43562f3b74cabc
+MISC ChangeLog-2015 6594 SHA256 7ad97a2b78a34ef75c486028432d98508d40decb1a4d06330bb2c0080bfda92f SHA512 56402b1501b69a51ac75540d16b3fd151bd934059fc95a778da34f548f537f64dd7fa6129728926bf3d540b3e56e42fd18648c9a54e64622ab1a2ae019cf2e9d WHIRLPOOL 24013db918fe9dd812f340f99cead27488bbcd1ee7c82980eca401670538f0076e2325c41a3d7377ca6f797c9b81d9428908f840ae38a0b1c89db0482a87c1c3
+MISC metadata.xml 392 SHA256 4d69fb0602aba911151aecbdb9efeee3f8fd2712d2e86893f67c86d3136cc7bf SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13 WHIRLPOOL 468608d8a5fda8fd09a4d03c269fb5782cf108c0b569dc55fb88846ec8ea01be4862e7b1d10bd3b2a2517224198184d2169acafd84b040dd64c5be2cdf4fc000
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/Manifest b/app-arch/p7zip/Manifest
new file mode 100644
index 000000000000..4888e2d1b817
--- /dev/null
+++ b/app-arch/p7zip/Manifest
@@ -0,0 +1,6 @@
+AUX p7zip-16.02-darwin.patch 218 SHA256 a0909e5a2dd20faabd5071478a4b27c6b5480d9f385c0b1fcb4e6e03757d50d3 SHA512 26ef30ce27fccdeae6388801e7a619225995c50394131ad5dd6fcf2236a40e92ad2d6dd2ea04c362fd660264decc6b616e5ee6ef83ff42c111e2b1a40f620c68 WHIRLPOOL 7f296ccc9d15b70e0cd8a472abc9d3c8d5e6d135f0d5681c77bf22d194a636644a4a2bfa5dd34daf6aa7408f0fb31f4a59eb9f1bc5142f23f6793cc7e590bc08
+DIST p7zip_16.02_src_all.tar.bz2 4239909 SHA256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f WHIRLPOOL b22f4dce96505094ffdee0963fa7e5fd75e92f2c920f2e69e18eff60a2ad9d4757c3512c8d4e7c4848a36212f54637a963ff41fc5c00bb7381f43220662108b9
+EBUILD p7zip-16.02-r1.ebuild 4498 SHA256 a45f73708091b4f59b3fcc4e8085d98420e57bbbde42dc03cc86b9e99effbdf5 SHA512 9a0ec08e5013933c43234e38574ac95d81b75b58992c021a2ba2679fc6d00d1ec4b79985d4555189c774f22def0125fa8a5e1e66a67de1daf84d1ef94720e3dc WHIRLPOOL dd35e404e62450c4949c12247b9857350f1d2fbfec76540b999c9536262a29f67d949a228441fd761fbfdbcfa47b45f06f687ce966dc207b8ad56b7bae60ddc8
+MISC ChangeLog 7507 SHA256 359c1da94e598421c96c3cac14a38592e5bcc7bd01d8d11377b12697217931bd SHA512 083527b42dbf4a1c24bd5b0ccb1509279708041c84abf739f8cde363e440a5e2d0fd28c209a912fc776380084a32a79b74ecb9411d7769df80e84267637353e3 WHIRLPOOL 3b1303b3c9cab2e82065c65aaa2f6bf106497da6f5a4833de475832eb42366eba47aa4886bef8888c45664ac90fdc37cad8f991b4d001ffae53013e0da7e1556
+MISC ChangeLog-2015 23615 SHA256 a54b898b9a62097200726e77e374600fa9b7f8cffadf132d110ca00449d42849 SHA512 e8e2f0cf43f704fa13a88f3febe3647d0521e1055627ba97d717155499e65dc79481752232a484e6264a8001f4bb0e638754b724d3e425e73dde2fb2e1aa92cf WHIRLPOOL f737bd27b70913de90ecbb477ab1aa21e4cba6c4a62cbd47c15b4e727fecd3d15c14de536850f2cd06059d647bd0471f4fc567a5c022fc96dadeaa4fd56fde51
+MISC metadata.xml 435 SHA256 fb78e893bfe72f7f34a02cdf2fe46cc6074855fb4ce3e327c54ab35584469df4 SHA512 3588bbc28ee0e54a059d88d35ce821596b0dd3b5c1f84490568a3f7d3f67f5ade02c301c699bdaaf4cb653df5d59441cb7383a18708cd15d64d97eb1f0847f1c WHIRLPOOL b53dd7b156271fddd0bd40ad617e1524aa916c0d3f82e28e5ab41cfdf23f7eda46c857385fca3e15b49d9c63284db3999c298824b894c9a390ebe03fe2dd5000
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..1ee5d3434b9f
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
@@ -0,0 +1,11 @@
+--- 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
+ 
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
new file mode 100644
index 000000000000..686e0639c24c
--- /dev/null
+++ b/app-arch/p7zip/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>prometheanfire@gentoo.org</email>
+    <description>maintainer</description>
+  </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-r1.ebuild b/app-arch/p7zip/p7zip-16.02-r1.ebuild
new file mode 100644
index 000000000000..9f3c5aac9238
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2017 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 )
+
+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/Manifest b/app-arch/par/Manifest
new file mode 100644
index 000000000000..1bcf193c8416
--- /dev/null
+++ b/app-arch/par/Manifest
@@ -0,0 +1,5 @@
+DIST par-v1.1.tar.gz 40959 SHA256 74afaf875412bce7dd93cac6e2572a7e27ea728dec0dc230aca6dbed4c1f724d SHA512 539be3cac0513429f44c9d53dcd61afa02b1e5a2935def3164398577882f47199b5a393f21ed6a1d6972409034bb0a7b63f338d69aa1fcdd3655adaf5993b95d WHIRLPOOL c03c104bee6f3b30b6cb8d2506d8e76602f1c2d290ec2459fada9e48aa134a7ba4e406fbca468276e23df79cb1f847ca8fc32aaaa839a9c3f7093adc75e293cf
+EBUILD par-1.1.ebuild 725 SHA256 1e8bf4d728486fbe61370b77d7f507a2218d68d86bced304144dc73868065d45 SHA512 9af4730337f01df83edba8c9e2c225fa8dbf8594960e6bbdc4127cc2e04e01c1e2d62ecf4b08722bea32074fbc04c0ab7b8949672bbb9ebdecec339f500a2701 WHIRLPOOL d9a9dcf101b5ba552d99177193e7e4eea3e7a34df8abdc4de7ead5f280adc0f73e2e9c4bcebf64792d0ee1c7f47c8e7b65c0a5101d03f8d3049e4cff0f7d2f49
+MISC ChangeLog 2506 SHA256 7bb96a428d56c45425585c93d89021ddcf5f1d79e6a83d1ac7441b6ef50f1ba3 SHA512 8e769b92f0793b04e89d4f922570ea4a46ca368e63cb2ffda6bf85286839b0fa50be61995a3ad0620a35ef5f328396ac7ec00792a40c55388ced291b13fbb1d0 WHIRLPOOL 7ef76bbf93eaf0027838bc5da825c223bd57f0bdc693ce5f17f5e607c4011d8ebedec91994cc19dd2e4a71e12fc26430c32c0f47ae1b8a41236f0bf5707fc72e
+MISC ChangeLog-2015 1905 SHA256 dc6349d59ae0ffa7c4b41888f4ef88f16eb5fd87050fe56f7fa9f836d93823b6 SHA512 6f317952d7f772d0b5bf10866de4de0ad2aff7e51b38b2d7d320e2fe027962f846970d5ce68a1911c8db63f486e2e8b47ed37c052b4d7c3cda6700c6997eee3c WHIRLPOOL cc68e5150fd650f695eecf7a7f9d7bb29f462169edfad0b1652bf84b0691404a3a850c02cdac5350e1c583de16b0c5eaad889788e5d479e94000914448ec5f28
+MISC metadata.xml 245 SHA256 79296e55bf4f9bf1b8b098eab1b00e4eb54820f2c455a771eb80845555e0cdf7 SHA512 023dccf92d6be9a5ccefa97f75d1d4df7a5590ec62f5969e24f45ba12be7d2128e0b2bcf0e5a0b59e2616d586c830c58fa43535d17e38c00b896b05490ecdf42 WHIRLPOOL 788dc8ab8b73020d3f1cd8243324fda5cc64ae969f895853f3c9d986dc8a517f847670369bc41704cb800f6d9b12d9ed30248054f71f24279cfcb7cad6a037c2
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..a0bb3fff9ad7
--- /dev/null
+++ b/app-arch/par/par-1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+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
+
+src_prepare() {
+	sed -i \
+		-e 's/\$(CC)/$(LINK.o)/' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin par || die "dobin failed"
+	dodoc AUTHORS NEWS README
+}
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
new file mode 100644
index 000000000000..0aa740b02ce9
--- /dev/null
+++ b/app-arch/par2cmdline/Manifest
@@ -0,0 +1,7 @@
+DIST par2cmdline-0.7.3.tar.bz2 3129759 SHA256 dfd8cb54c8ce6672ca1f94ae180179d702bbd2c2f88b36dac256d7cf1edfad55 SHA512 85fe91f2e7cc1888171390f82fe2d12279e65eab17b3a6db209998aed316c5ea9dd5e63004cf975cbe460c1ef27860af31160e8757921c4027e27997dcd8be8a WHIRLPOOL e40818de0da3ddf5df8b17fdb2e62d39647161de1cd7368f615ccc05efbfabaa47dedf9e56181e638dba51bc1e41828afb415e26acddaa8881c7b73e70b1d288
+DIST par2cmdline-0.7.4.tar.bz2 3129835 SHA256 e602db3d8bdc49e2cb9e0e089ec31cd262e661ef7450f5d556e43a97a299e71d SHA512 20f99556b4dae2e4467d781a96adab8d9f9a42dd43707de788b268eeea2bf59d92847e3c4faf413ea3de361360ef1236e97343ee8b625c9c2cd65ec9546e61ec WHIRLPOOL 38c11146bc7829352f33dbe57d68ed91e41547df5bd394efb6ea3d18ded5ca2770a98ac5c9364183afd9b46340218d9dc6239e7a15555a89702c473cb273e6d0
+EBUILD par2cmdline-0.7.3.ebuild 782 SHA256 0bba81eaeefabbda4837b7cd2222b1264483dde17082134c93ce35126a82149a SHA512 ab03cd0dbac07acbdb43e2a0d681c6e73469ea137ff9bf1f9340f3c85d1823a3ad3e15312682bde3cec2f5f4eadb1605e1a91544e69c809d6f46814d3a4731e6 WHIRLPOOL d56eea81286abaccd53b6e8ae7f76a321ee6f2de50acfec772dccfaaef141e690b8ed5fad8d6ef532739965db3316a69236ceac065a91991d62f76fd6d12e6f3
+EBUILD par2cmdline-0.7.4.ebuild 785 SHA256 de498128a8477b2e13b61a2dd6d42cd7f1394ea5619a82a38d41678f54706ab7 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8 WHIRLPOOL b16018cd2b5a0a0d1dd7c3662bbb1b5596525f25decc77303f242eb6dbfd1df944a31feb06607be3450513ae85999f279c85cc35e1c90407394a818167a6eb0b
+MISC ChangeLog 2785 SHA256 1a184b74ffeb988d67d05020f9da3f31481ce034991cc0f5b21cf74f1df6223f SHA512 bf9fe1207184d55e354de783ca8a0713aeb467c6d6a3a38dfbc1937ca5d113b5895e02099fec55a00271686a350ff1b314f543901dd6d78225921647d70756e2 WHIRLPOOL 0eaa859bea744a491ac7fad141ad1212f3a8d20043303d9bfc512d21678c9b097d9145c65c7cec59e55fdaef456eb025672654496e689ce28bda0616040186d3
+MISC ChangeLog-2015 6041 SHA256 f54a313c73550db2e90fb601a027e3af9bfd63377bf3c741f76f52f9371b7a65 SHA512 f04dbf477befc5a1d2036cf75193dc2f34aea0db57ce8d9dee06c66edfd8772ff93eeaadab16e6663278be3f39a164b06595c3882ad2eab02731e5474849c1d3 WHIRLPOOL 6d386f65cf03f3817c3b1154876000553bdb210f57c5c8e5917f37155133bc4738997f93432beb84edf30c711b8ff340bcd5c27c1d452090d98629923e1d23c5
+MISC metadata.xml 475 SHA256 180746b06c12ec901fcca7f82d84d9ccf1c74bcb17b6557511c3f63cf7b5d367 SHA512 3da9d56f2ad5a378af692de909764456ca128f3978153f51bb44e97fb897ccab693e01187b0282cad699842096dd02d37c23e0301eb5fefa167f06a3c21bc326 WHIRLPOOL 1aab73c05c189b6f0d89ea730559b006827cdfe26efb5c78b44ab10244c463102f723cf47928065d01c05ea2cd21d8064a6ce2e4118879b7b55901751132d4b9
diff --git a/app-arch/par2cmdline/metadata.xml b/app-arch/par2cmdline/metadata.xml
new file mode 100644
index 000000000000..d46cfbf7604d
--- /dev/null
+++ b/app-arch/par2cmdline/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>swegener@gentoo.org</email>
+    <description>Primary Maintainer</description>
+  </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/patool/Manifest b/app-arch/patool/Manifest
new file mode 100644
index 000000000000..4225a07c7971
--- /dev/null
+++ b/app-arch/patool/Manifest
@@ -0,0 +1,4 @@
+DIST patool-1.12.tar.gz 69146 SHA256 e3180cf8bfe13bedbcf6f5628452fca0c2c84a3b5ae8c2d3f55720ea04cb1097 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc WHIRLPOOL 2670226c76bf93e74d64b4ae023a33857ab4d036dfb9368d150eacf0de5d9185a53f5de34d5beee14a315cddd159c70c648abdc1ae6dd6171edaea1d09992d3e
+EBUILD patool-1.12.ebuild 438 SHA256 fbf81f145a170e6a4dacc592745d70ed5bef292b01f24f35f8c81a4d2c343279 SHA512 f3ed7ca96220448ec17507624c6ac6edd5294fc8a0729b8bcdc9f663aca95ec54ff9694e827343eff5c51e6b80b01dfb146be47ffa4b6880e4bbcd933f482ced WHIRLPOOL 82175148df628e1368c162835e0d86bff3053678f5bc6cd1c184d676536e6586430436e43b45402591dfeabf53ff642074d0b4050694fceca694f152c712d01e
+MISC ChangeLog 530 SHA256 77c13b300430ad690f7d57efbbc1f1a00524495d2bf3bb955e334dbe6ee155e2 SHA512 a3c03210969b376b5cbb00c6205e8e0d5410daed4459bd229e3fd2262710e2f5778ca592ca9c5a11bb9bcb4d871828fd89f038d9b14ccaaf49d3d233ed227f4a WHIRLPOOL dfe471becdb324cd96c0951a861dee868b649c1501bb10a7f987d55f61d821ef1cd5ebe05afb2d7309f3deeacc6f956f756ef108d2d92cb72d48b8e020b9d129
+MISC metadata.xml 455 SHA256 fabe481fbb3a3c1b0a8844a36c43dac7f9e27814acf839c547b493eeeb05779c SHA512 d6d0b1c1a2704fbf8949295fe2a4e3f527bbd9b4cf509f3d6da756cf358fb123afc717b87a7cc463c90246fc597bef8394d4a70f1bee68b0c58f8ce99178201b WHIRLPOOL 801c6de2e785f843139390d3c5cc067a300c5cb4535db68cf0ae46d981d95cade03d2bb2c3797bea68bc2b652f4b6fb7fbb7f49d9defcad6f47d021782dc7ae4
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..e85af20eba83
--- /dev/null
+++ b/app-arch/patool/patool-1.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+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/Manifest b/app-arch/pax/Manifest
new file mode 100644
index 000000000000..b4cab290188c
--- /dev/null
+++ b/app-arch/pax/Manifest
@@ -0,0 +1,12 @@
+AUX pax-20160306-glibc-to-linux.patch 932 SHA256 5dd64a70e394c15de0be8d9c4c2a366cb4cd998c2e32611dd0aced799a2c18e3 SHA512 96d018bd1be2b0d22c9c5e11a92d8cf7ef9bc72d1b13686e572aa15935f2fda9d507baf1e0eb916fec776c2f9d7bab458c203cab64446eed34b70f544109d1d7 WHIRLPOOL a9362fe33bd93532a123b35b4b12b97890b863035773dbcd79820cd7eb4ce4536c46fcff47a8d3947676ee166a4e10e62c1ccc84423ab3ee40d97d91fc67df1e
+AUX pax-3.4-fix-fts-includes.patch 709 SHA256 046520dd169157cd277a5c5be118848c580b67e07c7534d6dc39a9893058cf45 SHA512 16acd8b4f479a401e93a0bac6dc2436d0da833de697fd0b374c3293a429bcece18ba8344d5be043353664caec25f1e7717312870f07132b571d5000a5b0c10d6 WHIRLPOOL 1e23f57dad152b3ec768ba60582dce481769db099f6729e45db4f22e7fa81bc25759548ea0581fded4b01a84af0c702472994e74a053bcf63e5d74ab9178861e
+AUX pax-3.4-sysmacros.patch 204 SHA256 edc865b25d1dd8899b0e561d8f1728722a3412e59885bcad3d9f12444ec90e5d SHA512 9f99e0943aa243aeb026f23686bd09a3ded69903010495cfbee22eaac4b4c586103884e6275c63510bcd82d5cbbce13b4276996cfae5c6e522ec75bc3902a0d7 WHIRLPOOL 5b2c4b5a62737f47160437755b9a3a77d430936a2ff12d8d71567b1dffc50495c1bf55f6c7312e4362ac031a66e521f3f1bf535a5a44e28bde61fa937b72dfef
+AUX pax-3.4-x32.patch 6252 SHA256 d4d08ccda2a489c30bf933ec99ca45aaa50d8c67062f08d93522f2fa2106e138 SHA512 048a450eecf25333a9f4b20a1cf20c088636dd579b0ee37517e378793360429c8e0c86a4ebebb47ef15005ee10a265e359932deab970b86e35a2743d86e43d08 WHIRLPOOL d466be17e8e55a5ca8a34dc2504dae205484ada89aa9c8fbbfc0d37c015547642af3a75a6875c8da512f3e76b7cd90fcc07cd3024c9281e5da80cd8cb92eb452
+DIST pax-3.4-12.fc16.src.rpm 171016 SHA256 b86ca0556b12600d3dd4777900baae5118e71ce9e026e42e3bb51aed23853932 SHA512 78704cd1b66288acdaa8fdf4ca0a97c12b1e843e024be4d3fac88a6b42049928c6bfe69a72a58a00a9bf755c23e1e8e0b7d30bc72ba08a83830495dd5f6d9be1 WHIRLPOOL 8a674356efa939ceff0f502de926688d81f17da48c98f24674a76f11043f420c33aa9f47eb66fb1e896ddc4ca4c64cec554d7397379d1ccc884bf02b37eb9b29
+DIST paxmirabilis-20160306.cpio.gz 147448 SHA256 4e36fabfabc01a15e0d01eee0306cef79a7f374586f46254dae139eb866ae81b SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f WHIRLPOOL 5945f45cc69cfd25d7754a9b6b25db98170de2fc926ffe3a661402d95bc41517e40ff059998d682cc65e32fd7e70a78e222525012eb98dde54c1d67c0c6c2277
+EBUILD pax-20160306.ebuild 1423 SHA256 57518b16ed82b8be0516e80fff1a72279034bab7454bc8e103e0d35c07fd14e9 SHA512 f1845f4921f165c8ba3130edd20fc3972c701caeec35fdbca0898faddc23c08c076a290a983786ff4e28f9ceb1fa1d5af3b230bad3701dfdc990720cc35e0cfc WHIRLPOOL 68eb577d1e896fc08cbbbe983faaf8e86d062b83dbb2d8945c3bde71a4eaa968ec0b951f3ee37e384f69aaefd509b5e3d747a299909a2f987d036920bef70913
+EBUILD pax-3.4.12.16-r1.ebuild 1093 SHA256 a9dcb473b1ea1e9a809a3be72d649ee17269d44c621ed60569733eb7b0476702 SHA512 0eb424739cece9e87e6c8154733dd2035248f1f64b713dd532e4c342c10b4eb0b917e9aa548363a20314f2c01d1669bb781aa6836143849020473fe1340aa935 WHIRLPOOL e764eab01c0fd9c3f24231788602f8450d1890d12e558d8b56bec25b5b5cb5a7ef0062e7dd2943525090b981d15d230b7d8c3c670715e40ccd1f0479a1f6de46
+EBUILD pax-3.4.12.16.ebuild 978 SHA256 90615183f63838b7100d8212a2c309d31c75893677ed49e9767afd75a616f130 SHA512 641c0574dd68f22aab3bf9d9c1c1ef28369e06c082af391eb6aded79225f23549712e7b4d999b92bee42eabb1b49205cc0f458cc5fbb1d02e774f6c9249ddea6 WHIRLPOOL 423ec15bcfa280db1fc45d01b3d3cc5d52f4e6a0f74f303d129128d41a65a3ca0f1169e34453ab618545005c0b2baf1de805b983baca9089748faa690c251019
+MISC ChangeLog 3256 SHA256 1a854680b7745056b95722905aebfef2eb438d830e3f4913716c9683c61d9a50 SHA512 8c2888f8024a21aced6df437893ae171633b3b331878e3a09b2745b8b24b62e0f170f69ae73d17c460f39d33c1bf45c35bdd948ab71087f2fb8b127b2918007a WHIRLPOOL 3956aaad76dd9400ac706888bb4c4216a22022f744da5b3cc27aaeace344338efe670ff4960e4440182a4ed5cc081b726f89147ffb3196c18072dae04c738b4b
+MISC ChangeLog-2015 3174 SHA256 a6c50b489dab184206dc36f0ef5abe180082f7d802acae758c4c7c071a5fa733 SHA512 f74df2c5cf0a8abdd905fd80251e327c5608f6de95398ed16f571ea5be7273a9db215c1d0f943a89c823efb800989fb2ee8d8b91209c6b94f1ff905cd088b60b WHIRLPOOL 205709456a97a0dcdf923fd1674c33b45d4012379bab094ec57c41321b149e05b73d44573d82b808d7f4927545ecdb0cf5605c3d7f9de1c4edd5781b9e07067c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..f864729cc4fe
--- /dev/null
+++ b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
@@ -0,0 +1,38 @@
+--- pax/cache.c.old	2016-03-06 08:12:52.000000000 -0600
++++ pax/cache.c	2016-04-17 13:01:26.461307830 -0500
+@@ -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/files/pax-3.4-fix-fts-includes.patch b/app-arch/pax/files/pax-3.4-fix-fts-includes.patch
new file mode 100644
index 000000000000..5e4e37eb66aa
--- /dev/null
+++ b/app-arch/pax/files/pax-3.4-fix-fts-includes.patch
@@ -0,0 +1,24 @@
+diff -ur pax-3.4-orig/lib/fts.c pax-3.4/lib/fts.c
+--- pax-3.4-orig/lib/fts.c	2005-07-29 09:55:25.000000000 +0200
++++ pax-3.4/lib/fts.c	2014-10-30 21:38:42.404092744 +0100
+@@ -35,7 +35,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <errno.h>
+-#include <fts.h>
++#include "fts.h"
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+diff -ur pax-3.4-orig/src/ftree.c pax-3.4/src/ftree.c
+--- pax-3.4-orig/src/ftree.c	2005-07-29 09:46:06.000000000 +0200
++++ pax-3.4/src/ftree.c	2014-10-30 21:39:14.876093149 +0100
+@@ -46,7 +46,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-#include <fts.h>
++#include "../lib/fts.h"
+ #include "pax.h"
+ #include "ftree.h"
+ #include "extern.h"
diff --git a/app-arch/pax/files/pax-3.4-sysmacros.patch b/app-arch/pax/files/pax-3.4-sysmacros.patch
new file mode 100644
index 000000000000..3aede97ec06f
--- /dev/null
+++ b/app-arch/pax/files/pax-3.4-sysmacros.patch
@@ -0,0 +1,12 @@
+not all C libs pull in this header via sys/types.h for major()/etc...
+
+--- a/src/extern.h
++++ b/src/extern.h
+@@ -38,6 +38,7 @@
+  */
+ 
+ #include <sys/cdefs.h>
++#include <sys/sysmacros.h>
+ 
+ /*
+  * ar_io.c
diff --git a/app-arch/pax/files/pax-3.4-x32.patch b/app-arch/pax/files/pax-3.4-x32.patch
new file mode 100644
index 000000000000..7ae1a9d914ca
--- /dev/null
+++ b/app-arch/pax/files/pax-3.4-x32.patch
@@ -0,0 +1,162 @@
+https://sites.google.com/site/x32abi/x32-patches
+
+--- pax-3.4/configure.in
++++ pax-3.4/configure.in
+@@ -33,4 +33,7 @@ dnl Checks for header files.
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ 
++AC_CHECK_SIZEOF(off_t)
++AC_CHECK_SIZEOF(long)
++
+ AC_OUTPUT([Makefile lib/Makefile src/Makefile])
+--- pax-3.4/src/ar_io.c
++++ pax-3.4/src/ar_io.c
+@@ -378,7 +378,8 @@ ar_close(void)
+ 	 * could have written anything yet.
+ 	 */
+ 	if (frmt == NULL) {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		(void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n",
+ #else
+ 		(void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n",
+@@ -391,7 +392,8 @@ ar_close(void)
+ 
+ 	if (strcmp(NM_CPIO, argv0) == 0)
+ 		(void)fprintf(listf,
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		    "%qu blocks\n",
+ #else
+ 		    "%lu blocks\n",
+@@ -399,7 +401,8 @@ ar_close(void)
+ 			(rdcnt ? rdcnt : wrcnt) / 5120);
+ 	else if (strcmp(NM_TAR, argv0) != 0)
+ 		(void)fprintf(listf,
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		    "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
+ #else
+ 		    "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
+--- pax-3.4/src/cpio.c
++++ pax-3.4/src/cpio.c
+@@ -218,7 +218,8 @@ rd_ln_nm (ARCHD *arcn)
+ 	 */
+ 	if ((arcn->sb.st_size == 0) ||
+ 	    (arcn->sb.st_size >= (off_t) sizeof(arcn->ln_name))) {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		paxwarn (1, "Cpio link name length is invalid: %qu",
+ 			 arcn->sb.st_size);
+ #else
+--- pax-3.4/src/gen_subs.c
++++ pax-3.4/src/gen_subs.c
+@@ -133,7 +133,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
+    * print device id's for devices, or sizes for other nodes
+    */
+   if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+     (void) fprintf (fp, "%4lu,%4lu ", (unsigned long) MAJOR (sbp->st_rdev),
+ 		    (unsigned long) MINOR (sbp->st_rdev));
+ #else
+@@ -142,7 +143,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
+ #endif
+   else
+     {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+       (void) fprintf (fp, "%9qu ", sbp->st_size);
+ #else
+       (void) fprintf (fp, "%9lu ", sbp->st_size);
+@@ -334,7 +336,8 @@ ul_asc (u_long val, char *str, int len, 
+   return (0);
+ }
+ 
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ /*
+  * asc_uqd()
+  *	convert hex/octal character string into a u_quad_t. We do not have to
+--- pax-3.4/src/options.c
++++ pax-3.4/src/options.c
+@@ -1545,7 +1545,8 @@ str_offt (char *val)
+   char *expr;
+   off_t num, t;
+ 
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+   num = strtoq (val, &expr, 0);
+   if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
+ #else
+--- pax-3.4/src/tar.c
++++ pax-3.4/src/tar.c
+@@ -58,7 +58,8 @@
+ static unsigned long tar_chksm (char *, int);
+ static char *name_split (char *, int);
+ static int ul_oct (u_long, char *, int, int);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ static int uqd_oct (u_quad_t, char *, int, int);
+ #endif
+ 
+@@ -196,7 +197,8 @@ ul_oct (u_long val, register char *str, 
+   return (0);
+ }
+ 
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ /*
+  * uqd_oct()
+  *	convert an u_quad_t to an octal string. one of many oddball field
+@@ -427,7 +429,8 @@ tar_rd (ARCHD *arcn, char *buf)
+ 			       0xfff);
+   arcn->sb.st_uid = (uid_t) asc_ul (hd->uid, sizeof (hd->uid), OCT);
+   arcn->sb.st_gid = (gid_t) asc_ul (hd->gid, sizeof (hd->gid), OCT);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+   arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
+ #else
+   arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
+@@ -659,7 +662,8 @@ tar_wr (register ARCHD * arcn)
+        * data follows this file, so set the pad
+        */
+       hd->linkflag = AREGTYPE;
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+       if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
+ 		   sizeof (hd->size), 1))
+ #else
+@@ -834,7 +838,8 @@ ustar_rd (ARCHD *arcn, char *buf)
+    */
+   arcn->sb.st_mode = (mode_t) (asc_ul (hd->mode, sizeof (hd->mode), OCT) &
+ 			       0xfff);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+   arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
+ #else
+   arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
+@@ -1081,7 +1086,8 @@ ustar_wr (register ARCHD * arcn)
+       else
+ 	hd->typeflag = REGTYPE;
+       arcn->pad = TAR_PAD (arcn->sb.st_size);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+       if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
+ 		   sizeof (hd->size), 3))
+ 	{
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-20160306.ebuild b/app-arch/pax/pax-20160306.ebuild
new file mode 100644
index 000000000000..221a2103c1a3
--- /dev/null
+++ b/app-arch/pax/pax-20160306.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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"
+IUSE=""
+
+RDEPEND="dev-libs/libbsd
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+	$(unpacker_src_uri_depends)"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}/${P}-glibc-to-linux.patch" )
+
+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} \
+		-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/pax/pax-3.4.12.16-r1.ebuild b/app-arch/pax/pax-3.4.12.16-r1.ebuild
new file mode 100644
index 000000000000..7962aaaf3f41
--- /dev/null
+++ b/app-arch/pax/pax-3.4.12.16-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils rpm versionator autotools
+
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${PN}-${MY_PV}"
+RPM_PV=$(get_version_component_range 3)
+FC_PV=$(get_version_component_range 4)
+
+DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
+HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
+SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rpm_spec_epatch ../${PN}.spec
+	epatch "${FILESDIR}"/pax-3.4-x32.patch
+	epatch "${FILESDIR}"/pax-3.4-fix-fts-includes.patch
+	epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
+	sed -i configure.in \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		-e '/AC_PROG_RANLIB/a AC_PROG_MKDIR_P' \
+		|| die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
diff --git a/app-arch/pax/pax-3.4.12.16.ebuild b/app-arch/pax/pax-3.4.12.16.ebuild
new file mode 100644
index 000000000000..cdd4636f56d9
--- /dev/null
+++ b/app-arch/pax/pax-3.4.12.16.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils rpm versionator autotools
+
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${PN}-${MY_PV}"
+RPM_PV=$(get_version_component_range 3)
+FC_PV=$(get_version_component_range 4)
+
+DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
+HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
+SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rpm_spec_epatch ../${PN}.spec
+	epatch "${FILESDIR}"/pax-3.4-x32.patch
+	epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
+	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
new file mode 100644
index 000000000000..2d01f343fa87
--- /dev/null
+++ b/app-arch/pbzip2/Manifest
@@ -0,0 +1,10 @@
+AUX pbzip2-1.1.10-makefile.patch 263 SHA256 ea458b7dde5964718378ffec7e8b44bccfe8732a53a88eff899f66415971b1c7 SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df WHIRLPOOL 03ac019bfd10b665669fd38511493796c1c96a579f7c0d068f758fffc0de190447425417d71b5ba8a9fbb9110cd486b75a52641217f40b19605871409be355f9
+AUX pbzip2-1.1.12-data_truncation_fix.patch 3348 SHA256 f1412ad45eefa5e45347a8c90f06553bca73dcceec3c7b334b342b03d9ac50b9 SHA512 c6bac8fe33f9d123358c1a01cdb94a8dd6be4c63553f62568311f06b25cf371ab7d881797ebb0d66d9f772c5644fe1f38a70fdbd64b99adaaed82f1e96dcc966 WHIRLPOOL 8d33c41ed639b4dbfd2ce1aa4564a0d92d044073bbcfe30993b570c3de3de7608c97e12f3afb191e8681fa35f622d353dabc043bb7065be7f69bcc0fb83e4b17
+DIST pbzip2-1.1.12.tar.gz 47826 SHA256 573bb358a5a7d3bf5f42f881af324cedf960c786e8d66dd03d448ddd8a0166ee SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6 WHIRLPOOL e7e9cd45b51aaf227e5bcb6e8df37b2fc05b2e3b8b666fcf213e05dc21d6df7392918e97d95379d25231832a9cfae938fdf5590ae7a7d3e6ad1968a9b2c25393
+DIST pbzip2-1.1.13.tar.gz 48015 SHA256 8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8 WHIRLPOOL 113a73732e571ff3431d29a6b8c150a2199fe839ccf3282f6cc1adf4bbace649fce4d377e25401132fd8f1c1c3eb48840a0c00536960cdaa288958de51f28d99
+EBUILD pbzip2-1.1.12-r1.ebuild 1122 SHA256 d79beaf8ffd6891875985b2fef398a79392c4aa1b52f85be087ada4e14ed4c18 SHA512 137c5d554c2cae6a9db6010037aa24c1edcff8656ee524526eabde2c175543f596cd25d87f5fefa32567ca9b22856504f52a5f4683c6d619f7fac87dcd47a2db WHIRLPOOL f8219ec9b2b6c99a27802b00039a63909fb2036af52b8fa9c65a72605f1386abb2bdcd0caedd5f77097602fb3f74c311f3b5a961154fe5651d61ede3bbcda59d
+EBUILD pbzip2-1.1.12.ebuild 1060 SHA256 97ccf78157ff460f660dc08e3d74858154ad57886c09484ffd0b540cbbf40818 SHA512 3c6d032f54827eedf507faddb4c9ef4662dafcd5e36e5730a864f391714f08ab4089e595a2b314dfd494bb2df967ed9e8fa180032daf4c5c7ee63d055cebaf44 WHIRLPOOL 84c11da547458d4609b80920163402e5edb94f529c0da4bc8d467ae8c241009144da4e6cfe1b91cea1997218322b58a10446b79eccb0c4e64e401688d9220ca0
+EBUILD pbzip2-1.1.13.ebuild 1041 SHA256 ab11e54a247530cd5c6877e6d3e62490c0650f05e06055b8b0e412fe4f188100 SHA512 b722c6d121de58734d5d2cad0daa960e803a6110ef1725c24d805ac35ca4d1b0deb2baa832f9d47ae0c066ff0d79aa0c9a8669b198194d7392d5490e5164c6e0 WHIRLPOOL d299dbcdf2ad168f4cb162cf2912f09abff0757f46724e436abfdfb896dfbac6d10d83fa432c71825d2d21d1c76952b25f9a485cbcdcf999fddb7756f99ab8d3
+MISC ChangeLog 5376 SHA256 439f084ee45d48b36ab915b0831ba8cd463addd25d574daf4ba8327a12a25047 SHA512 2d347a6cd29498715485712e34dfd2224c45bfd98e46c74ed93aa3135d5f6b2f0ae79392cbce3f4623e92a02bfe465517ec622948f09252aa249be9c86b61bd1 WHIRLPOOL 7f33ea6ce9bc12b2a0ae0cd72e87b5e7526868025f4f7800c6faa63c902e153cd216cfcd79a043a11e8a323c6b6752b8d9f0e88c4f2c5a828e7522a2419a0189
+MISC ChangeLog-2015 15896 SHA256 eb0dd316e8512bdd7421176aa9556f63b00134b4339e22df67dc658976ed4d3c SHA512 e7f43dca126df512f2186ea72433b2e9090de44ebbf2a8f00ef1b98f6870dcb2d3570da45fe3822d3f78353e2210d72a60ecba097dd593741316b8e155612e9d WHIRLPOOL f7c7e8402de8a831b10829148293ca74b56a87f30569a88a6b817e5a7559cb0a47d84174cd4d4a676ac021cd325fee0698ba336720e32605d4c6d0cef398a4f9
+MISC metadata.xml 443 SHA256 7e39e7f000438502dbfcdbbebeaa8b115b32d35e5d46fab386a324215f2cc689 SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0 WHIRLPOOL e879b9763dded1e8a1631d8b13bbe9d74da22fd50618e95aaef59acd5ae24dde60343275b66606b3142e0acb3bb74fe79afe7e4f06ff5b9cfe451ca10cfa76ba
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..ff11b13040bb
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -0,0 +1,40 @@
+# 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() {
+	emake DESTDIR="${D}" 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/Manifest b/app-arch/pdlzip/Manifest
new file mode 100644
index 000000000000..fd128d47e1c7
--- /dev/null
+++ b/app-arch/pdlzip/Manifest
@@ -0,0 +1,5 @@
+DIST pdlzip-1.8.tar.gz 60564 SHA256 05af84a34aaac66c96d34e4935ecfde3717b535d0980211981ba4c539f92cee5 SHA512 ecab8500105754499448c0cc481917404ce5b9dcfb6ba66c5c51fbc8a6189b109d025f38bc7c497aa2f602e7722f302d6b05e4ee37c5ec8f97cdf253c128ad9e WHIRLPOOL 150e7627525cbfa021ea7c42f04557917b95450f5e42827e021df293622b09c55e6984c6d7410713f41572124a3817e7d52cb47e7ffec8e9a22d0321cddc45f1
+EBUILD pdlzip-1.8.ebuild 618 SHA256 aaa197617011b5f2cec5d4c19d4441147a0c60bf49a15e7336b198da256d7148 SHA512 6eb150c202f8ec95df5674b1817d14c15f99ed11c15cff59b39110b3c860b99a729bde2a1c72edb8b56e259637c499b27312e052925d03c44b9fecfd7b5d2bdc WHIRLPOOL d9e232ed3774cba2810dbe1174f62273fb993a1823bd06d5511d4df99a8411d95186f6c0631af54c44a6348b1d6705b7e9d6150721a1c6d3d30caedcb8862f60
+MISC ChangeLog 2393 SHA256 be9ff8251dd07350b98fe641a5326f535f5ba03603ecbd59a145949e7c76998f SHA512 f84d4623702fe8ad7b254a9a59d931d4cd01d680a093c7a23c9b7d2cf45ad48688fc7eaf6d1a1ce8e21828790ec9e89cdad0b6fb89f04109ddae4f71ad4c81f6 WHIRLPOOL fcf526ff082873e78675fc00892b91dd6613cf788d35838aaf94b12c503ca645fab76802eabfa1a6a0e1179a01e8cc3931771a78ed097bc48a9be45bdfa5d2a5
+MISC ChangeLog-2015 619 SHA256 9625d3357d48777fed215e658a06ed000efda53cafd8c69a2565ae2d886fe20b SHA512 8c59502ee850a93e5d1d581e11902d9db0e2943f1358e4de9849cb94a4b72023192e3adcf9304e628c5b403c716f2c05eda58119830557f87fb4e58c8036bbd2 WHIRLPOOL 63101cefbdb0c5fdca649d179f46263e2ef76b3efa56805c779b36050314ed61078df8b03d3d78db3efed8459945df463695b077af1d399eba4a91ba9cacfb9e
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
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/Manifest b/app-arch/pdv/Manifest
new file mode 100644
index 000000000000..44f6e0be39b0
--- /dev/null
+++ b/app-arch/pdv/Manifest
@@ -0,0 +1,10 @@
+AUX pdv-1.5.1-default-args.patch 892 SHA256 db727ffb6f2307163559f6e6f244ae30cefef3cec521ce211c5d25426ba67f60 SHA512 31f3b4f3331723e1bb99b16a9e9c80eb55d95dfce3bc3cbce7d3f629c1aadb16e5dc037bfa4a6157e1a85e889444d0c5c0b687022bf1e60d9a49acc8352e4f34 WHIRLPOOL 5a676803efab410dbf3599f2c48ff0d81d7f383e76332a64f9301a42b805ed2e9580449361411872c13bd9f67f497edc32b482489e483a22e64ec3c627afc8fd
+AUX pdv-1.5.1-early-free.patch 512 SHA256 01ae09434ee3bc239a461ebc10f496e699555acb476f664323fcc6556fe5ceb8 SHA512 52c921d80e33233e92c44948e9468f93b093bac4ae500e7e3a6b54b6e9b3d8d38c30ad776ea53e86e2000d634a0e7fb03e95b0df39b1fd88624831bb4f95e563 WHIRLPOOL 30ec7463b0b41f4a14ffd4237f78c7917ddbaae5508c49c336e53a724a11f35468e12e19005a7e6c3875fb8c84433c1294f0a6cea53d9dfea53d6a51cd6c9d0f
+AUX pdv-1.5.1-no-strip.patch 419 SHA256 0240a6c7288abad7d62521982d9d73d972644b316ed802374ad4cc86a215f252 SHA512 e45976aea1f0573ccd31379759c32e2504637b183a31451aca0ccf628ce12301760fb005376768c2f98d697dde59489768edad10c542d21a06a69d06b6c43b19 WHIRLPOOL 435de40885886c08aedc3cb308caa2c92cb4e7edc0e4785c04f9c91d7e9f75765e21a6b8749a3771dd9fd9482b741fc13a46fa6ea1f40a7dc2590242fee6877f
+AUX pdv-1.5.1-opt.patch 696 SHA256 40c454fe4a1a37da14db28b70bd3c6484eb2b2bf3b682db8b74b5a6c2c5cdfa1 SHA512 bbe6cece336f649970227a577d17835b401262e9d6021a61d97dee69972826466b720e5f9b60d552d84e1223003fcf047314390afdf48e07f4b2c55868caf599 WHIRLPOOL adaae5b64d51f1ff5c8fb551b04c14a4456f86f84bc721d837c374556d5fe06e893202259d7eb579ed5283aa5e791b192930f29a82576834f11daf142129cd0e
+AUX pdv-1.5.1-x-config.patch 529 SHA256 9cac5029327c81e08593efbd6af72b4503742d314ba0cc6652ddfd2d788a099e SHA512 7be234893169656537c15a124d5a50de138e85d2d23ab5884d600399f3aba86724ebac397846d03992a4556e7ca8a8ba42f5cf8c3e4348080e4c9e0522e05cb6 WHIRLPOOL b89667c007378f62d0225cb37560b764ab30c731875e43bd7a8316f7ad803584444a11a40570b34bcf9b8650f96f2cdc5f2c2ddba090d2db2b8729b57ef1599b
+DIST pdv-1.5.1.tar.gz 87858 SHA256 1c941a571e1f60b903b4b8e5154f1321d32cd593118c9f399e3fed4561a1b1ad SHA512 c8db9aa4c29016474d33111e8343174a1fb25f152517bceb29428def5e02590b1de523ffcf2c0f6ffbaec5b357e3893f48188775c2e66d343a21e04343b1d0e9 WHIRLPOOL f114691b60e80c598eeff6dcf3388670d13ba448ed893b5de6ea0a8a0a31afff993cef0b90fc84ccfeb944c8333accf05d8e6720668b62104c252c7388d7b410
+EBUILD pdv-1.5.1-r2.ebuild 1398 SHA256 ca0e5c7d5983567522e5d09f4facbd11815f35eb7c270a5a4ae9f68cacbfe25b SHA512 87006fb001ea0882103fd48688daab37eb5f33f755e7d5849dd35533950f62ea78a85799ee58e73ee6a1ccca0725b63fc1fefbd6eae7e0481761524dc9c3dc34 WHIRLPOOL c32c3bc6b8a2d51b17a90a6cd89222b24b529597f5418d3c3730b0987c544d3ac812e12d678a4c5d1d81d172d46637b61a0feb8d674a2e82f18b56fb4725b66d
+MISC ChangeLog 2797 SHA256 f0644b622f47fc3db01cf925ac752ec3aa9c1229176bcca45558970a80b30add SHA512 37e13c3950c76e497aeceedb26236d2f305ba4f8ff4fd6e76ba4246980e13fac0ed53b9e5bd8ed23bc6af53ffd474bcfcc4ca97c55359ef276f667ecef0ca280 WHIRLPOOL 870976b52ba8e951203aaa43d32a96a7d84980b704904b210c6d79eece3399e21e681dd47a1a64b1959a114b2756df0842ab723adb2dde4dff62d50a5ead0a94
+MISC ChangeLog-2015 3451 SHA256 44da66fd1abc1f0d7fe35b96e6c38211d61c81d8ab9f9d7fb0f9ac4abb47701a SHA512 46787addf1984e20701f5b9ebf6458bf72f21522ae5bd494301319721a51587a9c5c5fac5dbf8f487b2a14db3641068ada976f7fa6bc2d41f2ded167548ea1c6 WHIRLPOOL 5b490b61fcf93d7685942b248a5fc473a6b2f59bf68262fc0d064cd7a331e0db80dfa7b5b5d6f97c50a8782a738f4d5745204068d92d707538a1b35c8d4b6c39
+MISC metadata.xml 368 SHA256 ff65774cac96a19bef187a20f7f7967271f8501ebd29d9451ed49ad5c36398dc SHA512 99c932094f434a6fff58492ce7bd1e2195bd6c7bfd69dc3dcfd46b8ef2ce0111dfb56a679b6e696b02a8333f1a6459ed107ac6226bb8b9624fea009a74bdd488 WHIRLPOOL 15726c6b8b13eb6f452b5db0e5cd661eeea30d096ec4a6281737cbc35b7718d213bf5521f24f79ff3e8687e4d3afff71616823d870ff0f933bf51444f7b6d633
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-r2.ebuild b/app-arch/pdv/pdv-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..509ae0fa82cb
--- /dev/null
+++ b/app-arch/pdv/pdv-1.5.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils 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
+	>=x11-libs/libXp-1.0.0 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix a size-of-variable bug
+	epatch "${FILESDIR}"/${P}-opt.patch
+	# fix a free-before-use bug
+	epatch "${FILESDIR}"/${P}-early-free.patch
+	# fix a configure script bug
+	epatch "${FILESDIR}"/${P}-x-config.patch
+	# fix default args bug from assuming 'char' is signed
+	epatch "${FILESDIR}"/${P}-default-args.patch
+	# prevent pre-stripped binaries
+	epatch "${FILESDIR}"/${P}-no-strip.patch
+
+	# re-build configure script since patch was applied to configure.in
+	cd "${S}"/X11
+	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/Manifest b/app-arch/pet2tgz/Manifest
new file mode 100644
index 000000000000..211782e5611c
--- /dev/null
+++ b/app-arch/pet2tgz/Manifest
@@ -0,0 +1,5 @@
+DIST pet2tgz-0.3.tar.gz 90758 SHA256 12a52a3bc40cb62fee5626d1a72aeea64abcd848b2e107e9cb546a404dd6788c SHA512 e6d2612c27184ea06114f9ee1927f0d1c6fa5f2bdecd85366d4b35564b59318a123159180eb3da747d46d4ddcdd2f4ec40def0b10d2882acafe5ed40e84826c5 WHIRLPOOL eeaf761611c559de029a671c95a47e0b12d7d0a84cb8368edeb718a0be923d3cd8bb7ca6c2e3c59669360989abfd1fc96a718b37636c7ef16823e80fd361720b
+EBUILD pet2tgz-0.3.ebuild 343 SHA256 fd94e79751a10ef71e890c87ef331de298104be84acb1bd47ce7460e3558fe6b SHA512 16dc40d1819da026f102234353bd76e02cce512234e4554b645ec076b621172ff16ccd036a15e0aa03224857ef49d91823da09ad52e3103fc62968d697dd5ead WHIRLPOOL 2f260d4b65cace605bb8ff200f61e363d0e9d2777789d2e14277359bbb926eace958a8eb969a73395abfab68cddc1ca985c6b753faa6cd5c2e95057e53a91ce3
+MISC ChangeLog 2403 SHA256 9ca944d494d3d48f3fec778baeefe3376a8eebf95d6f08136e84cb744472569e SHA512 10fed510eebc208471bb53bdc34d96a02fd423369af26eff2a13fc51c5112f55dde0962912aa94b852ea9bd2d466c54da569ab0b3ab6621ef3cd73a477eba4f5 WHIRLPOOL b85ae40a406502177d7490a2872a2cff211307760f3c5bcca0b44b43435d8db9b4f8d3abe7335dff35937e68dedde84aa24e173830589f589c802d43d7c31168
+MISC ChangeLog-2015 423 SHA256 4666f5f42304f7c6c3a7ec2b21493940266f6a9651c85ca10015e771db63d167 SHA512 431b31597c8f8102d755ba92891666b912328d9d26abe986806de5fe13d1f68c24466e6740111d4cc2b2b585d982bf65ab8f35c19b4e26d849022013a5eb5389 WHIRLPOOL 424e3cf5d999d20f2617a84ab623734fd18963c721c34b2c79c2598cc14851881c59eb2498f6c9259b2d96ea66be020971a6c62b5bc9278f7abc4a3bd5fddda9
+MISC metadata.xml 220 SHA256 8da5def23ae19934fcc7c16c2477daf4dd7a36bfb36f78c1575a6e673f655e98 SHA512 97f16489a2e8400e75ba59f23e380a89e66d6e9765e2bb3ca309a99a797b525cd6f333194226aea6c933e99907d4fe13f95850d033e4273d8b61ca06814a6be5 WHIRLPOOL 5308a38fb9a59211a69d7ab1367b6cec012ccf349dadf5a04e0383b532cbf047496c0bfff87eab2ffc556d55c3c9438bdbee42387ba107a5546178935d23f493
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/Manifest b/app-arch/pigz/Manifest
new file mode 100644
index 000000000000..18fbca7ba02c
--- /dev/null
+++ b/app-arch/pigz/Manifest
@@ -0,0 +1,5 @@
+DIST pigz-2.3.4.tar.gz 105412 SHA256 6f031fa40bc15b1d80d502ff91f83ba14f4b079e886bfb83221374f7bf5c8f9a SHA512 c0d5da6c5b2da50841aaf3958d5694edca0356d4bef211175e9f2f17e0c815e80b2e62bb39c7761c8f83fdaa84ca7373e130cdb0fa2c96f91c397556cbf7ba2a WHIRLPOOL 971bb8b9c4504b67af0793f7eb199a2abbdb62a0151fed43ec4a50fb9e325a8c6e331bc7a8e417f633ae395e88865e82f4b15b9cba5534178776b18ffd8261e2
+EBUILD pigz-2.3.4.ebuild 939 SHA256 520ee1c96d3561a9332faa40819b80cf7e8778aeb780ad6781e04d7333d5b702 SHA512 302e35b9d71cc701aa80e51db4f15bb59ca2e539195fe15d765249cc7bad3e914bb5e0786a2c949b1916373a4d53f60fe009c58e1b9f4e2a4f43d4e697ca1804 WHIRLPOOL 55d8345284508dd165357c4f91aa844ba8b766ac0ae3a3a3def8bb678bed524d76407d4ae23b3c0908e970310c822bb5d807fadcc365e995dc9b95f422c78236
+MISC ChangeLog 3599 SHA256 527e26cd9ca67bf072d59e876e82b97655b222642657e22055008e3fe628c129 SHA512 18b69b52ae22034ac265cb5563a076883337fc1ed98db1ecd304cd3e7a34441ebcd0894f851f94a0db2cac5dcc91840504c60e1ac0ef6a7659da920b057d1c38 WHIRLPOOL b4e565d8bae536673a8f08ccfa3d84f1e49033e2033c74126f36bb6c39836142ddcc3986f4406fefb20ceed093d375a922e73952f414a0af97eb042ae8f3f172
+MISC ChangeLog-2015 5805 SHA256 28f1c5ae6ff8cdf225c62b81b48411a365ed35d77db96b8bacb39843aca0f355 SHA512 cea95adb36d42317fd7503a5e936fa0672bffbbaba4b8341458c6bf350e0f1ee1c2c3b97541c1541af60ca7e49977f7d55926cdf25d0d912a7c62010abf7ef95 WHIRLPOOL 5d0b546425fcea28755973593fb41912ff3825143d9feec015075c98fadc922c75b930bc5815694f3a37e074b0b3cfc25936aa5b5b8f556327bed4ba9bcc9ff2
+MISC metadata.xml 499 SHA256 5e2eb8e72e69ee7d4c3d0595829989e9d4c757945a74a5c2aea7bb5118b2373f SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe WHIRLPOOL d6a1a7de2d6d7e66ddf227febe50bde3980ef00b1df8acb71771333c4e253e2b25e8a08740bb211ef894e127bec18d5c28d6704aadd81c03f8a4bce810b0acd5
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..575fbbfdcbab
--- /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/pixz/Manifest b/app-arch/pixz/Manifest
new file mode 100644
index 000000000000..3989a80a9154
--- /dev/null
+++ b/app-arch/pixz/Manifest
@@ -0,0 +1,6 @@
+DIST pixz-1.0.6.tar.xz 119516 SHA256 02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8 SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7 WHIRLPOOL cc5849746665a07e41e2f670410f00428a7ef9390e4dea83f1797efe51b1e73324002d68d74bf9c659affdcfc597ce45442da5f548d3326eb48af9fc6ce033c4
+EBUILD pixz-1.0.6.ebuild 1133 SHA256 b76d54356ba34e5bb23346112750689d95a84295f0954e69fbd56fed5b7011b3 SHA512 350b2274074199349d2724816d233df340c015a2fa2efc228bae5bf35838a92ce91150e9d3b0bc86cca7433830288876da11d6217a79bd4495d8e5ae974dab16 WHIRLPOOL 2afa9be995834567a54faff812348ecd673038d65d314d49a5f509f0b4a1a8984598461b0ffc3e83e11b8a7310ffb091374fca27ea3331f787b3e75f88b93ee5
+EBUILD pixz-9999.ebuild 1133 SHA256 b76d54356ba34e5bb23346112750689d95a84295f0954e69fbd56fed5b7011b3 SHA512 350b2274074199349d2724816d233df340c015a2fa2efc228bae5bf35838a92ce91150e9d3b0bc86cca7433830288876da11d6217a79bd4495d8e5ae974dab16 WHIRLPOOL 2afa9be995834567a54faff812348ecd673038d65d314d49a5f509f0b4a1a8984598461b0ffc3e83e11b8a7310ffb091374fca27ea3331f787b3e75f88b93ee5
+MISC ChangeLog 2765 SHA256 3c4bc6d48bebf6af5d9faaa1ae65c2f962b30a366984c999715125ff97e271df SHA512 fd9843db820db4aaa11b4dbb396cd8af39c5975c86888fa43bbad53713bc8347f681f9255331a5ca4fc513a5700294ad0adf7e6dc9203e66a0858c2ad93ef843 WHIRLPOOL 62a4e040a72d204a2ba965273b15da1ab55c2263db20fdac4d4cb307c788fd313be64320a45f2114f381365b1ba28ff8f8e83c37c66547d96690a0a62124c439
+MISC ChangeLog-2015 1340 SHA256 85254555880b717a55686a0c14e73e8a9f970f33ecdbfd06d240dac30be3abe9 SHA512 4cbe3402eef333b9a11e0cee892da2c3b1dde6cdf16e4c5bdbce71df84d7cbb5f95566601cc9154c07dec451412decb6667ea445a822b9d81ce3d7cde2837710 WHIRLPOOL 5300ec927cf23b530a5769dd369222d1b045434cfe323639aeb029568a7aef6374a2de2a005226545ab44cead414b66da4d803de52320c56a72afd7ab08dec0f
+MISC metadata.xml 331 SHA256 5b9295546506c2122a63cbdd9bef0f3a1d8e8597051f2097722366423bcb70b3 SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401 WHIRLPOOL 5dd43d8bc6aeb4ed285e0011cd2a522daee092ab4f1caa98c0a4ffd957ff92920e72f4d7aa13d1ce13a8d2aaa37e8a3889e16c34224a613d356be8b4ee0180c7
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..488b2bce873f
--- /dev/null
+++ b/app-arch/pixz/pixz-1.0.6.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/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/Manifest b/app-arch/plzip/Manifest
new file mode 100644
index 000000000000..eee8434344c1
--- /dev/null
+++ b/app-arch/plzip/Manifest
@@ -0,0 +1,5 @@
+DIST plzip-1.6.tar.gz 66214 SHA256 5d1d79fe4a1e41aa05e3926d067243efbaa607ed238036152f867662b7d14c7c SHA512 14f794e290eb58bcdf1fc5699c08c36f57473e36eeb3920dff519741c4265883f8ee348095a9315562812574c3f5ece7bd7ef4a11fbd955fe2ee54e361900f77 WHIRLPOOL 4efbf33363e489dd2ce7c3dd51e3a96b6137eb823506d0971e2fafcf143cc65733c31234e49f4efbb166b4f073e702e189c46fdc9f4111f2c6193bc84a3a3da5
+EBUILD plzip-1.6.ebuild 629 SHA256 f43fcc5c010df5151e9f384c8099ed2e0eb29f26003e61ebfab7e4e6f041da0a SHA512 dbf4a42c5641ae7f411591a9a79cfbffbf93a4249be5c1f650810311cd29bb136274002d1f182dd1e97e2671d6d3d1b966df0a9fc6cfcc8eadc903a780420e29 WHIRLPOOL 890286fcb2150a5010721cefebd049b2522da2b6a98223835da578bbeb54b1d0b28ba69c8a1538b25a27838a5c761b9fa1cab60a978ec39afc5347e090f2a4fc
+MISC ChangeLog 2320 SHA256 35039c3d8ff4ab3ac4cb5668c4d2f949e2b7d74ac31d2f8480eea5701a1ae56b SHA512 d5f7e6d4cbc73a7c65278eaa86fe9ee407a8a9b55a123ba545821f263ac22ac9dd8dbae00a77942c4ecbc1e44ad9cf0d9fd26332d88816124aff07a2f76b3fc7 WHIRLPOOL e9c7a7b7132801b17c6104399c6e92112b56d07288a29d3a3ef7a983ed31ddf47e5d78fd7917121906be979918482908b32e8ed4cef0743995d3679d5be546ba
+MISC ChangeLog-2015 732 SHA256 9e9043a45661fe07983fb12be72bf177632abac01d82e4377785e847b6f52b21 SHA512 8c7f9e1ebaffab678905027b185e8adea9a99b6b270bd8215b99e238268341ce8b4a2bac703931f89c121a30844598d35eb873e91c09cd580b9c96530a7a6295 WHIRLPOOL 7a41027fe29838b09e153611477bed50c7eb708206afa0a81f16faa871507f5f4a3ba8254cdccf10bab765830c77f7f7527636f333654907389b9b79435fa2da
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
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/Manifest b/app-arch/pure-sfv/Manifest
new file mode 100644
index 000000000000..4224f9977238
--- /dev/null
+++ b/app-arch/pure-sfv/Manifest
@@ -0,0 +1,6 @@
+AUX pure-sfv-0.3-asneeded.patch 392 SHA256 82be727f05017bdbc1ed31c2986b96c66f70216ee9459bf215b57103d9d26427 SHA512 74ce8a8628e2d0571556301ac8d0ec46ad7f9da50fe515197eb6ba81d9a7b41da1f4886e6d7b7fe6e411688bfec00296ce2f18c742d224e80bf1a8b614a0672a WHIRLPOOL 287a63b7ff1fcafcdb48c4b9952c6b2dafe4ddeadb0380b6b66d64edf03e468e30caacadcc4dba40d86a0dc9e657f89d6679de87aa79f898065ec023a8e66a09
+DIST pure-sfv_0.3_src.tar.gz 79069 SHA256 b5dc97e96656dbe397439c85b0b8ecebddd9d350a09a7485c653ff9210989321 SHA512 defacdaa0b78f708c83198e911ad93a5c5456bf15e2b33df61c984241df8a82ff4d962b8c7994c6413b36a61df2cc6d91c467bf8994fa43e0ac01db2585a78a6 WHIRLPOOL 2befa4d4dd6e0e043e50ca4b69e0024c71c68483af52ffe13bbac569d6f9482d5d167e25e918ddf314cf950e88e7271813c05fd2d1e0177ac6177a619ed7451e
+EBUILD pure-sfv-0.3-r1.ebuild 681 SHA256 6ee36431fcfe0ca132ab82031f872aabaae0b632417de85e5a0959b863d0e124 SHA512 ffc5d677fe40682bf744968c1ec7b21633c888f470eb0efaeefc2888d398d102f332e80587254a77693d9e5ee27e1aa9fb8fd7ded63d64fb1e0453c8fc867e0e WHIRLPOOL 75d74260b672c99e440621b53d82453566aab520c7ff332c57936dd8e738a82dc208e0fdd86ab8722fd6b7bac25947eecb952e50c15666c8373b8761d6805103
+MISC ChangeLog 2563 SHA256 78d8d0e79a40bc2324c5a8f39c091c8ee074d7f6b95292618926192ac1a6ed64 SHA512 fb63e833d91568727467efb3347ae5ed3f487dcd02fd1782eac0edd672b05993114d21788f2c10414c0bca5ae9f1f2fecc910351ea39ecc98e1afc1e009de5aa WHIRLPOOL 86c14c7f60e17f42f813486a05446f89b349cbebf5048d4a73ffc6ed3d5081f21e3856fed714ecc1e6e505075fc3c5e87792d8ece5c8dde5f6460ecb3f4f581f
+MISC ChangeLog-2015 2196 SHA256 fdaa6c3bdac2ea62a3160d8d06b1d01c919b6ba741f5c0b68714b8e2731c3268 SHA512 bd7b357d1b019977a6a4f0b34faf3eb793034940edaf98e24e8cf347f4e600758497ba43424f298ac66e601777cf594f93efaa4a914a1cf38cb7a11c5b0e6e71 WHIRLPOOL ff5f5d2f81245a1c6b439508a53791ac3dc09f3d1896119ddf80045e2bd29748fe326e83afb15da0b7543d4bb2e7e998061652699da5913e59d0ca2bd760654f
+MISC metadata.xml 245 SHA256 a34d08ca4f199ddfc5d08224d97ee1e2c0e81cea401f873302d9252e0d823830 SHA512 4423c18a453e8c9b251ccc387341ffa1e1f492c2b0408d05b3948b94fd8f135145740bb9a04862d5f567c931c50c113f685a08fb10667ed1fcd1a005cbbe46da WHIRLPOOL 8259f19d9eb082f0121e29ec2395ed6cf20af942ee992036b805734c67ea4ba72d4d4346770f1f1351cf6d2192aafb7d080d9eda128772eab68d4a76ee59e183
diff --git a/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch b/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch
new file mode 100644
index 000000000000..926dd1318bdc
--- /dev/null
+++ b/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2009-01-03 18:36:24.349399478 +0100
++++ Makefile	2009-01-03 18:36:37.218398964 +0100
+@@ -65,7 +65,7 @@
+ OBJ = ${SRCS:%.c=%.o}
+ 
+ pure-sfv: $(OBJ)
+-	$(CC) -lm -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(OBJ)
++	$(CC) -DVERSION=\"$(VERSION)\" $(CFLAGS) $(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..ca26b16fbcfb
--- /dev/null
+++ b/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils 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"
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i Makefile -e "s:-Werror -O2 -g::"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin pure-sfv || die "dobin failed"
+	dodoc ReadMe.txt
+}
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
new file mode 100644
index 000000000000..5dc65a61a3a5
--- /dev/null
+++ b/app-arch/pxz/Manifest
@@ -0,0 +1,6 @@
+DIST pxz-5.0_pre20110811.tar.xz 11192 SHA256 0059ce89a35ed9d14634903ba1c7aae0a4af6116a6b0f04e10c4602862690ad7 SHA512 d7a837a1b777aad397752efdb0416778bd7b0da93db40528db384b5573702ff9c387c8223a65d1cdec3261cad07ca51ba8dc3bd8be18871d66f63009e144799d WHIRLPOOL f6b9dee63c2888f360f6298b04fb8d58ff20d57838faefa7e96296a37a98263d42b414380820642c9fc57d8ca4f5ff6d1eb7ddca66d09943c2676bf34b0e3a01
+EBUILD pxz-5.0_pre20110811.ebuild 480 SHA256 53cadf820a035a90862adf776867b0c677a3d4e221d8f62ded874352882b857e SHA512 9bb56111e2934281db524b491917ff6d29a7ca50ba378af15427a18dc8c9950b537ad4a7126eba918385c4e0cb9fe344a3c79bf9e38647747c0aa01a3640000c WHIRLPOOL 551ccaab00e64492f6684410342390231af121a4ff5526e80f3d2724ba0ca0c371e2c0e93d012fb9049d3f750d70f7c7ce031902cea8df117caf6ac347d9ea90
+EBUILD pxz-9999.ebuild 946 SHA256 3a35d916839a95b327e54c7436e9c5df8a95061e4324cd124f89623e475d9766 SHA512 3eea701a0b1c6558567fee886601435074f36ee1ffa805055bb10a6582d3e04ff663ce3e296272f76a4d1ce6b3a3f1d17192bb02c3f98f40a758c00316e156b0 WHIRLPOOL eb71df359cb7fbab48710f561a2d8482b00902c63710be26db6e561a016a7beda0dff91eecaac23403f9b511a0f64d35895277067111193d2474b10ea563faf4
+MISC ChangeLog 2619 SHA256 f3de9b455ec8061b5b2ff36c1f49ceba821814a4378364bc5bdab4c39d00065f SHA512 2af9eaf157a86a86638e3e30e0cc732e662b8ec8ffc0806c49fc0f5f77418e1458a685dc6ef60b1413aa9529a0a775140970c44870797ce731f48f0970ee8400 WHIRLPOOL dd94df5e595692673efdb2d4175ffde083dcdbb1171f07e3a52d31fa0a7534a2ae66a75a752b4219be89df20b9f3220c12e3fc611dd391c648630644793e068a
+MISC ChangeLog-2015 491 SHA256 c14f247f7cb759d0640faabbb4e4b7754a607e6d05f32476577a92479942ffac SHA512 ba29c72d8f559c0d6a4787c3826a41e3b7bfa4a5ad4e6dbf023c996799f940ca9081215c81dd26d933b59ab6a858fa9fb62e91702c7123bda96a9f1d8b846994 WHIRLPOOL 0197031dd1967c73a910bce019028d76008c5e31a4011d4df88fcbe7003b70a047ce288d0e0a2a3888c4bf1ef5a0a7a250c78f066cf46e810553153ad74da376
+MISC metadata.xml 589 SHA256 3b52f15989995179ccdecbaa859d690100baf29df3915f730ae03bfd8762f882 SHA512 4d345f2f0e3097fef6c502d28abb4ea2f236ec608c4ef0a56d2769513dc3f170e1589f9c14850e365c9914f25868a67352c52e8335a5c9694b69fcb3c27033ac WHIRLPOOL a660a9daf553b75b767e1b593219f905b3b67d071de370c38f12bbce39597eea0b5fd32d437473bba447b09a2c4e9a356899648cd99df18561bee0ffb6f97b00
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_pre20110811.ebuild b/app-arch/pxz/pxz-5.0_pre20110811.ebuild
new file mode 100644
index 000000000000..e36a6e9f0f65
--- /dev/null
+++ b/app-arch/pxz/pxz-5.0_pre20110811.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit flag-o-matic
+
+DESCRIPTION="Parallel implementation of the XZ compression utility"
+HOMEPAGE="https://jnovy.fedorapeople.org/pxz/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	sys-devel/gcc[openmp]"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/app-arch/pxz/pxz-9999.ebuild b/app-arch/pxz/pxz-9999.ebuild
new file mode 100644
index 000000000000..a79b3ab628ff
--- /dev/null
+++ b/app-arch/pxz/pxz-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit toolchain-funcs flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jnovy/pxz.git"
+	inherit git-2
+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_compile() {
+	append-lfs-flags
+	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+}
diff --git a/app-arch/qpress/Manifest b/app-arch/qpress/Manifest
new file mode 100644
index 000000000000..2773657417ff
--- /dev/null
+++ b/app-arch/qpress/Manifest
@@ -0,0 +1,4 @@
+AUX makefile 128 SHA256 8ad2995b21bd78a5c99a63724f39350f592fe3fe3687f0f09a1cd847c32ec389 SHA512 57004d5735f486170824b3056970d2c4787abf0708e0771b1a7161f942458abea9edc223d940a93f0560d630fe80d7ab6053e20984120ffda545349bcf4debfd WHIRLPOOL 2438c724fdfe8aad2c4ef7cad74f84cc8404c0f12d193fb67a74222c2f9ca88fcc5cec4c7aeb7620cc38d451286a2187fda887584197c83ada449ce3276e5f3a
+DIST qpress-11-source.zip 26998 SHA256 4bb66b1383bbc4c5490eec6088d37109e11205fb9f94ccd04cb84ec069829633 SHA512 986754cca8bb2cdcfc7e197f7e123c6b2da90db840642a6385f14613f49f7ec6b2c18944838405fe35d5382d71fcd5d69050a036dda4c5de2e588d144e16ea6b WHIRLPOOL b8ee4274da850091dfc2be520870530f9d1208f1791d5649df6856dfa2e7e6a500e1cc9c08cbcb64160f4a40137676af6d1820b862112e878f191da21d7f60fd
+EBUILD qpress-1.1.ebuild 525 SHA256 356fda1f6e8e482c285876dacaf658c58582d31f2a27471220461b460d70d2ff SHA512 aee317456ab1126bb2c4f7a9eaa487f8ae6487e3777ee1d63433afdc12d11fef66c699e6e809c29de7b93ef8d068216efd33eecdbc1cbb2f537648eb96f680e5 WHIRLPOOL 14076afe58f11181afc5954047d20d38d6db4e8c30e94bd3f13cdd0c395de38b7ca96e19caf355dcb0c0762f101d06bbe99650b3a8b576d53e95293be2f89ff7
+MISC metadata.xml 477 SHA256 abe29f8fa78877007d8938351bcc89d04219468d60493d8d5453b35910789f71 SHA512 e75146f4a742e9c51d47ea4e0c2e4058547378907abc0fce61e83d048c7af2eebe67fbb2f52d9affdef9a793e7c6abf63c5a1799dbe45b37c3dba74cafeffaba WHIRLPOOL c8d89f5e085da92a7186884eb724af12a5c9e8bcadebeb08709dbb144f1a606e58c605156afadb667f9009278e959aeb901fc8b06d2a0a68bcb5a1d7efa34e53
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/Manifest b/app-arch/rar/Manifest
new file mode 100644
index 000000000000..ba5fae1aafe6
--- /dev/null
+++ b/app-arch/rar/Manifest
@@ -0,0 +1,7 @@
+DIST rarlinux-5.5.0_p20170811.tar.gz 546839 SHA256 09af93f7d8c39baf8200fddfe507ca416a9f11cbe30a41b8d1346fa1cf3fdb0e SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb WHIRLPOOL 6f06d00a3e4908366fe3f7f68f45f0ad59c9f2d50f77a096dfadb671bf6653141e1f3e99be1afd3f6336a4fcc56a99e2ef3827cc9cb55bbfdd24e6aff16543a1
+DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 SHA256 798fa2815f62062eb2e7ca3750fcf30a9af212998f29738a33f12d819e866c4f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66 WHIRLPOOL 590d482caa7c50ff9b5ba99d06a2f34930327ed39a3ddb24d88c4b949e9be4caa95f6131758c63b4cdf0b02bb63ecce36e26597b5c30c7817c4ed45a204d9c0e
+DIST winrar-x64-5.5.0_p20170811.exe 2220872 SHA256 367d47ad48822caeedf73ce9f26a3a92db6f9f2eb18ee6d650806959b6d7d0a2 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66 WHIRLPOOL d3a54d02d9218220705b1789f7cde0de455e1f5fb67c576ebfce72da9d08106ab47b4d60af7bd3ea3de394ebe20112a111edd4847e84e606b5d0c4a40d5d9124
+EBUILD rar-5.5.0_p20170811.ebuild 2281 SHA256 a1e74cbdafdc699e3c4aaeafc6d691c23a221882c12ede64d4f4f603fa2214f1 SHA512 aa68c6bc07bca69dc599dfd7553bdcd23f884fcf353ea6ceecd1c0822f799016d2958eb75bcbe937c10352bf1aab7d60bd8b6f6934244fd842d01da749f6dd28 WHIRLPOOL ddc77a5290cd239f911859fe5d1a8fc405fa14b9ad22a2fab1f90d697fcc70b8f606c1fc4b108cec461903d4091b02bcb04c41bfa7caa1667a4410402ef5b329
+MISC ChangeLog 4643 SHA256 e19ca824548e5d47ca8f59b4b00a22458cb68b613e532bded7db7992171be187 SHA512 dbbf5e11e49062c40064aad078d947f6398c892bc83788999cc1b11f21aff5da6646b537fa56ac4c3eecf4e6824480d6ad5a2427eb23bf6f078405e6070486bb WHIRLPOOL 1ef116fb542ea5825e7cd769294351bb71e399c2b35518f8d052f3d82065fa78a97625ad12a384c942c766ef21bdc418ad27168de9e5c1c969e06362dc6c17a6
+MISC ChangeLog-2015 11861 SHA256 55cd4a66776eba230f3f02db03e718d1c7a3837b4d5fb8bc449de8be1c53c52d SHA512 ef507e9c9e270a484d558189880d75f7719088b1b15ba437ce0ed44b5965049a12b5b0cd97e3851a373e16f763d0d380961f6c64ec92d6cfec97689a8b81564d WHIRLPOOL e52e771268deb63a9d001bf97ff4c9f78bc7349fe425217febd1b8b1746060118661e15f8cded25df5f1fbf26638f1728a5611843cc85ed632514f6c9ada6bf1
+MISC metadata.xml 436 SHA256 4ed725c9f6678f49453554ca684b82581c0d835925e1b8d05d0722bd39d30c97 SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1 WHIRLPOOL 8d3bc2360f4f59be8715064044da0bc2f4c52151950aa9c029f404aae31b97ef752195bf041a1edc9ca9463e5ccd0fee6361dd837d97f2a1fa113dd75aa04d7f
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.5.0_p20170811.ebuild b/app-arch/rar/rar-5.5.0_p20170811.ebuild
new file mode 100644
index 000000000000..05ff5abaad7c
--- /dev/null
+++ b/app-arch/rar/rar-5.5.0_p20170811.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="http://www.rarsoft.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/Manifest b/app-arch/rpm/Manifest
new file mode 100644
index 000000000000..64913331afd4
--- /dev/null
+++ b/app-arch/rpm/Manifest
@@ -0,0 +1,15 @@
+AUX rpm-4.11.0-autotools.patch 503 SHA256 f1020af54fcad6271376ff50e9a2a166e31bb8602401bbbeadb570a82dc8b11d SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305 WHIRLPOOL 0acf50816eeec2fa4dca4488df83febece25b47b78fd94dcb0264c8e45ecc4b5e5ccd6e7d200dbe66c7737023c408d5549ef1070dcc8c3576eef959616b121d4
+AUX rpm-4.8.1-db-path.patch 628 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005 WHIRLPOOL 96260c3669e3e4521f58e720aa27f365c293d82c85fe26a8a271e069b00e7971231a08b19d390f1282eecbb80aa49ec58a67ca80adef8a2fa95ae410f04cd4d3
+AUX rpm-4.9.1.2-libdir.patch 1056 SHA256 e4beb68b13861ccedcaa0a90c49f42c6dd7a2d7799360798b21eec7ea689437c SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc WHIRLPOOL 2a72aa223728f18fe186686dfee3e137e52f91a8150d4ed364fee9b9152941a4b2df366958901e4bdb733acf1eca77f5662755373fa0928f4f782e0723197caa
+DIST rpm-4.11.0.1.tar.bz2 3670158 SHA256 98496c0c73095d7c66a8b6f1d8ab00998e1daf4e46a017ae74190c65132ffb21 SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535 WHIRLPOOL bf37145cfecb2820b21f3a79c7c28048bf6b1c25500720d4159083b75535cf79075840b8d73e3b5562aab6ad520e384d0fd4e2aff26fb4e212bb863115682afb
+DIST rpm-4.11.1.tar.bz2 3778922 SHA256 5bbb0899ffdc997d399c4e96311f9cda5364f1fed5164aaf9db685784499ef8c SHA512 ef65b265e74e549c9525da9247a1c81a4fca2b47f49c80b155e8065f0191039b6c56be3ed92fd9dd7a88c36954039a5c1a613e2bfb45599eb9a79d06503a8587 WHIRLPOOL 792c0c6cd45324a9c930aed276189908ed053429a8bc36337c6f6df59bfaa84ae92682b8d8131df9839911ec586cd445875e32c022be03f4da78b101ac235aa5
+DIST rpm-4.11.2.tar.bz2 3988837 SHA256 403f8de632b33846ce5746f429c21a60f40dff9dcb56f1b4118f37a0652a48d4 SHA512 de3d8e6ca4981bcbf48f9db5f74c03afcc14a3f100a74a721a351183be8c5cc6052be6dce5809976b9aa348a79bfb5bc04b41930f75df4d6fc4021311301ef0e WHIRLPOOL 6bcc13e81a2bd6c4611d341bd0b3e1380f2fbdc2737d1c6526fc79da23525d1c75e64bafb6092a35dad560a5e40df205c191ebed31c774d4b4baa0dc729ecd7a
+DIST rpm-4.12.0.1.tar.bz2 4129093 SHA256 77ddd228fc332193c874aa0b424f41db1ff8b7edbb6a338703ef747851f50229 SHA512 ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f WHIRLPOOL a6ba52bc98082f24b15d86da24545e5cff9cf5b63f5a0328c274decc554a1f97a8b82cf29e726f3ab2d0a594ded8e1dc919e84f83c3e955f67cca2dc1dae56bb
+EBUILD rpm-4.11.0.1.ebuild 2735 SHA256 d99cb7b11016af6f63398c3eca9c94f4cb3a9f2718524b207353e61cdee81715 SHA512 04dbbe9f9b6c35ee588fb8468007bace3254ef878ae0a41f9fbe9f2ac278f5b190ffe271b7b301e0c9006e2c30e519ea69c234f3cfbdeb0886ca6e8919415a51 WHIRLPOOL 438f7e723864b8ba4e8206e41a4a27dc50e1201714a951b927f22765c783fd11d93acce7083b48a467f03e6fbee90adafbf212ade60974c164f7fc7a0cfe787b
+EBUILD rpm-4.11.1.ebuild 2746 SHA256 314dfb4030e88a859da991ce70e19b25ae5fb17b00d1992b365b568c9fddda7c SHA512 2f7a4c98629bacbea6e9fe86bdce208a00418e2487f43b86a8b32c636a2c9687e2ec6c364ed49e22fca5a8e5ab51605afc4bd88564d236cfd801b9aa1e69c0f5 WHIRLPOOL 3861105e0fcbf2e85db87507e18ed47b83a397290c4470539496cca58bc5e611a47a55472ce0720a12bcbfdbcd265eebe10ff30b91a508e20246e465153b2223
+EBUILD rpm-4.11.2-r1.ebuild 2845 SHA256 3cdb6dd03fd45418fc96d052ad1fdc81ced941a523331a128348fad05438e932 SHA512 6db765d2670d7db18b5ee21136bae31af65d3ba1bf4862032ba7b40eed1515fe5e8bbf6b182995d551bfe16ed99e709d805041c817279a4c92bec7df86e1f453 WHIRLPOOL 33b39817a4f7f0b6e3df084908348a4574ccb644c93b7bee0b13783578aadb0917266b06ab34315839fa45a7753206f61f2cbfa59aa507aa6f18522bfd440a0a
+EBUILD rpm-4.11.2.ebuild 2746 SHA256 314dfb4030e88a859da991ce70e19b25ae5fb17b00d1992b365b568c9fddda7c SHA512 2f7a4c98629bacbea6e9fe86bdce208a00418e2487f43b86a8b32c636a2c9687e2ec6c364ed49e22fca5a8e5ab51605afc4bd88564d236cfd801b9aa1e69c0f5 WHIRLPOOL 3861105e0fcbf2e85db87507e18ed47b83a397290c4470539496cca58bc5e611a47a55472ce0720a12bcbfdbcd265eebe10ff30b91a508e20246e465153b2223
+EBUILD rpm-4.12.0.1.ebuild 2875 SHA256 19e5c134cd317db530f24d4501ceb8b7975432cd3e6e41711f670215b051be81 SHA512 b5040fc95f1fd142e57462257b32009d1d9f3da2797b4290f914a2c47d952dd5c6e7a703d7def9ad09c60195c3b9c0b39c945d7e4c9fca38a981c0d5ef2826cf WHIRLPOOL ba8d81acf84c2cb5e5d38f07c2ceb84c3f07a74b371ffb3a71b3d2781bfa7471c64a788e9e114ec6818ced18e49d9502d518acfa6939b09ef480234991364ea7
+MISC ChangeLog 2842 SHA256 3e168ac705100adf64251b16307bde473db3f2e6686c20cfec1b0abdda1d68b1 SHA512 4d82c973a0fc87ff97ee949f5d46100764d1a62bcbee77710fe4ca4e846e2185260d0bbe6c87c12709d8060ca4b1deb1ed18f7b0b5f69f85cffb96e8daa5d44d WHIRLPOOL 4cf49f2fd5e823f5e91dad3c38aca5e5e45f404603b26115bb6d0302b66ea7bad7dededd5087cbc5e49ea8e029107f2ac4990adacf7f74673bf409bbe874b354
+MISC ChangeLog-2015 29318 SHA256 84578d2af8ed4c27571145c34a5a459f2d5dfa31bf87d4b0396ed4fc378afd3c SHA512 ffcaea44f31351b880b0e4ce1c7633e6359dcc3c2f0e8cb9fcb42b16a6bacc93303e6027a87eaa3b7e255163cdbc5ccfbbc76d703a4ee84c2d8ebb12e25bb70e WHIRLPOOL 7306fd94feaf597f299a2665e894a20ca7a8ae641cdef74a1e79d79a0a64d36ca4581ca786c6738e6be34a6178111ed0d8ae29bd7d21b2c0d07e0451c96a9cc1
+MISC metadata.xml 232 SHA256 cae43e94e79a01960721d205a44935817243a3778791d1ba4c8c041c4a9d501b SHA512 23824ca618f16dec558197c0c853f3ebf5c0f1b034635242282bd40f01beea59cbac3b416e86f2eb4337942d9db945a2e1fd4fe52c88762b65749855762769fa WHIRLPOOL 774b24967a2336d4cc213a21ac9c89d0b11c17d626a93badaf1e98dec218db09edc4b73a30e47121a1f1cdd588c7ee9859da00b319d09707b05d802dcb134891
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..c78052713743
--- /dev/null
+++ b/app-arch/rpm/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>suse@gentoo.org</email>
+	<name>SUSE</name>
+</maintainer>
+</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..dedb3ff2cf00
--- /dev/null
+++ b/app-arch/rpm/rpm-4.11.0.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 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.11.1.ebuild b/app-arch/rpm/rpm-4.11.1.ebuild
new file mode 100644
index 000000000000..cbbff6316874
--- /dev/null
+++ b/app-arch/rpm/rpm-4.11.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 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.11.2-r1.ebuild b/app-arch/rpm/rpm-4.11.2-r1.ebuild
new file mode 100644
index 000000000000..a660f79bdd30
--- /dev/null
+++ b/app-arch/rpm/rpm-4.11.2-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 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"
+	# 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.11.2.ebuild b/app-arch/rpm/rpm-4.11.2.ebuild
new file mode 100644
index 000000000000..cbbff6316874
--- /dev/null
+++ b/app-arch/rpm/rpm-4.11.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 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..1c8029fe8dc8
--- /dev/null
+++ b/app-arch/rpm/rpm-4.12.0.1.ebuild
@@ -0,0 +1,122 @@
+# 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 ~arm64 ~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
+	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 )"
+
+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"
+	# 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/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
new file mode 100644
index 000000000000..9856163c12ee
--- /dev/null
+++ b/app-arch/rpm2targz/Manifest
@@ -0,0 +1,5 @@
+DIST rpm2targz-9.0.0.5g.tar.xz 5740 SHA256 4327b7dd30bf55e473198444b920029624948e24af575edff9ce466dcd4075e0 SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549 WHIRLPOOL 24ef16afdd2c6fc1c803d849da9140bf53c10ecc041a1b3363459d233f5862a97f6199186932eaeb43e8100e4b2c015d3c0253a2e0d993b246f9fd0f692ab45b
+EBUILD rpm2targz-9.0.0.5g.ebuild 799 SHA256 c647d84024799a9b63b911be1b331737c46786d02a743713fb8450f041a25bef SHA512 c0d03ae150d1b2afe6a9053693832437e1a2c9cebfe0468699b054e2080192e0eea4b7337aead758149c0d37d89b0f02704fe4e4e15d7e70cc05d498e2f80556 WHIRLPOOL a6c2dc4436c1766e973c832fe3625faa0865ad6fc4c34b29bea7e9531955788e5f95e89456f85ec91b6dcdd309c2568973ca47e89dc20718d96c6848b1731a94
+MISC ChangeLog 2439 SHA256 b1297f01541a2e1073028714fa82df008305866fc849b5acb96011d50c31f4ff SHA512 a3f34ef210bbe670b9172c41b080131c534ad6223c4ddf74b87bdb13b527fadc4cc4995eea4da16236dfdc5e9fdf087e2c095ddd0f1333abd7b58fc3800fb90a WHIRLPOOL 7afb20f60ea73bb07327d7c4435a38b00b134acd0ac837990db51d39b2600321a6d3fdd5606645d3a4f48c5cbf7486bab6fe8a95cc140d6ad6cd275a45afd4db
+MISC ChangeLog-2015 13205 SHA256 4944579715499535e7112ff419401c32a308cde9a8f4e9a7c8d9cb5fd6fd2e16 SHA512 181c71e0b6466833618ddadc10ab089d561d0a1f5200ef455f6f822d3718e24905ca57dafb7d8536f3abe24bd39602378645aa9652d0a5d19c275e5a99b3fc4a WHIRLPOOL 6efe7da9a3aba4e6929626b4a7ab4c45aa7e7b2aa5e8304371704fadf65ffa03c4bdfa88f4344c644a41db829284b5ff31f1c3ca3f30b6e5886d8c4c00a689bb
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
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..3c18ef69a11f
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+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/Manifest b/app-arch/rzip/Manifest
new file mode 100644
index 000000000000..e9fe2d4d022d
--- /dev/null
+++ b/app-arch/rzip/Manifest
@@ -0,0 +1,6 @@
+AUX rzip-2.1-darwin.patch 4829 SHA256 5ed4d03416fefa613c5a38b70f2853f5d415cc1e819e0015c01741d3915b9cbd SHA512 a3cd2c98a486626767eacd5a949ecf1f328f11bd663a1f4b9f758314dde709e9fd73fb1239dec8737d4511f61225f47682b610b9a2609646613a774d6f6ad5f8 WHIRLPOOL 545f9f12d09c059fd8dec993e9d2ee4a994c1dcc286188e02e4a5594762b2344284855a42eb02fb657cbbefe34de378c6306cb446f6ca45c9fa770e1ad235632
+DIST rzip-2.1.tar.gz 46785 SHA256 4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7 SHA512 06ed760ba2b7f09781a2e9312b645d41c145f96e3ee55ddf573714493e92466366ec6394267e5e06b0d8c42dcb67e1ae99dafa417a84737ce2b4a650a9059a6f WHIRLPOOL 7a08328c9854fd0448661dd284707e9c8bfcab5017907c0ec758067e180863b0fb72a457a13c5d1f278c937e2dc6753528e5322ac09a3630810cdd6ae5297d99
+EBUILD rzip-2.1-r2.ebuild 1073 SHA256 053350d83993c2118ea4782d5fedd84bb846a6a53c67b261f9d883935268ec9a SHA512 dcef2e5636a2f12b2cbec83ca40eb1280a2b733be4f2e93a204883854ac762d114fdaf646c754bd1c81d5ef8f07b43fabbfeec5c97db6728538a291ea027e83b WHIRLPOOL 427ac670a93a1bc2acdf4e9df2f506552abe3088c6d15746254670aa0d5d87b63e4d9f0b29b7ac1de3fb1fd57399adc8213f2a2d35952df50be0677ea1df3829
+MISC ChangeLog 2770 SHA256 fecb60ecc927df6494a0f24f93c24d56d6ceae906c9f8e86898bd7a84cc93588 SHA512 99c3687627253e48ab6eaa510ed9b530d6ceb28fd3e526e222b6b235ab6ec533d8c60ca61e52529aca9d7252f44ad8faafcdbcb43db0989c2396613f3bafda52 WHIRLPOOL 6d4a056bcb7343590c802e621148883c239ac17be0747a6d3a7b0cf81f40c7e1a82f72641aa65a020ac87aca3a7b75308afc39e8b812eb5e9427093a80167074
+MISC ChangeLog-2015 5183 SHA256 d1d9324b4395ef9e9654f3aa4433729c165ebbbc707d6f7767768cd4cbf5ae43 SHA512 670f391cbbe344df5f13378678c1c9aa42f1dbca036aa0c37f81c1ef0caba0ea4a627b3ef22d3d83429fa8517337c8713197db61c69b02316a3c18f52af978ed WHIRLPOOL 89d7876bf4fa801ca5ef34318bc5461c17524da01b60b9deacb849c45e518d5bd125f26b7fa68dcc8ff286b264fb52643da6e0ca7db48ef2db922475f537a43c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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-r2.ebuild b/app-arch/rzip/rzip-2.1-r2.ebuild
new file mode 100644
index 000000000000..134e0e7cd77c
--- /dev/null
+++ b/app-arch/rzip/rzip-2.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Compression program for large files"
+HOMEPAGE="http://rzip.samba.org"
+SRC_URI="http://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=""
+
+DEPEND="app-arch/bzip2"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1-darwin.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+}
+
+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/Manifest b/app-arch/sharutils/Manifest
new file mode 100644
index 000000000000..78302e21b8a6
--- /dev/null
+++ b/app-arch/sharutils/Manifest
@@ -0,0 +1,10 @@
+AUX sharutils-4.14-popen-rb.patch 791 SHA256 16ce549a6d74700db1197590bbf921201b7fea7c497274f9ecd6f47ece7ea7ce SHA512 96b7aa7b594cf2d31b6a0d85c7d4ff0901c66776bf83328651a6717f633d9fd3f0ce1e3185b110aecfb8c59009087b0853cbef3736eaf9aa25a08a11500d4833 WHIRLPOOL 02bd9383e94366b16320fc8766085ebf80a6b5a578f92cc1b5310d4d2bbe022d3deeee6c0a389056f334b2199c9d788f754360096321925828d51f0e30b82787
+DIST sharutils-4.14.tar.xz 1089052 SHA256 eae388efcf52aba0b081f09053189e0a3ad238561d88716b880b5c0676c07a0c SHA512 c1b87bc87915f7aebc9e02dfc1e08321f5ed2e144509c063139cde23eb8f75cb6469aa8042e4c6ec801f55d805e595f4c1c674cf5f2b4580a1e4933fcd605614 WHIRLPOOL dc3f9f3e2caaf296fbf6317f4b8eb1d4d8b8cb5aef59ef570dd24483afcaf3dd55f46e07a70e1213b393390c77e631e60891adae52ff9693ad446692189db649
+DIST sharutils-4.15.1.tar.xz 1126672 SHA256 b92ce637dbf95a69888ba70a55ecc8b527417fee9b518316eb7c650e8e90e70a SHA512 791e37730cfff36ef96793ff7e70af05845eef72c6f581ce05a873d7d9beb7d42504a253fb944c77938f355c5d29c1a9de78653812fbbf859574b7b72dc4d8e1 WHIRLPOOL d8ae0afe7857e708cb92061a759121058b18dd9da402088fccd63a0e974ba57e9f9340a161fa05639004fa9ddfb5d215e4fb30eb90eba71c9f3c661a06b89b22
+DIST sharutils-4.15.2.tar.xz 1122476 SHA256 2b05cff7de5d7b646dc1669bc36c35fdac02ac6ae4b6c19cb3340d87ec553a9a SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d WHIRLPOOL 2e29cdad58bf530b401509fcd480fdd4dd8bd98c7b90dcb5a9ab7a6feadd9d98d8bcb0bb2b18c176c17b856061ac9f81ecac25e37c7f7fddc4938205c6bd3eb6
+EBUILD sharutils-4.14-r1.ebuild 735 SHA256 d67efb2db823e5a4bfaddde3bfc879615d29838dd4f33ee45be7024160c3ee04 SHA512 53c7501e69be3b24924b7178ba561d997a579ac12f45e6e36abed598debee3917ec0bafaba3207a9b266918da3ec055279daaf82544af94c6e0e5b3b2baee71e WHIRLPOOL 3c5692c6da4aeb2f2ab52ea9d1e8a62d797f1e5fff1eb91c36f9ec943f5cb0a75f3c35990e1d73d93a207d51f6fb379d6a6ebb8c25eecbc40a75c6cf0559808f
+EBUILD sharutils-4.15.1.ebuild 748 SHA256 ba73bda2e99ff3b0f0eab1e555159f386441e2360e79a828d1d68746dddd215c SHA512 b0c5db15b48a7eae0f690b8693b532f070eb29905eeba07f996cf0b46799c13daa9f5192ad15d4e5c1322e38c1519e730e11347d43ba890dc302d74f43bca8fe WHIRLPOOL 10a39df46aff4bec94d92964d9f7d72203aade537d8933fccc8864136270ee102e833769a9a95a33db34a90da0ec5b1cdcf6d347357e2c8eed46a226accccec1
+EBUILD sharutils-4.15.2.ebuild 947 SHA256 770878d9e7993ab9b8be07d47a4e492f6102cd9063fa9ca3e93d110e3e4b2a21 SHA512 1fd94402f3c98991339522de39f1da7c27471b0ee1be545ecc2e560c9147e88678a4912d7a907c110a91d09e93346bb86e8dd47259a866af5016b2966af4996b WHIRLPOOL 59bddfbdaf2e3ba87f61370d22eb33f9ed66d5a5378bdd77bccc223b04560aa7e744536a32e9214c227272eb92757a037862bc60aa7bc929ed9b253f5df821f6
+MISC ChangeLog 2805 SHA256 3976fe7b7034fa3503cc2dc38b50ce022751a68ef25c71b2bf66d480b863accc SHA512 a4b1e496d5a5f89c280e72ec26c8aeab0d547ee918ceef92593fc42e7e0480bb4b81a1f8cf73e1654bced114eab9f3e41b9e5589713b70dabfc0bdf4c8c94538 WHIRLPOOL 1030ff61b3653c03ed93dc265d0a7777e55948c5ead9b17ca1a6ff64c4e3cff46a1becdc2227693723fa8cf298015249f7cdc3fe105cbe6eb8ca7cd594cfda34
+MISC ChangeLog-2015 18607 SHA256 e404e738ecb4fda995a9036010edd399b654f5982318d1a686d02d776f8dc9b9 SHA512 04c5fc1fbfd34476e7caf20e568ee2fc3d9092ec08812a0fbf7894563953c9c42fb6f34c2e11d67a1da61ad36ae12a57ac926811d88f6db29c2d1ba38558cad5 WHIRLPOOL 292bdf1a3c26280c309672f96b29d4a4614fe91219635bddf062c32bca3113fc1551d93b2c839d532d4f485e7d6b8893b1a2c180dea9f70483c8f592421fff83
+MISC metadata.xml 335 SHA256 ef6bd8d9820010a59d653100cfdef972f6153cc4b3e5ab6c904436ea58a558ed SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94 WHIRLPOOL 62db53bd997b3aec92f10e5cd1a3ff266ebcb9e578c3344ca67d5a76575d6c6e9680ea4144c557e8f4989dbd72a073001a422dab978949abd966075a213969c9
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/Manifest b/app-arch/snappy/Manifest
new file mode 100644
index 000000000000..e3778c7e3115
--- /dev/null
+++ b/app-arch/snappy/Manifest
@@ -0,0 +1,13 @@
+AUX snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch 3562 SHA256 f50f262a44ca45651fe0ae466ad2187383cf3b8bd124db7b8812e6c6ed6429bd SHA512 8d97bca1ec972e3b0727d5d2705cf1a499a62de478c653fba39deac5da5bc8c67f29cb83eaaa95ba08681e1c12f507d25bb6f903e6daf1da776ec017065c139d WHIRLPOOL 0fc31996dbf0fb07c10d11969a84835dc543ddb2f010d0f3e93977e496affe8e9d965e4f53ff1c221c7a3dc7c9503254e6b810a89c6a92cc13efd8612c4d2f5d
+AUX snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch 1451 SHA256 c818b8b2a70ddaf270029662dd41a6067ddf231c558f411452fe5f385a071d6c SHA512 2ad8647f89ff59ff96a24c7ab5067292d58269b7413e18c9b5165cfced8526abbf2d008f19bb18288a78a9a4f479790899648b1ef55df318eacae64d33fe417b WHIRLPOOL de39e8e6d21058a52a8913a245b018fe3802bbb286555279c648481e4464b23c2c8bff90399dc78cc00dbd38377f642fd71aa7ff7cad7824a67435f67aaf8020
+AUX snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1123 SHA256 8801b43c9c5aaefc38686f9c7b87f539b72f8f42b7ce866c971d62fff57355f4 SHA512 05265f5af9edbb69c518c4cd5260f6ef0c318292fb7d93556ab710d35d143a9d9d212b1f70b3f8e0fa6310b178f6e65bb07c370f33d7203a48a1101b660753bf WHIRLPOOL 4aa9fde6b7e827ec1d7657b6d1857d8009afcb9a46fd6d81a4b09ca5df8b01f2970573b659e0b4834666d5d2251a0694ed23ef5a79c47b4cf6524c6edf437890
+AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 SHA256 f83e3f116315bf4e8b4cf4c2a89470fae50a82d8780322714672a4e8f7bebf2f SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4 WHIRLPOOL ff63a1029a5eba8d4c86fa57fa19fa76ef74924299bf16dd833366557abf21f449568ddd93f4b46b8103fc57c2bbb7da5fb1eee0690baa7911f0a9f451f27d8f
+DIST snappy-1.1.3.tar.gz 1509026 SHA256 2f1e82adf0868c9e26a5a7a3115111b6da7e432ddbac268a7ca2fae2a247eef3 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf WHIRLPOOL 97f82d1439973582f0ba3fde43ba2ee2c23b2512e0ee426b9e372fbfbba87921355c1f6bf0bf80671d7c4da26a23d480508cb7a188e414b9cb5d95996bfabe39
+DIST snappy-1.1.6.tar.gz 1128388 SHA256 6fa92cde5b2caefd0d9a60336991ba42e5a7ddc3bdc36c5610451373751d0495 SHA512 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf WHIRLPOOL 87ee2fd77e4c68911d5bd5c5a278460b8e4200a2b4c96a454b2af0b61444588dfad68015effd22bebfb2bf8f9d3e0c6b8f8cc3e89614626f0bc1f91b18402eec
+DIST snappy-1.1.7.tar.gz 1090550 SHA256 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf WHIRLPOOL ed5dacdbdcbfbe88982b23d389d781548bf8780c1ecb9b99c8a09442821a97b6aca2fe5eec86b8db1c8e305e17b381391a595d5abacd24b9ace5048dc64cf232
+EBUILD snappy-1.1.3-r1.ebuild 965 SHA256 e70878882f78c0da0b3aca3a83e54be007e905148d18777919f8126f05555ac4 SHA512 78b96490c77f3a70cd5fb84e54aa50fc05185e064214c02baf9edd6519e236b76bfba64cec67b32f0d1860dfc6e73dd9be143d97d7421be0d93e0db0f2723293 WHIRLPOOL 824be82c9097a0143355e935fd7663f41542138141bbaf4aca1d67e55a83d080786db1f02fddf08a8db90734674b82a62f2a62c1e1bc30abb375ed7ac48b41af
+EBUILD snappy-1.1.6.ebuild 2096 SHA256 62f14b41dd8a8fc36f98f65b76f82c30eec52347040d7f8d95950924faf01b51 SHA512 4e91da054ef6db6625654883458eec94e154575114ebeb1e47f15682aaee298357ec469e1ae428a9d90d1e00f62d5e33bce394ca7ad7d12c4f8b91720f7b481f WHIRLPOOL e32384f23be790be148e767fdcc56fbeaa7b2b64e6d9af14d567c7294391eac9847a129794439974b4beea0a27583e4fa0afea6443ad2d215529c50cd1a86f40
+EBUILD snappy-1.1.7.ebuild 1908 SHA256 390eba923ba16713ba58295a473b7617063bee3a3aefba3a3a8ae7fedbdc42e7 SHA512 e6308d87213eaa2e70b8afd779ebdad8379ec47d78a1f5d958aa70f87c736d0433107aac23ecf863c41c0ffac26f403228ba70a449e6d3087f5d77c9b6634107 WHIRLPOOL 68f2a62cbfd4141f726ee7215e230567f13f82ea8617f681bbe6dc8f4f8d1f3f1845ed32b21e5c5ee6d77ea3254bf40a1e56efa6290eacbbeeda56e6215c8d16
+MISC ChangeLog 6533 SHA256 d83e8fab2af5d2e43708dc0f4b590875e2f798aac1ede0180e004029721b06ea SHA512 e8935a5c5c262c250e4aea2f8169585df61ab57cf84d7cc2a8e25785d2efd75d3f6634036533b04361decf841f4dc699e794ccaf87a9da8b330680265549d7d0 WHIRLPOOL 59b08a6091134ffe7ad95eaf08dba4cb510745cecb71c1ee99e86ecc89e533460ee67771e3b7716f80ca4f5631c87fabdf9471c458892f3d46854cae0fe471f5
+MISC ChangeLog-2015 3009 SHA256 496f7049cf9169cd876f483f36355d834dae5d53ee5e7d4ea832d94f8a91223b SHA512 16b814e292d70e3d7b8483c2e033810a0c92cdbc2f6916c3804129fbc06b19315dd5fafb0984c1ec34dd269b447465e07e1eb2513a7f2bce2e508f51c3794b38 WHIRLPOOL 89c95a8bf42c4ca793e68599238a4baee414f5537937ac58019410e2740e5aa881cb5a235caf3eecfefec7ca031a1f04d4808c5340bd42edd85547d9d6857664
+MISC metadata.xml 584 SHA256 f04f34c234737a786878b755c50e60c82f305a916e6540d78d64e4e125163da9 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552 WHIRLPOOL ca57c4d5abcd31ffe119bb9a85653c5addc651846cffe9d0196fa91eb1a0b748589962b580b544501b8af52b57fa89347bf7b0d0056792b89233e202abf03232
diff --git a/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
new file mode 100644
index 000000000000..b83bc93465af
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
@@ -0,0 +1,91 @@
+From 7507c5fcadc53894b128f3b9fc4b073d15564704 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 29 Jun 2017 11:12:44 +0200
+Subject: [PATCH 1/3] cmake: Use GNUInstallDirs to provide configurable &
+ correct install dirs
+
+Use the GNUInstallDirs CMake module to provide a standard set of
+variables to control install paths. Otherwise, the package is
+incorrectly installed into 'lib' (instead of 'lib64') on 64-bit systems.
+While this could be solved via providing custom variables for each
+directory, it is simpler to reuse what's already in CMake.
+---
+ CMakeLists.txt              | 21 +++++++++------------
+ cmake/SnappyConfig.cmake.in |  8 ++++----
+ 2 files changed, 13 insertions(+), 16 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index de52666..1ca77c1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists)
+ INCLUDE(CheckCXXSourceCompiles)
+ INCLUDE(TestBigEndian)
+ INCLUDE(CMakePackageConfigHelpers)
++INCLUDE(GNUInstallDirs)
+ 
+ TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN)
+ IF (WORDS_BIG_ENDIAN)
+@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h
+         snappy-c.h
+         snappy-sinksource.h
+         ${Snappy_BINARY_DIR}/snappy-stubs-public.h
+-        DESTINATION include)
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ INSTALL(TARGETS snappy
+         EXPORT SnappyTargets
+-        RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
+-INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION lib/cmake/Snappy)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
+ 
+ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
+                       SOVERSION ${PROJECT_VERSION_MAJOR})
+ 
+-SET(INCLUDE_INSTALL_DIR include)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(BINARY_INSTALL_DIR bin)
+-
+ CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
+         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+-        INSTALL_DESTINATION lib/Snappy/cmake
+-        PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR BINARY_INSTALL_DIR
++        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
++        PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
+         )
+ 
+ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+         COMPATIBILITY SameMajorVersion)
+ INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+-        DESTINATION lib/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ 
+ ENABLE_TESTING()
+ 
+diff --git a/cmake/SnappyConfig.cmake.in b/cmake/SnappyConfig.cmake.in
+index 5e604fe..d47656b 100644
+--- a/cmake/SnappyConfig.cmake.in
++++ b/cmake/SnappyConfig.cmake.in
+@@ -2,8 +2,8 @@ set(SNAPPY_VERSION @SNAPPY_MAJOR@.@SNAPPY_MINOR@.@SNAPPY_PATCHLEVEL@)
+ 
+ @PACKAGE_INIT@
+ 
+-set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+-set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
+-set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_BINARY_INSTALL_DIR@")
++set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
++set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_CMAKE_INSTALL_BINDIR@")
+ 
+-check_required_components(SNAPPY)
+\ No newline at end of file
++check_required_components(SNAPPY)
+-- 
+2.13.2
+
diff --git a/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
new file mode 100644
index 000000000000..0b7faa08772b
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
@@ -0,0 +1,37 @@
+From e801bd3553dc4e49e19a031ce4007620c35764f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 29 Jun 2017 11:14:37 +0200
+Subject: [PATCH 2/3] cmake: Correct & unify CMake install path
+
+The CMake file is using 'lib/cmake/Snappy', 'lib/Snappy/cmake'
+and 'lib/cmake' inconsistently. Replace all of them with a single
+'lib/cmake/Snappy' that matches most of standard CMake packages.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ca77c1..3d1a304 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
+ 
+ CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
+         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+-        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
++        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy
+         PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
+         )
+ 
+@@ -121,7 +121,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+         COMPATIBILITY SameMajorVersion)
+ INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
+ 
+ ENABLE_TESTING()
+ 
+-- 
+2.13.2
+
diff --git a/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
new file mode 100644
index 000000000000..b1b8a2cd5e97
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -0,0 +1,28 @@
+From 93d30c53e28759c9dbe82535821f3b1df29e5767 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 29 Jun 2017 10:01:37 +0200
+Subject: [PATCH 3/3] cmake: Add missing linking to GTEST_LIBRARIES
+
+Since the snappy_unittest target uses gtest routines (when available),
+it needs to link to gtest explicitly. Otherwise, the build fails due
+to unavailable gtest symbols.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d1a304..9f2cc23 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -144,7 +144,7 @@ ENDIF (HAVE_LIBQUICKLZ)
+ ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc)
+ TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H)
+ TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS}
+-                      ${GFLAGS_LIBRARIES})
++                      ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES})
+ TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR}
+                            ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS})
+ 
+-- 
+2.13.2
+
diff --git a/app-arch/snappy/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.3-r1.ebuild b/app-arch/snappy/snappy-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..cdb3bf06ca4e
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+src_prepare() {
+	# Avoid automagic lzo and gzip by not checking for it
+	sed -i '/^CHECK_EXT_COMPRESSION_LIB/d' configure.ac || die
+
+	# don't install unwanted files
+	sed -i 's/COPYING INSTALL//' Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--without-gflags
+		--disable-gtest
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+}
diff --git a/app-arch/snappy/snappy-1.1.6.ebuild b/app-arch/snappy/snappy-1.1.6.ebuild
new file mode 100644
index 000000000000..bd50aa801442
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+# upstream killed static lib support with build system update
+# (and we have packages depending on the flag)
+REQUIRED_USE="!static-libs"
+
+# all test dependencies are optional:
+# - gflags-2.2 is supposedly needed for command-line option parsing
+# but it's a huge hack and does not work,
+# - gtest probably gives nicer output,
+# - compression libraries are used for benchmarks which we do not run.
+DEPEND="test? ( dev-cpp/gtest )"
+
+# AUTHORS is useless, ChangeLog is stale
+DOCS=( format_description.txt framing_format.txt NEWS README.md )
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
+		"${FILESDIR}"/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
+		"${FILESDIR}"/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+	)
+
+	# command-line option parsing does not work at all, so just force
+	# it off
+	sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
+
+	default
+}
+
+multilib_src_configure() {
+	# TODO: would be nice to make unittest build conditional
+	# but it is not a priority right now
+	local mycmakeargs=(
+		# use gtest for tests only
+		-DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test')
+		# gflags does not work anyway
+		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
+
+		# we do not want to run benchmarks, and those are only used
+		# for benchmarks
+		-DHAVE_LIBZ=NO
+		-DHAVE_LIBLZO2=NO
+		-DHAVE_LIBLZF=NO
+		-DHAVE_LIBQUICKLZ=NO
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# run tests directly to get verbose output
+	cd "${S}" || die
+	"${BUILD_DIR}"/snappy-unittest || die
+}
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
new file mode 100644
index 000000000000..c87bf5a20151
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+# upstream killed static lib support with build system update
+# (and we have packages depending on the flag)
+REQUIRED_USE="!static-libs"
+
+# all test dependencies are optional:
+# - gflags-2.2 is supposedly needed for command-line option parsing
+# but it's a huge hack and does not work,
+# - gtest probably gives nicer output,
+# - compression libraries are used for benchmarks which we do not run.
+DEPEND="test? ( dev-cpp/gtest )"
+
+# AUTHORS is useless, ChangeLog is stale
+DOCS=( format_description.txt framing_format.txt NEWS README.md )
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/snappy-1.1.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
+
+	default
+}
+
+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/Manifest b/app-arch/star/Manifest
new file mode 100644
index 000000000000..2045220a1bd9
--- /dev/null
+++ b/app-arch/star/Manifest
@@ -0,0 +1,5 @@
+DIST star-1.5.3.tar.bz2 889881 SHA256 070342833ea83104169bf956aa880bcd088e7af7f5b1f8e3d29853b49b1a4f5b SHA512 622032a0e87f3df06ab1091af0af99d0362f478f70351cfe3d47195eec0fcc96f458fb6e50cae3531183984b1d390b598176ce008bcc5f29764795f66436efef WHIRLPOOL fd786e38666392813311d04350680bb9e1f4cf892412697652f8531eec95b9954c8e0ec3d1538dc1a7cc469e28dbbc38a0a21f8e210fdf929a65de3b73ab55d6
+EBUILD star-1.5.3.ebuild 2699 SHA256 7d7ace8cf3221dcc9329c39438e587d54c49aeb1ef2733eace8ec827c529dc24 SHA512 457ea7ff0caba696702e0d754598d9e368e374db959a264a50742fa483b6325c3eb250a6044736df0ccd3adf0f15f6a46f75ba8fdb40404ebed3386f7ae73e4f WHIRLPOOL 5d365196f9e6617619d774c8debcfc273fe9e01b82a0780bb88202e0d67c11e4c3feb5bdce54c089af41a30a4fe838ba03350387465b3b12b6ebaa5b92512029
+MISC ChangeLog 3458 SHA256 112dfaa462b403448f6ae4b1fdb08cd6d6b879658f14f5145dd19d42dbb777d9 SHA512 a5624c6ab93f9d7c46411b46a0664b5914e14878a12981754d34c3fc934d36132559470b76820e34e488cfc34ebbe3cbf08bd9dcba09450a54b0df2cc82d381f WHIRLPOOL 1a876049d62d7ac6794116a75c7bce50b4f4955c294eb3c83df88daba302b4d7cf942c84350fcecaf44678012c476c0c35835a290744a53a46b9e53bde90f9d9
+MISC ChangeLog-2015 16970 SHA256 959a2e7fab7f5d44618e2dd9cc0415303b0de15caeba7c88aaec5b6424334eed SHA512 cc05ba5d335a1821b5e95432dca741c2279fc24e83928e7d2153fa145cfdd8d9bd4596228af6dba87692c96686333d5e14919f7a51f3fff1908373d9a19785aa WHIRLPOOL b6c04928851d18c516bf006bfbc7c701f2eed077676f3cfd5d4e2348f622bc5e6cd20e5bc714b93476eb721225dec173089a82d4149a7850cd2b1a0fe5c2e505
+MISC metadata.xml 350 SHA256 1ec25faa3f5258ac6242cd85dd34d6dd37ba41fccb4e564022de28b9787fa0fa SHA512 2e9d3fb7c591893162b2518657d39d6c0a53e80b666b5aa4b307cc80bdb47a5c2f9f300abb42e99b8216be8f09ee407571ca39d2b5ea2dbdf427ba350db457bf WHIRLPOOL cd0d993959c413e89621a0d958275d12db9867df267cdfa1dd81c7194fcbc4e2bd190ba8a0911154b6e15632267a276b9971572699b8587049cf58c87afda173
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/stuffit/Manifest b/app-arch/stuffit/Manifest
new file mode 100644
index 000000000000..c3d664f44419
--- /dev/null
+++ b/app-arch/stuffit/Manifest
@@ -0,0 +1,5 @@
+DIST stuffit520.611linux-i386.tar.gz 1955619 SHA256 69ccd8659000f7cdeba640157ed42e360b2e448c8e8333b1db491f2c4daf7998 SHA512 a1d4631c2d238b49c710816cd5ed8a01dcf52c29b870297b8dfd76fb0cb6e725c5b0f9d4a6c155c7b6980005df52fc4597632f72e90f00bf93ad80a28972270a WHIRLPOOL 438a33133d959879d81cca96a2659b82ae07c3cd4b137904f3e02fbbedac6a183ba411ab4e864e3bfa0bee2b27531bfbbaab7928d138640069e01bbc605669cb
+EBUILD stuffit-5.2.0.611.ebuild 1465 SHA256 bac5f327e49f281c4251e7bf532dff5822584a99b55b0d4309a21fea9514db95 SHA512 d34265918291a3043262aded8ceb3bee13860eb5b8e5503f681ff9002176aaebc7abb1a21dba3779e7c10b7dd6b7301811489f7d92c0191c25a2e3aaca8b0bc0 WHIRLPOOL 3ad5e335471d9b5fd374588debb06dd0d40db093130fff3f74ee851037c7cea11c93898b636e68dfa17103bc3f62e3f85051a59b7f77b0fb7d89df58778fba66
+MISC ChangeLog 2530 SHA256 47ec67f86ea7388b6ffe42b7867b117fa1d24f50dab1aa0aa01687f62df74fbb SHA512 b9a3761395d2741c5272bf94735c90a0e7342789ecfa0373908f80990bc450a351dd18d2ea7db90cda1f6e8a95abea7b792c8b5e8f0d439801e8746fb27504a6 WHIRLPOOL aca5a8d0f9f416fa9038e84fd2c6ef7de3fb9c69c5cca6c430cb8c3b79d19d7a4660896a2f27c9c521587c790ae3541c1bfd5d70a0a8390e4ffbf17da1c7fab9
+MISC ChangeLog-2015 2358 SHA256 0fdf47e927af0b7a4d854cb6341f84d57a5832ffcedf417dd96fd359320531c2 SHA512 918d04bc7e3ed00cdd4ae5a25d823657da4fb857d44a1907bd4644ed26de0d1246c0e83b303e73bb4e09c3d26fd2a7184f06d8f966bb42aa0d0a0713304518ac WHIRLPOOL 2a692056f6d7a9927cec8e432bd86be06d2ec535803078b2f4e02971427b530617990b0754ac2b270da35251be64d2d0145ea148276cb71a916e90cad880eb65
+MISC metadata.xml 302 SHA256 12738acd56dafb91f93c229822ed1f372943b8c3ff30e421c0173f2fd28c2db9 SHA512 cb8ca2c4b1b49221c5e2ef4d37a9f8faa4a03ec8e116dfe31185f0a09aeaadf1034f45f655d984658e8318f057ca9028edb4cd373abb0d5bfe05ff6dd83d00b3 WHIRLPOOL b2e2f4671e4f311225101f39d6ef6ca5cbcecce3104facbacc487fb84c9500dad7f8aa9fef3099e16ad20e9f72a957ccb008ff2b06f6cb2157c22ffe9b38e7b6
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..e6853abaea75
--- /dev/null
+++ b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/stuffit520.611linux-i386.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
+	dohtml doc/stuff/stuff.html
+	docinto unstuff
+	dodoc doc/unstuff/README
+	dohtml doc/unstuff/unstuff.html
+
+	# And now the man pages
+	doman man/man1/*
+
+	# Also add the executables to the path
+	dodir /etc/env.d
+	echo -e "PATH=${INSTALLDIR}/bin\nROOTPATH=${INSTALLDIR}/bin" > \
+		"${D}"/etc/env.d/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/Manifest b/app-arch/tapeutils/Manifest
new file mode 100644
index 000000000000..549a2a6e1d83
--- /dev/null
+++ b/app-arch/tapeutils/Manifest
@@ -0,0 +1,5 @@
+DIST tapeutils-0.4.tar.gz 14116 SHA256 01b9d6b9ed2e88860ea28bc09a00e2e54683498a3c4ba31732e03bc55ae75197 SHA512 b87b725c3f1610f5a116263120ffea84a7e81146cc9e46be69391388bb0b3bf4814d16428bfabd285557a0f72a3607f138e454b61989f2606697875e30c948bd WHIRLPOOL 90685fa67565e682822111e556230f3e3bcb14e1b8e588af77899d27fc6bec080231ba2f1bf812ad97518718ade3ff92c3bb74024dced10015cc747a7e50e0c5
+EBUILD tapeutils-0.4.ebuild 596 SHA256 8c07a64ebeaf365af7119ef9a99eaa621ad1c4710acf1e03ceafaadb225b9ff8 SHA512 c0f70db3528c69bbdbb5d2f770eb891e7ae5d5cf79cf82539e38308a490b3e65b3a62d985388e02df5728243bcb33f8f2599fad978f87d3e9a2e516ea45d0a3b WHIRLPOOL 6fc11f47ad44ae010dabb432c79273c4b951b480b939b7a9c5c79a751866a37d5cd04e16f67e85d740cb7e78197faabb7069cb70d2f45efcb8a96efcd1879468
+MISC ChangeLog 2429 SHA256 642ed4db987fee886e653a8ae4cc95d8aae08db9028e281ecaa54fcc00e1ccbf SHA512 6e5aae8cbbdb11e9e58b9b39fb8b7625d5dc0a51c859c3a4a89a70f40be7893161284695792f7a20c57b8b81f08de7b43019b2978f309fd8f6e9f27ae4cdedc3 WHIRLPOOL 1f6143c53b788fedb6c019ce0ddbf72ff119cfd618e8bae75760a9d429f5b19f3c4337f5f10c6a37bdf6d38723dac31b56034be11cb7d213d0c27b0305be5d27
+MISC ChangeLog-2015 685 SHA256 2856ed03b827403332f2309b5fafb15322c06bda3022c93f43b17298234d5245 SHA512 82bae55e362ac85f81385989abf4432fcbabf6670cfd887dec703ef9706e5a69e2505a21ca0e95f35c1f5f92ce3a7aa93a63dce036d8d6b6b51d63a991468163 WHIRLPOOL c2eb3267f6b007357a5cd6cb9b4969bafdf4c1a9d4cb4e5b1c534225ee716190b00dedb0049149a6a4e0f838e1cc36ecc5e3fe1388470d4d38bfa464cf9cbe88
+MISC metadata.xml 268 SHA256 972faf76e6638f2159ef3c7dafdcfef26d582070e6f0064d9136d1c6b2bee905 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850 WHIRLPOOL 759c32dcdde671d2fda0269ee9326f6d0f0e44966f767ac7becc40e6efb5429237b683cb23867d76a8d13dde79fe257e090ef890761b20f9792172a90369296d
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..b70a469e36db
--- /dev/null
+++ b/app-arch/tapeutils/tapeutils-0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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=""
+
+RDEPEND="!app-emulation/hercules"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin tapecopy tapedump || die
+	# no docs to install
+}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
new file mode 100644
index 000000000000..742be526be48
--- /dev/null
+++ b/app-arch/tar/Manifest
@@ -0,0 +1,11 @@
+AUX rmt 263 SHA256 c0371cb0243a190b6bb43609c86dfb4cd637882d4ff3ff9651ca7ec8d6b59355 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152 WHIRLPOOL 11869239f2ebbb237f8429d1f13f146fd2414e90edc2475d190f16659d052d3ac949d717939dcfc815a30942855fb26e60b6b506104876ccad32747191b04727
+AUX tar-1.29-add-files.patch 6602 SHA256 187538c4e45201572510c700a7eac064299731bf3f35c77a2527b10877089628 SHA512 5c87dd4a8e6d86c8e2311ac8487958abbda846484aec664ab82b7502ac1bb6a6cd43d3869fc64e06f792915b6a0659c41b9481357e5da19fbe43f9c913a10f3e WHIRLPOOL f31bd92d6681251ae4ef95a35cd0e4a9ad79aab14941561f64405cde8a67be6345dd751447d4052e0a81e68604f9a904b5312e918a54e5e29206ec3126ba1d5d
+AUX tar-1.29-extract-pathname-bypass-upstream.patch 1604 SHA256 f9d60be9a2b84a773f0bd29898a33ef2898d55cf04d82766efd762bd8e2d8a51 SHA512 c13046f8b0bcc435197c859006b1cfd12b79377f3b90edfd4b77f86ec6d3ca431c716d731be84884f0ec6d6129765cbfbccb5971d0b909c3f45aff8f0b9b45cb WHIRLPOOL 302ee68c7b001e1e652e4b71041160a907de972176751b88abbf7d303788b3b35f40355428b440055917efc580ef6ba167e9617b797b5a7994de429fd4a94bb3
+AUX tar-1.29-extract-pathname-bypass.patch 723 SHA256 c5aef4c88c46978a51e0b4bd344d9de5d5b6e2c619e1b2e1f8bfd5dda1919455 SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a WHIRLPOOL 6328a758f1ae1e27bf2b6ad37a95fd1c02878aaf015dc6bef818a2be926a914054a3990b6fff5adf17bade0868f1c7654fc196cdb74260457e3652194319213e
+DIST tar-1.29.tar.bz2 2715993 SHA256 236b11190c0a3a6885bdb8d61424f2b36a5872869aa3f7f695dea4b4843ae2f2 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b WHIRLPOOL fa5f66a7bb7698c35ad842bc4900a62997da5eb2f3cd6154391b88505a581078a64a8399bb5976d4723d90951d34c084e00d17908d90792bb5139184e8b92a94
+EBUILD tar-1.29-r1.ebuild 2157 SHA256 4f05d483c649c0d3d0b7a33ea3877d721ae692bb11069ee0ee899095ad414ee6 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b WHIRLPOOL 5aa1d2c3e0c7891bc158045572c76a3b3754561a64b7d1d115c6b320d59957af20232bfd0f341c65da2015aa6bf61b2a88af24d1e62f0e83b2d13bfcc8b1e821
+EBUILD tar-1.29-r2.ebuild 2189 SHA256 2cb98b7bb62b43b44a6ffd3eb76bf0d36f2324a62591f1b49a33bc3d9727730c SHA512 940b2a32fe1058e0a40feb016779927019b45bfa402f4e5a32f44110bd2fea67d08e4df842b9ec93c730a25eb6e6a7408ab01174919828827938875d2579db9c WHIRLPOOL f58640df4c929475ea48da9a46c0a2a08b58f4bd49d76f8cb10574f637cc022faff9e703c8285d2f3badd6a3dcfe3fa587130ed6627c051ca8bed996f3ca09db
+EBUILD tar-1.29-r3.ebuild 2237 SHA256 ad83cb69dddcddb154e9b989a3db999e886f40dda06beabfca46b6862aa99201 SHA512 3507c7519fccc100b8f0c12aedfb24ddc907e459a9a66d0cad417f085c05d3d6212654bdf9aabec3ef582f3a90a426c676c34dd7bbbefe79ed76b6f237cf8307 WHIRLPOOL 9d80b343873931175a9c8e78f341d24b330b8f4cc75bd0689f3700a26a26a768e48ba1f662d615672920106b7e2cad6da6024e39b49f84f73b6c7a8c0ef0583a
+MISC ChangeLog 6826 SHA256 4d216216b686a8bf3c1ac2afde5649a1e4faa81ec4935edd7177c50fdb2169be SHA512 7953d186e78e680e7578995393d52670495e6dc792d6bfd10620a06f01f8f20a5cc46c0ee06a386eb6ab90c53f393d53a27051c78318c73fe09fe4f827e8a065 WHIRLPOOL bf4a5a1b471d3d889b0aab88796676d777a8f6fd34fa1238aa194b9035abfd6e407f39e2333a4958ae232bd4fb46e13069ea1185caa97caf5c6b31b088d1c9ac
+MISC ChangeLog-2015 31970 SHA256 9e334cc3415e0417fbaed891f6bba1d434ffb07d7ea080688447e0cffec5e462 SHA512 8b8b47dec0e0cd310947ce1b355dec2b9d3173ddb1f7915fb41de337debf35640eafa5b8f6d160fe0e45fc832419f4cf470972ce1bd0e1498879d120a490341b WHIRLPOOL eb05a9e69d7e0efd1a9c0352207e1704b252cf6e9a6fbb8c1154dbea8becfb487b437b3caf83852129d50521bd22d93ab9fdf24dbe5ac59aad852ab1f884d6b0
+MISC metadata.xml 387 SHA256 fae089b1cff94a61ec673decb3bdad5f363260f048d8a6dad027bd141b1d739d SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7 WHIRLPOOL 66a5d269f6023bcef32e4520a189735fc84a1c028a2e9db19fb9fb8ba091fa05fb4cf93ae1c76de16f89e5c4055f45ba345989e81ae1af0b0134914faa28aec3
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/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-r2.ebuild b/app-arch/tar/tar-1.29-r2.ebuild
new file mode 100644
index 000000000000..722e7f9b5f0d
--- /dev/null
+++ b/app-arch/tar/tar-1.29-r2.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-upstream.patch" #598334
+)
+
+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..fdb89dd461c7
--- /dev/null
+++ b/app-arch/tar/tar-1.29-r3.ebuild
@@ -0,0 +1,81 @@
+# 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 ~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/tardelta/Manifest b/app-arch/tardelta/Manifest
new file mode 100644
index 000000000000..48d09e795a6c
--- /dev/null
+++ b/app-arch/tardelta/Manifest
@@ -0,0 +1,5 @@
+DIST tardelta-1.0.1.tar.gz 3672 SHA256 49a8057d304bbe9d916ba3a3331f63e304f84846538ebe1bb23e6bc706749f69 SHA512 e2ef4fffd484c8e76d2c8b2c148e31e8af8dc6ff7d11625375c50353898f3051b22c4c36bd2c8eb9f3aee4fd5009d0b6a133eccf605ef3d50c27f381af17de57 WHIRLPOOL 0c33e634ab18fa7572d6f63b42fe0ee739fbcff0ed325b21989a4c3c77902887e071e1986e1afc16fe58333734c566ff0b26d07862ea159f2b93fff0e68741a6
+EBUILD tardelta-1.0.1.ebuild 594 SHA256 e9ec757aa5d1ecc0263bf266f0dc9ae47da7ccd24b83fe47f6a03be01a91f0b6 SHA512 f6370dff99b56821743c17396a3df9a32885b69dfaf233fc1e01d302a19ae513fdc13e441f45abc058bea611bdb028e50093a874bbc817125a7890f460f97d1e WHIRLPOOL 763d7b70d11586586ec480b9a9905121a7ab680c3683fd3c41f9d01c47b99eb6670c260c179d835e309451fca0cab32c4190a3bf883e7494b987b2d505b91edb
+MISC ChangeLog 2433 SHA256 fc9e0507816193374739e04c589d3d5eeee4edb8fe2aa6132268a91bd0b66eca SHA512 4c084436acccb2d77a3e723c8d085f05ce355ab5652c6a0e7a23596914bfdc259b56a90b85151abbfa45196cf27657393dde86badc723e18418df804efa800d7 WHIRLPOOL a41ad817d6dbd83f89b83525543bed81815fcb2645578ffff0ea1bba059a1527e31f6007bfd205dc21ae92d6ddd2b560cfd8d686b3762ee9499dfeefe517a8f4
+MISC ChangeLog-2015 494 SHA256 24b89d01ae01a9f6d3f1e43edc1b79c90f72738abc96e5ff66aacc899657a6ed SHA512 5a91ca53e0b856b7540a15e1e25fb3ad2e136dddbb776bf6a149c225eb240696b3049814080799738213486e4d7d6453e589e37409ba8696d3d8e86c15769376 WHIRLPOOL 0e0694397b9ea5a8842a4edaa924812b79619edd179d4d504457c917d01c32f29ba9d11630ad2e58ce779af9e2ee47e277813b07150d7765bb362952a960044c
+MISC metadata.xml 299 SHA256 5517523c58bb80e3a23aefe5676e1e5899dadd64fa2258698e089b07484d8570 SHA512 4842f9100c9032fd47975247671e59c2c24cf3e90ddbcab576a168776b09966ddb2c582637f3aabe5b34a35f25dd8f4f8a3f215752d9a15346ac03edd882bfd0 WHIRLPOOL 61241509898b7393c45b14faa8af2f57df234d0f0a3ec2f0fea49cb2b4111043ca98237bd9aa5f20b70324b0017d0c5b238264ff51ae1cbcfec1bc81e7d6d465
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/Manifest b/app-arch/tardy/Manifest
new file mode 100644
index 000000000000..16c82022f807
--- /dev/null
+++ b/app-arch/tardy/Manifest
@@ -0,0 +1,6 @@
+AUX tardy-1.28-test-utc.patch 247 SHA256 7cfb303145ed40bb082e3cbb36493014b8adc40f7b09333aeec5d9dc9bb550e9 SHA512 402988d7e0f73cde0bffbcb9ffa4ec60eee310e17c108a80993effdeb6bf00c8a5d6298e7c0b6ad71f85a74046b9d3722346cb4d0beea958653ec29dcafd8b7a WHIRLPOOL c5b50ed349453b1b96a2fff473b5a2b0377dac54d42b91db5364bdc93387a58c56c28749a73e2082d0e547042b65932ddc5095b2076641d73ef72795729d70f3
+DIST tardy-1.28.D001.tar.gz 1848303 SHA256 79b4652a1d90745e131efcfc8512f4427b1388695036718938ec79fa5bc6c26f SHA512 d8f02d8a310cd3d84f89a67f3bf4e91689e33631b1701a98b70d32b801b1a7cafee5755f13ed18e31bb9d5b1ec147da21b13b57722e1bf15a9efc355ea5438df WHIRLPOOL 5e2db025e6243bb7f04ed1b39673e24fc7e3ef9c1c391c7c45fc55ae6aa5e689b9a26c3c8cc156c3f5364d496834902b6d0d77630e72a641360258b07c239fe4
+EBUILD tardy-1.28.ebuild 703 SHA256 41b72622fe688d64aa97a95040d05dd03355e3024344a17d9e9cccd8713e4d46 SHA512 95d4f4660acec1239ab747cbd7632c4cb511d4fcc95b388cd409e8bc54e7cf000107afabe7d643b481a8358eb9eca0f75c0e3c35680e612fa5e1f50dd4504f0f WHIRLPOOL 2e641613734cb89074e0060d91f7ad08eabef7674e085aaced2ade23e9f5d008d99f71ad51396ca472c6bf238f3eaa831b13605a9a0c44f2b8398734b646f182
+MISC ChangeLog 2548 SHA256 0df8a0f806125f6e4cb02b3f24dc906846ff304b2a2417d34271b38232647af5 SHA512 73b1a29a94a758d6eebeef52269aef2da43d2c700b30751f305357c0fd179ce2e343e00a9af91bd2bc98802b636be51fee55fecedede929b340a6073db21e7b2 WHIRLPOOL 5c009bda159374ee14b7aeb89bcada43aeae673b8de19b8dc41dcaeab180392dffadb385bad156d6b0b02dc404e3f3eb5ea026d8292197ec509cec95aee1fd88
+MISC ChangeLog-2015 4032 SHA256 7d484ff4f03626f062fc928f710b76a203e779e33b17c990e86fb9436f682186 SHA512 c79ec419f079f02203ca7d1a6da0375d226469c9790d581830eb22523885b2d7bedeb50f7d14689d431c9e4a5087077a35891dca6da81073d56f729ccc92ac7e WHIRLPOOL 10826f029af0702198f62757668d2ece2fb1e2e75adae9f9cc0671801b7754acc5cb01012306b4e39472d5ed02c51994b85b5fd36e30496cfd5d17f3c0aba3b7
+MISC metadata.xml 343 SHA256 a98b351e0b508f31bc67d566147e9b4b7587a56a927088cd9d9065298de0ee66 SHA512 97b6897b8a642636f9a9b5e1a09eda1c81469a281c7d53278753aca7638a58c0ac7053699f9f6bb31a4642c17489d46f34ccfdd4c98b9d96fe70cf2cadb6741d WHIRLPOOL d6b5210afeeb736662bf7542c44ea07fb72225d75b1b58314acb02d2b82dd52740cc065cb139d0c8594444f6cee76ba91d162844e5ed852305c20f2861ed61bc
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/Manifest b/app-arch/tarsync/Manifest
new file mode 100644
index 000000000000..157b0d2e3459
--- /dev/null
+++ b/app-arch/tarsync/Manifest
@@ -0,0 +1,7 @@
+AUX tarsync-0.2.1-gcc5.patch 2069 SHA256 411c3d8bb8eeddf3c7bd99ada4a6972f846029eb4febd58fe82d76f8049f595b SHA512 f62fa7f65e506d34d6f9a90579cda2e0568da55cd11c0926dc8f39b5f3d0f4952e6984bd4b6913f3bff938271d37e689e2b8168f393382a04ae269aafbebcd8c WHIRLPOOL 8f60e50eadf801e5940311ad5a8540aa9617cbb76a5e9b9f0a3f261195f264a45b2625b2a86f151e4656b337f053e9343079085ad5a41eee4a07b1167f286234
+AUX tarsync-0.2.1-make.patch 269 SHA256 f3e74f80aaa5c62552b925a6b4ad03eff369f218328a4b3cca6d030c20aefcad SHA512 011c028ffad1575f0b7c1eca10d9744d1466fa74efd9414af54d8b0ef336ef1f7d340ff486a915a946ed2720141016597d3831f452c560bc6fda9569de90643f WHIRLPOOL 6e0c7179d93cf81d4bbf149168693886ac779bd5a16dd52295109bfb1ce1b27dc74aa72e8050e1a72461744bae4df8e9fa13249ba5609d5856ac3f64cf01fcd2
+DIST tarsync-0.2.1.tar.bz2 13593 SHA256 5cbfdcb637b899c29bfb74e97a09daff6173c45201840aa5ac251eb93aef1775 SHA512 bebf8e495ad196c002414c41f9fe9737b5300de18b7c3b16576a7d3bfd94608f36f1b86cb6ed4879c600b71c7706255d9b2d4140b73c5743a473fa2500dbca2d WHIRLPOOL 27ec7ee1942b553aa05e47789b5d0c227a7ba4b239cf6837aeadf168420ebb671b0ac237dbf739d83d538b18d24f054a1e62364b7bd93811ed132958a1ab0417
+EBUILD tarsync-0.2.1-r1.ebuild 731 SHA256 2b6741752932cf7c8d34ba4e78edf6d363e698be4b8ff143b02dc85392daad77 SHA512 32382ddd0296f6ce67fd1563c95f4876fe707acab345470c878f940fd955d11959d4dedf21ba37585a2aa747737e87b48d93d3fd2ff97513ad14372e681b258c WHIRLPOOL 209f3b11d16c81ff358339ee78c4598b59ad9e2ca32c117056d44fc9d17a239e48183100297507194d424a7f55aa4f17dcafc583b5116bebd900f2deafc0bc5d
+MISC ChangeLog 2826 SHA256 4830084539f2fcb991ceec6701e77cba8f84fcd93f04df8df6d57f9c3230e448 SHA512 44499d8bdda10830daa93d78a94c613fd73054b0b952278d1b1cca24108bbc4d2e9bc37ac481cea79b51380246410f6a505f4fb88dffa9a742ac45097490748f WHIRLPOOL 0f88d7a987867ccae85fe80d7f8038691b7c96e7e69aa32178cf108e1d36209d92f162941a82e30657bcabf013c912fb4c474726417a5e0faa0dc5f6c7a52634
+MISC ChangeLog-2015 3266 SHA256 a5e25ae1d3af7a6d5423903f8f89ef15ef5ab364b989d44a9ab08c7e3b1ec522 SHA512 f0c0fd8955fb37f4b3256c8f46a72023bb9ed1d55e7c417f59f01178708628e34abcd746a532a50315d552f310b16ca0de91cffae9f30ffb54bc6f77c39b13ba WHIRLPOOL 37fe71b37177c019a3e35839ef685c5085c7482cd4d4f333c42211b5a3efa714f956443bac3018ee014732fc74dbff28ad33851b10555eae00cb2985391f0fe4
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..c631e6e45884
--- /dev/null
+++ b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 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://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/tarsync/tarsync-0.2.1-r1.ebuild?view=markup"
+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/Manifest b/app-arch/torrentzip/Manifest
new file mode 100644
index 000000000000..479124cc842c
--- /dev/null
+++ b/app-arch/torrentzip/Manifest
@@ -0,0 +1,5 @@
+DIST torrentzip-0.9.tar.gz 59007 SHA256 89059002613e3e9f06861ae90047e3d4ea6cc1b2cc4ef21bd75cb51cecb2bff6 SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d WHIRLPOOL 0e172c0797d2577afd632d9d53d09a2cb25d05e78037984963996999a719aaf7295dc264554794f0b1f2eba8bb162c2ecc9d584a058c241b6f84849c0ab47e7b
+EBUILD torrentzip-0.9.ebuild 545 SHA256 609cde48b7e7f3fa446dacf06965e7fcdf0b85ee4dfef5a853a1249966785f41 SHA512 e8529a17ef17a9907b32c91fa31bb743a2773ed4bff637fd0cce9f88e510e50e814fb779f96e93567b32485fa7cf2130bd32daac22219e4ffec61e83e89ee5bd WHIRLPOOL 4deb8f6830dff727c2cc2ddbec1bd2867f20d05b1da2b0a72bb8e87cb247ff3139dd915761a6d25847665f3bd30e63030a4c37e1d76f121f8c0b3ca588ba3107
+MISC ChangeLog 4725 SHA256 9f63796d27924ee76423cc39e6279d5427218407040729220b0e80fbba33865d SHA512 4fb9c7ab0b65fff64aa1a3ff2e6093bd6e45e41d440d34c82172eb970db5bb76bd38de2adb2c9bce67a16b2511eb9d5d9489d523a61a5a435b340f3f8de319e5 WHIRLPOOL ed3b42a3d3ec6b41253b5acfdc5967b7ad7fc813a63ee12fd6349a3e4ff39e55958ebf9c55196a8d9b405bfe01b986be8990060ec8e32aa20f25ac752b4a7602
+MISC ChangeLog-2015 1311 SHA256 73ff65c9026521db709caac75d76dc887059e1a9da89298d687f865fd46b9f43 SHA512 7eb91bbff4aa805ce35a9c87585a6a9e9e6523ea01a7ea9ebcf790f1da3008c6da38c95954aa19834c5ae14169d6dc0159353bd7e7722819afdb1304614aac1b WHIRLPOOL 5bd4e5439d76b69dd097d39dc555bd2a71b709f9a48bff1ae4a8c91131b96219cddee149884b6aa0c88f79535e39cc29a0e5615dcc6dcf0f04cf68cec169c6b0
+MISC metadata.xml 798 SHA256 f7854d0bfeef1858ebaaf90a4856516587a3613ba24fc38d5a2e904a8a6deaa0 SHA512 fb7ec69525466e9e8d91f7c75255c76d27cabc564fd2302faa5dfb1f21cf44820ddab366e2a73cdce33325d59af56648d72eb31988e0fdc308d82593ead9c1d0 WHIRLPOOL b3d94876187ab820ea8b485b6272e56c08c57c01a56e43fdc0a91be851fda732edf97ee8e47d40877614f9b9fe23a0bc40dd5af865673dd4e3bf29c3344ab0f6
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
new file mode 100644
index 000000000000..ddf78d96b55d
--- /dev/null
+++ b/app-arch/torrentzip/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>alex.miller@gmx.de</email>
+		<name>Alexander Miller</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</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/Manifest b/app-arch/unace/Manifest
new file mode 100644
index 000000000000..9500bc599112
--- /dev/null
+++ b/app-arch/unace/Manifest
@@ -0,0 +1,8 @@
+DIST unace-nonfree_2.5-7.debian.tar.gz 16205 SHA256 9cc12ae2fe1af2356164800390316501a82293e1692268edc9781275058ff809 SHA512 f381e68fe27f9e892bf76b0b976e89b801829fdb7d25caf3bab758a7d4cc9cf6d5157d6cccf08df94fa895b5cf75c8c0b8f4a0f5bd87e2b71811f88ec4e94b12 WHIRLPOOL a27dfa86f5e58a970187307cfc846ed92198dbadad885df2b62b44506ddb66662a9bb2e1df6a4c58e3676db4381670cae04c4309311a28f55adfd1cf7242c152
+DIST unace-nonfree_2.5-8.debian.tar.xz 16312 SHA256 697ebcd1e2d20fea394b0ba40c097ff04d2b3b0f7d435e74f304b74c01c4c47b SHA512 8b8ce964aceee1c96040a1f0ca347c95c035fd688cc2501543543a48603513a9c9314920f899eb6c3122c44a77dd0e7c8bd67c41395c5028d5ca5fd0b42e9229 WHIRLPOOL 91a7f8782ad4f6c068c2fb7a347b6b5ad9f6f35d5a9624752bbd28c3bef6bf7c2634842fa0d42cf6c01530ee0e82e47aa4192cbd14d9a7e788f1292460e2f7df
+DIST unace-nonfree_2.5.orig.tar.gz 122509 SHA256 5a85480ed0d39672962a05dc835efc0876be4f0d47b0fa7741b955ae7b148566 SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b WHIRLPOOL 9aaa3098ef45dad66a00c42d13cd916206751e37042ad5ce9cd5704a88219b0941bca69612a4c102acc2b6877d33b8b50f4fcbdc5b1853cadc2d7e3e5a1f3361
+EBUILD unace-2.5-r3.ebuild 737 SHA256 70db7566e49e0d40178a0da1f6f9b37d8959db636f9cda33385240c4cb5f1423 SHA512 5fae9bb1a6c8ab462faf143282a2276f1d523a28a20b3d4e73e417e1ef5b47b2fee88f66b065456d54b2e03a27f5ed5470ebd15d1646a8c28c47730306307ab1 WHIRLPOOL 5f7e9510197c255d9889aae201e937835d4432bfdc7541a85043e4db484b254a05ba2597831b90ee27b58f0d45b2d4eabc3c36deca0df180abf4d94ff0f0db2b
+EBUILD unace-2.5-r4.ebuild 745 SHA256 67c27ce33e1f849dce0c293593b31fd24032c56b845fdab5f8997298e5fe7525 SHA512 98543d7914ec4c5113585018750f5cbb4bcc0f5e16c30b19c017cfa09fb4f6c525610065e79f49c73901491f67308212919275d3548c9241e3342a4a97f81230 WHIRLPOOL 9881cc55729a0abe201b1403f65443bca96bba42091d7c4d7b4911383d0e97052ac4343e0acdc33abf3e3c32a32b9ffbb866b239c688a0e60650bcae152f3dd4
+MISC ChangeLog 2563 SHA256 2d080bf1d902e3799b53b2e840fbaa4c1afd7f130360c4302928f083325dffde SHA512 da6d31018e5d5241502bd0f5008218d008e7136fdc59118b6316b0c4c1179f3e0b3c9841545691578cdff900d6b5021ab04550563c3d6ba5ed22921e96dafd10 WHIRLPOOL dfd92fb286108c734d9bbaff39ebe578596e8865046f61f8dbf4eb376446c6a2fdba786b3b20d298c5841aea0c2f03e662d3329e6712ccf969d845499ba72faf
+MISC ChangeLog-2015 6704 SHA256 7a35482b5bb5176694e68749e6d098297fe2cdbaef739f8c9d2f82c0fa17e956 SHA512 5e95df95c93c3bbb094a56d116cdc2b37c6403967920d830cc3582972517b8310504a6d9ae25ffc27f27d87229aab8c5bbc54aba73776880be310af5ecff4b63 WHIRLPOOL 90d8ea592f028feed546c464b672ef97530100ebaaefb811404f39896e08fc2aa355ae85d1369a2957d6405baa2e4303cd4f2a5b920e13f68ad46fcc99943d50
+MISC metadata.xml 334 SHA256 f11f437c59002cc0836173d68b7b4c5d6adf3c789b6a8345bd9e3a6ba0f4cdf5 SHA512 13504f823b15124d38de0d351767169e9b51ed0f397175b3bb59ee7c16684c494d1adf2dc2be5cdea91e2f9186c5e318ee514d37b821eeec73f9f14ed5d731c4 WHIRLPOOL 1ba0a74326d8da938c114ccdd990db38c9b8bf916f05f01c94dcd1b53b842048a9e3d46f24c9388cd5086f5ff0727d0edf4ec2ac3cd866f06c3de626772bad0e
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-r3.ebuild b/app-arch/unace/unace-2.5-r3.ebuild
new file mode 100644
index 000000000000..d5ea14054905
--- /dev/null
+++ b/app-arch/unace/unace-2.5-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DEB_VER="7"
+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.gz"
+
+LICENSE="freedist"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch $(sed 's:^:../debian/patches/:' "${WORKDIR}"/debian/patches/series)
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin unace
+	doman "${WORKDIR}"/debian/manpage/unace.1
+}
diff --git a/app-arch/unace/unace-2.5-r4.ebuild b/app-arch/unace/unace-2.5-r4.ebuild
new file mode 100644
index 000000000000..3b5df1486687
--- /dev/null
+++ b/app-arch/unace/unace-2.5-r4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DEB_VER="8"
+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=""
+
+src_prepare() {
+	epatch $(sed 's:^:../debian/patches/:' "${WORKDIR}"/debian/patches/series)
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin unace
+	doman "${WORKDIR}"/debian/manpage/unace.1
+}
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
new file mode 100644
index 000000000000..c3abda5878d6
--- /dev/null
+++ b/app-arch/unadf/Manifest
@@ -0,0 +1,8 @@
+AUX no.in_path.patch 1341 SHA256 0f108dec4c55abf80baec2e993faa0d3374bda337de9f817831a044f06f0e4de SHA512 79e218cb222ac8024a8c6decab688428677298269c11bfca683921a84e70056f9fd58b12f290cf30944017fff1c794a713701cfd0c722fd98180a2c3d521a1c8 WHIRLPOOL 0e23cb3b9eefb27ab4f4b99f118bb915af53a663119cf9f5ee651d111537c101332beae2097bf5015ca5bec4c3624d31b34eb6fff5ee212720de58a3ba008394
+DIST adflib-0.7.12.tar.bz2 135412 SHA256 41c4d0bd369f789a615118b9206905fcd07241d486cda6dece71384dbb42a1bb SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3 WHIRLPOOL 78399e5f9d4554bf46c1c40e0502fdc317173c36eec6196972babf9ba97a207cfd39ba3e992260528a927fe57869cbc6a875ed24e9f0797d33bd5b901b57211b
+DIST adflib.zip 254914 SHA256 d78dbc554e6bf0465ad3cf075968f5479b2a983fc1f29b482500b9f9eebb42df SHA512 fe8edf5247ba82e475f62f96fcb72d50bf80641e14e957c99694def98735eb327a67208e3460504a0d109c9497d6e81f0cd8ce07ddc73486adc9e7070a75074a WHIRLPOOL f071b5d4f6131f01db132015783f59fa680391a2fe0e8e9bc7fcb79c6b2e745ec26e1369b3e8b5e2b8ac7b8842afb2f42b4f85eab068abf10b13b8d1afbf1633
+EBUILD unadf-0.7.12.ebuild 640 SHA256 971e5f9cd16f93cf4e9f16260bc97448506579bf2eab97d731e93fdd49428436 SHA512 e7cdedb3d7fc0b5b20fab9bd932311a99d3829e2345b78b74d098397bfba1c64532dfd2e6404fffe64a210bcda09f7d05755d46b4241d4148b187866be571671 WHIRLPOOL 56f60170d4b71f2096915f042d43857c4055ca5ba11a95c8472f74cf5047c1a67d9aa2d6f7d431ae357c9ac61c8c905712295c80135565e6aa98585b32dd8a00
+EBUILD unadf-0.7.9b.ebuild 875 SHA256 8f9a7444c6dea30c21a04982ca75f279d8b762c584ccd0b4a38c8808583bbde8 SHA512 be619ea1d383e7279313c45c2cdd77aa32854962c04a1693bf99488ed9032c6de2b4a84ad0211d3358989cb68d9f8637bba5e625fab9fe3ee4ccc15d692a8f1a WHIRLPOOL 1820f2964614836b46e5328cf1e48022f9d90c0a9a9eb19f509abcc1e2b2b0a8ceb0d9f87be2edc07ead840ad8bc8bec903217a990bd6f2f94b0c8d8442a3e46
+MISC ChangeLog 2650 SHA256 aa9903554b07dfce711972d2ab4a406a8f5923aeaf1b921f35f68210a369187d SHA512 b6a3865ce59bbeb068b4a7c3c1187a2012d97cb4ec03c35bff7d522cf770d7436c6bb89d673e338281a4c48e1b31a86b029ba159b4f870276a9f8cd118d8a5e7 WHIRLPOOL 50b49f2c77d5f1d28261971317b3d26ca52238ded1c3cbbfb8de02574e360e576d5ca87b1ef542ff31d2ec4b8b9a42cf1fe09d5da1616f341c9ffed144494dd3
+MISC ChangeLog-2015 1690 SHA256 d001b6d7e4909f85d78a1e5dbd852ec155fae47548d1f79ab6bd48408a129325 SHA512 819898c74e86a7ff1ce5e0c8289cd370af6d96c910d24afb05fcac9742ac1718b9dc9f0cebb4c87ec0e6ac5a9d9429fb2dd6a56baea9e195e323405222b8763c WHIRLPOOL b69508a2249d04d008e8bc0440f21f8e4ab4a1c80d43df822c94e3b7d3023f3792178bf42c82398951e6d32aadc21d8fe76aab3b0d7c2c9affc0e25f87856496
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/app-arch/unadf/files/no.in_path.patch b/app-arch/unadf/files/no.in_path.patch
new file mode 100644
index 000000000000..51de8f989fa1
--- /dev/null
+++ b/app-arch/unadf/files/no.in_path.patch
@@ -0,0 +1,39 @@
+diff -r -u ../unchanged/Lib/Makefile ./Lib/Makefile
+--- ../unchanged/Lib/Makefile	2004-08-26 00:39:58.847605592 +1000
++++ ./Lib/Makefile	2004-08-26 00:41:12.307438000 +1000
+@@ -41,7 +41,7 @@
+ # to define LITT_ENDIAN on little endian machines (intel)
+ # checks for sizeof(long)=4, sizeof(short)=2, sizeof(int)=4
+ defendian.h: myconf 
+-	myconf
++	./myconf
+ 
+ adf_nativ.o: ${NATIV_DIR}/adf_nativ.c ${NATIV_DIR}/adf_nativ.h
+ 	$(CC) ${CFLAGS} -c ${NATIV_DIR}/adf_nativ.c
+Only in ../unchanged/Lib: Makefile.orig
+Only in ../unchanged/Lib: Makefile.rej
+diff -r -u ../unchanged/Lib/myconf ./Lib/myconf
+--- ../unchanged/Lib/myconf	2000-08-19 11:08:08.000000000 +1000
++++ ./Lib/myconf	2004-08-26 00:41:28.344000072 +1000
+@@ -31,17 +31,17 @@
+ gcc myctest.c -o myctest
+ rm myctest.c
+ 
+-if [ `myctest |cut -d' ' -f 1` != 4 ]
++if [ `./myctest |cut -d' ' -f 1` != 4 ]
+     then echo "Error : sizeof(long)!=4"
+ fi
+-if [ `myctest |cut -d' ' -f 2` != 2 ]
++if [ `./myctest |cut -d' ' -f 2` != 2 ]
+     then echo "Error : sizeof(short)!=2"
+ fi
+-if [ `myctest |cut -d' ' -f 3` != 4 ]
++if [ `./myctest |cut -d' ' -f 3` != 4 ]
+     then echo "Error  :sizeof(int)!=4"
+ fi
+ 
+-if [ `myctest |cut -d' ' -f 4` = LITTLE ]
++if [ `./myctest |cut -d' ' -f 4` = LITTLE ]
+     then 
+     echo "#ifndef LITT_ENDIAN" >defendian.h
+     echo "#define LITT_ENDIAN 1" >>defendian.h 
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.ebuild b/app-arch/unadf/unadf-0.7.12.ebuild
new file mode 100644
index 000000000000..8250209a1c24
--- /dev/null
+++ b/app-arch/unadf/unadf-0.7.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_PN="adflib"
+
+DESCRIPTION="Extract files from Amiga adf disk images"
+SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+HOMEPAGE="http://lclevy.free.fr/adflib/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-arch/unadf/unadf-0.7.9b.ebuild b/app-arch/unadf/unadf-0.7.9b.ebuild
new file mode 100644
index 000000000000..db8411325450
--- /dev/null
+++ b/app-arch/unadf/unadf-0.7.9b.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Extract files from Amiga adf disk images"
+SRC_URI="mirror://gentoo/adflib.zip"
+HOMEPAGE="http://lclevy.free.fr/adflib/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+DEPEND="app-arch/unzip
+		x11-misc/makedepend"
+RDEPEND=""
+
+src_unpack() {
+	mkdir "${S}"
+	cd "${S}"
+	unzip "${DISTDIR}"/adflib.zip
+	epatch "${FILESDIR}"/no.in_path.patch
+}
+
+src_compile() {
+	cd "${S}"/Lib && make depend || die "make failed"
+	cd "${S}"/Demo && make depend || die "make failed"
+	cd "${S}" && emake lib demo || die "emake failed"
+}
+
+src_install() {
+	dobin Demo/unadf
+	dodoc README CHANGES Faq/adf_info.txt
+	docinto Docs
+	dodoc Docs/*
+	docinto Faq
+	dodoc Faq/*
+	docinto Faq/image
+	dodoc Faq/image/*
+}
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
new file mode 100644
index 000000000000..5f43f6dc0230
--- /dev/null
+++ b/app-arch/unar/Manifest
@@ -0,0 +1,5 @@
+DIST unar1.10.1_src.zip 2552535 SHA256 40967014a505b7a27864c49dc3b5d30b98ae4e6d4873783b2ef9ef9215fd092b SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e WHIRLPOOL 980cc9224d2146a79c4e42c7890b4ca1f81824c2f04cb6c076c5a60a5a2e2dc98012c9076deb653cf0d4766533081b37baa0c0494ad6da355923b286ae51621f
+EBUILD unar-1.10.1.ebuild 1145 SHA256 ee89a7ed86aa3a3d00e85a51287f7233a370407a35a1a8766e08acc895276226 SHA512 28741166d10ba1a7392107ab76f1246c3be0907c348cc0f20d58275fad6d281d55094fb819207e00c5f1e4e5c84c876269427e79ccba9edd30e605a52bbcc045 WHIRLPOOL 4e4c808ba0da875cf859e2f7d1fff0adcc8ac66e81cc4b6b981f5d81ac64f1c73dca9047c2a0fe6c12021c41ad6cc77dc251b741dcebaddfcfea0e7e1cc8ae40
+MISC ChangeLog 3367 SHA256 460a96af349bbcdce4d689faa382657808f1e92ec8aa1b35218a113f39be5e8a SHA512 0029e4ef74943e5576d3aabe9babc19a7307f2123b314f9327ec909448dbdedfa741f6f43d4f6861140b0f992488b673064d6dcb169f73135c8bb22c5f4188d0 WHIRLPOOL 47c9a7aa510f817f965992d2b1c5534f8eb7f7af641f1d9aacbe9bcdce0a19cd9fcbd51cc1e6c46bd3f5792c1be9791ee13f3b639e1af9ff57f4f0b80c727428
+MISC ChangeLog-2015 1740 SHA256 4932c3751418d459e7bbe4427156739d26a0971ebb3338f7ff35fd4ccf444ca1 SHA512 8a457ac02732411ddae1469a93970211622c9ffdcc2ac01fa8733d636c224af966fe9e4d83bdaed1598c4da2e315405bbec066e51996805bc92aaa904f947294 WHIRLPOOL 056b48b72ce5483ec7a48804a366105398ef6798fda23ac8d31ee7ee693e250440063067dcc21ce177ac004f149348c6f93e2affa6b7fd2ffa930f6c210cbc87
+MISC metadata.xml 299 SHA256 641e6aab048b0037b32ebcfe345b46dd089106005326c48c8601066712a66dfe SHA512 6b3bfdb09755e678dc609356ff3819f66574af5718870ff7f2ca29a6f1a1c85e1cc781d713bd27ebc8ae2d44171efabd3a69202f3b1c75323c4f410136c2850f WHIRLPOOL eaff41d6d28ceec04f4484a614686a5232498f997bb5e894d9ae8b27e51146f75cc1827992a8cdcfb59751fdc0d314c528387f073f3bc09a122fbec6f02961e3
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..b482d11dbaba
--- /dev/null
+++ b/app-arch/unar/unar-1.10.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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="gnustep-base/gnustep-base
+	dev-libs/icu:=
+	sys-libs/zlib
+	app-arch/bzip2"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
+	sys-devel/gcc[objc]"
+
+S="${WORKDIR}/The Unarchiver/XADMaster"
+
+src_prepare() {
+	# 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
+}
+
+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/Manifest b/app-arch/unarj/Manifest
new file mode 100644
index 000000000000..2d937c1d9e0d
--- /dev/null
+++ b/app-arch/unarj/Manifest
@@ -0,0 +1,8 @@
+AUX unarj-2.65-CAN-2004-0947.patch 1523 SHA256 ade062a372bb40ec8965c4e3fc223edb6721057a0b7bd8ace1f0e885c15d4826 SHA512 714580c0602b12013ca39fc3850298c1fe11d48ac156a5883a3d7b0c5a8adabd96d85963e5e4500df82ebc9300366d437be0f67bf6577739da9ce880eaa44b85 WHIRLPOOL 4b7ce1fd8fd66f9bb6ea44cf870497031c1470e0caf4e674c6f6cd57fb33f5a43b8f58d73c4237c9dc7a82c7aad7f4c0ec09692def6a42ea4d90755ac9f7558f
+AUX unarj-2.65-gentoo-fbsd.patch 220 SHA256 cceeb9cbeecaf1468dfd5f919982f949d99e60c262b174f77df38022d123682a SHA512 4f6949bb8c65d9cf86846cf57c6e51ef13d6d419a76b19e90ed39c776e08e3ca212ec731f13d3f209d979239a7a3302bbbdeff36af3962ac6841d2829691a6bd WHIRLPOOL 1b4af445cf8cec1a1b4feb25c27e42e0b291791c52c3f3323d4cbcc8531f0332ee3ae26c651b52f8497f7bd0548c7290f957cc09345835a0131fcaa093738eef
+AUX unarj-2.65-sanitation.patch 2710 SHA256 6f6507362658dbe1629945834461c59ba6fbec097655feb40a72136efe758b1c SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755 WHIRLPOOL 6850fd6f8da729bd8c9aac3cdf2f3bc2a18ba68015de4ef1581210e7c88c6ca8ba2ae40c7cf142459867c667d8c2194a0913f51fdee349b574f5b8c03096cfb4
+DIST unarj-2.65.tgz 21568 SHA256 092869f3b4d4943b3d999db4f266f39ab9e474f2984b813b20735283af068304 SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386 WHIRLPOOL 431d8b43d58f05bf0a9213e98c5c15e3ae4b32089426d2b89b2832b0249390d8491293c0ed0f97e6c3c44f30056e497ce0f1ad807302f0d36c738e4a6085374a
+EBUILD unarj-2.65.ebuild 783 SHA256 5d494ea921e9fb5ba4bca2d01c36006bb0cb2b4421386e5233837dc711d4c6b3 SHA512 bd42993bc7a866dddc7822c269d8bd64952bf4e5291b777e522668a4a44e374bec204ba2e66989805a403be1bfbf0a40337234e7f0631d264a6def4e72c4f0c7 WHIRLPOOL 975556cd9d7b77e6575913e6cc896d71ce7ec0347c9c353a8989f8b19053a6e685459257673f30cfc4e4752298c17887aa3d0cb0f3696990ce836d7375995ecf
+MISC ChangeLog 2719 SHA256 b522c771e65e1238bcaab5021243d27944931497627f83c11c30e1a28e5278fa SHA512 8773911f49ecf9a2f86e4499de33e33fd3485b6278eb07f1292438406b1695a5b433be35e11bb6ae3aa9d3e8ad8fcc1d153f49b5ae0e108f55fef6a02ef03e7c WHIRLPOOL 5a1c3aba359caf9042798760b552be7a3b513fb4a3c1731477cf78bc7b3121c2662f4a52001f3131a17e543c879e854ff97c545c82382793adedaa06ce7bdcb0
+MISC ChangeLog-2015 3534 SHA256 b20753d3b7c7c4f3a38817e06cd82c4b9e752de45af17c6de70d6e56a9fd0dea SHA512 c9896d90d839163c2bcb0e02f524edb464fc2cad5e54dbc92aa03002784077d1b851aca01d8483d2cd7375f93aed05d337c85bcb36e7537ee4b83dba244c2be8 WHIRLPOOL 9ae2f3f0e1fd830b3869da471898be50b4dc3f9fd3f4de51ecb93516b299cc4ef222d59619a1854c282e09e20d366d586825cf583c50a7a1eb56eb80e961f754
+MISC metadata.xml 515 SHA256 8c7e26fc7893da95a73479be1aa5ad207554babd8af33de04f8c2db6190a58fe SHA512 72e4397504e316cca89b760d909cf151146f122e349283d4509f40036eee1272008ca8cfa2f2dc4b4204ecd450e6135f9ca1ffd8670aef6cda29d0865a61907e WHIRLPOOL e6bbfd38994847d4c3f25433486442654f079cc3cc92330e65ac60fbce9aa1248ff0a236dd2cc2d91d6785edf9225d95a757546cfe8b9d07d7e00be29e631d59
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-gentoo-fbsd.patch b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
new file mode 100644
index 000000000000..755b9b696cc9
--- /dev/null
+++ b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
@@ -0,0 +1,9 @@
+--- environ.c	2007-06-19 12:44:09 +0200
++++ environ.c.new	2007-06-19 12:44:37 +0200
+@@ -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..8f032a3fd115
--- /dev/null
+++ b/app-arch/unarj/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>nitro@legroom.net</email>
+  <name>Jared B.</name>
+  <description>Proxied maintainer; set to assignee in all bugs</description>
+</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..d579027e1d33
--- /dev/null
+++ b/app-arch/unarj/unarj-2.65.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils 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=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-CAN-2004-0947.patch
+	epatch "${FILESDIR}"/${P}-sanitation.patch
+	epatch "${FILESDIR}"/${P}-gentoo-fbsd.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dobin unarj || die 'dobin failed'
+	dodoc unarj.txt technote.txt || die 'dodoc failed'
+}
diff --git a/app-arch/unmakeself/Manifest b/app-arch/unmakeself/Manifest
new file mode 100644
index 000000000000..9ab62ddfd91b
--- /dev/null
+++ b/app-arch/unmakeself/Manifest
@@ -0,0 +1,5 @@
+DIST unmakeself-1.1.tar.gz 3635 SHA256 b89e3f8406050050c04d2f4dced4e0bc6d5e2e7062ab5c640357a11e4a6ec48e SHA512 3e8a05a907b8807080208300f6c20577587a0e87000c6746ba457c276e4dff37c8d61227bd1db37e60ac20d9532290c4110a1204c8389a8a1e97a121b68c682b WHIRLPOOL 5cda3534bf5db9d3624d501d9a41cb67581a3c6911a8c44f70584cdfc8d4040d7195000efbdbdf5d0337b24d5082b0c1908820cfc26383c72cfa606a3c7ce209
+EBUILD unmakeself-1.1.ebuild 519 SHA256 be9f5ebb3aca1f593c680ab2601baf5ca6fd67f15cd987ca9994058438534f79 SHA512 da37aa52b933214d89a0fa1d4f39758d068b7499dffe7fa6c47d2785a4cf08fd209561f3c26a966d866f70cea683112a0a4ea83ba2157a0e32223e7b36ad85eb WHIRLPOOL 4f8b721f387e19a68f509f95ed7d7396aa86e88437098cf0dedc009a18aa6eca230d2abc2bda750969cdbafb62f7ca706f725916e3438c7cf5d584d1c352ae26
+MISC ChangeLog 2482 SHA256 5f5a3470584e2eb97a19ad907cf18af96a771d950ad7549951bad44e4b255e3d SHA512 5ffca170cc87e5b0c4f1d44cdcabaa00e2866472779cf2394224147fc94a3b069c36a3e15e2a0aecd944df6ec6488f56508c454e2e50e4c83b4ddb6541bfb4aa WHIRLPOOL 82e71121e88adfa0ded5d9875092144bf930be93b94439ee79f1f57620339bb9731ab36a0c857d9370bbb098929a31f79446e93064a470a452923b4268700021
+MISC ChangeLog-2015 1433 SHA256 4b392b5cdfb4bda28fa274f2e74e06a4bcc065e9278ae1381e4f483904b633a4 SHA512 9e72aa4530a26769816927f8838588a5a56b39aab2e0178e193e10584692561e2cab0cc54c9c36fd2f89760965022ab26944073b5ae2bace226c77244397558c WHIRLPOOL 3dc1d2a38db59918218daf9f94e4345048f4e8788be26591f15d0b7aabdae9963d40437b0e1a06fc8911f7efb6af1b80df51ec6b072b25e74da72f90c2bf2617
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
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..cdf879bc73c6
--- /dev/null
+++ b/app-arch/unmakeself/unmakeself-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="Makeself archive extractor"
+HOMEPAGE="http://www.freshports.org/archivers/unmakeself"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/libarchive[bzip2,zlib]"
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDLIBS=-larchive ${PN} || die "emake failed"
+}
+
+src_install() {
+	dobin unmakeself || die "dobin failed"
+}
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
new file mode 100644
index 000000000000..618d984f7e12
--- /dev/null
+++ b/app-arch/unp/Manifest
@@ -0,0 +1,9 @@
+AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 SHA256 691af0548264b7e77ff9b9aa6b5bda2ec28542c426e7a00cf482848d05c0786f SHA512 c5e683398572889e4c09d3dfccf8847566421be5e3a56d086217ebbb70c17c4ca23c124cfe5d146e7e5b71e0ecce914575c1c50bdbc8438d3f00a6282790edca WHIRLPOOL 86b0564331f61aca671ac28470d737e69a95da9d61b5e8f0fccc63d4d1b202996e63d0051aa50285548cc33ba9613f71c79cf412b4a87314a9a5cf16952e4d0e
+DIST unp_2.0~pre7+nmu1.tar.bz2 17537 SHA256 7c2d6f2835a5a59ee2588b66d8015d97accd62e71e38ba90ebd4d71d8fd78227 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362 WHIRLPOOL 28fcec4dd271f952bac9313e5f4bff8fc244361831dc7829a5746d0af26c89586744d158a79808c02f3be9b41240b5eb082cfe11cf151e38ac8fd962e72af8bb
+DIST unp_2.0~pre7.tar.bz2 14492 SHA256 dddf23bf81444a876d4dba67c25c934e077f290499ada531ef70a930aa8fd6a7 SHA512 b90238a3e359d45e4b0ec3e5559a682fce3a7a37f74dd5419b005bb7bd3e3e5be03dde2e5d40d1671c0274ff1d795560fa238a572fe6cf3ab12f17dd1e2bcd1d WHIRLPOOL 21b1c7ded3b861739cd5e94d858e98b3ec785c777cd924c41599a36735824faebf845ec40a0bb206c1573aa20f0afb240e0356e4ab25a6547a29905c127217c7
+EBUILD unp-2.0_pre7.ebuild 907 SHA256 7e614f67e72b86f277d5b1d6ce252c9f721f7c8f528ef24ad405d334058e754b SHA512 22c61e13cefc72e3b048bd1a9d4cf1736c1970f3896eb5a801df93e0da48d6d54faa17e4ff1879e63cc4e3a7e69e44e3519f0ba5f90bf14ec70cac85525c0d7b WHIRLPOOL 328703d5da8fabf18bf63d5e2b5654a92d0632a446fabb6ccb565acb64082c6edbd4d84798f763195c8523add666af36e1d1334cad905ac377a4631bf975325a
+EBUILD unp-2.0_pre7_p1-r1.ebuild 1232 SHA256 25054f5189acaf953d7f479dbdbe5f86ff9f20610260fca1e6d83884e73e67ba SHA512 787b6750fa1b67b5462e40b3499b0aae9d2dac9706c96804a20a645266beb9c56f468a5ef53635f7736350131d8e498342f4aa1ff890c65fcf5a1859aa1d4aeb WHIRLPOOL c1e5f477dc0a68656ee78a5915e1c3e1092758d0f3ffec4f84ba04f4a6a5a1ee2e49d506634e6a5cf3f2b245b0495e6b644fa409d40ce08bb9d65df29d10ee64
+EBUILD unp-2.0_pre7_p1.ebuild 1028 SHA256 2a590b2e09df49e8d7c64d997b692190eaa85099963fa2136496ea40e748ddc0 SHA512 5095690f96dbc6a3fe47bf550863ee3b795b14ed9b9e6f3594ea5ae7ac2ef93774f0d30277a9eb2f0e9ba53ca0ca9e4c481dd462cd5de52fb178d3156af02901 WHIRLPOOL a172a560bd98e25432fd05fe49c745c8a1ae9479377aed9e5bd5779ccee48a2ac1d101123430c3995700b446975d37e0ff4fede488e666337e55abe4400d35f0
+MISC ChangeLog 2920 SHA256 1980e0f523a41297417080712fd389072039d95800abc6ac3e199f9d1cce9fb9 SHA512 3c5245f9e323330751469d70a89b994a9101ae960064c42ea7becbd89ad06e7a8580386b6f690ddc5c028e14af618ffa4814fbf7c3f12c85d7652068fb759daf WHIRLPOOL 857c28508a8e6003ec36d58ef5129f27ca6549dea59585a677e39cce61794ff723e2e4b0f40cceb88c5c1fa77c1dd38d816118a8adbe8496ef061b71324e9b36
+MISC ChangeLog-2015 4044 SHA256 9b0ac48303020185b21bbf3b008191c7878b4c98cdcebf9e455021cc60b2d2da SHA512 1af6fb25fa7def5c9ebff256945941448d9521389d280308d50ddf33f83142309c5efc9410487fb764d87231f5149cd3a3bd67d1b33cd7b3d0bd2b7157e2d3e5 WHIRLPOOL a496147b45cd1163ef2fb025a0350e6fa6c85ec0056b50f82501667c0f080df84400fa507aff85e21de047386a502d4091121d012e60313a514f0782b07b3fdb
+MISC metadata.xml 210 SHA256 261430405ac37ae531b59949774ba64133ecc8593015df002402afe0f0f60d7e SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f WHIRLPOOL daffaf412be04b8235613f91913fd8a88e1650897a3563641f50de943a4cdee417461a6627acdf7a99a3ff9f5ccf080c0676ae37105f6bfcda3a8200718d1ada
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.ebuild b/app-arch/unp/unp-2.0_pre7.ebuild
new file mode 100644
index 000000000000..17f3ea399609
--- /dev/null
+++ b/app-arch/unp/unp-2.0_pre7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Script for unpacking various file formats"
+HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
+SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${PV/_/$'\x7e'}.tar.bz2"
+S="${WORKDIR}/${PN}-${PV/_/$'\x7e'}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+src_compile() {
+	if use nls; then
+		cd po
+		emake
+	fi
+}
+
+src_install() {
+	dobin unp || die "dobin failed"
+	dosym unp /usr/bin/ucat
+	doman debian/unp.1 || die "doman failed"
+	dodoc debian/changelog debian/README.Debian
+	dobashcomp bash_completion.d/unp
+
+	if use nls; then
+		cd po
+		emake DESTDIR="${D}" install
+	fi
+}
diff --git a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
new file mode 100644
index 000000000000..c2ad30c74766
--- /dev/null
+++ b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 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/unp/unp-2.0_pre7_p1.ebuild b/app-arch/unp/unp-2.0_pre7_p1.ebuild
new file mode 100644
index 000000000000..3c2f98f8f9cf
--- /dev/null
+++ b/app-arch/unp/unp-2.0_pre7_p1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Script for unpacking various file formats"
+HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
+TEMP_PV="${PV/_pre/$'\x7e'pre}"
+MY_PV="${TEMP_PV/_p/+nmu}"
+SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-remove-deprecated-have.diff"
+}
+
+src_compile() {
+	if use nls; then
+		cd po
+		emake
+	fi
+}
+
+src_install() {
+	dobin unp || die "dobin failed"
+	dosym unp /usr/bin/ucat
+	doman debian/unp.1 || die "doman failed"
+	dodoc debian/changelog debian/README.Debian
+	dobashcomp bash_completion.d/unp
+
+	if use nls; then
+		cd po
+		emake DESTDIR="${D}" install
+	fi
+}
diff --git a/app-arch/unrar-gpl/Manifest b/app-arch/unrar-gpl/Manifest
new file mode 100644
index 000000000000..cd1a509421be
--- /dev/null
+++ b/app-arch/unrar-gpl/Manifest
@@ -0,0 +1,7 @@
+AUX unrar-gpl-0.0.1-solaris.patch 1584 SHA256 705ac0ebc6d25c9dd1fcfa3c6369acded6df2d6896f27fd8408ab7663c093e62 SHA512 c030b1ad583df36af680d7bb3392360fd232e81d61b8a33346b4e65ed571018a9f85c9cb982c1e43ab4fc5949e9d0d50ea27b3570ff5db5c1e741f9088ce9fac WHIRLPOOL 081c8040adb9d4daceaaef04cb9b20678caa3aedb2c4ba522bf69afa9865831a9beb80545b2735a9b40fbc752c26ce9f78bbb959388b1dca0f4bc1fffe458961
+DIST unrar-gpl-0.0.1_p20080417.tar.bz2 138495 SHA256 6a9605aabf53693105d04accb70c4bec49b4c313f0078828cccafbfb9d1966fe SHA512 2d0a7ee92d1ba25185b4e35c4c8aad1b5818472a48b597bf8fb7c673c8ad3c6553c29108766bd85ca8b724486ec4466a09a1f3622951dba7ffafcd8dd8d3d2a1 WHIRLPOOL 6371b79529f376c9d73dc0531104d8d03da3f2b0fdf511c6c2829bfd1bbb8aceb02c40891df0417f6f29b8603d0ac61d40661d513e0b984b0bf34677468bf883
+EBUILD unrar-gpl-0.0.1_p20080417-r1.ebuild 528 SHA256 72344f65cf404ce735b43966986e5a74337053af9255d481dac54cc654a1dd54 SHA512 8e556ade04c819fb2f1db63f8d1c87c5b6ee969f10c5d53b93a8ec60398e54a858f1044a4ee3e1081d7cf5b0eaf1291e8c0ec18e8ec4927f12fa77540a890345 WHIRLPOOL 854430c1bd92821218729aa477230519e2affe1d24ec4d9722879c1c74d6c176d75b96b7d86ea8d55f048f9f547d6191215d5b5dfddb424ff85843818a039b8e
+EBUILD unrar-gpl-0.0.1_p20080417-r2.ebuild 898 SHA256 63e77c7cca2de89f57a4a239c166180608f37f0efe11a2b47288d8b337182e08 SHA512 e52cf000b35b6b9b3171082ae9d7e42f246fb6f110d7512db6cf07ee4376159747cba1408e85524d3d008ed12e27791cb8ec2c523577c3ec6d3580d18c629187 WHIRLPOOL 9e482e95cf5a2cebceb706861b94640d523b49355db43d652b93ea6a5f0da96474d6b6a97bdaeeda38d2707e23b222a214be145b1667b5207517da8109c33bdd
+MISC ChangeLog 2472 SHA256 eec891717a99b29a147a9161d2aa8a671f4cd7b2f57fa93b4849a9616547e4b4 SHA512 94bbdb23a45d0fe227261f59fb11c458def9394f627978763ca459092411f0a545af02c287fb0a1e974823dc31f163e7e138369a5c0bcd230e84f9006a9276ca WHIRLPOOL 60d0f3d531baddea5655667d4c6ee1fc16d5b6eb9fdc56e33355b4de07d101688f51e928c8a7e160c804ab921d975b3350c73e4a22ff7f1823b16ec50ad6a548
+MISC ChangeLog-2015 2136 SHA256 df6d8735c044aac1bf5e3feceaa1027a17f0c99b4a71d2f6938985e41b9b9c9c SHA512 ef8eaa08c02aee62b11fe062f8c810affe3bf5196d51eadb4c1fd3fab36319458eac6034c8a44f79301d08731701e1eef56a88734338551f1127a454a7070445 WHIRLPOOL 91b5efbf8c63b8fe4212ca8c09a05a86b8c96e654b786f9428de416983d5ddbd81087c354acbb0144d6a843c91e4f877d9a3977d742e787bfd87108ffdaeb751
+MISC metadata.xml 214 SHA256 3743c268744cb74ac2b894c639d1c5b8fa749e8bf3d3ea2a45f06b0cc297f902 SHA512 2c93cc03eaf96dc2d6cb2357ecd442dfc2a1a64baa97af3fc4b786da42d1750ea57df23e5c3943e093c49e6e57d53465916ed9ac2bcbddee7aa6ef7f68d98a99 WHIRLPOOL 2027556267f788ef3fbf49c4337440215cf79a5151ba3f587795191765a00dfa60e58560a41111504d23343ca9a34a00c14698b8d1cdc9ab114d03be8cffea66
diff --git a/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch b/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch
new file mode 100644
index 000000000000..f1cf8ef2338a
--- /dev/null
+++ b/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch
@@ -0,0 +1,63 @@
+* grobian@gentoo.org: allow compilation on non glibc hosts by use of an
+                      external library for argp, and check for certain
+                      headers before including them
+
+--- configure.ac
++++ configure.ac
+@@ -14,7 +14,7 @@
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h])
++AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h error.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+@@ -24,6 +24,7 @@
+ AC_FUNC_MALLOC
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([atexit realpath setenv strchr])
++AC_SEARCH_LIBS([argp_usage], [argp])
+ 
+ AC_CONFIG_FILES([Makefile
+                  src/Makefile])
+--- src/unrar.c
++++ src/unrar.c
+@@ -24,7 +24,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+--- src/opts.c
++++ src/opts.c
+@@ -22,7 +22,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <argp.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+--- src/opts.h
++++ src/opts.h
+@@ -56,4 +56,13 @@
+ int parse_opts (int argc, char **argv, struct arguments_t *arguments);
+ int compat_parse_opts (int argc, char **argv, struct arguments_t *arguments);
+ 
++#ifndef HAVE_ERROR_H
++#define error(S, E, ...) \
++	fflush(stdout); \
++	fprintf(stderr, "unrar: " __VA_ARGS__); \
++	if (E != 0) fprintf(stderr, ": %s", strerror(E)); \
++	fprintf(stderr, "\n"); \
++	if (S != 0) exit(S);
++#endif
++
+ #endif
diff --git a/app-arch/unrar-gpl/metadata.xml b/app-arch/unrar-gpl/metadata.xml
new file mode 100644
index 000000000000..b265683d48c5
--- /dev/null
+++ b/app-arch/unrar-gpl/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>hanno@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild
new file mode 100644
index 000000000000..08d8305c862e
--- /dev/null
+++ b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools
+
+DESCRIPTION="Free rar unpacker for old (pre v3) rar files"
+HOMEPAGE="http://home.gna.org/unrar/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DOCS="AUTHORS README"
+
+S=${WORKDIR}/${PN/-gpl}
+
+src_prepare() {
+	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	eautoreconf
+}
+src_configure() { econf --program-suffix="-gpl"; }
diff --git a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild
new file mode 100644
index 000000000000..cf50c74e6c32
--- /dev/null
+++ b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools flag-o-matic
+
+DESCRIPTION="Free rar unpacker for old (pre v3) rar files"
+HOMEPAGE="http://home.gna.org/unrar/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+DEPEND="!elibc_glibc? ( dev-libs/argp dev-libs/gnulib )"
+
+DOCS="AUTHORS README"
+
+S=${WORKDIR}/${PN/-gpl}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.0.1-solaris.patch
+	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	eautoreconf
+
+	if [[ ${CHOST} == *-aix* || ${CHOST} == *-solaris* ]]; then
+		append-cppflags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
+		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/lib
+		append-libs -lgnu
+	fi
+}
+src_configure() { econf --program-suffix="-gpl"; }
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
new file mode 100644
index 000000000000..eb741be76405
--- /dev/null
+++ b/app-arch/unrar/Manifest
@@ -0,0 +1,7 @@
+AUX unrar-5.5.5-build.patch 1021 SHA256 2e976ae054a1738a8d5f472779a9be132c15442e81eb61eebcc6156bcecedd0c SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0 WHIRLPOOL 0a3e7b7ccc9940945b5ab6edc5d63a8a65c67f8c7f7f0dc910e7e80aaecde74782c879730d665d53ee60634979b2e47eba66b241bcd7735522802e03e8bf8b1c
+AUX unrar-5.5.5-honor-flags.patch 1211 SHA256 0ab61a4494e54de96823dab1faad874ab54a95ea3e1e346946bf2f681da2a8ce SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569 WHIRLPOOL d5bd506113ccaf4d39fff6b3f29a767708e394722c9fe93a27553d55528459e3c3d744a119283defec8848c33e2b14a25b8f6907cc3ff4e9c78b0cc9a8368809
+DIST unrar-5.5.8.tar.gz 222285 SHA256 9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa WHIRLPOOL 3e96f6073c93b28089b53f2b39016a98d0ffe243c7cb6262bf6bc0bac95daba005279f0c0d8a7fd717443891e932a4c0d31c19a02b9a5438ddc570f3812e2687
+EBUILD unrar-5.5.8.ebuild 1861 SHA256 88b579a56158fb3c8d88b54b23af5f4c565b22bf4fdbb3645e0422c7d3be4b66 SHA512 dacd50014b98f3698ced2edbc868b59908b6289114cfa0824f88d4190e36664d6e525e3ad677f2db29d3041aba01c54f2f39b9ddcc53b1e6f969a3f0ee8a8f14 WHIRLPOOL 8623edd0a8b646472130a450bc04cd3688ee5960c5fd29f527676d18ae5a2da9f9faa8c26463006b938a31240d1f26851d99f679e32faaf7c27ac44a57e9ef9a
+MISC ChangeLog 8763 SHA256 6bd10e9dc85b11f3f2707633af7334d2aff22fa00eaed070a69a19a051694337 SHA512 3f741e6aa0c74e9b5607e504e0ef2ac46b0c43c041f117edce12dd4fd5cd7c5b089dd3e2cf69724f6ddc10eaa6f84624de3ebe4279c1e0674a13eee89885b185 WHIRLPOOL 363e864096e67cd2172eaaea55029411622bc7565886cb036771705afae3229f62921e316f17e3bd1e0adc36962029490b48fc59f71da516e8d3ffeea831dde1
+MISC ChangeLog-2015 27748 SHA256 678c90a69bcbb5a698543fa061e46b55fdc9a4b34d4fd261579d563de728c76e SHA512 851e48e9796f79b68421bbbf1b1ff3f242b4d89df2fe53fb36f58d3c7a4d18ed0b35316d09ca016b8c1b2fa4663870a50b9da43dde6e685f1966e752bf55ad1e WHIRLPOOL fd77ff80db0db5b469bc881a4147f0c24bdbc8af86b451284cc1da42c9fdef6cee3dd8aadb733416a3d0441a227022fe839183691b62d5b008a3e9663a6c4cd2
+MISC metadata.xml 512 SHA256 3704de5936a8614f743e1213072a7d6e3379974978a4e631cdafca6b701f1ddf SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d WHIRLPOOL 6e0911541a1f23735fb740f04e651818a9b643d767c404be5e625de680077b9c2c3ad3787fcd9797be8b52a3b6b7c95fc6c16725bc1bdfe36f87bb4728290905
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..309bb4d4bcb1
--- /dev/null
+++ b/app-arch/unrar/unrar-5.5.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 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="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://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/Manifest b/app-arch/unrpa/Manifest
new file mode 100644
index 000000000000..679fe969592a
--- /dev/null
+++ b/app-arch/unrpa/Manifest
@@ -0,0 +1,8 @@
+DIST unrpa-1.4.1.tar.gz 14367 SHA256 a6f20fca0e00e09220933060c98180ad11d5a7633fc902684099b5f2c4806b0a SHA512 9b058adda9a39178950df4c39af40726cdca410f0fca699d0dec1bd5d7046c75c8811c8914c0c8756c29988b6362d3b4ad3756aa77f238eafb13d4414d3266cc WHIRLPOOL fc01837fa7a68e5121413c551abb1f9231adf04b677caec1017aaafb112da5546e5f68ea10b7cc68329bacb6499468c5b595196a4abe93ac9b7bcacb1aa5f89a
+DIST unrpa-1.4.2.tar.gz 14458 SHA256 d8c4a92380721f82f21b9c086c7755f35609aa7738ab5f8e8d3aaf1f21774090 SHA512 2608f4ec11540de1b14290ce1aaad6f06e8111a55b5c6a38c0c9e4d7228c04ccef480425f812a7cbc3913c0ed6865d0b63c8aa0d5ec9131495eab40bbdfcdcc5 WHIRLPOOL dc454ee7eb09a5a793cd0a311e17cf8c5b8cf2a276387a5957f86f5feaa4b7202f886fd83d82dc5d231d769aecbb52fdbb7839bb9cdff0939d41119a460de331
+EBUILD unrpa-1.4.1.ebuild 635 SHA256 017a582d4ecab38ce10cb298861992fd3d35a077da75c67ba0be8df378b8b460 SHA512 f902a1168f7043abebd81b68089bc32decfe21f624f09fcd07367360f65319d0f225fa6d05002307dfc4db195c6b3c9d5dca81da3b956611ce3531bf38d22ae2 WHIRLPOOL 47d703d8894375bab0f0b7e6aebe3df25c1780d0b525688bde8a16f3f311bf75db02054d955e3d024b7b2341a23bfff8bf18a3ebfa16c3e3aab7113b64bf2027
+EBUILD unrpa-1.4.2.ebuild 649 SHA256 b11f70504d57301bf586673751599245f687ba754a476badeb60df6fb811cae4 SHA512 7c14f5bb9a71dcf41307b368ee05a9ca8fe1d8c85ba16552ff5ee7eecce8704537c07b3213f78365c0f44b127d9a8ac4c89ab8ddb3652ded2890492b6244b1a3 WHIRLPOOL f2ae07a8434e547dc1b1b2915917bc476094d0e8bbb34e3b2cc2aed5f6de56ccbb6c06deb2bac18885b3b3f00f023ca9e16ce6e94579ab724fd957dd7dcb806c
+EBUILD unrpa-9999.ebuild 649 SHA256 b11f70504d57301bf586673751599245f687ba754a476badeb60df6fb811cae4 SHA512 7c14f5bb9a71dcf41307b368ee05a9ca8fe1d8c85ba16552ff5ee7eecce8704537c07b3213f78365c0f44b127d9a8ac4c89ab8ddb3652ded2890492b6244b1a3 WHIRLPOOL f2ae07a8434e547dc1b1b2915917bc476094d0e8bbb34e3b2cc2aed5f6de56ccbb6c06deb2bac18885b3b3f00f023ca9e16ce6e94579ab724fd957dd7dcb806c
+MISC ChangeLog 2216 SHA256 e601849391c2e9e9498ecb2a08e9a90ac7cdb51c5a28d79c183286607e117199 SHA512 c41503993932dca715d691ac55c8e7a59174a0905f94b2124b2d92525f600e3473af2465242c7f5cf792116cd68ecefa53e7774edb42b0955be209a03723e8ba WHIRLPOOL a852206dddba0d8a7a67746271d97e8eeca1627b760d272a85cbfa12eacc431139690583f951e068e659f113ca7df8f7239f38ed830ae1a88b90f3feac6572da
+MISC ChangeLog-2015 524 SHA256 66e2bc2fe09ae0209cd56a4ed4fbbba751016d2be8e142a7e8f622fcbd5e23c9 SHA512 b0e14b8af44c6129ebca486394a0c568380e08db01b37c7769994c561a2cc50d911035c52f1414a76539882e2d4f7bdf85afd807947fb5878d68eb405e13cdea WHIRLPOOL c4721e8a2acd8f53236acecfbc19eaabd04a8e18661e592088428ec636cdc84a3bd9ef5fc5587da307aa9096813e5279005dcb9ae208cc9ae7d3afd39cbdccd4
+MISC metadata.xml 499 SHA256 b6695653441364010819176d7355ea7228c3c7593e2eaec2eed79f2e5a10c713 SHA512 762ed0781c8f3dd507eabaec36dc615094c17255fe3420e4f2ce9e63e6c4ab6fcf9a2e9f4b5d3ef120ed95c1dee112a3fa0850bf52ceadfdce10837bb77bbd40 WHIRLPOOL 85f80d7c87b7f83d14939da43e86ad15355bdac728e79ab32a7a61a9beba50c6232d33be1aaeafeb5f5cfc205eaaf0b3c3b0e8d3076e31868c19cb2c7e8d5812
diff --git a/app-arch/unrpa/metadata.xml b/app-arch/unrpa/metadata.xml
new file mode 100644
index 000000000000..ae6fe3733ede
--- /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/Manifest b/app-arch/unshield/Manifest
new file mode 100644
index 000000000000..aa8fb9d63ec5
--- /dev/null
+++ b/app-arch/unshield/Manifest
@@ -0,0 +1,7 @@
+DIST unshield-1.4.2.tar.gz 46051 SHA256 5dd4ea0c7e97ad8e3677ff3a254b116df08a5d041c2df8859aad5c4f88d1f774 SHA512 3ddd5df47198adade66acf89644efe3a1c87d60fcdf511f8e5c1fb29bbb07e77a9abc57a05b161ecb54a26a2a86242bbcba6e90df770b1325965ff5aa8eddf58 WHIRLPOOL 75a62d7bf4d0a9609e5a0d82cad509bcc287147fba7997144240b08d2b993674e1454c881914b26e50ba67d8dd8859bce163ea631c3b3a93e94ed5cf1ee505a3
+DIST unshield-1.4.tar.gz 37199 SHA256 8ae91961212193a7d3d7973c1c9464f3cd1967c179d6099feb1bb193912f8231 SHA512 b09c29fa8e5785f2ca90b40105304802d00d201dde42ef4f5e4b5504ca8edf10da426c7ed1daa8c0685980f085eb20437162812a2068a0c03c0dfd240edbf944 WHIRLPOOL 886c6272d8666192e67fd0978f3d038b9a023ffc8456689b0e6ce6d2c0913f21a1ad8e2baa3d57991605cf64d59a5991a4f8ef3f8856ecabbaccb664bbc3c91d
+EBUILD unshield-1.4.2.ebuild 846 SHA256 c43cb0b99a0e49349190202d7ee8a572f04e93f5b094c9ea379ec34361205990 SHA512 99f96f2328ae4efe4dc1cc78014b12d630b69413e0f98823d9ad895d45bf3a7bfd96ea132105786699d165440cfc64fa1352f2cbca472699947fb88e3b732772 WHIRLPOOL 2c40b0e44120e2de521e1f1f4dcf582cb4d51514d5b87dacc5a8a93dbbd3d279f06e43e16b9d05db606cb75f76e13b6a04c7d8d118ec364f74a89eb14844196b
+EBUILD unshield-1.4.ebuild 932 SHA256 524c1b9f95f2afe6f05160e84b88ea380839d46c70eb3ec193c0fc67390e89f9 SHA512 81c169fa18106e9a4bbebe63ac9f3f4e43f9d4750091a33f65336e36f2995fb1382d5a02bb51b17fb403a06a77ad3a6c0bf47fffa783205b1e53720fc35254a9 WHIRLPOOL f9ed19c106d615968fb4c9701af2d996187231bf2c95f11f58484ffcd6244bfaef32e1dfef17c24ffbbdd201d8344d8eb834a059f427414d67a99ceff34c4b26
+MISC ChangeLog 3948 SHA256 5b875027d626005a7dce9fa1caaebd4cc6fb8c2f8c3d90d263d58e933be7c20f SHA512 26c65bee23ff2e0486fa94fc41775ee7354f29f467c8a15649b6a61380d03bc0e36df07e4e54fc846807502b78f4777f842e7580957b380191ba6a48ec885a31 WHIRLPOOL 33cc1fa82faa5aa4018d05f52f852c3167149cac214131d07f3e2e5b51c767c6fe9ab68f1831763920bc75798f5fbc418601f5f25dff35ac188563785cd8b31c
+MISC ChangeLog-2015 3948 SHA256 1e3c07bd6e6e8736e66dc5ef1c511f3bee0ac43dce6d8f08f8c5b00346637bcf SHA512 f92a5feef0319fc288a62b8c025b7b4217571be0bd42a294cab498b4638eaec9003be893a7481154d1f99789daad25efa399a0d7b2a5aabc2ba51fc5737d561d WHIRLPOOL 495fd38350565d7907926822ed39ffaffedf4b0a6d9460d64cdfd0958f58f73f10a569ca7b912c1fa094ef295f4785479024cd8abbddc213cb913e41c87ac1bf
+MISC metadata.xml 224 SHA256 1a209c2b9a233bbf348df12a4ec946c08bf8658cf1cd34e4b755cc46d1d3e902 SHA512 3c955bc3bb3a290848f9cc01472321c321ad63b98a10eb1a7986024db98c099e5a18c628c6398b37c42e69d333fe88d74cca5c22293aba196991aa317e6ed670 WHIRLPOOL 5c1d3edfbf61c9e4fee24b84e949b8c67a51798eecb9896500dba6399533d73f368de507bb00b7b339503d352aaffee4652fdfab9b75365c3eda8b88d99476cc
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/Manifest b/app-arch/unzip/Manifest
new file mode 100644
index 000000000000..8586a6f84cd1
--- /dev/null
+++ b/app-arch/unzip/Manifest
@@ -0,0 +1,8 @@
+AUX unzip-6.0-natspec.patch 14304 SHA256 cf7b6146b034e5687e77c328a9e55efc68ddb75636fdcce84853995ab60082dd SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda WHIRLPOOL db49d3f17313f37b87dc0a597ff703474c7607ceae0b0fe456b3407bf915806557d3bcfa1de8df37a6d3f1d9c74a516f88ef1f05606fbe97b085f07c17d79337
+AUX unzip-6.0-no-exec-stack.patch 381 SHA256 ae62249dcf8bbc3c30468b07944df6c8777b565927d9ed6d1fdf7395899ea7c7 SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5 WHIRLPOOL e838b3835e9cdcbbe5f47bb1ab92b2ce0fffff1ce77e69ee460a9ff9d5ed4a3c16311d65b0a16f14a3b4e22b2c09db1f3d88b35fa978d40e67ad5307e5a29a39
+DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
+DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd
+EBUILD unzip-6.0_p20.ebuild 2557 SHA256 28da56bf99abfba333e7df31e9c0288123aeb09d5ea1630f19fedd505fb5adf5 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212 WHIRLPOOL 16d6d5c7612bb25877162d572ac88731d313f1d632eadb1f72063063e544d08bde57fd5e87b792adc77adbaf58ada2e3aece28770c583243e7efa2e068f69ce4
+MISC ChangeLog 5049 SHA256 b0c10cf3ce667fc7eb0921a97209fe4337d83375f69510c99a95d4f3f32accbc SHA512 e42d5c5b1e5ccf47f1a1b1a13296d68bf2563f7ec90d67bd0dba798215f1313b14f1671d61f70a4ca77cdde1023b404f72b981655e9f776e2cd3bf2f3fe62aa2 WHIRLPOOL f020fc753e8f5f9def179c888699b879bfd130b73d1768b45c24c30e908a08f870aed8ef851efd8482fb9af1126bf8f436e32002a8ea676391ec7986f7b96680
+MISC ChangeLog-2015 10492 SHA256 d02b2f95413294e2ac375d98127e9465a60c9132166c0d62918d48474992f966 SHA512 06717ced072fc605e067c9018e74e811c3c47c07ae7ec39a7260955b0ba3168ab710a5c76ace3e365c5a90e9ed9976172e2e77a8e985cd4e1154e398244ff200 WHIRLPOOL 3fb404c5672c5977c242380415b7e505eb76af9b7f0028ead8d52f988399fa03f5f3d023aca7e4be95e39133fd49b8a587f3fa6674bc5e97cae8534ab5fbca37
+MISC metadata.xml 476 SHA256 91ce6b527006713ac4c8b533935adac492ace0235b21f7ab4678d75052d78ff3 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653 WHIRLPOOL 039f215da0822c5bf526b0c1a4483af67c0423326b7a149b39f8a216dc18d1c0ff205dee0e872f5ab8a1ae78e0346eddfdbc42922c7f70d9030fde66746cbc96
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/upx-bin/Manifest b/app-arch/upx-bin/Manifest
new file mode 100644
index 000000000000..7abc43c54711
--- /dev/null
+++ b/app-arch/upx-bin/Manifest
@@ -0,0 +1,9 @@
+DIST upx-3.91-amd64_linux.tar.bz2 373664 SHA256 ec709333175503c7388fb6e91054de4db1b34ca214b0574c98ed43dfc1aee1f0 SHA512 7f57564c89baf1bad89d6038c17a83268a3f528d2cb3cc992160c6dd4842a6b3ef7123fea86480a491d8df7f7b099d8444effa6f677532f4bf756f72a51066e9 WHIRLPOOL db06d0d4016043640ff8e7aba7931c60aa3f113abb1a4cba81b948ea1bbeba4f27f426270b583e79fe8f473e768f185798b77194630e18a19d6c65d5e669a43a
+DIST upx-3.91-armeb_linux.tar.bz2 363100 SHA256 b127bfbedea0cb95c779ee55838f7ff795b9258e12bd5cbc42e4ceb560af0c1d SHA512 730fcf1b8b2a81043f1c1ff611c94c8b4e26850c7dbbbd9fdcb6a6603878792873ef6a48f073feb12e1db3cdf0a7964f747ba4d7daa75cc2bfb8844b234b4332 WHIRLPOOL f0ee5a1e20d649e0f902529a408c869111cbe1431db3d68399ba06a482a6c7fb04bec7cd160ed2a28e1c422a23aa230a2075a2f9ab4140b89f59924295506bb0
+DIST upx-3.91-i386_linux.tar.bz2 366446 SHA256 af4a4682a3a1980d3e09dcc08df3066f670778461e9087c4f4ce2fd6fe296ac3 SHA512 b679fc54a4e4bbf1ed7bf11473b85ae33df82752815bdf7fae9499f6d1cb1df0251a284596d7303fcba8465b77c6dd233e1cff288806a73c84a50a48ec13aec4 WHIRLPOOL 42045dada5aaad6921ec40d2ff40338c885e13ae80e2a0b2a2adb9b9280d06e2c33f31c294e7acfd6b036765cd8b54ee1144caf0dcd49345801fc4373c680111
+DIST upx-3.91-mipsel_linux.tar.bz2 530222 SHA256 471865d5482571599f8254322c6c6927f9437e4652d9f1672f8381a3587e6ce2 SHA512 66a256127104266350e32cffe6914790586c3f35b4aea49a12ce8c37a911f7b2195eeea72b9a9e4ad32e12e8efe16fda36f93cdff85e15983b496211c961f71f WHIRLPOOL 37410889abf67f87d80e979936f0ca029f61b241e4962708b18db56063297e48376730e72a3a4bcccd9c58b59293eb4b6afa0fdb6f98ac73a0584442c2911828
+DIST upx-3.91-powerpc_linux.tar.bz2 474332 SHA256 a4872c83d6223445ddaf7159274656a612abefe9e8846cbeb103584e403735b2 SHA512 1ea12baf9f8cf7a40fc58be7b41255f2e65044937faa44232f3ef5d4cfcc6d98ac1cbf7511c941df7610cf5c2378f9c9dfb323a6a1c5c59526b67d38eb800afe WHIRLPOOL 8fa78c20bc991fede40a03d708b4062311c6b189a47327283765e0b2c9cbefc9213e23db9ba6c3d46f557174752439b3a6dfbff3bc37f5e51cbaf5a19f4a87c7
+EBUILD upx-bin-3.91.ebuild 985 SHA256 3bba86738efcbeb0dc78355ce24a5d4330eda76317f8075d6a1a845cab33b811 SHA512 145bfc6d92604b2cf3e8947f29aa1aadc51fe39117ef8f0632d92ceed290f33ad39042a076bf26d7117c188a43be963680cb17adba17945ccd043f80a068bc2f WHIRLPOOL c68e36459c13f2eb6e403455542eafc80b1477330116a01516391603382f2e70fb667b6d628798564b29f787f439469a8229fe69dff9de307fb2970eb0e16bef
+MISC ChangeLog 3066 SHA256 dce7d7aca9677ea8bd9caee6649eff3a93b5e5eedbb19f89e5140dbba8532040 SHA512 82f1fe815481bc99dcdc0dd2f2b9fa36b6fcb071558c2ea241554754bc75cd2067ab27bcb654e6a15ce4009ca78185eee7e2fbce16d95aa6ddec42619f6c970a WHIRLPOOL c8ec076ffecba5ef49f8e8e735134a1e9522afa9f4ee15848eb0b17e0271fdc47e97c7c8f4b9a6a404b1c6a1b8b26581e1a771fb09cf0b5b7d43f8042c8d29e5
+MISC ChangeLog-2015 4088 SHA256 55bf8eeb774cf9b335b17e62e6a6a865b5e07551b7754b882e183f0fb93806fa SHA512 2531edc3169ea259d43d5d66c389352977c7682f1f2c96db34195d355bfdd3a47696a66334ff1d4c82fcf6189c86dbffda3ae1b222a5165b39094e7fb4ff0b23 WHIRLPOOL eb569168ec54d9724090a7cfdbbae346ee402920da647f37f348c9ffcbc8683407d080f672e87bc4ec63982c4979d255a82d7b5b5c6e07aa6b6dc5a0fd0afc40
+MISC metadata.xml 350 SHA256 1d763267acc54973ac7afbc12c9024d27a3b18b7a3f03559be9ba97f494cb11b SHA512 d46dfabc7ce88e5f377d658f33cf45bd107beacc479280d6efddf6611483a7729a038f9e9970e1194739d60fa948b3436493acdba7c08f0004306d715cd73448 WHIRLPOOL 97d8fbebc6cee9a1380467596d17de00a44360c6f037640d84cba892db55f9f05f3002372af88b30dd427193d637f3ed1683fffe31eb9ae7be7de97bb4a3ff1e
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/Manifest b/app-arch/upx-ucl/Manifest
new file mode 100644
index 000000000000..e7d2878d0d94
--- /dev/null
+++ b/app-arch/upx-ucl/Manifest
@@ -0,0 +1,6 @@
+DIST lzma465.tar.bz2 288122 SHA256 c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e SHA512 690f005cfa9d3a65db03baddad57cf8dd79f861ac72d2e1bc18a151f3673d5f8043e3331f5dc3fba713dfd7b01ebf0817a2c0b6a1b22e1f7d8255a42b85ea4ac WHIRLPOOL 34a08888ac6874c1ac4ff181774b02eec993cc90a28531596122183c975c2e29fd9852d066acd24c0fe1f213ae9e03e7daf3fc9417c587043e968d973551027f
+DIST upx-3.91-src.tar.bz2 904747 SHA256 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c SHA512 7e9a392fe11daf7baf9632f2c448ef9936da7dfab215f86ba417e9f097770949acb653aaabe6cc5ed812efc486cb35e0c1e128c80026b02825713d8b12251cf5 WHIRLPOOL 1e20491528c9c7da50985c4484c0062799a243adebfd8292ea3c136b93d865842e85e164e15f1005d0e821b83aa7162e7113553cafd5f0b584d9b08aa6c7938e
+EBUILD upx-ucl-3.91.ebuild 1019 SHA256 0cc40f06d1cc13336659cd5a71cacc3d3e61a944ac46413a1a8069050b41897f SHA512 fedea6f60f1360edc30fb28d47ebe373f81ca909d3a13a1b5abe866a6bd5daa63dece6dcfdd2a6dbe3ab9e99cef17e0725379b25abcd8a35fe71bddbd52bc8a5 WHIRLPOOL 098354dcae5d8b929f18b40d8146598aa3201b7f158eb0f7df2055b47473e570a910d88af0609ff7a7edb51def41d028a83cdaf1b5da49e558422a42945dbbc9
+MISC ChangeLog 2968 SHA256 88bda61204dad2ff10e0b7971ceed7bdf017d89cb432b97d23bed37bc275b671 SHA512 422091883ee90ebef4493120a85948ee92a642a3fc0cbbc947d834e54b269752e40d557d3497e27d9f9a8178e5736e50eb053820f872ccc6f0851b411798c7f2 WHIRLPOOL 004d0b6322ef0d9fcf559a44081b0692f74308c2a11f9434a881bff65398920ea2772c1da41eec0b4d411d70148f7119c2ab270c04219df1ec0ff8644e803c61
+MISC ChangeLog-2015 4255 SHA256 5c6cc46995e5ff18ba132b0bbdfa3f91784927203fb690717544415d0d925806 SHA512 36d2ee08285ef5743f5b7b15a16ef4778d7cd338a7d3f6bea3f1ee17850f7b01ff3ca312863cca71b552f9a36605779950e1198c3d8bb5b6bb5822964135e674 WHIRLPOOL 27dd937689b7a358d1f4cb7f9c726c082e4d478d0edf5c024e743a44990fa65736aa856cd9f12654cc241d3ac23b141b8bc2216021032b5b8158329cdbfed5ff
+MISC metadata.xml 353 SHA256 37eae4f9333c7b7e85f2cda59d682b03644fd678d97af3696f02e81424241a0a SHA512 b5aa861749330f58aebf8c047c68f43dae170612d140bbbb795fc79b6db5f625977debebb5f36dcd77c229d1e39b79089400133e0c35817ea9f78adb2fad44e6 WHIRLPOOL a87a9133f911105cebef4053761e01ad0802fc3db048e9da0df4b1ac328dd6e03ab9468f6bf88edd66edd49d695d59889ec8fe396fc32da073189be346f66133
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/Manifest b/app-arch/vimball/Manifest
new file mode 100644
index 000000000000..116edbfd9735
--- /dev/null
+++ b/app-arch/vimball/Manifest
@@ -0,0 +1,6 @@
+DIST vimball-0.5.1.tar.gz 5246 SHA256 74c7bb873e5e530645b0735995244adc9de4eafbd157498f27c096f074a37544 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549 WHIRLPOOL 4c05aafd7c78124b637665aade84404c1a445b1eb3eaacc8b21c77848267c289b3246acf2b32b7e41c812216920f9550627b4bf27e5e66d534d880f1b1c7bd16
+EBUILD vimball-0.5.1.ebuild 654 SHA256 006be2967dbc3410bffce2609af682951c8535ecb257a958c26a0d9de4651233 SHA512 b5ba733eb02fcf5bcf1e38db66bb63515d80b85ac9dc1b5d4275dd321452db2f078891b86887917ffe94bad99b1a02c352c8f93a8d5493ae9bf09ae56eb61b94 WHIRLPOOL 275db55b37f6a5166e1c65ae46feff338c6afb4d1a5992b26fe199a75119c697f7904ee2b4e4ff51a0a0b3e45b03fd1aae2de6529a11c66c9809e7b28179ea6e
+EBUILD vimball-9999.ebuild 658 SHA256 8384460252aaec9a81682a9ec5d190d113fbfd0e81fe3a03dc0c003ef23cfe4c SHA512 8b35615ce1cddeefb6b84c68d1dcc308e525883203d0fd08a5aef40f76578ae0b7ddbbb7b69f2f84cc542a1bf6fc9b2ee4d0b60596d0630f57d31054e83bc5c5 WHIRLPOOL e557ed51c71b13cf5da153e7fd3143ba664d8e5d4577f1d13d9b5d06156893aea91482157dc7870aef2fc83353231c89e56845f770e30893d2c5b7aa50d31560
+MISC ChangeLog 2609 SHA256 16ac1fcc1c66f2fbc9d82f1d649c9907de57e3e5bb15743028e0b0b8ea22e5c6 SHA512 aeb18997dcdc1185ff12ced9fc53c65c9a5704680faa067c16396366520f0d62e843f045f94f8a9df446ff7d138f753fc7662b25760441d820512f46028ddf87 WHIRLPOOL 56cc38cf5796cca867954a4063df35903ea0e11a64efe336515540e612362e918addb7237d4ceaa2128c04ab5553da32ccef694fe5fedbeb396ccbe9ec263e3a
+MISC ChangeLog-2015 755 SHA256 26011076ac8e6b91397ba1e260bbd54fedf1723aa76abf43c6a26b55dfa8fc61 SHA512 47177069b65798ca50e3a2ba47a193d82bfcdabaf978e9096843b5f474bfcf73422825a002b750175559efe65699f0a574441a8f3f708089c6022edb37f1e700 WHIRLPOOL 7d181f57c70231bdc86604976301554284b275841ca61a57ab2cc745a27189981d9eb31a53d15e0b1472c17c24ff383f1f9770267fd0a93da25711500d0ea9fb
+MISC metadata.xml 385 SHA256 08707f9e08fe33ed73ed91522f70f6a7f8fb615b73804e9162823d834bda7842 SHA512 7086cce11a9a20d93dd24741e060d289c90bbc3c20d5102452d4c987597921b00195badd68d916a64b03faa5dae1fa4adb68654bce5c70c2e1cfa5d8417b33c3 WHIRLPOOL a20dfc49f27322d2973ef6c9b810b830780b9a710d0199259983cf5c578877b4504492f952e2d3f58d2d2ddb9da3a19ff2e3bcc849d0bf0e952d0957669e545e
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..9cdd63e021ad
--- /dev/null
+++ b/app-arch/vimball/vimball-0.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{3_4,3_5} )
+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/xar/Manifest b/app-arch/xar/Manifest
new file mode 100644
index 000000000000..05cc0241fce6
--- /dev/null
+++ b/app-arch/xar/Manifest
@@ -0,0 +1,10 @@
+AUX xar-1.5.2-automagic_acl_and_bzip2.patch 1619 SHA256 2ac709aa38122395c6742e82fb2352393ceb39c62fae0b0ff173f9d29bde3caf SHA512 cecb77eebd658be30eb4132166563d829f76bf6ce6a0c38cdbff033ec7eab2d4aefe87eb9b8bbc80961ea9ee44f40cc90a87cfd4860aae66661d698126e678e1 WHIRLPOOL afce1361bbc197f4054ef070985d0d17ceccc604a8a087ee4a0cd1100a4eb32df041b4c3b5e91710f090b45fbdb65b84e037f260a6e72def03fdc0d77f5be3c0
+AUX xar-1.5.2-respect_ldflags.patch 1058 SHA256 a1b57b7ac48c37d472c1856cddd09c2401e0daef7786144b665c247569702956 SHA512 30c474cc51d7cd3a6ffcbda565867ee81fb619d9648a8d2502a020b98ab36f756096ce88244db7d370b3627da9a5a88129fb5575cc1a6073bcdf26eb857a95bd WHIRLPOOL 9b56379ced822c3793c82f82647f8260105abb51e6a27b3877cc9d58fa8cb5f420f6903a6e61722bf001b7aa406bc0972121ae3d1d344068d12007dcb5c1e355
+AUX xar-1.6.1-ext2.patch 693 SHA256 8190dc973cd8e2ac0b6a4ce2a4b9ef1070bbd751111da2abd86635261c56e410 SHA512 fd04b8552c85b0a4c40283b691746ef2a40aef17aa30ed697b8e1f83e10caa2e21b4c000197192e98a1ddcffd745a37ab592193eaa5120a7048b861ed1036c89 WHIRLPOOL 15ce821186f140d17a48ff59708eadce8955f78383b482f679035ba8bf7137731fd93b89fd56a0489d2aec3166b41fd2fe9963afc5a618f20dcb8bcead18877f
+DIST xar-1.5.2.tar.gz 137973 SHA256 4c5d5682803cdfab16d72365cf51fc4075d597c5eeaa8c7d1990fea98cdae3e6 SHA512 975861324ee31805eb107f51f2f6c43029b25601d4c1daa2dfee49ec7e25351e94798de9fb5c011b90d93dd6a3bbd3fe15c97ab0fc32f0b36b3000dd48cbf46b WHIRLPOOL b820921ab7412495bda671774338ca6eacb6666b2ae50ebc76c0ff5e965d24042ffa98dbe306ce46de71a375beb2ae8cbaf6814c085ee3b3b3a4efae897ebd5e
+DIST xar-1.6.1.tar.gz 180771 SHA256 ee46089968457cf710b8cf1bdeb98b7ef232eb8a4cdeb34502e1f16ef4d2153e SHA512 6ddf83130519006c4d8fe699cdf5a6e5e41b293f3411d4744bf3425fda21556ef54b95e46f60c13f9276070ccda94c8d95a543f1fda4cbd9e3087ab9b5d0b00b WHIRLPOOL e7e77de1ff8aa089fe12c6eca0565f5f639e1d97653f5bfe968994a5236e12e8267d3ee082aa84e91561e395dd4b0b805bd5861c6ebff904b7f02f6d6b4be89e
+EBUILD xar-1.5.2-r1.ebuild 798 SHA256 80d946f8bb2eefa1f227dcddb1d09248bb4ad1c5b9b17602f2a744a5462e4c37 SHA512 e5e8f4b9ddb93e892cc2c4072cb97d3204758b2957aceb0f6268edf525a7ba980f3d121705902bc9a7d51f2660f91fc86521db213aa2cadaf237d4c07765b8dc WHIRLPOOL 1e92beb7702edce0c9ce21a890c5e4361a1f5d8fdee99934352e4b3b43a462b9b63bc8320bfe2523c2909e3ce96ea61b6685a4645d89a06fc2805f7ca4ec0bf7
+EBUILD xar-1.6.1-r1.ebuild 796 SHA256 ea6d3d9b06846827d7cffe585026b17bdf2ff2d32b96c71657321974ef12ca16 SHA512 f69913a2f0ae8de5e0cdc92ec071f4559f1994f2d3c89faa3b3801899134e729fa7ce2e41b29fd76c964de962cc0fbf1c0706eff9be7c89bd3e88e08733a47a9 WHIRLPOOL 13a22e8b72ad5ec4aa994d2d32b47b718c8eb00455a107081084f7df4bec86711067e788fd0e0a3e9611ca307f9d83975878c8da551b32d28baa71398d1fb3f8
+MISC ChangeLog 3456 SHA256 22249b63ff209173b62b44a26cd4512b5b07a788652d3ce90f2d48fabd3d6d83 SHA512 f78d69e0b954d1be22474c5bc542b8bc100d405902bbfe792e6500e31fae2c0647b66dac11cc313968983834d236109008edd3ded76832b2a79d480c7be3f581 WHIRLPOOL fc212f748041489a546bc65c63f8513d2deff3f010d56e71d9b0c7410642759a328f468e83ed15923ffc3287da24a6573bce4922b7e4d1653e3eb328179d7b1d
+MISC ChangeLog-2015 3648 SHA256 91fc1b94278a158e22125eec47c6f296a78302e6c1f133a5a86c3e4ee99e9c05 SHA512 9ef30cd123c8c858f8f77c1884727debf1f0c28569ffb521e67f07e629db3ba170119909432f65fa227c9e5fe5ecc597cd8cbeec439aab60f8a508530554bf58 WHIRLPOOL 03fcab0f2a8562c8a684a540b9a8dea3863132ae9546ed242d194586bf90f7b842537b4dc84c94261d90a841204c3433d437a676916da53c24d7cdc466dc3222
+MISC metadata.xml 913 SHA256 e8a05d256865e70fdeb5992f70c1f541600ab9f8f9555306b8a178e82a0c7b82 SHA512 18d544f82de8d9f59d73b2e22c0b9a48cb0fd77a4b0f999bb0a1fa8d734f4b191c78fcfb4603faa7e00655856a29bdd2832b6401e822c7db3bab3cb44395ef56 WHIRLPOOL be47a018dd13c7fb29a5e88c44e1bbb3fd3a9cec0e37a729332a902aacd0a0735f0031365f044f69ab484d5043fba144c1840330f36223a839727b11260a888a
diff --git a/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch b/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch
new file mode 100644
index 000000000000..54ad8f725314
--- /dev/null
+++ b/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch
@@ -0,0 +1,46 @@
+diff -ur xar-1.5.2.orig/configure.ac xar-1.5.2/configure.ac
+--- xar-1.5.2.orig/configure.ac	2007-12-29 20:49:57.000000000 +0200
++++ xar-1.5.2/configure.ac	2008-05-19 17:07:23.000000000 +0300
+@@ -181,8 +181,13 @@
+ )
+ AC_SUBST([enable_autogen])
+ 
++AC_ARG_ENABLE(acl, AC_HELP_STRING([--disable-acl], [disable support for libacl (default=autodetect)]), [ enable_acl=$enableval ], [ enable_acl=yes ])
++
++if test "x$enable_acl" = "xyes"; then
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
++fi
++
+ AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
+ AC_CHECK_FUNCS(lgetxattr)
+ AC_CHECK_FUNCS(lsetxattr)
+@@ -251,7 +256,9 @@
+ AC_ERROR(can not detect the size of your system's dev_t type)
+ fi
+ 
+-AC_CHECK_LIB(acl, acl_get_file)
++if test "x$enable_acl" = "xyes"; then
++  AC_CHECK_LIB(acl, acl_get_file)
++fi
+ 
+ dnl Check for paths
+ AC_PREFIX_DEFAULT(/usr/local)
+@@ -342,9 +349,14 @@
+ dnl 
+ dnl Configure libbz2.
+ dnl 
+-have_libbz2="1"
+-AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"])
+-AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"])
++AC_ARG_ENABLE(bzip2, AC_HELP_STRING([--disable-bzip2], [disable support for libbz2 (default=autodetect)]), [ enable_bzip2=$enableval ], [ enable_bzip2=yes ])
++
++if test "x$enable_bzip2" = "xyes"; then
++  have_libbz2="1"
++  AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"])
++  AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"])
++fi
++
+ if test "x${have_libbz2}" = "x1" ; then
+   AC_DEFINE([HAVE_LIBBZ2])
+ fi
diff --git a/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch b/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch
new file mode 100644
index 000000000000..1ac090d94863
--- /dev/null
+++ b/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch
@@ -0,0 +1,21 @@
+diff -ur xar-1.5.2.orig/lib/Makefile.inc.in xar-1.5.2/lib/Makefile.inc.in
+--- xar-1.5.2.orig/lib/Makefile.inc.in	2007-12-29 20:49:57.000000000 +0200
++++ xar-1.5.2/lib/Makefile.inc.in	2010-04-07 01:18:59.027890429 +0300
+@@ -134,7 +134,7 @@
+ $(LIBRXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o)
+ 	@mkdir -p $(@D)
+ ifeq (elf, @abi@)
+-	$(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@
++	$(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@
+ endif
+ ifeq (macho, @abi@)
+ 	$(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name @abs_objroot@$(LIBRXAR_S) -o $@ $+ $(LDFLAGS) @LIBS@
+@@ -150,7 +150,7 @@
+ $(LIBXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o)
+ 	@mkdir -p $(@D)
+ ifeq (elf, @abi@)
+-	$(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@
++	$(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@
+ endif
+ ifeq (macho, @abi@)
+ 	$(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@
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/metadata.xml b/app-arch/xar/metadata.xml
new file mode 100644
index 000000000000..0596745d09b9
--- /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-needed -->
+  <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>
+  <upstream>
+    <remote-id type="github">mackyle/xar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/xar/xar-1.5.2-r1.ebuild b/app-arch/xar/xar-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..4f493f664b6a
--- /dev/null
+++ b/app-arch/xar/xar-1.5.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools base eutils
+
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://github.com/mackyle/xar"
+SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="acl +bzip2"
+
+DEPEND="dev-libs/openssl
+	dev-libs/libxml2
+	sys-libs/zlib
+	acl? ( sys-apps/acl )
+	bzip2? ( app-arch/bzip2 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( TODO )
+PATCHES=( "${FILESDIR}/${P}-automagic_acl_and_bzip2.patch"
+	"${FILESDIR}/${P}-respect_ldflags.patch" )
+
+src_prepare() {
+	base_src_prepare
+	eautoconf
+}
+
+src_configure() {
+	econf $(use_enable acl) $(use_enable bzip2)
+}
diff --git a/app-arch/xar/xar-1.6.1-r1.ebuild b/app-arch/xar/xar-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..6e7d19808e11
--- /dev/null
+++ b/app-arch/xar/xar-1.6.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune
+
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://github.com/mackyle/xar"
+SRC_URI="mirror://github/mackyle/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+bzip2 libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2	)
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ext2.patch )
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_with bzip2) \
+		--disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
new file mode 100644
index 000000000000..ccdac6f32e71
--- /dev/null
+++ b/app-arch/xarchiver/Manifest
@@ -0,0 +1,12 @@
+AUX xarchiver-0.5.3-add-mime-types.patch 1436 SHA256 9fee60d67b43aeca0934db0c5be97c87254079dbf6bc01c0616d416bfab08d97 SHA512 a11bedb1ddd28571cca950d6b61a1f292d01c44f4077401c5a2f75cc99cb7a311b3593c1b1da6355a988aceeb35fb13714ad28ad3b707dd1b26f4a0e9d14b136 WHIRLPOOL b836355c80014d2ee1a16d5a2cc14ac6023a4c693c656d0edc3ace6349acd05d8223c0fcf10bb75df560801a2526bd50790674178e14dae6c98b081b3e4557f0
+AUX xarchiver-0.5.3-fix-password-protected.patch 1213 SHA256 f8bfd2e8087d55520e1fb330a10670b79fb568a52be678d93cf4144a5b3b5d71 SHA512 bd38943d8afdc0e023195c31c8bee78a7fdd5ec6a276c3f66c395dc41779b18bf829356dea4d794329abc0bd8ac81a58bbd961283b95f74a9008006826be9a75 WHIRLPOOL b0f53f407ceeca21a69a4892dc3859d6f73b1f8c60fcd4ece5d0583d400a58f611631877a921a92661bfabf6bcb7350ffef28ada6b281f6d28b94a8902b8fb57
+AUX xarchiver-0.5.3-fix-rpm-support.patch 3291 SHA256 f570238c818b88092bc459ebc37b9d58669baf92b969197b29c8662bf8783315 SHA512 4ea64799b765ceadb34d4ea48df8f1e1748749a128a3b734265c7e9aa414bbc4a443007d3ae2b767cb3d6c3cae6b6bfb3866f76584cbbf66b8cc4afa34a76ebd WHIRLPOOL e56dd6e7c33a245f34cc37befffa0311a7bf762106c2d810f127bb198d12b4f91e74d8a885cbf47ec2b950102e90be60a90094d3f15c20a6eff27fc8cbe01ab8
+DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 SHA256 2dabd6f5d96c5d886d9a5ed7d299cfc43d1fef88be37d1d298a78c4c01a63b45 SHA512 e63e9ddd98c5ec5708b74e993cb1901835c133e220ba95aa5a07cca01660fab5894533c57b39223db6155e2fc0ea014ce6eede853ebaf067de27f1e77c5e023f WHIRLPOOL 3516a976e6d5e161a1313d1e10d207e8344c26a0570fdd1cb1a271410bcf9ad2cab1fbce057f419e5e41833a56ff6995649a67abc47322a20f1de8f8e194035b
+DIST xarchiver-0.5.4.12.tar.gz 1074764 SHA256 62885813edce274055e8fccd3f360b61a74a3b0e4854080201638fd1f3306370 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554 WHIRLPOOL 6dbf1cb0784ef2a2a8a07c681a6a43329757c8b6cbd5f557a756cbdb53f5d8703065a141334ffddbc3fc03fce2f3acd6203615a04bb10cb3555eebc8c01256e6
+DIST xarchiver-0.5.4.tar.bz2 1003045 SHA256 e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4 SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d WHIRLPOOL 3f5a277b05147daf29db0be26718ed51fa0bb6d2416ee41cdd8ce6c54bc66064fc5f313af39a32b428997f906c9fd4d1a0b8d60fe5d2d867b1137960b0cbe4d1
+EBUILD xarchiver-0.5.4.11_p20170629.ebuild 1420 SHA256 2430052898a6d3b9d39f07fbc381eb3477925ebea8c6b830762b373e0f87f15d SHA512 0030d3bce1e6dc695b90d15a97c7d66910d9e90bc9f0743e4b942eb3a59cf194ae6b82dd095255fc8eb2ec8b2b3c409f60aafbdf9ee2cb0c1b6b22b5e4a2267f WHIRLPOOL 74f1591cc179a33509b0211d5b1d1289459eaff2d0a27255532facec982129415327c1b42bcbd6604ba5eedc3b4db8e75e6a6e31a287e64047085487180fda87
+EBUILD xarchiver-0.5.4.12.ebuild 1327 SHA256 374c82e7e1390c9870c0ddb328166a61aa00bffe01ad91bc6958e2bde86a4cb0 SHA512 3d68e09bd828a97de1782daaba2fc3384927c56bfd183248f83e98e721c07e8195f9b3ae26421dd51197600ea438e90d569b426cb5bd58c200c94745c01d1429 WHIRLPOOL 6a87a6f72bf3ec5d93f238c51f857cc8b3ca95b1d360b7d42459449b5b15ab50191395033fb8fcb4431b234d31ee4421a71f84b57ccc7b031175a2dc67f804af
+EBUILD xarchiver-0.5.4.ebuild 1328 SHA256 36908cc698d59ffffaf5e3963dd0d8a74e5219f9aeb5e81e02a6c5bc25c1a43a SHA512 ed25ddd86d9c9d048f8a6cb155fd79c0c45d380b91f587bd8364ac3d455fc0a75d9eed271b64f7b42d293c762c57747c52608a30f2a1899ee935b091c9a0258e WHIRLPOOL ff20b59c5348e2ce0beb31b33395835271ee2b2f5bf3d903f2cd2005941a31c9bef79f3c8dcf31177321dc9a99890b0a1c70ef7beec7e605032dbf4b15c31334
+MISC ChangeLog 2332 SHA256 53344e7f6e1595b6f50c285d432ead65b6ccbfa7da599386a7911d513f97a729 SHA512 ff61796480c258e5d1c68b03b2776ae27a17fdaab1d04a9636dfadbc6887c9a9a70c76950e088cc127aff9ebb874fc2b6b87633caf7152a7bd0f39ac38f75dc9 WHIRLPOOL 72e76ef151c2cf8f5cb1a2353c583befa1dabeb2fbc45d994210e05a52b0c793f264d125c8492930aebe9f9a57511a21964ef722a7f7c9a4c25f1bbb61395994
+MISC ChangeLog-2015 1790 SHA256 ada6d52f727b1d79ae78c258e2fcd9d5c17e1ae77e0ab7e318e32c06afb9888a SHA512 c9f0c983a914bfaf1fd8e837223ef0b6eef00e6441dc743bf4f664114e40282ba1ef56d0966f4f892b906231d605a450e65127298d6f0316a1b39968c291ff67 WHIRLPOOL 442072350a88cbe8c5c69b3231d784f0ed23c77a28fe4be1bbd49b358a7e431a6a22fead877d84acf011ab8c935a55ca09bd9f8962e7638b47a5ccf10841c1cb
+MISC metadata.xml 447 SHA256 5d440c423735d30856bb021cc0fcbdf0f0f2e50afc42928c4306f0e1cc5b367b SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a WHIRLPOOL 8626b1ef4d3dc607516ba3158e66c6ac8912857a871d6bf0448f4fb78f1086dd6848e7271b03a1a6ef9e832ee3cdf1379985545ff7e7cfd18d32f11cc43f3c01
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-add-mime-types.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-add-mime-types.patch
new file mode 100644
index 000000000000..ec427b99aeee
--- /dev/null
+++ b/app-arch/xarchiver/files/xarchiver-0.5.3-add-mime-types.patch
@@ -0,0 +1,17 @@
+diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in
+--- xarchiver-0.5.3.orig/xarchiver.desktop.in	2014-05-12 01:08:12.159131913 +0000
++++ xarchiver-0.5.3/xarchiver.desktop.in	2014-05-12 01:09:02.585526393 +0000
+@@ -4,11 +4,11 @@
+ _Name=Xarchiver
+ _Comment=A GTK+2 only archive manager
+ _GenericName=Archive manager
+-Exec=xarchiver
++Exec=xarchiver %f
+ Icon=xarchiver
+ Terminal=false
+ Type=Application
+ X-MultipleArgs=false
+ Categories=GTK;Archiving;Utility;
+ StartupNotify=true
+-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;
++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm;
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-password-protected.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-fix-password-protected.patch
new file mode 100644
index 000000000000..00969349db01
--- /dev/null
+++ b/app-arch/xarchiver/files/xarchiver-0.5.3-fix-password-protected.patch
@@ -0,0 +1,42 @@
+diff -Naur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.3.orig/src/window.c	2014-01-24 08:10:09.305990000 +0100
++++ xarchiver-0.5.3/src/window.c	2014-01-24 08:42:45.110729290 +0100
+@@ -1694,7 +1694,7 @@
+ 		{
+ 			if (archive->passwd == NULL)
+ 			{
+-				archive->passwd = xa_create_password_dialog(NULL);
++				archive->passwd = xa_create_password_dialog(archive);
+ 				if ( archive->passwd == NULL)
+ 				{
+ 					gtk_drag_finish (dc,FALSE,FALSE,t);
+@@ -2702,9 +2702,12 @@
+ 
+ 	if (entry->is_encrypted)
+ 	{
+-		archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
+ 		if (archive[idx]->passwd == NULL)
+-			return;
++		{
++			archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
++			if (archive[idx]->passwd == NULL)
++				return;
++		}
+ 	}
+ 	filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL);
+ 	if (g_file_test(filename,G_FILE_TEST_EXISTS))
+@@ -2768,8 +2771,12 @@
+ 	{
+		if (entry->is_encrypted)
+		{
+-		  if (archive->passwd == NULL)
+-		     return;
++			if (archive->passwd == NULL)
++			{
++				archive->passwd = xa_create_password_dialog(archive);
++				if (archive->passwd == NULL)
++					return;
++			}
+		}
+ 	   	if (archive->extraction_path)
+ 	   	{
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-rpm-support.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-fix-rpm-support.patch
new file mode 100644
index 000000000000..cf17ff7385cb
--- /dev/null
+++ b/app-arch/xarchiver/files/xarchiver-0.5.3-fix-rpm-support.patch
@@ -0,0 +1,86 @@
+diff -Naur xarchiver-0.5.3.orig/src/rpm.c xarchiver-0.5.3/src/rpm.c
+--- xarchiver-0.5.3.orig/src/rpm.c	2014-02-09 16:26:24.000000000 +0100
++++ xarchiver-0.5.3/src/rpm.c	2014-02-19 07:54:27.744136749 +0100
+@@ -23,8 +23,11 @@
+ 
+ void xa_open_rpm (XArchive *archive)
+ {
++	unsigned char bytes[8];
+ 	unsigned short int i;
+-    int response;
++    int dl,il,sigsize,offset,response;
++    gchar *ibs,*executable;
++    gchar *gzip_tmp = NULL;
+ 	GSList *list = NULL;
+ 	FILE *stream;
+ 	gboolean result;
+@@ -53,14 +56,68 @@
+ 		archive->column_types[i] = types[i];
+ 
+ 	xa_create_liststore (archive,names);
++    if (fseek ( stream, 104 , SEEK_CUR ) )
++    {
++        fclose (stream);
++        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno));
++        return;
++    }
++    if ( fread ( bytes, 1, 8, stream ) == 0 )
++	{
++		fclose ( stream );
++		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
++		return;
++    }
++    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
++    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
++    sigsize = 8 + 16 * il + dl;
++    offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8;
++    if (fseek ( stream, offset  , SEEK_SET ) )
++    {
++        fclose (stream);
++        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno));
++        return;
++    }
++    if ( fread ( bytes, 1, 8, stream ) == 0 )
++	{
++		fclose ( stream );
++		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
++		return;
++    }
++    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
++    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
++	sigsize = 8 + 16 * il + dl;
++	offset = offset + sigsize;
++	fclose (stream);
+ 
+ 	/* Create a unique temp dir in /tmp */
+ 	result = xa_create_temp_directory (archive);
+ 	if (!result)
+ 		return;
+ 
++	gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL);
++	ibs = g_strdup_printf ( "%u" , offset );
++
+ 	/* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */
+-	gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL);
++	gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL);
++	g_free (ibs);
++	list = g_slist_append(list,command);
++	batch_mode = TRUE;
++	result = xa_run_command (archive,list);
++	if (result == FALSE)
++	{	
++		g_free (gzip_tmp);
++		return;
++	}
++	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
++		executable = "gzip -dc ";
++	else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2)
++		executable = "bzip2 -dc ";
++	else
++		executable = "xz -dc ";
++
++	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
++	g_free(gzip_tmp);
+ 	list = NULL;
+ 	list = g_slist_append(list,command);
+ 	result = xa_run_command (archive,list);
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.11_p20170629.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild
new file mode 100644
index 000000000000..371df75ee5bb
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+MY_COMMIT=79a73d46b782cf8bb93d058d00d2cb81a9b3df8a
+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/${MY_COMMIT}.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
+	)"
+
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+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.12.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
new file mode 100644
index 000000000000..9cca9271d933
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 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.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.ebuild
new file mode 100644
index 000000000000..d318b747671a
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
+HOMEPAGE="http://xarchiver.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.24:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${PN}-0.5.3-add-mime-types.patch
+		"${FILESDIR}"/${PN}-0.5.3-fix-password-protected.patch
+		"${FILESDIR}"/${PN}-0.5.3-fix-rpm-support.patch
+		)
+
+	XFCONF=(
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog README TODO )
+}
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.in || die
+	xfconf_src_prepare
+}
+
+src_install() {
+	xfconf_src_install DOCDIR="${ED}/usr/share/doc/${PF}"
+}
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	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"
+}
diff --git a/app-arch/xdms/Manifest b/app-arch/xdms/Manifest
new file mode 100644
index 000000000000..c440bc201bb6
--- /dev/null
+++ b/app-arch/xdms/Manifest
@@ -0,0 +1,6 @@
+DIST xdms-1.3.2.tar.bz2 43010 SHA256 367ec4f02dd6a3a225b4338ea7b961b87fb144f7388b2ea1eb3a5593fc53f47e SHA512 e29dd1d2373c635ba953ef526849e0b8fa645a0da91fff3a3512ce26eee43fb2c1280f27fae0a42a4fd47106494d6e44c5684eff3581661e538780927b851cac WHIRLPOOL 1dd14c88b29f8f6dd7dc3e72321d654f47287b61b47509d4b5ce56d9ee98f5e55b8a0287ff5fcca51a6c4b74a48e749a6aa7eaefe7f9ef8ee8ce39de2029eda6
+EBUILD xdms-1.3.2-r1.ebuild 660 SHA256 66045eda09070cf39b3ba7a3f36a1ad164645143dedf2dd3a1b3c35d2b2b0987 SHA512 5dc5f013532b1e8f255bd86134c15cd1deeb5f1ac7e62bc90128035e1f6ad1dc2f4d83c4b0aec26dcb5abe620383ca95535f9ed3f8da4b1089b6c6a7d5c6e531 WHIRLPOOL 415c363d58f793020ec05fbe6e74900302e2007d8613487a2018973cb4c9aa0b89b07424a15ccaa1fc6ee7b0cc33a363a811650d2f7e234037a685f6ffdb8583
+EBUILD xdms-1.3.2.ebuild 662 SHA256 61242641c7c380ebe53148de7a41b81dec3c330f2f4f07e0c8a01b58a29150a0 SHA512 8d3a83393aa0e05eb044ca113eb78471c35c0c454a74b575f0bdb16f7aebac3e4f0d24bc6e82e65491bf4233f11fa5aa47f3aeca0b62be1fe7ff825008453b3d WHIRLPOOL e75086d3d5ba742871294ec64f6064142389b6b37b96873c74885e681e07d515722b0096649c94baa3a5cd2321c2619cd3149a37974a078216fd539faf80c04c
+MISC ChangeLog 2724 SHA256 cbcf026f84906f20299ba40aaa00603ef7b918fa3f36a100425432ae37601d66 SHA512 c7e354967db13ba524aaa5a4d266e4fc3f404e0b203c181b137b99cb40cb75c0c3f484c73a5f5de1933385ac5b89b7aa7afe1d72467bb8ae787ac6a0df61e919 WHIRLPOOL 194af033efa4421c73a452b1d80b1c8bbde204112d510a41e6dd569f12789433793c96d92f707cfca5fb40076250277afa4cc4c177ef0e7a90bdfa982fe35298
+MISC ChangeLog-2015 1172 SHA256 bbe149c181bf0ec916f5ac7256377bfd7b1ff8d4558c9585985c7ab4df73b3fd SHA512 037275d54b66c5104c865f36f1d01a5fd99e1016cbd283f44c2bd0f4f4725f9188983c7eaa82e7becd9c1e8f911fd3745b4b5f4874383c77a4461644c74a0a36 WHIRLPOOL e3f5303878e7d905d4df7094abd48b97cf84ab01f4235775d1a18d5d6da68043b1edc4ef2474130552701af35454e122b72acfec1e59dbcf47768303cdc9dc21
+MISC metadata.xml 864 SHA256 3461ab98bd1e11a06bfeb23126247a02d41903020b206bb9408e9fac2a802192 SHA512 a535abd221a7ea350cfeb4fbb84585cc4f4d6ee83f607ae5d0eee73a709b8df5ed3cf9b3056dbd6b8a68ff06353c5c8b407f322a06a3bbeb5fe3d6d0cea4cdba WHIRLPOOL 1ae015da2550dbb28de61ec460b86195f7c3d4560eca0564c5dc836fe884ed56ae312d5595dba48336a982b722e4b576083007b1783d211986d2ef5648be1188
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..3561bdcbd691
--- /dev/null
+++ b/app-arch/xdms/xdms-1.3.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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/xdms/xdms-1.3.2.ebuild b/app-arch/xdms/xdms-1.3.2.ebuild
new file mode 100644
index 000000000000..f8fc4c99169e
--- /dev/null
+++ b/app-arch/xdms/xdms-1.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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=""
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e 's:COPYING::' "${S}"/Makefile.in
+}
+
+src_compile() {
+	./configure --prefix=/usr --package-prefix="${D}" \
+		|| die "configure failed."
+	emake CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	emake install || die "emake install failed."
+	prepalldocs
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
new file mode 100644
index 000000000000..9364e3db1a4f
--- /dev/null
+++ b/app-arch/xz-utils/Manifest
@@ -0,0 +1,8 @@
+DIST xz-5.2.2.tar.gz 1464228 SHA256 73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2 SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813 WHIRLPOOL 7707f10908a57b5780cdb9dda6bac2674f4c5e3350660ea61539b4df5ecc7dbeeb03f05a9b32873d28a14343f9c6491d68095769d3b283018e8139a95bf5f369
+DIST xz-5.2.3.tar.gz 1490665 SHA256 71928b357d0a09a12a4b4c5fafca8c31c19b0e7d3b8ebb19622e96f26dbf28cb SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6 WHIRLPOOL 1a3f5b5a0018770098c50ba310cac705dcc44bd5bf58079903eb076e26443c1f687f0c75d4a47aa0df279ab44ca36b340e21b73881521c93a9353165d309be9e
+EBUILD xz-utils-5.2.2.ebuild 2097 SHA256 4e30c6313b5f1c0ea75c22b137a6380907a44b69105f638f9182cbbeac853101 SHA512 19a6df27b09c8911375424a287d138b15e6db3f3c51dcd3b95fc83b3cf2bcffbd8779622e3c398e7a7d623b83b87bb4a272b98976ec12a4248b2ab826bb25f60 WHIRLPOOL adc24af607e8ff102a03a1c6e0372e8b2c007835f5a06df19c7b9d3f1f0180aa4d2447782729a1c55ae435ae893af51adc8c9a9361ec0671decd6b5b0ed96f49
+EBUILD xz-utils-5.2.3.ebuild 2111 SHA256 9a3536fb53bcd9fbf278d557bad5346d391916ce2bc24aaeebd925335e0abe4f SHA512 6f8d099b820445cc5ae05cb62a8e582dc80f0dc9decbe448bedd85fd340ac35313e4d510b61cd1126bb2d95f4776a69e960572a604e29b05cd6736711e500efc WHIRLPOOL 5284398b78c00a100b4a2626eeb2f725095e76456f4c422fe3efe88360a0804bd1e2095678e82bf66b2e2a33b7df108cea0d6f1fbb864e627c924949e126b3cf
+EBUILD xz-utils-9999.ebuild 2108 SHA256 f99c6e49fc66e931b45cbe19e0a3968a31c7e6505351697469cf7f6ee83f0f47 SHA512 46dd4e4c6de3863c0ed400de486905e408eeb33a4d3b2a9155db68001342d89a3a80334b8916df65a90d5b8fdfa4b7ea1220d328a68e97d6f423b4c1af7e85ed WHIRLPOOL 27a771cbe2bc03a100ee60a7ed085ef5ea8b2df56f65bd0ac692ca57b20a9e4ea32224f88717b81205e16de91da3614b8727598a5b6bc5cc3cdc3ba2f9d6b0f3
+MISC ChangeLog 5449 SHA256 d69f1208f895f611b314ae8f3de4e8b1c5dfbb4cc867b567c73da35f2c88b67f SHA512 e2aaaca806d48530574a0a816ac82186853c5c2a7b66b500f9de5832d2a68cc99f39d6352c3cd61ba1ff561e9cf845bca286962c9b59c12fe62148dde9fbccfc WHIRLPOOL e3ff1142f59e816cecdec9444b50824748719e3c1900375bd5c93c269e3d1da4d0b40a4ca7a3ae5c76a7a15895a53f2134b9f9f5864c5869646ca50ad03f1032
+MISC ChangeLog-2015 12969 SHA256 63686500ae830d3f1e9d0b1982c440a6e9dcb429e55d039e06ef5504482a8cf1 SHA512 acfb4e9cb443c31446c0499cdb0fafe13ffcac18e3b62b24df487096310468a5f6d4d7913a2d321cb6e9d6109467241d89a565d3c85a385be06899930aa99f0d WHIRLPOOL adefa045fb20f45aaa9abe710b74887bb7aa002331664cedc61ea4a9bcf810dba09ef1da62fcbe202a06f6b3a8aadc78c1001b1acc7af95c70e880ae614687e1
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-arch/xz-utils/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/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
new file mode 100644
index 000000000000..227aa3cf924f
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 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="4"
+
+inherit eutils multilib toolchain-funcs libtool multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	inherit git-2 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="http://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://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 nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static) \
+		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+}
+
+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.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
new file mode 100644
index 000000000000..b074679f0e09
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 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 eutils multilib toolchain-funcs libtool multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	inherit git-2 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="http://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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://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 nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static) \
+		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+}
+
+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-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
new file mode 100644
index 000000000000..cf2f6076d65b
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 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 eutils multilib toolchain-funcs libtool multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	inherit git-2 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="http://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://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 nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static) \
+		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+}
+
+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/zip/Manifest b/app-arch/zip/Manifest
new file mode 100644
index 000000000000..4f0c765d5ee1
--- /dev/null
+++ b/app-arch/zip/Manifest
@@ -0,0 +1,20 @@
+AUX zip-2.3-unix_configure-pic.patch 444 SHA256 3e348be7890f21280fceab6cb2a87f3020b08a31608ab93d1b5a53667760e556 SHA512 33a8ff4bd59d50868321ea04b7454ec3be2affaa998a9ccd0fa8cd51a3b1024a4b89c56102def8fa800b3124b9d0a508d7bf679c2e006315c3cf41be41ccf590 WHIRLPOOL 87c2b56315f9b2135f1251dfd30579fe2ecca4ff5c9dd6d7a2f9fb3fe94abf554106543bf7705a37aa535705ec3ad84201e9d7c8f7c77783b0c41b752ffe2099
+AUX zip-2.31-exec-stack.patch 407 SHA256 108686d8854096422bd4895690a37202aee66757d0d2b43afa16d9fb914cbb29 SHA512 a4e9eae229cece47052bb0f1de0314b72fa0bca3e7e9e8cfa484471746a39c3a1cf5f5f7f5996bca4bccf843361d5560c201d2f76ccaa36ebc2c0da13b7f8004 WHIRLPOOL cb1d57d9222467448f06b70abdca6d075a42db8c3d281bb4e82a5e8c5aaf23f54072824f91dda42eec6dc9cd71c1350b60ad7c1dfb17e11464234609a3d8cfb8
+AUX zip-2.32-build.patch 2003 SHA256 3e4b94015c1448c8769d7154b308bd986e1d0e6e514da151d658d1b8ba3a774c SHA512 e4853ac5537072c6b887d5e0fff5afa7bcbaf902910739698e76ba362f670fcdab807d1b142fe8f55a2b3e431412ed0d40f56fbf430a6bbaa65ed032758f413b WHIRLPOOL 3264a7d8867bc58f759fb101f4e3705a83549aa28fd94f22963bef547783c10721869fc57fdda9c4f3039ce9088d65a4c01cbb172b72f2fa4a2bd0ad3fc674c0
+AUX zip-3.0-build.patch 923 SHA256 a66386c3a48019d8063a48c3610a28862412926f04a3b8f44662c6a87bb250f5 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d WHIRLPOOL 44585744d662222c8d168cbf32b246e0ba5c4e911c06014bc9397455e1507ddce072d33895a30876c2f422d2e7c0951d5fdc02cd64babc7e9ad283cdd5724b41
+AUX zip-3.0-exec-stack.patch 548 SHA256 5e46b247107c71f34e00c93d27d9f5cf0812d1c8ffc171fc71addee715308ff5 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab WHIRLPOOL f777439907edb695956a6eb5c6934865575cdeca50fbcdfcc173f16b8fc6294306044245916d44eaf3083be7779e6bf308aac504c4ac99ce65ff0a8ef71c38f6
+AUX zip-3.0-format-security.patch 507 SHA256 c7f1b10f0693793954b0fdef4dea7a02ee63cb816c987bb56122899cc18ab697 SHA512 172e842e1cd43006713f570ceb8bd4998595282b973569d0e264bd9599375668a4045d691fc952a75088ad6f17e6ff90baf22606388f73ad2f2c0ac64d250fa2 WHIRLPOOL 0814288f8c665a58ff33ac2d6d603038f2c3bda30cc3e9b89222434adf8b880ee897336238aa1b17119a85f8a95f4dd103e6f0adbd3cc24c7fffb5f1c8eb1a51
+AUX zip-3.0-natspec.patch 6800 SHA256 999283d54dda78def1a21a023a5c2eb6a2f7ea407fab9718fb8334dcf2bc088a SHA512 67cf89ad016d51ec99e153cb05ee150318c18b3243b04daad0a9a0c0fce7e908bf7ed6fcd6361029bdd4da68759c22abf02dcbcca704b45a75367b1f42ebe964 WHIRLPOOL a2110dae96a3fe75522e5bfe93ce2144e600b698340021854112a5c3e03f2b288d3de22bd80fe51a469aa76ad92ad37cf0be5ec2356d0c3404bedd7b3caa11d6
+AUX zip-3.0-no-crypt.patch 1108 SHA256 e5bbe9ce46a3ab89e7dab3515cbe119c57f3330d289b7fca967c5da9b6844cff SHA512 89a99e694fa2ad289ecc93a514e7b408e4b9e01778e622b2c2928d98181de3823446e91085f401e3478afce1ccbf8775fb227c1908144889dd0106c2d7029b83 WHIRLPOOL 09b5f8e251dee686d46c49a7baf948c1f4911f48d3c21f08f82d9c5f89b1b8007d98544dbd8d5128eae28e044a4c82f607c0afccfe7c78681b6e0890d8f3cba0
+AUX zip-3.0-pic.patch 499 SHA256 5f64ef0fc1afc0256fdb3a503dda10de6c5df576b8bfad328de720c68f8b777a SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e WHIRLPOOL cdec56f005c806b9d0f5a74486ea190db330d358a71e1c79cc5a425fb731f95c2f463a297fda6009be1d397b10a087b306ff51ee8a365c12b2746f56c05935fa
+AUX zip-3.0-zipnote-freeze.patch 2170 SHA256 2e0bd374a92c123578550ac559f4e601a51687ca2fe2e020e1c07b05368531b4 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367 WHIRLPOOL e6e6101d0536606e8a0358f92768e1b8c6e1a0c2a96c01c286ecf381cec28cb54d2edb63f862d8992cf5ce7f791b25c541f6b45b8d0601a7a584fa12717056d2
+DIST zip232.tar.gz 807180 SHA256 d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f SHA512 706646115440597f361b77569ef0301a72c4c990ace5053d4c3b730f20ba0f08af2a8c4fe27c4df5808649cad52d477a6e36e731e82057d6b426a3983836fde2 WHIRLPOOL 3bf33c495c004089c06a17e4146b9542f21fdef6ee45368d9891893d84101ee62e0ca3190ce9eb318a5f1e02f8f4d94bcf361b90350190584d5e28833ffeb8da
+DIST zip30.zip 1287223 SHA256 7061ceac0407682b6dc54bb480347205f680f4e56cf34fe1423df2309f18968a SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8 WHIRLPOOL 9e25cd9bcc25645667438019ab3423056a43b62d137c176e7aabad4ed8b7f7ddf6a7ccdedd9ada848c22d33b7f50f442910c39c4b2a5a188ad872109519cae7f
+EBUILD zip-2.32-r1.ebuild 1085 SHA256 6929806902b6ae032e6875213a508c43e9ecd8c8694382b931ce634f4489000e SHA512 28d8c49581ef41c537131643d5ef5a1b5229f181455cbcc9e84513a3784e48a65e51fdfb2c1e8ef0de6e6932f12d383c53f6a91f4599d4f3afd234d4df1d9e46 WHIRLPOOL 83a14b729e20403552fa3f4a9870b16c8b8fb4ea48fe064d610c9afa3a376acb383737f1ae89bb7bc8bcc42cb0a77103b55bdeda4b8cd0725d098e6891814c95
+EBUILD zip-3.0-r1.ebuild 1378 SHA256 2ed50e322e46882055ebe2db8e49a24f9c43cc4cc89859169740dfad20e4f110 SHA512 a3bd7c975178c44f0530f14361a7112ae1c1662e0914fc0252c591951b7e0a25f4ab498f263d0fee4fa916fa26d8fff59262cd05a45f52d12fef1f009b53ebc3 WHIRLPOOL e4e33113ea565d718701d1bff31e2008c9059c2d3cc29f09552d53ac52508bf07e9f41c036c7be76bb7c3d864c6588c5db020758fb79a639e855c657075a88de
+EBUILD zip-3.0-r2.ebuild 1620 SHA256 6abd5b78e3affcec967d89e3119324d2d74372e7cf4061b440ab3a56de1a4736 SHA512 05f7dc22394c58b22435bad6c7de359ad994ccc1665ddae55a556f9f9dff6e14136a1115532b70ccb1809c3cf4b0eba14d3aadd26a3323a0b53ff3b5b2510b14 WHIRLPOOL 6203220d249a1ae4ee1e66b0bf5be2588b847e840dba05145b1c839ea4b56f474641dd614e265ad86e531af67903d687482f076f264b98f6088dc987c5676149
+EBUILD zip-3.0-r3.ebuild 1720 SHA256 cfc04f3c790cce603bc701592dff0c2efee9a5fc47c473182bb52ca289902e67 SHA512 1910a94dc81acd0533d91b161a21b1270b4898708cdbb20bd9cf728add15456c23ba9f9b820e181beac7e77650c8cbabfabc1fc12993da281c9960884179cdf7 WHIRLPOOL 12ded356a5579b00e0f61c516dabd0ac9a813ea2b343bfbfd66a5701ed5b1a80179db94904ab85dc58f1e8b0864d134b44bb8961b08bd2b5379b6745148a6a38
+EBUILD zip-3.0.ebuild 1379 SHA256 3b6b5e399d2875407b4a8445c7bd0043d64e80cc90687983abd40578a7ca0b99 SHA512 c2954826d1e990097adcad8bc9925a5143b2e6eafea21bcf9e60c962af5db3eddfd607730ae9129dad1f8eaebfc9b5828b1e2f193e0a468a1b699bcd7d4fe712 WHIRLPOOL 7e9a6d3079c07e8137f11c34808b8e226ecec3617f3bff5ac6b124ff6c2f0064f4e1a00fa85bed3bfe7fcd2201021ae72766ca624d22858dacc6adf0aeb1d926
+MISC ChangeLog 2936 SHA256 204060e5158c91c88b6d5fa0faaa228aad798df660f308d8b78c6c1b86c71268 SHA512 5abb2b24f294bfdf79fdde2781c86767c2b898989de78785e9ea66bbb078c53df1e53a0bca655c0c1225d6eacd51e324419c5381a3a579b3202d060662934b1e WHIRLPOOL 7aee3fc102b5fbde31337f139c5ce0e382cb7bcd2e4e697c211ce97633e81d97f302dd519adab902698c01bd0370b95ac01f9debd5923e55e4b8401e718a10f0
+MISC ChangeLog-2015 13052 SHA256 458e506761fa34d0556105328eab52ead10a1a1871de74b352ebadca02e1e26a SHA512 215b1030ee2b704ead62c9d08016e6802cfa75163cf598ce371cccd815c7047b6eb1743df54f6e74c7cfda3d68d737c4beb2d61d761d2962a66ee7531573116c WHIRLPOOL 6c007e598b20dcca4863b5766032d9d97150b815cc22c8644b8f6b273de99ba1dc93cc74f10b9068f4da89456501bfac511eab55c3fefd59c01e30b5b84b15f4
+MISC metadata.xml 573 SHA256 37fd463f438c3eb58b729b66474d0a688cad78c26727f107ff76690f0fea9e88 SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131 WHIRLPOOL a8c868054dd34c04f0f7007980ef69308346dd277cdb36721a0dad8fdf4f53d27083fda624fcf33d87a2f8cd2ca0f7d222b6df782e26ff4d2f38244cbcf1ba36
diff --git a/app-arch/zip/files/zip-2.3-unix_configure-pic.patch b/app-arch/zip/files/zip-2.3-unix_configure-pic.patch
new file mode 100644
index 000000000000..45b137b0ed85
--- /dev/null
+++ b/app-arch/zip/files/zip-2.3-unix_configure-pic.patch
@@ -0,0 +1,12 @@
+--- unix/configure.orig	2004-09-28 06:45:33.000000000 +0000
++++ unix/configure	2004-09-28 06:54:53.000000000 +0000
+@@ -29,6 +29,9 @@
+ 
+ echo Check if we can use asm code
+ OBJA=""
++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-2.31-exec-stack.patch b/app-arch/zip/files/zip-2.31-exec-stack.patch
new file mode 100644
index 000000000000..d3efbd902cb1
--- /dev/null
+++ b/app-arch/zip/files/zip-2.31-exec-stack.patch
@@ -0,0 +1,20 @@
+--- zip-2.31/crc_i386.S
++++ zip-2.31/crc_i386.S
+@@ -238,3 +238,7 @@
+ #endif /* i386 || _i386 || _I386 || __i386 */
+ 
+ #endif /* !USE_ZLIB */
++
++#ifdef __ELF__
++.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 */
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
diff --git a/app-arch/zip/files/zip-2.32-build.patch b/app-arch/zip/files/zip-2.32-build.patch
new file mode 100644
index 000000000000..61a2bae34b3f
--- /dev/null
+++ b/app-arch/zip/files/zip-2.32-build.patch
@@ -0,0 +1,89 @@
+respect build environment settings
+
+--- zip/unix/Makefile
++++ zip/unix/Makefile
+@@ -12,15 +12,15 @@
+ 
+ list:   all
+ 
+-MAKE = make -f unix/Makefile
++MAKE := $(MAKE) -f unix/Makefile
+ SHELL = /bin/sh
+ LN = ln -s
+ 
+ # (to use the Gnu compiler, change cc to gcc in CC)
+-CC = cc
++CC ?= gcc
+ BIND = $(CC)
+ AS = $(CC) -c
+-CPP = /lib/cpp
++CPP ?= $(CC)
+ EXE =
+ 
+ # probably can change this to 'install' if you have it
+@@ -47,7 +47,7 @@
+ #   LFLAGS1   flags after output file spec, before obj file list
+ #   LFLAGS2   flags after obj file list (libraries, etc)
+ CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS ?= -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+ LFLAGS2 = -s
+ 
+--- zip/unix/configure
++++ zip/unix/configure
+@@ -13,52 +13,13 @@
+ 
+ CC=${1-cc}
+-CFLAGS=${2-"-I. -DUNIX"}
+-LFLAGS1=""
++CFLAGS="${2--I. -DUNIX} ${CFLAGS} ${CPPFLAGS}"
++LFLAGS1="${LDFLAGS}"
+ LN="ln -s"
+-echo "Check C compiler type (optimization option)"
+-cat > conftest.c << _EOF_
+-int main()
+-{
+-#ifndef __SUNPRO_C
+-   bad code
+-#endif
+-   return 0;
+-}
+-_EOF_
+-$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+-if test $? -eq 0; then
+-  echo '  Sun C (-xO3)'
+-  CFLAGS="${CFLAGS} -xO3"
+-else
+-  cat > conftest.c << _EOF_
+-int main()
+-{
+-#ifndef __DECC
+-   bad code
+-#endif
+-   return 0;
+-}
+-_EOF_
+-  $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+-  if test $? -eq 0; then
+-    echo '  DEC C (-O3)'
+-    CFLAGS="${CFLAGS} -O3"
+-  else
+-    echo '  Other (gcc?) (-O2)'
+-    CFLAGS="${CFLAGS} -O2"
+-  fi
+-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-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-2.32-r1.ebuild b/app-arch/zip/zip-2.32-r1.ebuild
new file mode 100644
index 000000000000..7d5eb0a73215
--- /dev/null
+++ b/app-arch/zip/zip-2.32-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="crypt"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/zip-2.3-unix_configure-pic.patch
+	epatch "${FILESDIR}"/${PN}-2.31-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-2.32-build.patch
+}
+
+src_compile() {
+	tc-export CC CPP
+	use crypt || append-flags -DNO_CRYPT
+	append-lfs-flags
+	emake -f unix/Makefile generic || die
+}
+
+src_install() {
+	dobin zip zipnote zipsplit || die
+	doman man/zip.1
+	dosym zip.1 /usr/share/man/man1/zipnote.1
+	dosym zip.1 /usr/share/man/man1/zipsplit.1
+	if use crypt ; then
+		dobin zipcloak || die
+		dosym zip.1 /usr/share/man/man1/zipcloak.1
+	fi
+	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE proginfo/*.txt
+}
diff --git a/app-arch/zip/zip-3.0-r1.ebuild b/app-arch/zip/zip-3.0-r1.ebuild
new file mode 100644
index 000000000000..739f4b6aafdf
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit toolchain-funcs eutils flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
+IUSE="bzip2 crypt natspec unicode"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
+	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
+	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-3.0-build.patch
+	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
+}
+
+src_compile() {
+	use bzip2 || append-flags -DNO_BZIP2_SUPPORT
+	use crypt || append-flags -DNO_CRYPT
+	use unicode || append-flags -DNO_UNICODE_SUPPORT
+	emake \
+		CC="$(tc-getCC)" \
+		LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \
+		-f unix/Makefile generic \
+		|| die
+}
+
+src_install() {
+	dobin zip zipnote zipsplit || die
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak || die
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}
diff --git a/app-arch/zip/zip-3.0-r2.ebuild b/app-arch/zip/zip-3.0-r2.ebuild
new file mode 100644
index 000000000000..c7965cd8afc7
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 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 ~amd64-fbsd ~x86-fbsd ~arm-linux"
+IUSE="bzip2 crypt natspec unicode"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
+	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
+	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-3.0-build.patch
+	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
+}
+
+src_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/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
new file mode 100644
index 000000000000..ac5bf2612082
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 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 ~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/zip/zip-3.0.ebuild b/app-arch/zip/zip-3.0.ebuild
new file mode 100644
index 000000000000..24708dc83140
--- /dev/null
+++ b/app-arch/zip/zip-3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs eutils flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 crypt unicode"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
+	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
+	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-3.0-build.patch
+}
+
+src_compile() {
+	use bzip2 || append-flags -DNO_BZIP2_SUPPORT
+	use crypt || append-flags -DNO_CRYPT
+	use unicode || append-flags -DNO_UNICODE_SUPPORT
+	emake \
+		CC="$(tc-getCC)" \
+		LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \
+		-f unix/Makefile generic \
+		|| die
+}
+
+src_install() {
+	dobin zip zipnote zipsplit || die
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak || die
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
new file mode 100644
index 000000000000..6bf73339c73f
--- /dev/null
+++ b/app-arch/zoo/Manifest
@@ -0,0 +1,7 @@
+AUX zoo-2.10-gentoo-fbsd-r1.patch 744 SHA256 0eaa6cf1a59173976765c694fee2389bf62a8016330eb22cc6927230abe14123 SHA512 083e94a0ab2089b046f6ddf469ec21d0c9d31223a9ae109c360de368b815e551f1ad28b53fb2e1497290b231a8fc6d67e5716c5cf604b3e8088569ddc439a068 WHIRLPOOL 91e373315044c974c3fa63b6e1c69c7793333b7926a333284d3494f3f3841068d29fd10e20e14f021a2b925e5140b5a28f5c9029fa870f74ffcb3be62d8d4253
+DIST zoo_2.10-28.debian.tar.xz 14984 SHA256 17ce35beb831b9d67a2fc19172f519881ef88fd6f134ffe69f327c7a8c9e7a78 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708 WHIRLPOOL bb21e803f88471806ada28d279925b3841fa93b19d730a202341c58d2c95907f71ebdfa1627f14587c96890ac313523a0e35d8c12b9195c883eae4eef39c4893
+DIST zoo_2.10.orig.tar.gz 172629 SHA256 a8bd2fb9907db425760831eb28b3b690c18529a53568e7e9c42a97f9ef70f129 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f WHIRLPOOL 566645ea8e00ec0f938657cc725deac3bdef42f5773a1c9514079afebffb27c1770b305b6448e848da511e1434e19cd41dca2ed77be690735921112ade1ec005
+EBUILD zoo-2.10-r5.ebuild 841 SHA256 0dcb317ffef818e2473a2c60353e3c8b384c5ff4b0b521e0d7bd3f25299adbf3 SHA512 caaa2b61e1b73e930d712186190efd990fb91c4f50239ad83e20ddc5d324ef9c1d4151c6df566714f3ca02edcd7f1987c9e0c15740482f31a5aa5d62475e3f5d WHIRLPOOL 2f4c69ece314494c51af93b88785103265823ae8c279443d00023671d616beb6fea38a803eb40b96c92cefb94ad74a2f09b9dc885f3df73ed1322f5554503a55
+MISC ChangeLog 2706 SHA256 1dcda553bccdfa95e1c6c0df4381395175a0ebd1df91900008ffa397c0dc1755 SHA512 4a4e53f21f2f20cf31f4cc68bc506cb00cd73d8541fc6e386c3c6060722437381f6c627d113ea2625bd19874087754cddcdeee000a5106dc04fe97b8a65548c4 WHIRLPOOL ca944e6ab9bf60017265d1c4327a65ea41fae7590648f5f6613dc04e7ac67ce14d13b6fa946b27266725deb585aa82baa4b3968f5a08db141c479c00ba0e708d
+MISC ChangeLog-2015 5353 SHA256 a5057ce17f08afe698720e00ec9a233ce8f43b59b511a973e0f1581cd0672e8c SHA512 642eaa1ee84026bbd538cb35a4ab08e5c2019191d81d73158e47554d679bf911f150c8d977383a260a811e0b957f2394de7438613a9835fa4e74e747e6dfaace WHIRLPOOL 5c883ef94b801c0db9e7dec22f2dfd1d856977b636226680fe80f04453e2d7aab8346a665198a696e1864f6609fede6e2ab0e30fa6bca23c2a67fa97ada0bff7
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-arch/zopfli/Manifest
new file mode 100644
index 000000000000..e49c80300941
--- /dev/null
+++ b/app-arch/zopfli/Manifest
@@ -0,0 +1,8 @@
+AUX zopfli-1.0.1-makefile.patch 1979 SHA256 199eae957ea8da28424f5c0e25c1525a2bebcde29951311a2b1baa613cee5025 SHA512 f26b02d88df75d9ce9bf8d86ae5bbf3cdc548be14a81939d26cbfbb2b6b29b74fcf40a62dd4ad20650e7c147d8234f6a0d5d82ff8780c2a1d54ae59825cd43b9 WHIRLPOOL 93cac6f840b3ab75b72edb3118bff126c2546048529c4d962bed89b413caa7ac265307e79b6cd2d789bf3906a55b8156e65e72c1279470c4b0591c7d0e338574
+DIST zopfli-1.0.0_p20140705.tar.gz 125759 SHA256 d0a1db54477c8da8b59b4ffe620e7fcb0bcb9192d6e5ef08d849bb463c05ffd1 SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca WHIRLPOOL 9affa8b1eb7ec9d509c90e26a385644cbf1f7c031813eab5986c297f47881454a74023cb1548e338cebe8c293d0f8876c048998185035377fa5a187d62e46fac
+DIST zopfli-1.0.1.tar.gz 128178 SHA256 29743d727a4e0ecd1b93e0bf89476ceeb662e809ab2e6ab007a0b0344800e9b4 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430 WHIRLPOOL 04578ab35c952b268931d309c29b9de9c5adf3646d02848abee5388520e26bff579d970da9049bfd6fa81cefe2eac1437d499af8dee81d592a6244ce698c8ad8
+EBUILD zopfli-1.0.0_p20140705.ebuild 677 SHA256 df58df6d07385995b6c65575e206b4ef3621a8311f21911ac7b118bb9758eb61 SHA512 2ed577374b97e3bae087491a10b88d0967930a5de22663bf489844a0577f743bb6562d08b21c1df05396c82c5af0c16f843fde738a5eff37135cc8b2051b615c WHIRLPOOL 8e26563ad2906f0b034f6aab716c7a8285cd1cfee2a910f541685c328adfa399261dd87985fb4a9bc44e1fe70cd218f11808280b7e06d48abef723b46af09399
+EBUILD zopfli-1.0.1-r2.ebuild 922 SHA256 345fedf84a01d8031ea7a10a18d75bdc0bbecceae02be8b25dddb17f4f64ecbd SHA512 acabf1c21f7d8f4c02fa5f6569f8bfdc1b4b5303a480bde95b762a84c04e7f67aba16761f358c65d14bfc9735e3157788b1317dc2e2b8b1352acbb92aa4a4d33 WHIRLPOOL 3634dbf7c0a7541e1f2b5548e62ed625b0db14220f413f42972026f8b67b6679242c69b0fa02bf6322264c26515d4e01e1aec94b8dbe1891d03d06764ceb0091
+MISC ChangeLog 3732 SHA256 9da218bf2f6e4ac6101cd7d0e24f4875bf68f34c6e087baddb77faf3e83c8fe4 SHA512 c5d14dc3da2fcad48cb39ba04bba7ab52395ec88cb91f81f8fd32fe157b5ea18c34e970ed520928d6b68480f4dbd269bb4dd434f87440e8f909509b46eb4e356 WHIRLPOOL 9c3e52622b95ff0cd89c8850c106963753f74f68a655d23168e120cf1bc280242633ee0cb2b4bbcce692d750b225e9b1fccec7de9bf98ec22dba92f92ccd4e7f
+MISC ChangeLog-2015 2752 SHA256 f7bfa0d70394c21ef8e464f58348e99d5b88bfd6d6b62aec55b702ad9718d632 SHA512 e2c35a7bc5a71d3590bce764ce311bd5bb02236dcb57102c8efa997296849d149391705af74cb3ce2fa1d3b1881b6e282dff4eb331365b06eddff3712ea7980c WHIRLPOOL aa7f00d54295594c3122b551dbeb14c6c2cbcab714e36c59ed08f48aa20288ea8ea378fc03604fc36407281c3cbe6edcd0f4c5ad46e9cb869cc37d85f4a18cf1
+MISC metadata.xml 665 SHA256 f9b3e3b1e84c974032fb7d664d650bd66b6df11e146329d40f3cc0a3d4545d83 SHA512 edd29a89c8492a2582f69bb0102b33f509830ac861961965aa9a1c280413bd01145baed1ef08428055a82fc27b4cf17c99de4353b1d2f457c74dfe20879838ac WHIRLPOOL 70d46661a9349764a62af24e76a382144701ae58f15b0a9186e10b6117619a87fd798dabb0b55a5c411c7fc3c760c24b2e0c0d97d28b7b37cd6436064774ccd9
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/metadata.xml b/app-arch/zopfli/metadata.xml
new file mode 100644
index 000000000000..634b54aec83c
--- /dev/null
+++ b/app-arch/zopfli/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>alex_y_xu@yahoo.ca</email>
+    <name>Alex Xu</name>
+    <description>Proxied maintainer; set to assignee in all bugs</description>
+  </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/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
new file mode 100644
index 000000000000..8230662f595c
--- /dev/null
+++ b/app-arch/zpaq-extras/Manifest
@@ -0,0 +1,16 @@
+DIST bmp_j4c.zip 2511 SHA256 98fe722a89ac107f637d54bf609673402fa9ede87d19ed68ee28633e64e879a7 SHA512 36e51f9ccef19069cb5bc93f3f8139e458406c8f1bd50b8e15440bed8808c43284248e0e2d436c613bb8afd1953703d5e9b681f95857b801d891e9497992bc6d WHIRLPOOL cda7d004d40102c198557e18d8e8fd08d16fe1aa4f2d66869349c7e75bd12b0c000a1388658e593b9ad971fb37c8638e7183addc94fe4ac3b42dca8c42c3f56e
+DIST bwt_j3.zip 16535 SHA256 c5e75abdd8d8a3fb6effa3c467e98aeb3175068bd454a635baae79de024b9120 SHA512 8a34909cd70cae76ee2c19b1d90895ab75422b7b2053cf6a4555250871a9ec1f585fe6d115abd6c0ea4cf092711ab71ab48906b4ec5b0230b4fe62b989177f33 WHIRLPOOL 153dd0f98201218d867360f73ef3eceda4f7a784e4e46927c34615a442bd63ecaca00ad59cf42ce2da3a80461ea5e8a6d3bff02d51b5d33d4226876fb4ffbf3e
+DIST bwt_slowmode1.zip 138176 SHA256 3b7fb3c4a2491b4f8b2c243f7f67a4f2c7d2b793558207001b2565f06e145a92 SHA512 d415b049f284dc4d3d2211830db260489f26e6b1cc00fd60c16b6d138196299ce247fd0e20b58bef016451a3d5aaf9f55e53585ce97f95d1cfa5672735e4316a WHIRLPOOL fc4b56621de29fd1ec424924678e80191247b64e8f07a84ea1d9fd4dd273ca2e4a4c6eb6102a668e837aafe53035a542741b614ce76dc51ee165e229da764de5
+DIST exe_j1.zip 9828 SHA256 8e13ca38ed6fb7fd9ae5244c44b045f179b068c3d3281f1f2690c352e45ca239 SHA512 9b62486823a21b91ffefbf8de78e6fcd4a291c98549226b1e17a6a4c71ce510c678b71cb74cf9b38364385b3310f0b6dfecaf96652f82a0eab367a2122176596 WHIRLPOOL f7973d7b68614363a2f06d16e4fa96b9f54cda0d9b93a72d61f9ed7b78382c854808dc080cde09553d33d0dadcfa0a6c4b1c1aa70799cb533e7d8df440628b6a
+DIST jpg_test2.zip 12189 SHA256 b09eedf0760826fa6822d266c1e262e67ad4ac119e11235e192e208e558e4855 SHA512 a866812a9d9e77a777d06b6acfef4bd09e7af1b55e3d47eb75bd24d8f5b02ec455991efda7f7ee2a5db035602cf9843e01133fa8a7f75488cd94f1eeeac70bb0 WHIRLPOOL 82915421c0c22d31472d61421bc503426d07ed725568ed3548c9b3e1e8536ca056094b1115457cda018adef13dd216d88afca310e498d128f0acd3ee18559f35
+DIST lazy100.zip 14958 SHA256 6c4366a7260c3013eb85db0aa7209ea19d41d3d2427b95a4526595cc9b64b44e SHA512 2102d268bd15843773653fae8934b9f5ebbdb98a5c519a465c57ee58a6cd104228ab79b885f1c7a6cc127930b890c1ca14b09b799d9129d973c2cf83bd03be3d WHIRLPOOL a462ffa7fd30537b7937479203de02521c01a29af2fd3c6df1d719c172d57f8d80bec4923795a1e55428419c0df0eb3db298353c0eea3d273003b15026042bae
+DIST lazy210.zip 15867 SHA256 7c6d55c316b366328d711ada5fd8302e4db89916dfd66449d696416d7f60d735 SHA512 9a45b281f3e0c2a24d2679b7eecfa9b5e8b5a13894faf23924784cec09f90edb17513ec3e13001ed283dc4ef2a56b764f32808c45443b5871d8acdd919a4f353 WHIRLPOOL 10cde6b1f3139579c48465e6066dfe6c9476d608503261890dcf0556df3e978a5d662f956b71f5e73d8074f02a962c94cb50ce8116975187121f8fcdae26a055
+DIST lz1.zip 10012 SHA256 2817e3d300edee5c1d65d702feb58b51bd459817dc32a2a29d82d0f92a0ea7d9 SHA512 b03c84351a361531e59242904763f7cd13ec9b809bcbfbec5c270b139ab80ac1a99ccf745ba7a797587c0e71cb7dbc083f643fd62cd3b56906ff5bde8944a1a1 WHIRLPOOL 4f73c5ce636d968c65582ec313a91c0315267719140aeecfb1c8b471bc8ea43f4cea3e0cea4b8738ef5be07ba9bdc4003946801c415328fc79d74e7bd9c1682a
+DIST min.zip 9560 SHA256 7209ffaf0d48f5e10e3134826d766e2dc52ed914ed5dbad415023db10b4e1113 SHA512 e2ce1283438793abf5c8f62e6419249fb86f9d386a2cdc40acc72c4fbaa44469be2cb7c7271355af13d40070d386d87e12268aedccbf4cd6ec9feb91cd92e65e WHIRLPOOL e73a58647dccdcf5db1de8709929b4e72600d61c1f6b474b34c3a661b972d39769327ef8c0cc1203f694f62798e4414dc1a9d76a72f99a29b0359226a86521ec
+DIST zpaq-fast.cfg 359 SHA256 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda SHA512 3f1118bdb61bea4c8df4e7a88a9ae079aecbe9f1dfc2aa7935334d330d374a248ab2327da9524857ca9c2b214ac32f3d2dad6ad420f0688b65384c2263147e57 WHIRLPOOL 79f8d8e6e75dfd44148e42271a2c34a74fbd3f7fbc0ee9dca26f4a5a7fa3332810207784e0ccc9df39b2978b2e8f1a402a385ce3bf73de69ba7066347c3d7d86
+DIST zpaq-max.cfg 1754 SHA256 7965863923d5558409f5792167c74914a9c0d07f813ef385587450e7b5a156b7 SHA512 12758ea633cb37619c26753f8a4f368a1adc1b682a3ec738e36b8f39bff06f81dd9b37f9b58839ad43488d9b821690a9cb43e276da88f36d1b20f842cbcab70e WHIRLPOOL 2653a3eb7c33cc9d6ee13511919f3f79664d2df0d3fc692df2c14f8b7b5c2b08567c1963fc3140f432a1e631f56aee76e74d3447fd793f1c751078bed3d35b74
+DIST zpaq-mid.cfg 786 SHA256 51dd9dc78513e36217033c501f4a3331d30820df875e466052b6b6175bc9bafa SHA512 ef08f70b5541396a690b7df630ddbb9fb3093b7617acb26394e9f7da40d5191343500bb0b6f0e66ed73fc840b7d5666cbc47a74f7eabba6abbe3743de7db7235 WHIRLPOOL c7ff0e6497e0f03083d1cc7d787800194092f03db292831ba1d07dfa3f8f00f52c60d8e948d84cd121fcfc2040ac4f71e9556c2885971ae3d99921bfaa962160
+EBUILD zpaq-extras-3.ebuild 1527 SHA256 301c58838036e7148e1391b7c9db962c0bc2f7fc9156c091114adcc9a58da502 SHA512 5284467d1e4c8b9642b34f4230ed909999c719d0c58a7029666677044dbfc13ebfe062dd8241168b392d037a8d26b19d6996c170dac0714417809f2a3d2b9b86 WHIRLPOOL 55465d4ceb502647ff18641e94a93b092cc9da4ec5aced7c797da8afddc57691acd632ba9a4b700b46e143917955723a1efcb8b1ed5e6e8f75676c904fcc9954
+MISC ChangeLog 2321 SHA256 e6fe77b66e54e371100f437f689a723c001515bfc6c1e456a63d46ec9ecf39c1 SHA512 3715ef0b9fa403d4ee2f7f68677295aec942dbf3f354b967ca2ff69a0f827068683cae3fcbe4a5f7c57a875d7be38e45482b42470e37141514c2de8a2dec527e WHIRLPOOL 6b010c6d4ad963e2b2871d85fbd29bd676878080a69444e0d6f5466477f0de3372ffac761e4b26d5116a98316ec1e58b2443381def13a0669fcab3f382084a91
+MISC ChangeLog-2015 1805 SHA256 4f97def72c284c059528efb65ae634108d3153ffa5d892cb7c8dab17d5f6d554 SHA512 6a1c2b8aa2cbf44c93ab7fcf6aeef188d18b98debf4601f82724a05da4de052994bdc396873d91033ded7af3bde7499564d8a2a5cd8767225ea9332ea5d42379 WHIRLPOOL 80a2f69bbcf5987f51473883ce79256f72169445673216f0ef20744ce7d4b41739494130894b6fd868d1c1a90e1c3286c03592ff14bfcb9e5502299596f0d98b
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
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..5ad339e5bbe6
--- /dev/null
+++ b/app-arch/zpaq/Manifest
@@ -0,0 +1,7 @@
+DIST zpaq713.zip 829863 SHA256 9120cf4fb1afdecea3ac4f690d7b0577f7cb004ca6b152856edd8ac444f0d919 SHA512 93ef758e9c6c13f4cc89b1969fce3630132c941ee5076959c3a7988b28e12530346c5b489837af9187937be35129bde0c9cf0e8aa8bf326799c893ef9fc74f5f WHIRLPOOL 494c3b9a6e6e0f50cecaf2630bcb4c9edd2433c128c13a1fc7a31d1695cbfbfadeda68f7fa2bd0023a0854d8548221ee52a1c218755b4a5a10b695db6b5a142d
+DIST zpaq715.zip 1000646 SHA256 e85ec2529eb0ba22ceaeabd461e55357ef099b80f61c14f377b429ea3d49d418 SHA512 4cddcc04dff5e9dceb7138cf9e82b718b696048368ff494339f877d93e4423ed7959c0cfb2e30ba7dcbcdd6bbd59fa1021ceaca6d51e3180d8034b7a3997c265 WHIRLPOOL 2d87e0e710ea3e19a599e21a17e69a0fa4441211a493be5ca114d5d69a063bc929606b687dc156ea04d35d8bb8df76dcc33c9b77940e0271a4a4f513bae5113a
+EBUILD zpaq-7.13-r1.ebuild 1261 SHA256 bf7edb9ddebf5013c8a2e40b7b5422a7095fc6135154f6ca3323dbe28a02203d SHA512 d5e505dfeae0963ab337433fb90092aede4344a3047b47d95eddd0b0b8d3701c81bae146033a8f63cec0872eabfdee0ae3828b9f982fe4efa35547937072b854 WHIRLPOOL feb1620a379e226939500556ed521ad6a07bb3713795af4094619d08877358d150b82e022b938ab32d8883820b894b57f9e223e600244c8c782123838bfd013f
+EBUILD zpaq-7.15.ebuild 1027 SHA256 2ff650bc811d5f9d7b8819c355d93f97b18694e10c0684ed7eb8853b0a36f2aa SHA512 6f8cf07a70e61b5c2faf5c15295a8d07467dbaa3542313290767783d41c151c7d2c2c9a129583e5461076e29aa50bd2a77804a9f46b42b0a66086ff30fef4893 WHIRLPOOL c29f620b7cd35cfa2744d5dbb4d860d8707b8f9b60b3e0e9020fc88ba469602f47af0cd70caddcdd0208b098a9b966a7b3bb7aafcaecedfb404d30e8021eca0b
+MISC ChangeLog 2942 SHA256 870d8aa5dffffdb90b70443ffd8e47d7eac594371e4651b6770364c999ef1468 SHA512 d4118153dc39d460dda890bdde5724e344ea220fc42d0b362144982076b6fca8c98b52512e1a27d1c77ee9320a59fdac3a68cb85df48e8526c9ed665730010a1 WHIRLPOOL 9fbd09b374887da5abf9ac4c2a0412fb2d5d50ed8a1b54180cadcf39854182d5e374506edfd94a69447ace8435ae2d52a2dc192dab19cb926f59940494191fb2
+MISC ChangeLog-2015 3275 SHA256 a24b570db0d6735553de07658323d7f89535b4145cb4ffb8e6ac4089b5d35724 SHA512 021ead691db860cd4cd95a02b7661706ca019b4af93293ef5b740a041f22072b703f9c0b8b93f3618d790ae1392a78f7c4204f34e90289e64b97f08373865c61 WHIRLPOOL 036a08d8f507fdc17d65d5ed4478e7f8a24add4fc321fa33ad8296c63610145588da5cca49df62794ff82b6de9f2d0bbd08a4c57d521bd9531dd13a55c78c0be
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
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.13-r1.ebuild b/app-arch/zpaq/zpaq-7.13-r1.ebuild
new file mode 100644
index 000000000000..578319520411
--- /dev/null
+++ b/app-arch/zpaq/zpaq-7.13-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 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"
+
+# now 2in1!
+RDEPEND="!app-arch/libzpaq"
+# perl for pod2man
+DEPEND="
+	app-arch/unzip
+	dev-lang/perl"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	sed -i -e '/^zpaq:/,+1s/libzpaq\.o/$(SONAME)/' Makefile || die
+}
+
+src_compile() {
+	use debug || append-cppflags -DNDEBUG
+	use jit || append-cppflags -DNOJIT
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH=".${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
+	use jit && pax-mark m zpaq
+	default
+}
+
+src_install() {
+	emake install PREFIX="${ED%/}"/usr LIBDIR="\$(PREFIX)/$(get_libdir)"
+	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/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/Manifest b/app-arch/zstd/Manifest
new file mode 100644
index 000000000000..a0f7802ceed6
--- /dev/null
+++ b/app-arch/zstd/Manifest
@@ -0,0 +1,11 @@
+AUX zstd-1.1.0-fix_build_system.patch 3103 SHA256 60ffe3a5f9a5195ad14a1647de3cc3023abd3bab45ca1aff11cb0da74d934fa7 SHA512 0ea1a9381a5766f1b7558f57a4082a919f02ead3f5ef6400c991f8f70390349bb8f96af1e36599c2c985285acd339a673e51cfbeb5839a790fe1aa672f93aaad WHIRLPOOL 8c1772dd01c496cfab6e7874df718a25c3f19d64156bed2c2e02e7e91ac56f72084a06d4e5d412251ceecd6ddd740af56a46677036724998f194f68b051ee143
+DIST zstd-1.1.0.tar.gz 716327 SHA256 61cbbd28ff78f658f0564c2ccc206ac1ac6abe7f2c65c9afdca74584a104ea51 SHA512 9fe72081d333b58d5c8f27f13bd01ab0d729984215b75690282770aa769aab6879b88177aa2b45d8ce2869bf1b360f3a828ca00aa3646a7cc57285a4e167d71f WHIRLPOOL f7e4eab8e7dada2dd0d3ab8eeba4f2b3f165476c4cacf1a609269cb8ed9bccd12c498f50e2aaf365d6c0167c0f2db2b6b6902a786ba98f169e4f0ea0b7ceacfe
+DIST zstd-1.1.3.tar.gz 845902 SHA256 106c532ae840a6ee4aee5258f04f3acab7b3e09b9e9584ebe94e4fbfd899af0a SHA512 6c025ca3899d0487bf2b4a9b333b47c6e2bb525ae3fc7328cc040f50d6f3c53a1bb9bd17e104352ddbc7b96b240c250c60d5be99e0a980332dbd3c518b2a81e1 WHIRLPOOL 1ff898dce54bd13a45a27ee6e395aa38adc88f1767321e5393148d76e443b539eddee65ccbc00ccf691ab51019a7f1ec6e19f1d7dc734b5982a29d47a432c1e2
+DIST zstd-1.2.0.tar.gz 1300584 SHA256 4a7e4593a3638276ca7f2a09dc4f38e674d8317bbea51626393ca73fc047cbfb SHA512 b21910c6bdcfad3199c07b9f70f7c049062ebd1cce9249dd33c36153e29f24dd9e796ddbc2f37846b9f508c14b0d0f67651fd8d2bdce558128f20bdfff50a7df WHIRLPOOL dc52eee5d075d952e870c1e12c73120a664337585f6d81456c98341f4bd3f5ecfccb51fbc22063e64cb4287e429d4e12c4395007d78df74a2f1787e01cc29007
+DIST zstd-1.3.0.tar.gz 1469911 SHA256 0fdba643b438b7cbce700dcc0e7b3e3da6d829088c63757a5984930e2f70b348 SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30 WHIRLPOOL 61d20ecb675d95ef972b73e5cec144dde6f8a784423b136f4520f51ff8429aa3a59600a371b9b8eea7b2a1949d85508346f620c3cb1852162b27827ba99a7c73
+EBUILD zstd-1.1.0.ebuild 928 SHA256 2b56b5bdb902b1357e37489cce468b36c80c854ba0e0d1016ecba8b8f8f0427c SHA512 46c64fe1cbdbb0d4cc6233517253e7ea9d098b7ae355aa93fd972f9b10fb07fb7ad19b6dd7bb1bcba36c24c3be4fc3ed14d06f96ab547f428d60f5115bc0d971 WHIRLPOOL a48f61f75081c876009fc62e24e572693b66225432b4d26ff1edf71c9948fe69bf31162f626221d2b55f2cd8ed53ae8802b7b776bc5035c879e05918858397ac
+EBUILD zstd-1.1.3.ebuild 895 SHA256 b1817039ab1be2095ba28c88312041df9e881b139da9097cde5029117ac34d66 SHA512 aaae58ce1141b04f8c90daec424f5b2a52ef49b12a4073c4687ebb73013785e0fe39d617693c25c3e180dfafbf2c6c953f9029174f8749b9470cda028759c6a3 WHIRLPOOL f526e6b3bd85ec27c32fa6c499b7c4ad41e5f05f8da5eaf00198207d10e9a97de40f21d6eea5f89d47255084464b96044162f4484a0c2e4d6b1b2e21f50f5a93
+EBUILD zstd-1.2.0.ebuild 904 SHA256 bf8d6a21977ac1b1083602cf02719cbe2feba9b08a3f6200fc5fed9e2720814b SHA512 f74706f6936df707e5e6999f3c642e7f833a611faed7db59c0c7b85ea553ec886d52365160967f10e4b8be35bdf0afbb8193156d4b11a3f49deca53ce95796e0 WHIRLPOOL 2bc2b7ffaec806e2aab878a172b04070d06ab3d23c9242bd4bc54dec297f62da2d6554529864b499874d3d83b8a6e765dc81ce0ce8231b8633ccb8dca61b6ad6
+EBUILD zstd-1.3.0.ebuild 1239 SHA256 6ea8e8de8ae955ec563aadf78b1ca60c1d8463b64704d6b6858a37ac1be55602 SHA512 07c505650dfd7e475337e2d9b503256b0709f794f9822dbf1947c257493b4c6ea44e9eea1b2abd9b8fd3dad7a569102b823e08167686b8d80eb00222113768d5 WHIRLPOOL 88e235da82e810440fbd560589c1d391d401c06b15102394f73d989c108b09cb304ab369e851ee07f75f1ffb82980d173d5d417b0aed9a7c79af7ad5972f73e7
+MISC ChangeLog 1336 SHA256 0458cf9031095580000f282f751531d4401321a2e71d4ada520f934fa077f150 SHA512 405e90f9065dd8b727d40ccca61b387b046d2d3560bdc07ca56a94001414c7903d63da5540dc44fb460d2dfb8fcadea695bfe64a7354c5eb47a08c529f880b0d WHIRLPOOL a1b7181df2c485254c980cf2f08f38bd2e257b75d2e7e3b266f10ae28fdddcdcbc18222b353d50e19824c6ffa1c9a866044f5ddce6a6fe680d4f0db9c811cffb
+MISC metadata.xml 335 SHA256 f037a36869488c95518aa3577c4ab1c644df5b682bd569ce8fc95433397dcf85 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6 WHIRLPOOL 18f946ccabf43f944251cb5f73eae533221f4a19af5195bbdd11170cb82ea438d9a48ee3ca070c8bf9abc365e7bdcb038e0997261139be0deb062ee635e4e44d
diff --git a/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch b/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
new file mode 100644
index 000000000000..75531c409974
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
@@ -0,0 +1,79 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index 4fb8ed9..ec5436d 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -63,17 +63,17 @@ all: clean libzstd
+ 
+ libzstd: $(ZSTD_FILES)
+ 	@echo compiling static library
+-	@$(CC) $(FLAGS) -c $^
+-	@$(AR) rcs $@.a *.o
++	$(CC) $(FLAGS) -c $^
++	$(AR) rcs $@.a *.o
+ 	@echo compiling dynamic library $(LIBVER)
+-	@$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
++	$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+ 	@echo creating versioned links
+-	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
+-	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
++	ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
++	ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
+ 
+ clean:
+-	@rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+-	@rm -f decompress/*.o
++	rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
++	rm -f decompress/*.o
+ 	@echo Cleaning library completed
+ 
+ #------------------------------------------------------------------------
+@@ -83,22 +83,22 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly
+ libzstd.pc:
+ libzstd.pc: libzstd.pc.in
+ 	@echo creating pkgconfig
+-	@sed -e 's|@PREFIX@|$(PREFIX)|' \
++	sed -e 's|@PREFIX@|$(PREFIX)|' \
+              -e 's|@LIBDIR@|$(LIBDIR)|' \
+              -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
+              -e 's|@VERSION@|$(VERSION)|' \
+              $< >$@
+ 
+-install: libzstd libzstd.pc
+-	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
+-	@install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+-	@cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
+-	@cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
+-	@cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
+-	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
+-	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
+-	@install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
+-	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
++install: libzstd.pc
++	install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
++	install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
++	cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
++	cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
++	cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
++	install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
++	install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
++	install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
++	install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+ 	@echo zstd static and shared library installed
+ 
+ uninstall:
+diff --git a/programs/Makefile b/programs/Makefile
+index 6e78d0e..993d138 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -21,11 +21,7 @@ MANDIR  = $(PREFIX)/share/man/man1
+ 
+ ZSTDDIR = ../lib
+ 
+-ifeq ($(shell $(CC) -v 2>&1 | grep -c "gcc version "), 1)
+-ALIGN_LOOP = -falign-loops=32
+-else
+ ALIGN_LOOP =
+-endif
+ 
+ CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
+ CFLAGS ?= -O3
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
new file mode 100644
index 000000000000..b9782eebc304
--- /dev/null
+++ b/app-arch/zstd/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>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">facebook/zstd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/zstd/zstd-1.1.0.ebuild b/app-arch/zstd/zstd-1.1.0.ebuild
new file mode 100644
index 000000000000..c120d6aa6675
--- /dev/null
+++ b/app-arch/zstd/zstd-1.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="http://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 ~x86"
+IUSE="static-libs"
+
+PATCHES=( "${FILESDIR}/${P}-fix_build_system.patch" )
+
+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.1.3.ebuild b/app-arch/zstd/zstd-1.1.3.ebuild
new file mode 100644
index 000000000000..997d094a7964
--- /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 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.2.0.ebuild b/app-arch/zstd/zstd-1.2.0.ebuild
new file mode 100644
index 000000000000..f3a76665b7ae
--- /dev/null
+++ b/app-arch/zstd/zstd-1.2.0.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 ~arm64 ~mips ~ppc ~ppc64 ~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.0.ebuild b/app-arch/zstd/zstd-1.3.0.ebuild
new file mode 100644
index 000000000000..b96874e7c9a1
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.0.ebuild
@@ -0,0 +1,58 @@
+# 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/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~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>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-arch