gentoo resync : 05.02.2020

4 files changed, 5 insertions, 77 deletions

diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 867e851ae165..76c4c2425e0b 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,11 +1,9 @@
 AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e2e20ef2c15817fffb7dc275fd326fd96b089257a8044982c0ae130ca3dc42126356d973ee6a8afd43e28df0 SHA512 101a21a20d8e30ca2cccc1605e332579064d362feacb36e9d4a7cd5218585298dcb48ec2805ff9523ae9b25e8e3d3e7557b73ea457702c6cb6d8c50d324ea1f4
-DIST unrar-5.8.3.tar.gz 229162 BLAKE2B 1515af301fdcbbe02d1ebf487b1a0ab7849919e0065f223ec78e69cf5fb9436778f184c9cdead927c37d41ddf779bc7c539259cc60b1e9db19225762af17ed27 SHA512 32ab5cd9135d968f2e908975e72e716f5aa8911ee53fbcade6cf9783eb22330dc0114baf5db148c223015498d28fa4c60446e0ccd8108856c6d089117a147669
-DIST unrar-5.8.4.tar.gz 229618 BLAKE2B 3b163a7d3a13dd5864ae729eef6c6bc171e45b0db4e716660b24a14ecf035572fdd1dc44a9c59d07d9fde87255b941f45d5b2e0aeffac3a53b021dc1cbd4b0f1 SHA512 dd3502662b443f05c7bd01a50806b9e3443f9bbba7d88ee8fe9ca0d671d93b0db8956b822ec25b9d827941313ef2ec5608f15934bab91cecbab1ccea9ae8129e
 DIST unrar-5.8.5.tar.gz 229641 BLAKE2B 132453d2e2ddb1b1b2151be15bd092dc06fe7ab96d8fa640db95dc1acdee90f6b259a5d04c1da959a398e3a9beb22862a14db9b41b19055771373e00d89e958b SHA512 bacd36c78c6bab2720b13796b73b376bd0ae693916b8130637cc4e6bbd76f6bd103347d9033d2d6cf6301587ba62449ec88b3aa4c18c8557ad5ace3475b41a7c
-EBUILD unrar-5.7.5.ebuild 1860 BLAKE2B 4f15915fc48ee749a8c2b488fac6377446007354b1f5cf32c3ef277c8ad7618520bb49c266da733a850262bab18ccb98eadf4f3718808021a44682eb6775b996 SHA512 8a369ec848020f91ff1bd6f11a01b4d0970620f7927ad85b17140d2c30a4e656d0d1967ed7eca56071e109911d3ef1c438cce0dacbce64fcd3da2edcad76cc45
-EBUILD unrar-5.8.3.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
-EBUILD unrar-5.8.4.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
+DIST unrar-5.9.1.tar.gz 229913 BLAKE2B 0969678b0676fbf8058e214e2ac8725ebbfbd391d23690eb0f55bdbbaa86b0a0752d4028bd52a95b455aacb324be5180dee485864b9f6cf63e2c1efc90b52af7 SHA512 dcc1ae8cd886f711f7ce400c2dc496e170e62f17f41f96bb26e3900bea82c3923114678efee07b88a9bf55ce22d7d07d36400744e42f2b59231a51724b04c138
+EBUILD unrar-5.7.5.ebuild 1861 BLAKE2B d6eea740529262d022b81d39e36897f53a9cf43b04301eb235b9f4d039fb5f98db06de0d2cbcbece731bd69b0839cde8b5c51c05b5c0ba407affc9ebab40a55e SHA512 eed6b71e09c40bb7979562fd0a917bacf33542a62ded41d33765f9dbe2effdb4bad0e46c6aca885e63fb999b2730cbd75d1ccf01c97d3dba4d32fdf70b0274d6
 EBUILD unrar-5.8.5.ebuild 1874 BLAKE2B b4dff343451dff39f39527d40028111e55ba10f09a80be5e9570b426cf9b81a5938b8c1b5aeefee7842885ee13d649a89665e8ba53bc3e6b66160e1d66a4e4ad SHA512 8525bd45c3b74f2bf3af1140040b5a1dbfa1984a3d7a79492c55b85cedc0123e5f359b331ad78d09e20d4b145192ed9f30bc6a9b4a58f95bb202e23c22a13c75
+EBUILD unrar-5.9.1.ebuild 1880 BLAKE2B 9130011293bb6bb4668aac8d8e5b99d0f89b63fec3f126bb81d2b5c09623e81bffddbd0c8a2054bd7eedadb1161b2bb4b78ec0a77219f90e6d06fd7157cf30fc SHA512 efce6e14033e39c4b95ca1eb1b753f81e63acd80cdebabf223adcdf664d7d37a56ee9d04211f083f3ad0f456d6ece1e956a71d5b57cf7bde0c82eeb34ba707ea
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.7.5.ebuild b/app-arch/unrar/unrar-5.7.5.ebuild
index 3e3c594c4e00..a9fea920cc3a 100644
--- a/app-arch/unrar/unrar-5.7.5.ebuild
+++ b/app-arch/unrar/unrar-5.7.5.ebuild
@@ -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-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-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.8.4.ebuild b/app-arch/unrar/unrar-5.8.4.ebuild
deleted file mode 100644
index 7fce116316f4..000000000000
--- a/app-arch/unrar/unrar-5.8.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-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
-
-	find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-5.8.3.ebuild b/app-arch/unrar/unrar-5.9.1.ebuild
index 7fce116316f4..232fbdb7ddd2 100644
--- a/app-arch/unrar/unrar-5.8.3.ebuild
+++ b/app-arch/unrar/unrar-5.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7