20 files changed, 191 insertions, 366 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c0f6b19c6175..2567e7b9456b 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index fce7c1c4f994..bf11fd113626 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,14 +1,6 @@
-AUX dpkg-1.17.0-gzip-rsyncable.patch 291 BLAKE2B 0b24353ccd186a65ada8e74149864ee9ba5c3069ffefc82d0c97c1bef1d9e93f0ccf3b15e356c0c8275019c7c2d9e4630a335d71ad4902c1993266944c3dffb7 SHA512 c7e0d0f1417afe9bd76bcac7f1f54a775a2a328db558a4431580a4854a436fe1a054840284fb92d22bdcfd266cf5cca71a00e94f47379c9a1862eadad908ed5a
-AUX dpkg-1.17.1-flags.patch 300 BLAKE2B 5ec2c9ffda2450ccc8afd59a9d931a6ea8e61838efbd5afc658ff7b9c6dff4ec8f48f229e7028b0e625b8f0cc3bc350b5246c548b7acefbeee0d33bb242cf1d7 SHA512 6dbede2fdde0e28f5e66d77f694a8aabe55b1395ba6a8d26a4808bbe2909cda00946c21a513bbe60b68e76f5669ef08139c72c036f9a16c095e7d702483ed9f4
 AUX dpkg-1.18.12-dpkg_buildpackage-test.patch 215 BLAKE2B 9890d9f9bf0f2229f73d5639f1118fe32426485a6056c43cb4f443c3fa143a915c4a84ac6f484d2a1a1ad813344b9765d809b6e18cdc35191aca2151783e00a0 SHA512 c31aa285a9d896ea313ce7d04a959767811019781fb747714630d91b56c631557ea64716e6c0ff20f6f60da67ff8c143cc8697d7b482a2e387ca4712908d9154
 AUX dpkg-1.18.12-flags.patch 416 BLAKE2B c7fe40b28793420afa0b895585cc14a675f9be68784beef7965fe6e971f6b2d6ecaa7c8bae51bb9f774c9517a618bff85b723052360224952cbdd2b74759b42e SHA512 6c86e8519ab4a05a2c15a658f41c0da14429c4fba0fcd364426afce7db03cd886a69de3f04f167d0f7b6d36a05252455864c11b14f58baab0a4536249331369c
 AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919fbc3ee5e2837540f91cf80229e669a6fe24d6de1c4bd1c1debdc34a0c04a2bbc6a21eb964032f24526986678eb1b14 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae
-DIST dpkg_1.17.26.tar.xz 4410860 BLAKE2B ebb4676afc981ec3f08e4c6f2b7bd6ca6951051cfafb2b3cda4b7cad3d05b1ad8a947d5554338d6397bdc1d61f6684c6ed3f597b7d88822ce5bb45a98ba396d2 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538
-DIST dpkg_1.18.18.tar.xz 4501988 BLAKE2B 62133cefc40ef3668837906a014cbb12f007402105c6b182d13f6b522af2350af6fe3b4f3dfda1865fa1742da70cb384f4bec4dc897aedfce23ce379dec41c48 SHA512 7682c8ac523ff710acd6742b9a884ed8ec8537e3b38496f871f112fdfd2f874af6d676cfef2d31d2474c5637df043838c814ef4038097b009cf06b3d4e66029c
-DIST dpkg_1.19.0.4.tar.xz 4559160 BLAKE2B 544927e07443ca6ba4c1c965e08940aeee1c61ce689a6c3819f78e900e167becafbc1c9845211cd49ffcf05ebe0149a43df1debb857d899c33657157ef642ebd SHA512 3452889a0b5820372a9dd919becff694d4814f12a77b633f0c5f75f2a3bf6c883894b11dcc93e3be591bec42e15ae9824c2496c470962691759525f6aa42f250
 DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
-EBUILD dpkg-1.17.26.ebuild 2370 BLAKE2B da683d7db12e5f67733ad3c2c7436d3582629e8468f37afa883c9ec018691dd7548654611c11cc673a6f8bdd6641131e1b45d0844215344c27b308b211480445 SHA512 5799c29b185f008856ce1480bbb06ba350159562f6de042c7660723f02c60c2ce40d7223bcc6dd45fe11486423cab16c7ff34b5758a4e60bb32dc757d63992ae
-EBUILD dpkg-1.18.18.ebuild 1846 BLAKE2B dee5063b678be9ac8e5d4d0978a2c6658b19a2f0f4d2c49770b11c0af6f47655c90cd4b7f52f6888255c2604c3f0c6ae6155a7f0e2d9caa79ff1f5be9808081f SHA512 54440e27a9079754b2667a3321c3828596be222bf43d829accad90b0c48424349d1644f188efe7e83b0f199e9fe1e783738306f9373e032b06d3f1c4fcaee15f
-EBUILD dpkg-1.19.0.4.ebuild 1854 BLAKE2B 819c4a7e9c03b9f36dcc6c5e61635ae5a6e35824bc10a678ea653844d00bf9b4bb3bf25dfbcaec6dbefc77d592d200d822f59e7b050c2ddbb9da27c6ec68e617 SHA512 8e33864cf024978a2c1dd44e9e3cdb8ef24d75a0e13e74964737ffc788555f8ad0d51cbeec91be2b2ce1f11c329d7d9355899119133d47e930a5156cd4aa4492
 EBUILD dpkg-1.19.0.5.ebuild 1845 BLAKE2B b6320665601e48f808499ad616aec40b0c7be70673561120eb963065e87a05f1f2e8e0f1fccedcd80fdcc98ff7239a07e7f9ee75396288058521099af94189f6 SHA512 54b06dd32e8a95fffb89a3f8e160d4156002fa51d02fb8648966eadfdc9e43d999dfb6d42c4eabc68f4b8c64b73c171221c1de3154b06e1ce180739a35e66f13
 MISC metadata.xml 339 BLAKE2B e4de06c58c3013dcb9ca8065c85811113f04df7c75283e405ea8670c8323eda1488d662b8281a4afed93795ee038ec6c4a4b5eb08316d4472913e08a67a03060 SHA512 c3fbabc925c3e99f26c6441cdea9626dc93520f2a8d3c5e45bfa7e51d42095295624f0f82377240f0c11580a9eccc5b5b15bf149ce6cfa36960e52f8c77aa61b
diff --git a/app-arch/dpkg/dpkg-1.17.26.ebuild b/app-arch/dpkg/dpkg-1.17.26.ebuild
deleted file mode 100644
index b967679f9315..000000000000
--- a/app-arch/dpkg/dpkg-1.17.26.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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:0=
-	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
deleted file mode 100644
index 7a0b17c77758..000000000000
--- a/app-arch/dpkg/dpkg-1.18.18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.19.0.4.ebuild b/app-arch/dpkg/dpkg-1.19.0.4.ebuild
deleted file mode 100644
index 88cfc19ca527..000000000000
--- a/app-arch/dpkg/dpkg-1.19.0.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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
deleted file mode 100644
index f956ca590ce7..000000000000
--- a/app-arch/dpkg/files/dpkg-1.17.0-gzip-rsyncable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 9517714fa41b..000000000000
--- a/app-arch/dpkg/files/dpkg-1.17.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/file-roller/Manifest b/app-arch/file-roller/Manifest
index 7812d2061e03..8319f7224620 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,4 +1,4 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
 DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
-EBUILD file-roller-3.24.1.ebuild 2223 BLAKE2B a1d82e9e382095697fd75e0d180c8629fd64f27b7fb18a7ddf38912018e2856f05251aee55962e9212965d4bfd9fb307627f4895350cafd67b7afe5b16e96594 SHA512 d1ffae59e371bc1f01f7e487039a13437e3afaec545e69266693c05a2b0219d5075af9c9111ace747eef1029c8d6fd3fb824f6c378a4b4678be6cad59f872b85
+EBUILD file-roller-3.24.1.ebuild 2230 BLAKE2B c0c185067dcd9ddfe7603008161fc8f0dadf5cc533858f6e487ed276cf369c47365fc5d69576d2a8af023aee754f020422a482e47aa8e5e33879c3798d773137 SHA512 23acd0e0fa8385230550b50ffc77b4e7185749840a1b49cedafa1ca9f7f5d8eabdb1d2c9fcd69459baa6465675e9fc7c1bfc6a2cbfe7805351d06589edd6f38e
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.24.1.ebuild
index 61e1a7c6e37d..e916e5b37d95 100644
--- a/app-arch/file-roller/file-roller-3.24.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.24.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest
index 5b72c386931a..ef22b41fc38b 100644
--- a/app-arch/pdv/Manifest
+++ b/app-arch/pdv/Manifest
@@ -4,6 +4,5 @@ AUX pdv-1.5.1-no-strip.patch 419 BLAKE2B 94d963ecc43585f6d2d359a8cf23f6ecaf12d19
 AUX pdv-1.5.1-opt.patch 696 BLAKE2B 83503bcba43c43f06e2e60791a0b4166c994206d767d35c7bd541204f00ae4777e1cfe31acef0d28fbd7c5d8c23d70fff13553a0e2bee0b1379860b8a68fa18e SHA512 bbe6cece336f649970227a577d17835b401262e9d6021a61d97dee69972826466b720e5f9b60d552d84e1223003fcf047314390afdf48e07f4b2c55868caf599
 AUX pdv-1.5.1-x-config.patch 529 BLAKE2B cbdec2a9d9a512534ea5be14a2557d7cb0d89da8732adfd77b48de0a6881473ea95a9e5472f8efc8dce18aa55a28337921b06ef8bb8ad14dffc734ef0d822212 SHA512 7be234893169656537c15a124d5a50de138e85d2d23ab5884d600399f3aba86724ebac397846d03992a4556e7ca8a8ba42f5cf8c3e4348080e4c9e0522e05cb6
 DIST pdv-1.5.1.tar.gz 87858 BLAKE2B b0397e177803ed57a69fd69a331b61743379be5ff4272fa5b03012856e9bf5a671e67701215964aabf8d57836da350bf66db20c81985e5f6949bbc9cafbda11c SHA512 c8db9aa4c29016474d33111e8343174a1fb25f152517bceb29428def5e02590b1de523ffcf2c0f6ffbaec5b357e3893f48188775c2e66d343a21e04343b1d0e9
-EBUILD pdv-1.5.1-r2.ebuild 1398 BLAKE2B b2423567f3b5e38241609ad251805081162cdb503b920ed01243383e94b673228d6263db46f4fadc6d316555481872ec669409dd4db1d280dd35e671d76ca330 SHA512 87006fb001ea0882103fd48688daab37eb5f33f755e7d5849dd35533950f62ea78a85799ee58e73ee6a1ccca0725b63fc1fefbd6eae7e0481761524dc9c3dc34
-EBUILD pdv-1.5.1-r3.ebuild 1423 BLAKE2B 99850f6111a414ba7f7d3375d8fe78580946ca1dccabe6e7db5085fcbba6c291f225162e3922af980ce05bc7fff91838304000a933769a3609340445e862e805 SHA512 d719bc05e23c2293b885084d1d4de9faa99dfa52c33b345135cd5b362e940a0995aad5b9062d6a28d7e4bbde7b45c154bfadb5e8ff9b33a72ac2f031266ef926
+EBUILD pdv-1.5.1-r3.ebuild 1420 BLAKE2B a2185d1edcc325de5b26f1dfc33c0d6d6dfc91c2d6c59da038ec07c8655e6ad0ad69ce5abfa820c0c5e686bb5b289c22e89b8d5c88ff916690bcb03582edac55 SHA512 f52996ffa01d64ec5e883250187a4ea351f7d411fc5ad6cd0208707554a807a93b01b4304fcf787dcba26020c01fb7fe26326cad3aef037c5a0fb1e877ae11fa
 MISC metadata.xml 368 BLAKE2B 2e8f5fb6b3f8549f4ab592d8fa60bc700c0c646115c381deebe95c8f9bb0461b5cb7d88d2e49a983fb70393a799713658d4e7dca01c23609cb645e6972823c9b SHA512 99c932094f434a6fff58492ce7bd1e2195bd6c7bfd69dc3dcfd46b8ef2ce0111dfb56a679b6e696b02a8333f1a6459ed107ac6226bb8b9624fea009a74bdd488
diff --git a/app-arch/pdv/pdv-1.5.1-r2.ebuild b/app-arch/pdv/pdv-1.5.1-r2.ebuild
deleted file mode 100644
index 509ae0fa82cb..000000000000
--- a/app-arch/pdv/pdv-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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/pdv/pdv-1.5.1-r3.ebuild b/app-arch/pdv/pdv-1.5.1-r3.ebuild
index c865fa967985..8b712196c4de 100644
--- a/app-arch/pdv/pdv-1.5.1-r3.ebuild
+++ b/app-arch/pdv/pdv-1.5.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos"
 IUSE="X"
 
 DEPEND="
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 1a5177d76b4d..2259a6ba18c4 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,13 @@
 DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
 DIST rarlinux-5.6.0_beta1_p20180311.tar.gz 551336 BLAKE2B d56bc53f729641cbf5cbc7b4abf9b3260e164e7cbf37e1faa227736456fff00d418699d05d628c5dfa0bf8517aa2c181a231e520e7c66c37288707808526d3d2 SHA512 9061ad96f8c933f942eb9e7d383a38b7056895ff542fdc26980f4d1140180f7a5c21ed288d4068edd0b25898645ff7977aad4b646882f5f8f57bbb8b89a40bd2
+DIST rarlinux-5.6.0_beta2_p20180331.tar.gz 551421 BLAKE2B 150b3a46b3230d6be39d25ed7d26894402abf879c45160e2003cb678cabf42f89dd58e4e61cdde27d5c4c2e14d2d83c30d1d9614be2a7ab6e2f86661057940fc SHA512 d07824c3604122451e7482960a48f7ff50cdc6450b223c5ff5b22880f909215d7842ef538138156bc19d64e93b0cc74521ab8b6d97573d9e44cc754267ee3949
 DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
 DIST rarlinux-x64-5.6.0_beta1_p20180311.tar.gz 540817 BLAKE2B 4ea8121df7dc57880cb148a8bf81c69b596011d3bfe462c90aaf9da4ce26d3fac1eb16324c55aaf79380f604493b9ecba1a1ed5ada76f76df1d9a1b97d522af3 SHA512 ca6624bdf55fe732a3aac18733b3ea35a519567474a49f549c27272a0107b60fa93ee16e0e49d5822d4fa33b11c355f67b047c42ed0393ef3a9d840eb8b4c783
+DIST rarlinux-x64-5.6.0_beta2_p20180331.tar.gz 540942 BLAKE2B b52dda0a52442c8aca930d800f4c3e6d69356a3265cc64f0b1e974fe61c463aeffbbc0fe2ae455426f2727dd71c12df473e78b42200ef2f25cd683e1259e8554 SHA512 117cdc30b8c1aef8784773160bd641cd3e6698a35f7c83c13cfe9a23784cef67fdf62f2f828101bb04cae58beb00ad0851ed89a73e0a77d703220d3f44d12bd5
 DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
 DIST winrar-x64-5.6.0_beta1_p20180311.exe 3186432 BLAKE2B 13063c52488f3a1e1d6a9f0b85761194d14feb549aede1c8653351cce8527794c88a37b177988328ac2293cf993848e1b0b4865a6f0adeef7c49a33a71f2f366 SHA512 2af5dabd88a0a70bdc2ffdbb1488e6b0b1c4cbe52d91bef86991c40b31fd8ef7482f47c134a13197798366eceee7ae6f8d39e0ef3660245ee89265cb65d43ffe
+DIST winrar-x64-5.6.0_beta2_p20180331.exe 3185320 BLAKE2B a3a859d57a72d92df8c752358184dd41fb59303b52c2d47f155d727b6555bba24a67b1a801a7b5e3653d27b6f72b4c1f05cd03cf02af6432845551f3052be753 SHA512 8b4cfa1db475edbb71464ae890c1f23b699637a17a0abd40145e396097888b8fe3e057b05a6fd20dd287494985f291ee3f717acb6fd9478752859221694ab6f7
 EBUILD rar-5.5.0_p20170811.ebuild 2281 BLAKE2B 936018068fa7ea883561da7ce0a3919b54c6ee8ab3d67522cf072be3627baa01bd2872b84f3a8b25100a4e76a165270e81281cc93730969d9688d61b97f64347 SHA512 aa68c6bc07bca69dc599dfd7553bdcd23f884fcf353ea6ceecd1c0822f799016d2958eb75bcbe937c10352bf1aab7d60bd8b6f6934244fd842d01da749f6dd28
 EBUILD rar-5.6.0_beta1_p20180311.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
+EBUILD rar-5.6.0_beta2_p20180331.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.6.0_beta2_p20180331.ebuild b/app-arch/rar/rar-5.6.0_beta2_p20180331.ebuild
new file mode 100644
index 000000000000..182140ef84a4
--- /dev/null
+++ b/app-arch/rar/rar-5.6.0_beta2_p20180331.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="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/unace/Manifest b/app-arch/unace/Manifest
index 3d46e551b57a..215210d160af 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -4,5 +4,5 @@ DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
 EBUILD unace-2.5-r3.ebuild 737 BLAKE2B 01bfcd31d54fd225a0adbe86203ec7a7c615bacc9ed27496511181313d0f68f942f15bb4240cde22fbfc7bcb031e6a34ab0969b43d4ebc190ce7a8d5c4c8a04e SHA512 5fae9bb1a6c8ab462faf143282a2276f1d523a28a20b3d4e73e417e1ef5b47b2fee88f66b065456d54b2e03a27f5ed5470ebd15d1646a8c28c47730306307ab1
 EBUILD unace-2.5-r4.ebuild 745 BLAKE2B 1670cffdd677a2ed4890852a7e132e98221a8c89e6b094b83e0bb4d26244a6001bbd8dde7a703c0f5da6e17df99e39dc176072f7e0e657078f65e262ec8447f7 SHA512 98543d7914ec4c5113585018750f5cbb4bcc0f5e16c30b19c017cfa09fb4f6c525610065e79f49c73901491f67308212919275d3548c9241e3342a4a97f81230
-EBUILD unace-2.5-r5.ebuild 683 BLAKE2B 4d8f36324727ffdbc20a95701089b0973d03ddafff1241ddecaaf316f5dfa6f62430310784b84d9367aaabe40b96ce522ab6d871a7f6b044402b63c14f65ee40 SHA512 4edfaf618b498d3f418b9a5a4e599962cdebe4b08068ef8b6c8a68155cdcc5fc8aa636eeaa05a7bed9c9b75d6659c0b59d40db0cf0b0a86458d5ccb98d9cfced
+EBUILD unace-2.5-r5.ebuild 680 BLAKE2B d32fc448a7d15865f4401d97259884310d32d705f906fad76cb614c071fdbbfc51ce07371f4355fb2306d86e6f6abb866b516369bb2077083b439f71ac208e52 SHA512 37dfc24995e4bf62c4c8935f6dee2a09d5bc4a81649fedfcb061fa643f1802697cde4ea23a2326b5ff7dca1da80793ccb36d097943726b5e2a79cda1c7b487d8
 MISC metadata.xml 334 BLAKE2B 70154980d5673f6a7b222729a9d122d52b6a9eeb273105a0a99f8c8a334f9b2ce7b723e0055de15205177da6c833a989c5c19c60a551e9df9041e559096b53ea SHA512 13504f823b15124d38de0d351767169e9b51ed0f397175b3bb59ee7c16684c494d1adf2dc2be5cdea91e2f9186c5e318ee514d37b821eeec73f9f14ed5d731c4
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r5.ebuild
index a7fbd70ded45..ee6cbf130be6 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.
 
 LICENSE="freedist"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 PATCHES=( "${WORKDIR}"/debian/patches/ )
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index bde2997269c8..9e8d822fd11f 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,6 +2,8 @@ AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
 DIST unrar-5.6.1.tar.gz 225408 BLAKE2B 1b4cef7b55dec0658d4eca09e9dc933ed1ad10d87dabe3626a01974bddb51dabf89c39f2db200cbe4388a682c0a756c720d116b9654e4539bfca1658396d0768 SHA512 62f37f9e3deb86651c92832190fa27a8e4490084c6a95f42e8a5f5668fbc7aafd9c273a2c60683c3534b614e0ca44b20d18598296f67edb0812850a50b807e77
+DIST unrar-5.6.2.tar.gz 225677 BLAKE2B a8eaf1ca3262caedb1f1a44109d26e688208d62c2424b476e40b90406be8d6274073bae4f1963b0f7eec4e978a25347b36be8561e74143c6a6ce84e2c4956130 SHA512 67f958330bc58fecc2fde3a16073bb44b61b5fd4a0ff19c5e345ce830a1ff3f00f3fb2507455912b7b3252804b9d27a92c4469f31513337569fed298d6af7655
 EBUILD unrar-5.5.8.ebuild 1860 BLAKE2B 05707ae5839ec56d2f6238a68fbd52749809e32484bb251a6691191507776996561ac0febf1efad0de6c16bdb82b67ae5f49517b55604953267b7fbae4f347eb SHA512 0f7e829f935d4ad1417b733e384bb9332e12397c18a458c0c456021ce7350862862ac39afa1857faefb013745b0ae823b8d624523f2e3c24d5d27278aa3e650d
 EBUILD unrar-5.6.1.ebuild 1869 BLAKE2B 702bb407612b4c273d486f049c1e130bf6065ac7b11ee269d33822052898b5c7202c7493122015b77bf5389ca4e9f14d88ebd130055bf1d5a8945e4a3c82c371 SHA512 207b7433322a4b96fc1d7d7d33ef093fe199f4457fd7fee2f0a61cd41d373c08a20e5bd61f4c4a175b24d578be4640487af647932aea1ddba99ea1f49d04ce2a
+EBUILD unrar-5.6.2.ebuild 1869 BLAKE2B 702bb407612b4c273d486f049c1e130bf6065ac7b11ee269d33822052898b5c7202c7493122015b77bf5389ca4e9f14d88ebd130055bf1d5a8945e4a3c82c371 SHA512 207b7433322a4b96fc1d7d7d33ef093fe199f4457fd7fee2f0a61cd41d373c08a20e5bd61f4c4a175b24d578be4640487af647932aea1ddba99ea1f49d04ce2a
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.6.2.ebuild b/app-arch/unrar/unrar-5.6.2.ebuild
new file mode 100644
index 000000000000..a5e2977fed6f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="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/xar/Manifest b/app-arch/xar/Manifest
index 4b60b82f0bcd..966d8958ec04 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -8,6 +8,6 @@ DIST xar-1.6.1.tar.gz 180771 BLAKE2B efc15995941b7240486a02cad736981e4881dac8a57
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 EBUILD xar-1.5.2-r1.ebuild 798 BLAKE2B cf559675c085e7f4f2b97a3496aab0aaa468ffc2f35a68cb94a686526ae0dd90ab96e92ff452226b678c02709e2b9c4fef78735bc7ba82909c6b43dd24c38634 SHA512 e5e8f4b9ddb93e892cc2c4072cb97d3204758b2957aceb0f6268edf525a7ba980f3d121705902bc9a7d51f2660f91fc86521db213aa2cadaf237d4c07765b8dc
 EBUILD xar-1.6.1-r1.ebuild 795 BLAKE2B d4df3b81faa611d51fb4006dca04417cd8b1c91d6566fc2a306f0dca40d08081a1184bb378b0e2a0305562f197ebdbf5e9b23ef3311b9510f156c8e9abc69172 SHA512 8dffdbbbaf6519f6ec5cb69fd1f944f845c3c41d999b281bf66440c2a76fef08604aa5320f6042f30553d43fca1efe6713616f17ce1f5bd47148237d57ceb7e4
-EBUILD xar-1.8-r1.ebuild 1210 BLAKE2B bf406e7c1740a4ee0005d3a1708b15a89f69aed25b4534d9e5a132f838eb218e46a04198d0e2d55a1617d251800c4a7b3be9cba0573b853157993bbe71daa690 SHA512 3a12cdd7ef418a2e0d3d814b2390de54953d57a0dc20c26a2a74c63db831b0934a2c0ad30980542fcc9326a056af4f0356dac58854f9f84cd18d2e850d7dcef2
+EBUILD xar-1.8-r1.ebuild 1208 BLAKE2B 4cdeb84cb00efe92a98afccfb4b3fe6d429b1456a7d1a275b5d2e3155e1373574735ccf176c0df7514a43aa50e5b45946cd10868116c9db4ca1dbf736f9b00d2 SHA512 9261fd405f79ebcec4b9dab0d865fbe531945d297573bdf77603f0bf26216191ba483b570cdc521c4ce44c15e205a1feacedf8940e311aaab5e3e6690a9b70f5
 EBUILD xar-1.8.ebuild 1162 BLAKE2B 91a94417a7cc057a4df9ba6ee2bce98b9972fc0d7a2f0dbdd083cf0c37ab8ad88ef5710c995eb7edf212e2fcc3629f4b3dc1dcc63e28e0a1633631af769270b6 SHA512 afeca9c84293c6c08c8b9d2e7169e9159befe58f5cb8cf4d10a9a5f448baf91ccbe92d677e4f3461eb456c76d6af09befbb956b697c58fe8a8be3f1609bd754a
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r1.ebuild b/app-arch/xar/xar-1.8-r1.ebuild
index 4156c54127cb..ffacd4497029 100644
--- a/app-arch/xar/xar-1.8-r1.ebuild
+++ b/app-arch/xar/xar-1.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="