gentoo resync : 22.05.2021

4 files changed, 76 insertions, 7 deletions

diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 392794bdf55c..08dfac2e44d2 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,6 +2,8 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0b0271d43d3df43849cbcfe60a4fd4546fb5e69dbe95d6729b344f705b97483a5bc0c1d11edc21ce8e08bca6b SHA512 b6d3e5c6bf0e3605c3390b97bdd1f0747fff32eb7780a7ec967421841203a6cacb42ce16041bec84f88fa1eb2fd15b9235da1f37d517c9e7d876034a5bd79466
 DIST unrar-6.0.4.tar.gz 232379 BLAKE2B 39382eeb71cafdeaa608ef497c44cd88d950d761e5c8395a224b2bdd530328a0060dec658aec943f9af8e135ce29cf86c3522ed17799f869cd0d84cbd7acc74a SHA512 9d2beb39fa0e3c60298b482967f1ae51d8a6531c88f5b8b053cc8905c033c0235cabb776d8449f9d96da6b81946167b84d19acdf93dda7ada14cc3c53bb7df19
 DIST unrar-6.0.5.tar.gz 232702 BLAKE2B 8e33d116ae9de06818379f4303241dd7f44ba319619829d0eb2c9257b3fd27e473b636d40edd6049a1ff096ea722fee0a71bf145456923b2664087dbf7d4554d SHA512 cd6d9b316a2daf2f3f81b28b4d6054cbe7ca9a7e39087a5dc7e4c554e5d5590b395243f03f019bf358e127be48dd219e827fdb6af7543305a52c3f87f6e32dd7
-EBUILD unrar-6.0.4.ebuild 1883 BLAKE2B f5d07b289b8446ae79daeb3b49be0f9c908b31b2bb22e5209d8c48a8f6e11da75aeaee912edc0d9b9d42397b7bb41f322427f6303e269c132caf7b979b7b386a SHA512 9619fb9a9f6f5d18f9ddb6377b99d62a8227c7464af4dd1794173537ff3432c7b3bca1d28d73a8d411f3ff44af3fc3633f5ab36569f35527869ecc04abb89449
-EBUILD unrar-6.0.5.ebuild 1889 BLAKE2B a4af1d6556180110b67f6581699c3f282ab4c039c8a5672b0c39c8819cc313ccc9cc522d342915061139bd8297beca26113e28d622ed1daa90c0b800c1966625 SHA512 008cd6a077705d080d4dcc8c3678e15343e56f08d011a5611ed6c36a426554247e3809f45764e00bd93b693e48bb3f4d4a2c0cdcb75c418c7332698cb3b6967a
+DIST unrar-6.0.6.tar.gz 232874 BLAKE2B dd32f09167a641d7a63a2dc4979f6eb4462b1a16529e92fd0fb1e0e27f4eeb22e7ee15b96e7aa9d852db4dddd09d73efb53f2bcb2426e12612afa244f06f0387 SHA512 cb50cdde120c02461bb6618e4b8773a221982c5ba81309669001b9713fc14bedc42bc5a601f30a62674be7ffd5c674d51be285c02a468d6e3fe0ebc02da8bd8f
+EBUILD unrar-6.0.4.ebuild 1862 BLAKE2B 785443182da522d483e6efbcf32999755ff897d36bb1f59c8b77d57a7060348759cccaf653af7a017149a927215cecbe78179c85389e2b9e1df1a18e1b83a805 SHA512 4c887ff1f51183c96b76cbdd62774bf74fd98e53f48bee5a948fa84e91fb87d4f1724efabdeab40b2f7d4cb1b59c97774aabebe4899a146067f485b842d1b6d4
+EBUILD unrar-6.0.5.ebuild 1863 BLAKE2B a151fcc7bcc6e015450a00216793be440c50241726aa0c238c246e8708afb3976dbb548d7de9eaf5f8842a46ad283aaf41593211bb57a60169b08d974d6f7ef2 SHA512 27de8a6deac82faab6419b01651c7f24d69a3c430614b75c304fee9477d4cece38d5791a0afa9326a70dc1f8cc8682f61daf858e7458d62772da71948285c9ff
+EBUILD unrar-6.0.6.ebuild 1868 BLAKE2B fcfa10d454042f03584c0a5f775ba754f316adcda1710a53529e06288ea13adf81a850238bbe9c04238e3cc56675924680adc6c4b91d1faf328a1c002d3cd80e SHA512 8edf12f59856ca178d8ad82feaede9b8c62133483f7c708ac41f2a0b582581a12fc766ff1cb9a4be7ba1249e88ad709ecfe407b712fc2aad115228671f3df394
 MISC metadata.xml 520 BLAKE2B 14f38803f23547426b6d1d87101a52cc5260b65313dfc727c0c8d8a719326792ba10ed27b584dfaa2be23811fcca217fe5418daa22ba90a6217a38cf4db84267 SHA512 9654aa3df0a399d971cad519392a232e1cbd9f407702bd2fd6fa31472fe6fc8966df787b3a99861f43db2e9bc3f8ced5d2840c21b10cbff6c74b07923d60e116
diff --git a/app-arch/unrar/unrar-6.0.4.ebuild b/app-arch/unrar/unrar-6.0.4.ebuild
index ff89fa03aada..adc92be38a0c 100644
--- a/app-arch/unrar/unrar-6.0.4.ebuild
+++ b/app-arch/unrar/unrar-6.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 MY_PN="${PN}src"
 
@@ -15,7 +15,6 @@ LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 
diff --git a/app-arch/unrar/unrar-6.0.5.ebuild b/app-arch/unrar/unrar-6.0.5.ebuild
index 4715611272fb..e7805e6a50aa 100644
--- a/app-arch/unrar/unrar-6.0.5.ebuild
+++ b/app-arch/unrar/unrar-6.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 MY_PN="${PN}src"
 
@@ -14,8 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 
diff --git a/app-arch/unrar/unrar-6.0.6.ebuild b/app-arch/unrar/unrar-6.0.6.ebuild
new file mode 100644
index 000000000000..451427685623
--- /dev/null
+++ b/app-arch/unrar/unrar-6.0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S="${WORKDIR}/unrar"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-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} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" 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
+}