gentoo resync : 25.05.2018

12 files changed, 113 insertions, 13 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b76dd696664d..3daec37c8f56 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 3cb756822c97..e4e1af069326 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -4,5 +4,5 @@ DIST advancecomp-1.23.tar.gz 1288937 BLAKE2B 48044f8e896e29ec41518f50daee50bd10e
 DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
 EBUILD advancecomp-1.15.ebuild 919 BLAKE2B 765d9dc15ce846b70c0d29548b65343f8a47ebe8757e1881b38dba191aa1afeaaf7f1b975147e086712a5290031fda36b8400ac793dbec942a4aba1948c32060 SHA512 a4ef58fbf394c95cd311a27195480b7f054c46c8890ae7ecd3527969ebe8a060ef2081c1820ce8761796c9768e76d741ff3783aa98032b6587c98c51b2a382e1
 EBUILD advancecomp-1.23.ebuild 916 BLAKE2B 203186b5cfad20b2df8ea1ae4608b7b2290f3a6d2868581a6b3c373fffbe073266e84253e71a4d5db4afa9c1fd53affd74f285df385d5e247b26a4a63db377fa SHA512 0d103571a0f9d4d5d4a6144401e86e9e48dd293a9c4767250e7fa845b0da917e032340930edb4bc70b895ef5015f3f154dd20644c154dd55b9cbfd550fb70593
-EBUILD advancecomp-2.0.ebuild 916 BLAKE2B 203186b5cfad20b2df8ea1ae4608b7b2290f3a6d2868581a6b3c373fffbe073266e84253e71a4d5db4afa9c1fd53affd74f285df385d5e247b26a4a63db377fa SHA512 0d103571a0f9d4d5d4a6144401e86e9e48dd293a9c4767250e7fa845b0da917e032340930edb4bc70b895ef5015f3f154dd20644c154dd55b9cbfd550fb70593
+EBUILD advancecomp-2.0.ebuild 915 BLAKE2B 451c776fe4e417379ce26cbe1ec9f46bb26489178bee833249c26864dcc64131dfa42142c015926521323da3a4ac39c2ba8390c706e3ea6b982d189efe01f086 SHA512 90e5805a3f37c7e7d480d34ba565fea28af048dac3f7e1749e6f027d1e671ae718628936e25ab8696f64862094c83349710e748ed25aadc738db23eca2842eb5
 MISC metadata.xml 521 BLAKE2B 84acb45e5f88abc50bd2e45d1b03a98b62623c52a7ba5fe1a6b54cb6f481c6328418d23920b55fb570c633223a115a36b1c89992f95b9673c9986a449c1765be SHA512 48bd30d199f5dae792a18e564454c3bf6707767a15a752aaaa28e2f8507e0824ccc348a9478531d03db839176742f00beabc95f532540ded145b734d2f4b3c45
diff --git a/app-arch/advancecomp/advancecomp-2.0.ebuild b/app-arch/advancecomp/advancecomp-2.0.ebuild
index da4307230c37..02c4e4276dc0 100644
--- a/app-arch/advancecomp/advancecomp-2.0.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="mng png test"
 
 RDEPEND="app-arch/bzip2
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 3ae43c3c9fa4..9a434c405e40 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,3 +1,5 @@
+AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
+EBUILD alien-8.95-r1.ebuild 764 BLAKE2B 283f36f16148748575029629aae5bf8ac0cd67f5461bf4ca663ed0f4a6b5216a309e88d16f17f9a0b67072f031cfc3defa390e3539db7ecdb78c9569a4b62fc1 SHA512 a6c188dc13fd2773f88837172f42de118971927fc585708d0f06d14317583cf76e1ee14ed0fdd25fd9b112b46243f6685785012a59b6b1b92ab7cf28ae920a22
 EBUILD alien-8.95.ebuild 697 BLAKE2B c642f99017920dab03230135924cca52f059cf0722adaefebd50de977e805fd6185730f35f613d687d6d9706044021f8301de0d3873c16130185c18b2a9cdac6 SHA512 0b95e1e9168c109d4398191a78fc8946f5f93b91dd4c16a6f15d8dc9c8e92979315b82f92e8ec79c9adeada792bd094cbcae0dc76b1c0e91c37cacc20839e894
 MISC metadata.xml 299 BLAKE2B f0c85fbabcb5ea8dd194f3560a66469354932c2df8a09aacfa26eb980bf1b301ff1d59e5c5196e4014fc637b7f78361ab031930409509c4529a08e78c8d540b6 SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b
diff --git a/app-arch/alien/alien-8.95-r1.ebuild b/app-arch/alien/alien-8.95-r1.ebuild
new file mode 100644
index 000000000000..c088b5dc1813
--- /dev/null
+++ b/app-arch/alien/alien-8.95-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+bzip2"
+
+RDEPEND="
+	app-arch/rpm
+	app-arch/dpkg
+	dev-util/debhelper
+	>=app-arch/tar-1.14.91
+	bzip2? (
+		app-arch/bzip2
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-tar-extensions.patch" )
+
+src_prepare() {
+	default
+	sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
+		-i "${S}"/Makefile.PL || die "sed failed"
+}
diff --git a/app-arch/alien/files/alien-8.95-tar-extensions.patch b/app-arch/alien/files/alien-8.95-tar-extensions.patch
new file mode 100644
index 000000000000..4709fcc1c4f8
--- /dev/null
+++ b/app-arch/alien/files/alien-8.95-tar-extensions.patch
@@ -0,0 +1,25 @@
+From 01aabf053ea28308df87272cca79e645a9268fd7 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Fri, 1 Sep 2017 02:20:37 -0500
+Subject: [PATCH] add more tar extensions
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ Alien/Package/Tgz.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Alien/Package/Tgz.pm b/Alien/Package/Tgz.pm
+index 7ab6e8b..65a3d2d 100644
+--- a/Alien/Package/Tgz.pm
++++ b/Alien/Package/Tgz.pm
+@@ -11,7 +11,7 @@ use strict;
+ use base qw(Alien::Package);
+ use Cwd qw(abs_path);
+ 
+-my $tarext=qr/\.(?:tgz|tar(?:\.(?:gz|Z|z|bz|bz2))?|taz)$/;
++my $tarext=qr/\.(?:taz|tar(?:\.(?:bz|bz2|gz|Z|z|))?|tb2|tbz|tbz2|tZ|xpak)$/;
+ 
+ =head1 DESCRIPTION
+ 
+-- 
+2.14.0
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index da0fcf7a6ea2..5d0fe480127e 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -9,5 +9,5 @@ AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e
 AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 EBUILD bzip2-1.0.6-r8.ebuild 3016 BLAKE2B 1f48f0161c93dabc18beeab6f064b5ec44b901ca474525c3159c7859cafe3fd6207bafeb7254e763c5a9261f9d4b59271af564771d9201c00ecc408928154388 SHA512 b969bde987920cd44a90c4b89efc90f35f71c988852e0c623c38b461d8ec5ab9e969963aaf7b2177e5dad1fa4d0e0da7c61092527a5aebf2a6d17d5d6949bc85
-EBUILD bzip2-1.0.6-r9.ebuild 3061 BLAKE2B 9524a49b0eb6605bea586dccf9ff822e30e3b845239f4027126656e72f406657a8c1755a299e6638462a2195d652596cb0f220e21bc0b35b16ccf9b5d879abb4 SHA512 d0b6898314fe2498421a6f516ad5946dab295ca84459389a2dad32e5d09acf4e6806bd776d2100d10d5fb06f3d98ff1f0000d8420df84d988a46e7893566cdc1
+EBUILD bzip2-1.0.6-r9.ebuild 3058 BLAKE2B 84ef512a98f1829fc0fae2e6559ebb599c6531ba9a2ab202ed99a9c54ef6afb6c25f08335c9457934e4ae005224644c51a5d741bcefef14abcad92d4ab222a60 SHA512 38b452d940339af54541f23bfc2c36ce3e5b01f665acf76cbf158edbfc5aacec8e7e3c0940879d30e0979101b0af2dc12d944871034f87870e9e843d61fd60f3
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 35cf13b6d7b6..69a0d6fe4773 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index b8eec8a7022c..545b937c8ac7 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,10 +1,12 @@
 DIST lz4-1.7.5.tar.gz 208019 BLAKE2B a3d79d622eb0be2447cc6b0459bd81ae22b44ebe536ebd34b1c394bf1ff560c9b53e3f9203d5c94d046101a48d9b1ea7db74c39875d0a67b3a5f71d9633aa3b7 SHA512 b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295
 DIST lz4-1.8.0.tar.gz 222840 BLAKE2B 0b33f920f59a5ec9576051baa9ba887b320d424f8f64e1a752124371797d3f8bf2dbf13ee2e7268ef363d70697b8358e7ad627489c6843c61bdba004df80c5ec SHA512 aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535
 DIST lz4-1.8.1.2.tar.gz 228640 BLAKE2B e5e7176dcce5319e2dcb1f6d69c47749976fd7e8c53c2379bdd0ef4c6f60bf426b2b58d606407f69d0b91e6835c9740265299107d11554e7a13963cdc855e8e5 SHA512 f4ed450bc05477cc6c2b42e6fe1fbb1fb0907f1d05b68b1d69d975b555ddb385550f204258e6d91642e14ce373815141dc218cda03b711793935d5458bc45c7f
+DIST lz4-1.8.2.tar.gz 320742 BLAKE2B cd97b6a31a1f45d410d598af0b0b696b3ccc3ffdc4fd523316576ebc68e24e545b8ce359889b0dca1968b1c296cb69951617b91b49cbe8eb98cfdb9ce400803c SHA512 5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
 EBUILD lz4-1.8.0.ebuild 1058 BLAKE2B 3a3c63fd72df58c8e69c4e9981fe7e06f6dbdefd939b4638536898a407bb508ca7873ffa9d8b34bdea23523b52af3bd14571f4ae1b48e3c115f92465e4674f9b SHA512 ae91981fc93118aa57d261292412aac4141d04974e5358819b27dbeaca8902bb995e4439373d35b625e5c19b5f3cf50073e4c22c2293ab8c2390ad7ddaf3ccf7
 EBUILD lz4-1.8.1.2.ebuild 1068 BLAKE2B c29f13447c24f824d19816f9c8bd97e5be475a39ca4fc94c3dbabcf476779d1ce7177ebdf3cf97ec7ff899b7bb27b6867793ec5852b95b57093bafbad07d9a56 SHA512 e300a60ac5575a1fc16577efec351f886d98e7ecfa389098e72f4ec393fecf6b675caea554647eddf91edae1c0e01f2784602f4e94ac7fed5285a28801ef7cb6
+EBUILD lz4-1.8.2.ebuild 847 BLAKE2B d74ec14097136bb3e244bba53c6e0f60e9f0a261ff646ee0e47c6633f81238cb1f879db36fa482e8368580bceb35958a3337f96d12af9659601d737cdd20f4f6 SHA512 9a333c5d7d56e5f9d598ae04fabd812d703749b04d7e4b9f5fb247ade28099e82823e2bd85bea065af66820e6f42186ac49f4966ef279890b372111fc5abaf10
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
diff --git a/app-arch/lz4/lz4-1.8.2.ebuild b/app-arch/lz4/lz4-1.8.2.ebuild
new file mode 100644
index 000000000000..0fc870435ede
--- /dev/null
+++ b/app-arch/lz4/lz4-1.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	EGIT_BRANCH=dev
+else
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r131"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index a8ed282efbbf..583c6c577b34 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,3 +1,3 @@
 DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
-EBUILD unar-1.10.1.ebuild 1145 BLAKE2B 2ed53334ac8b07a4356b55491604a351cf7760ae90dbaf66d3496352f88f8b0a787a1796d6d4201ac0eedad6c8fb02181b68b58f5147d92cf267334eab590c16 SHA512 28741166d10ba1a7392107ab76f1246c3be0907c348cc0f20d58275fad6d281d55094fb819207e00c5f1e4e5c84c876269427e79ccba9edd30e605a52bbcc045
+EBUILD unar-1.10.1.ebuild 1169 BLAKE2B ebac22af794e9a19dba80156dfe96c912ddb27b163b485e884a3c9cb7a8e725c01f420f733cf216a5b19c97d50330144700b56f12426152f893d80e33f2cd261 SHA512 e8681f438331639273f32e52a9fd51f761b628584a75ad0792f42fecadde25cc5dbc175a647df031bbb1914b2f848feb1e60ce098e9a707287013ae727936492
 MISC metadata.xml 299 BLAKE2B e4ba80605afa425e3affada863a2816f561e3ac3a7eba58e6392df43b9772dbc8de406a660688c556a4ebcd48647722bbb1139b2016596901a34712b9a8d4a31 SHA512 6b3bfdb09755e678dc609356ff3819f66574af5718870ff7f2ca29a6f1a1c85e1cc781d713bd27ebc8ae2d44171efabd3a69202f3b1c75323c4f410136c2850f
diff --git a/app-arch/unar/unar-1.10.1.ebuild b/app-arch/unar/unar-1.10.1.ebuild
index b482d11dbaba..e81a5cd05425 100644
--- a/app-arch/unar/unar-1.10.1.ebuild
+++ b/app-arch/unar/unar-1.10.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -14,20 +14,24 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
-RDEPEND="gnustep-base/gnustep-base
+RDEPEND="
+	app-arch/bzip2:=
 	dev-libs/icu:=
-	sys-libs/zlib
-	app-arch/bzip2"
+	gnustep-base/gnustep-base
+	sys-libs/zlib:=
+"
 DEPEND="${RDEPEND}
 	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
-	sys-devel/gcc[objc]"
+	sys-devel/gcc[objc]
+"
 
 S="${WORKDIR}/The Unarchiver/XADMaster"
 
 src_prepare() {
+	default
 	# avoid jobserver warning, upstream bug:
 	# https://bitbucket.org/WAHa_06x36/theunarchiver/issues/918/dont-call-make-from-makefile
-	sed -i -e 's:make:$(MAKE):g' Makefile.linux
+	sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
 }
 
 src_compile() {