gentoo resync : 07.10.2018

3 files changed, 73 insertions, 3 deletions

diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index addfa3e9c424..dd4f18f221f0 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.5.tar.gz 226296 BLAKE2B c35dfdc10976ee2a7827f9386021f79af6712ae3a6641e83934ef7223e1202c46c59e12d2b78abe230c3f929f2228fe8c0664f05275b905ea06806a02cd685aa SHA512 984340935671913b4d2a765db5c4edc0d08d859fc43f3ae0e97e681c4ea302a51808fefa8c11c3aeecad1c2681541f363c5051813d978b5b14959c2e55f71281
 DIST unrar-5.6.6.tar.gz 226484 BLAKE2B f5facddd5c326c039c02b31ac28ba86d5417a51d00a463da1c6fbb714856ffb275defbe400a0d56a21850c754f06eda615fcab983a206f335422503d76f11427 SHA512 1e1e9dc2ed104ab7819d11ad2249780a4320cb30f3c427ea1669c3769fa3a8369841711a2d46d918049659bc67b2cd7dc7560a12127d810a57614293c24fe25a
+DIST unrar-5.6.7.tar.gz 226579 BLAKE2B 32b6e70539e4ba0a09bac5eaf880ce555a1012516ba6f439060e6604b5274b17e3f5c8dfa721999243eda64fa9b1b53eda95f7b9df11320ade1873bf665ee3c0 SHA512 2c102fdc2f1a924a57c5492b966b0e1d0035bc3de2a78a46733f300d412ff9983fc5c717856faeb21e71c4bd090296e57e5b87888190867eb3c41f62550647e9
 EBUILD unrar-5.5.8.ebuild 1851 BLAKE2B 68be65e1df26e7a21690e7f2fae539cb2314fec884ea62be47e8f7008cfdddc47e8ef097b41017e8c68c2a7fbc385bbada86715b3bc06a61e5635d3201fe0627 SHA512 dee6fd8a3d7dc51a1162aab23d9031b5524b74aa9fa1b50275a8b4a5b0524439277daffbfa062bec4c6622356232882eca023542da766db4af57789a853a4e4d
 EBUILD unrar-5.6.5.ebuild 1860 BLAKE2B f88156419bf1bdd826b64d9e3f7bfaf0adb8eaf740d056e1a8019fa000dbab6511eaa4d24480601f9c2f1c1d6bb88c5fc6e63669ade5104bb61b2b493f10d8a9 SHA512 6df34351e21f462a334b27d361ea3e6baf9a736ec29e9b21baa98d503761b508626ff18e8e28f81da1d1cd08ac807360f792dab428b3e9920d8cb500e73c5543
-EBUILD unrar-5.6.6.ebuild 1851 BLAKE2B d4ab091a3e942be9c5fbc6eab230fad46e7a9576d1acce95f23f61b18ac9ba6fe4999803f25e7ae028807a9d65f6f97db5fd2b913d088e2efd41e814cc1711cb SHA512 2c5fa5fe23538fb0f775145817ba34cb730c4ab102079f410f212efabb80025632279a18b6aaa727e052de9c4bd680a7a6cb39aade3290979d0418892ce6717a
+EBUILD unrar-5.6.6.ebuild 1845 BLAKE2B 54766c25151e25f7e0c5e8c671b98ca9a2e6a420b40489bbb9ca392a75bdd3724bb4dd3e803364c6cd7885497175875f45bef7bdc953eccda7e7774ac6271c16 SHA512 25299b8fcbe59cea8f6ac92376412da2497f4e515d62f716714aa2ebd1e36ab4a20a1eb0f0e676ab0b7326dc2e8d8fcd399467ca713e555453ab271645620dee
+EBUILD unrar-5.6.7.ebuild 1852 BLAKE2B 70e7e9f58a06b2c726b2d227dd32045e10a5a36ff6a7a74550d8697472d9cf78913f2539f7c114b718367aa79053d75565f3906f81cf08c5096847b5fc38e5ac SHA512 d82cc2a9e8f3b46df705ebe5a897cd005ebfeb814b2dd095c8abe5485a6e3c0f6ff9f2a1da3cf6773f94099b1af7768ddcb2129553187fb2441d98be5bfc811b
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.6.6.ebuild b/app-arch/unrar/unrar-5.6.6.ebuild
index ce463cfa5935..3b12004604d2 100644
--- a/app-arch/unrar/unrar-5.6.6.ebuild
+++ b/app-arch/unrar/unrar-5.6.6.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"
@@ -14,7 +14,7 @@ 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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 ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.6.7.ebuild b/app-arch/unrar/unrar-5.6.7.ebuild
new file mode 100644
index 000000000000..384033090666
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit 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 ~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
+}