7 files changed, 74 insertions, 4 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f35615e33654..34939688c1cc 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index bbeda263cc7a..c9b4ce37a116 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,5 +1,5 @@
 DIST gcab-0.7.tar.xz 332248 BLAKE2B ef9c03b86c0e73b94286ff30dcc41c031a91dad0b124b601adda3ccaf5ae5924c4ea4408dcc52960b641e799e1c31e8ae882a205a3707c7a5dfa796036a00dbf SHA512 db8c0b4ee2bc75b8bb540b4fe0e9304782b9848b3ab0ba3077638d13cdec652f6178206ec6474af036fba90e952ef0052dd9d19be9eb72bae97d98f8f18a0c02
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 EBUILD gcab-0.7.ebuild 941 BLAKE2B c84ecf6ad2a57bf19225046f239d0c185b80325476f6f55e68182bad2bd2b5f07c59ce0df83d959ff569da40fd5850b0d09375d6f082a88760794f79c4e6bb76 SHA512 e7cd50ae66c96e9d671ea9fe72074c7b0d0031efaa2819ec6629079de12abde02e12e13117f22d728cf642e653a5a4be974173fdff599c3aa7eb75442c32e729
-EBUILD gcab-0.8.ebuild 932 BLAKE2B f77a95039e5b1cb287fe4f65b66bbed84dd5f4831ac74ff9223a7676bd4cdf4b108f9a20e99aec0601f41fdba0c8860e0aa154233f4e64c36b84cad3479fbd65 SHA512 fcaee2a2b8c2530d5df5215166d4dd0eeaeba64f8a22230044f07b1ea1017a5b4e7288c50b29c6ec1e1587e934b404ad345449295851c02aeb6c853191cd1749
+EBUILD gcab-0.8.ebuild 929 BLAKE2B e12fde624c46663de83a2dc939775e3e7fdcd3aa9f0fc7a51db922d182bcfcbfdd48e4535025fb241aefa6567d8ec41b853931c07e5b7a5e38ca2bccd178d9ac SHA512 e1a54670519578814cf03c30cb70707ddd30142b06ce560f2a886cf64ccfe74415670614b191eca04a2c38bf8836e154efd74a0dd614202349a86cfc716a8286
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
index 5de14060ae19..71c089ebc8da 100644
--- a/app-arch/gcab/gcab-0.8.ebuild
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index 82fb2bd72fc0..3159e3a1a962 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -2,6 +2,6 @@ AUX no.in_path.patch 1341 BLAKE2B 7ec890361f9c7a30b5b60682773bbdfbf2eed2d6de19de
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
 DIST adflib.zip 254914 BLAKE2B 9683ea4edbeb7254e0c162140063e2aa53e183aba31b4b7bf1ab498a5bb218ae687a54d87e50cc2b15e5725a2f77c16e9ca4dba23b5d5a373f513747839055a9 SHA512 fe8edf5247ba82e475f62f96fcb72d50bf80641e14e957c99694def98735eb327a67208e3460504a0d109c9497d6e81f0cd8ce07ddc73486adc9e7070a75074a
-EBUILD unadf-0.7.12-r1.ebuild 712 BLAKE2B d3b7c30a3646c35f0c231f0ebb28a4e2ed615a61f061e250217569421c0f3384aff24d5f7103525fcec6d08aff2f380490a38e3851f1978eb36e9616d973b1f8 SHA512 5f7f95bc553a624af88bb31bb87fda728ac3a1a9042d76e4fdccceee2fd7c665d83b29ace890e581555760a0fc8ad5840dbb1338a4622fba21303cb88d20521f
+EBUILD unadf-0.7.12-r1.ebuild 711 BLAKE2B 3f5f4f4ce0b60f1cc8e5f52b12b52ce83159bb12286613eae5360d3b5145324da315fa0eb719289dbb275619c70a1726a3aa152db80a2432eef7a00f6bbe0b44 SHA512 8fdca2e22a57466c677457a56124ffece2f87578b97b70b8d3e2faba0b8062c31a6ab2505a47309e021e83dddc15c3f1fc62335d6d105e1382742c66019fc62a
 EBUILD unadf-0.7.9b.ebuild 875 BLAKE2B 9df1ceefc07e087ebf0b5f5f5a99963fe19cf1a391eda0036a9950b5bc6af080cc4c8f4257fe83bcb4424f9c2562a5ed83903f2f7f854adf31724e71075b39ec SHA512 be619ea1d383e7279313c45c2cdd77aa32854962c04a1693bf99488ed9032c6de2b4a84ad0211d3358989cb68d9f8637bba5e625fab9fe3ee4ccc15d692a8f1a
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-arch/unadf/unadf-0.7.12-r1.ebuild b/app-arch/unadf/unadf-0.7.12-r1.ebuild
index fb1aed5c2ad7..1bbe4e3b7be6 100644
--- a/app-arch/unadf/unadf-0.7.12-r1.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 3f16d6e132be..7ab47bf81bc7 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,9 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 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
+DIST unrar-5.6.3.tar.gz 225788 BLAKE2B 8baf99ef85052a395fe0f2daed41803587e7d839949488eb3430e3d3a3dbca30ef894530d5ef40757f7ea2ffdfb2d493e8e13d7322e65885cf03f8fa0859b804 SHA512 cd3c97d357242a91917cdd9ee6898527829bff73dd187e58d7490d0d0ed5ffd8f8db651ce63d4bd8307c6a085fa95d72faa7b0cf1348bba191086136232a98fc
 EBUILD unrar-5.5.8.ebuild 1862 BLAKE2B 0b70c50aac539ba810e1764dc0baf9e7eb69a049d48f3eae43e8cc4d1754b3b728ae1a4d8903f8e7a95f0f9429394e85766a34b20b4a54f1355fab7eba64eb86 SHA512 9fc24eb6ed0aa9b333eb6369c529acc062ea89ac95a943b7b7553f69dd0767eadd7e1a6af13a34b62e4717d8996f010c9f6af997b44df134cce4770c48f32fd3
 EBUILD unrar-5.6.1.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
 EBUILD unrar-5.6.2.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
+EBUILD unrar-5.6.3.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.6.3.ebuild b/app-arch/unrar/unrar-5.6.3.ebuild
new file mode 100644
index 000000000000..78288603ed4f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}