gentoo resync : 18.11.2018

14 files changed, 246 insertions, 70 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 923c3490da24..4459443dd813 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index f416766e06c2..a206a23b59df 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,7 +1,10 @@
 DIST cabextract-1.6.tar.gz 241731 BLAKE2B 49a94b1b0d8a6c9f61cd51280a035e3fedb8d7a2d097b132bc56114c6003a558647a7f8c47b8d08fcac1999e68bea5303adb2b03c8e6dd010995e8b0c6dcd442 SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8
 DIST cabextract-1.7.tar.gz 293760 BLAKE2B d5ab4783c944d5d8b1d9ed8a2fbbfd60aeeab9f12b836032f982efc5721055b2caa521147246b3b5274d9456b1dbd2d513455cfd57750cf6d7fdc18f109f96c9 SHA512 63789e485d57299f2a0a60dc6d9a94e83639eb59b73789eff52977d3d3bd37a1c00713c86a4c6289e35541d0b7240ea0545ba84013713c070b4324ae1f2865ce
 DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
+DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
 EBUILD cabextract-1.6.ebuild 1115 BLAKE2B d6898fc1ef97920e8c7a54d3f79963a59f93b90b0c432f3cf088efaa202a4eb37b1385cdae1c2f91b97f3252938216f55192851291824c33c79ec02df6f7a08e SHA512 10c82fad424f0e5093816ebab945c37e88180618431be7b1068c847534ceb83e3e9ee0379862ec3dc312b65b01cfc2954d3300dd98d36455421d6814840df534
 EBUILD cabextract-1.7.ebuild 1155 BLAKE2B 0f93ea1453dae2141d540a11ca038cc8dec1443d93bb4b517735e3b2eab92ab5f56a94330cb442896808d500600fe78a19a83e32c2e167f49fed37eec9ae402c SHA512 d0503c4541eb6eaf93fb3dfa50a6a968b8355a17cdfe5d52af0ccf2187b886bd23e1db740fb0f3647b43c88f1537fc6d992fc0cb96eda675f4e45672a4856266
 EBUILD cabextract-1.8.ebuild 1152 BLAKE2B e4db9bd87b69f44a8be2e56462245531b639a6a4700ac087f8919319997dff2fc9c3267e21a763fa7607a678598b20bfdc6705eba76a19d268aa9e945460b5d2 SHA512 9da9c8b743b7eb5a091af81ffc9d010dbea4580e6b15a43c8e68c0638b14c397412b1f4c4d1fca8759cf3a18d033dccec351dafddf894cb888ee39948189a09b
+EBUILD cabextract-1.9.ebuild 1543 BLAKE2B 707fedbda86cab166376cbb6eeffa4129ce1721fda5166348ee44e2afdcca71f77eb5231f422a8742068df79dc24d965ff32953dc5eba88b713e58b940ded721 SHA512 47e0dcdb5b20b8eeb864617b7727d145f820ae4a655172e3b7da42b2aef3c73e69d6ecfe49e9fc84bc6b680310d44dfb0312322131d001ad06c512944a2d1e46
+EBUILD cabextract-9999.ebuild 1545 BLAKE2B 63e227bc1912b9b79227015436421a4732a56611dd8c95effbcff7f16a0a18cc5dd00f2c71a1d9129771c910c3fc35dd2fea8133a1d3c41ee34331652529ef26 SHA512 51f060bcf741c5e4be1d0926a846d664aa91db0f270833fc1345c6242d28d69e86c90ffd6462d60a9ec30209192f4cb7a4a64bf659b118d2eac338daa7c1173a
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.9.ebuild b/app-arch/cabextract/cabextract-1.9.ebuild
new file mode 100644
index 000000000000..68a27ed3bc97
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+
+	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
+else
+	KEYWORDS="amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
+
+	LIBMSPACK_DEPEND=">=dev-libs/libmspack-0.8_alpha:="
+fi
+
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
+HOMEPAGE="https://www.cabextract.org.uk/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="extras"
+
+DEPEND="${LIBMSPACK_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="extras? ( dev-lang/perl )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" &>/dev/null || die
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-external-libmspack=yes
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO doc/magic )
+	default
+	docinto html
+	dodoc doc/wince_cab_format.html
+	if use extras; then
+		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
+	fi
+}
diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
new file mode 100644
index 000000000000..49070540a767
--- /dev/null
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+
+	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
+
+	LIBMSPACK_DEPEND=">=dev-libs/libmspack-0.8_alpha:="
+fi
+
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
+HOMEPAGE="https://www.cabextract.org.uk/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="extras"
+
+DEPEND="${LIBMSPACK_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="extras? ( dev-lang/perl )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" &>/dev/null || die
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-external-libmspack=yes
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO doc/magic )
+	default
+	docinto html
+	dodoc doc/wince_cab_format.html
+	if use extras; then
+		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
+	fi
+}
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 91097cfa603f..327d5c510917 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -5,6 +5,6 @@ DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a71
 DIST dpkg_1.19.1.tar.xz 4600848 BLAKE2B daadc95f0f66312e6012a5c9ce053dba055d87f766d8e9b9e99ed3eed59e83616b89cb2324fc61205bf4e22388cc0f9f62d191cbdd858250a50f7c6d141adf7d SHA512 d2c745f8cc3db94be15ce3ef74f9317768b316d9bb96aac2c681c2f47433524774e0c2d5ff3daf6e7cc779e5ffc4ce96783de12802f32dab1d72022786ca6c20
 DIST dpkg_1.19.2.tar.xz 4607868 BLAKE2B 4c191fb3dbe64bb3a515dadbb5f81bb32a0ae3b7267603978f7aee34f6baa02bacb818600759fe4bac0c3470ce2d6409c778a408833af796fe65f27fe910713f SHA512 244a6ef6aad935aee649503d6ce3238e34f4fae3f57ca79e99c1890140d913c29255bc9d0e90b50e96d2cf44ab0e44d6c3675a7bed306213fe5fe31710324cf7
 EBUILD dpkg-1.19.0.5.ebuild 1845 BLAKE2B b6320665601e48f808499ad616aec40b0c7be70673561120eb963065e87a05f1f2e8e0f1fccedcd80fdcc98ff7239a07e7f9ee75396288058521099af94189f6 SHA512 54b06dd32e8a95fffb89a3f8e160d4156002fa51d02fb8648966eadfdc9e43d999dfb6d42c4eabc68f4b8c64b73c171221c1de3154b06e1ce180739a35e66f13
-EBUILD dpkg-1.19.1.ebuild 1972 BLAKE2B 71a351df31f038300194ae18dec0f94e526fbd5a33efd0ba96fd1b56ae75dd5e5cf3df03e60ef82c1955e3f6d0f9907dae35e414ed4c1bbe4fab7dc89a3190dc SHA512 ca8a12976460a62d77d20bb6417e62f75ad4af7e9b4d4e7f919d1cb6147bfa45266b4899ddd1d3c1c79abae15eddd12c88220eda07179bd347786d1ddaa28204
+EBUILD dpkg-1.19.1.ebuild 1977 BLAKE2B 5c8762c2ed232b9d9a1e0a82094214076596b3e8df4dc1d95c5a75076e54afe04cbb620f7c60cb741ef20662458ab58492128830d23a711b9541ff6de5d0ad90 SHA512 1a9cf8c4b58e71e5308b1a7f407b08b32e9836d3b364f247ea805dc4b32bb3982a1fb79e2823346062a8aa35463b52303e82a52578d7faa3d9d2544b71f03412
 EBUILD dpkg-1.19.2.ebuild 1972 BLAKE2B 71a351df31f038300194ae18dec0f94e526fbd5a33efd0ba96fd1b56ae75dd5e5cf3df03e60ef82c1955e3f6d0f9907dae35e414ed4c1bbe4fab7dc89a3190dc SHA512 ca8a12976460a62d77d20bb6417e62f75ad4af7e9b4d4e7f919d1cb6147bfa45266b4899ddd1d3c1c79abae15eddd12c88220eda07179bd347786d1ddaa28204
 MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.19.1.ebuild b/app-arch/dpkg/dpkg-1.19.1.ebuild
index c56f2a56df1e..32aaeb80ad78 100644
--- a/app-arch/dpkg/dpkg-1.19.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 
 RDEPEND="
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index bfe18a68ffd7..755e2f17180d 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,3 +1,4 @@
+AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
 DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
-EBUILD wimlib-1.12.0.ebuild 1410 BLAKE2B e8cd8d59c7535051260d2700f25dbcee7daeefaf400fde7b86e2e7d9ae076516251882486ba0a3b8997aa5f11371e72ba8dff681a0f4205afc7d39909fe3fe59 SHA512 fab7e339cc5291fe20d34edb2d0a6054aec70c49e33d8c2a5b28499968b5074a4b02618a05b1127551acea6ed360caa5edb405dc351bda71b230817b9b38c1eb
+EBUILD wimlib-1.12.0.ebuild 1454 BLAKE2B 67e5bc2760f9a0aaae9de8d761ab2eb5eac2888cd5d84c1bb65c0725d3e19e28a1b547e2fb9daacfdce740a8a8bc5028c9c4f7e5f45b208518a86d0ccf18a7e8 SHA512 1c4d848b98c34678efe2479efa1deec3365fc210b3c7c53dbfbdc43a52aeb21cb9de38104e0b47accd999a61fd886c3dc41c704fdfa3cb22809c60da608d456c
 MISC metadata.xml 684 BLAKE2B bc45d2b67f015842912d4fa5043bf31f2eb2ae59b29a9104987c6041282730491470fefd065be7ab49de230ea26dc10f64d4fd85591a1df6aec5a6ab408752dd SHA512 999d8b7bd11c22193d1e87e73b70fd750404e92c26b7916a4405c0bdd930a103ef8b809259e0c3ddfb73281f2622b284bd20ea73dff409cc8063406cf41a7724
diff --git a/app-arch/wimlib/files/syslinux-path.patch b/app-arch/wimlib/files/syslinux-path.patch
new file mode 100644
index 000000000000..6fd5bcd726c7
--- /dev/null
+++ b/app-arch/wimlib/files/syslinux-path.patch
@@ -0,0 +1,25 @@
+--- a/programs/mkwinpeimg	2017-07-29 13:52:09.000000000 -0700
++++ b/programs/mkwinpeimg	2018-10-22 19:14:35.170566559 -0700
+@@ -488,7 +488,8 @@
+ 	for biosdir in				\
+ 		/usr/lib/syslinux/modules/bios	\
+ 		/usr/lib/syslinux/bios		\
+-		/usr/lib/syslinux
++		/usr/lib/syslinux \
++		/usr/share/syslinux
+ 	do
+ 		if [ -e "$biosdir/chain.c32" ]; then
+ 			break
+--- a/programs/mkwinpeimg.in	2017-07-15 13:49:06.000000000 -0700
++++ b/programs/mkwinpeimg.in	2018-10-22 19:16:59.323070604 -0700
+@@ -488,7 +488,8 @@
+ 	for biosdir in				\
+ 		/usr/lib/syslinux/modules/bios	\
+ 		/usr/lib/syslinux/bios		\
+-		/usr/lib/syslinux
++		/usr/lib/syslinux \
++		/usr/share/syslinux
+ 	do
+ 		if [ -e "$biosdir/chain.c32" ]; then
+ 			break
+
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
index efc6d34190b6..77b9c95e2751 100644
--- a/app-arch/wimlib/wimlib-1.12.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,8 @@ SLOT="0"
 IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
 REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
 
+PATCHES=( "${FILESDIR}/syslinux-path.patch" )
+
 RDEPEND="
 	dev-libs/libxml2:2
 	ntfs? ( sys-fs/ntfs3g )
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index a50aa0e10837..538faad3173e 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,5 +1,3 @@
-DIST xarchiver-0.5.4.12.tar.gz 1074764 BLAKE2B 65d8968a470f7ea607fcbb1e2ff3b6c54ff8e521df1ca0cd29d3b7fc7b84d2ad5e2b9987bfb482979c7099d62287c463317d524cadc4a03d6b80ae61d28bfcc2 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554
 DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849
-EBUILD xarchiver-0.5.4.12.ebuild 1448 BLAKE2B f2052bb4fff9c3665392ac688cdd8cfdb529dd98268f877ae7f1e2c4583da257c49b892cfe561929c29ab80417d237592bdd98c26fdb3030eacb6f3c660a4adf SHA512 08b81716f60fb6dca34e6d4e77a1224db528148af9ff9f005deff35be54deeaad772fcd3b2d32be07bfa0dde535ca27b01ca2d1e32976988381adabeea310043
 EBUILD xarchiver-0.5.4.13.ebuild 1449 BLAKE2B 6987905ac1c6f92380978e4ca884f9a0f6b8238b5f14ef39cc2a1b586a10a0125d7b1ff3b3514c0b31f08fbb76df547dec706fcbb914e899b134abfed6ac2851 SHA512 0c5bdacea1aeba2d187932a61a3eff4c1b93aebfaa098cfdba75968c37a64764cc20235c739b991507806958bf4d57ae1c8b5f2d0d3d6d0b66b403f920823d67
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
deleted file mode 100644
index ffa666d4ec89..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
-HOMEPAGE="https://github.com/ib/xarchiver"
-SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-# older pigz versions have incompatible command-line processing
-# https://bugs.gentoo.org/661464
-RDEPEND=">=dev-libs/glib-2:=
-	x11-libs/gtk+:3=
-	!!<app-arch/pigz-2.4[symlink]"
-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/zstd/Manifest b/app-arch/zstd/Manifest
index 1bac9f2239b1..624a45b8d93b 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -7,8 +7,9 @@ DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e57
 EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
 EBUILD zstd-1.3.2.ebuild 1265 BLAKE2B f714674c9fec5168e389afd1733421bd91408f58ad7765bbdc5a461fe1ae3b584b452333d768031354d6f5b64f4fd7ed75df259c305cdad439f8f912083d4bde SHA512 4527e9019464671a27df4d76f77371e770a14d2e0420a433e63f77688146e5d2647cd95bbc38a5b0c05316c759f016eabef2a8b6338b406d83ee637b4497eea6
 EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
-EBUILD zstd-1.3.4-r1.ebuild 1325 BLAKE2B e16867df0ee22463eb70757f9885b66563a8d65d2b168a2e033c8da1b1b7d2a73eaa02b099dcf675c018777f7e4fdf790b2e4003007c5bf6cd0502a9aeb476bd SHA512 938354909f39a90a94c5505b3d3dcbe111ab7d408996439fec299c6e5e7c4381b057fbcce5ed31085552895f046dde3ae8feb288fed88af0881a9254a8b48459
+EBUILD zstd-1.3.4-r1.ebuild 1324 BLAKE2B 6c86407ab28db1104e64ff9cdb71be4ad556958dc78f0068f54a145163bcdbfd12fc9a6acb5a703fc0d7b4d15b2e9d89f2e7a11187ab367e703f43b653f4cdd8 SHA512 fad16dcc03b5572f69776711176d98699a770a51b9b4d19e0242fe5156186dff73cdb912c3fffdfc5f96f0826dfd03a034760e281f207c27512c0875ad9ea18c
 EBUILD zstd-1.3.4.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
 EBUILD zstd-1.3.6.ebuild 1331 BLAKE2B 615f69529c47cdced198d2e406d02fadd3b58da3e065196f236e4f414d665a78af4100c080327ec9f554af7a4affeb75c45e44b4e4cd46094a06d2c0cb9b2136 SHA512 61e7cf83bfd201b525032b7de744cd08d3ee6179dffb30c4b67b03fd8cedeb40dd5d41dfa95d74c201a873c294c43f121fb38c2197513a6517c52a37dd570779
+EBUILD zstd-1.3.7-r1.ebuild 1684 BLAKE2B 6da2ee9256414e143d6522fd80d7c374b54b95332b336bf95342cd059700e22e4878c6f055c88a33f3541716af8ba41012083d6b9dca64b9a61502f788480407 SHA512 fff293c4b04e42dae4deb773653af832d7d3f5cc5995d95bdda7aaf015c14534ad2d219f25408fb75cec0e19f65ba32553f03b5c8c68851edd2609a795c5e98e
 EBUILD zstd-1.3.7.ebuild 1331 BLAKE2B 615f69529c47cdced198d2e406d02fadd3b58da3e065196f236e4f414d665a78af4100c080327ec9f554af7a4affeb75c45e44b4e4cd46094a06d2c0cb9b2136 SHA512 61e7cf83bfd201b525032b7de744cd08d3ee6179dffb30c4b67b03fd8cedeb40dd5d41dfa95d74c201a873c294c43f121fb38c2197513a6517c52a37dd570779
 MISC metadata.xml 457 BLAKE2B d8251ae19e395d977bd88e72fc3c666e6d6a462a7a65db0f62fe3ba9831189f0f48e9457e04028b03dadbd4d099d0b051b313b626a3aaaeb1845cee636558b8a SHA512 801938d4394220ffe8df4d8198308b0d5651ebc198711a4af48d1e6dd9aaffdd7da030a8075bcbc7c3182403aea86e56a9ddc999dcfb2556496679d835a16058
diff --git a/app-arch/zstd/zstd-1.3.4-r1.ebuild b/app-arch/zstd/zstd-1.3.4-r1.ebuild
index 36ab42a5b0a1..50823c51fb2b 100644
--- a/app-arch/zstd/zstd-1.3.4-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..0882b2bed1d6
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.7-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="lz4 static-libs"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		libzstd libzstd.a libzstd.pc
+
+	if multilib_is_native_abi ; then
+		emake \
+			CC="$(tc-getCC)" \
+			AR="$(tc-getAR)" \
+			HAVE_LZ4=$(usex lz4 1 0) \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+		emake -C contrib/pzstd \
+			CC="$(tc-getCC)" \
+			CXX="$(tc-getCXX)" \
+			AR="$(tc-getAR)" \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	fi
+}
+
+multilib_src_install() {
+	emake -C lib \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	if multilib_is_native_abi ; then
+		emake -C programs \
+			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
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}