gentoo resync : 29.12.2022

4 files changed, 54 insertions, 155 deletions

diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 0512d99cf968..0efa20a1cfc9 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,5 @@
-DIST rarlinux-6.0.2_p20210611.tar.gz 610546 BLAKE2B 927a7f60af431e84e9ff19dc1abf52c4697068264d3c67a17ada324bfb00975824e26937a19dea023cda772066991de719ec68fb1fb380f6656130af67202131 SHA512 6b6ef629dd0e681702fb0835cf6fe9962dc2ce774291f800893308a93a0a498099775e7d897d69375f68107b0ce0862bb2a6a169b8fbda534091678e9be3f09c
-DIST rarlinux-x32-6.10_p20220124.tar.gz 616277 BLAKE2B 051a8c5689dd0924bc841fab05acd01cfaa7752a5ce54de71b727acedc6606d62605f3487af99d59af081acfbc1ded95ee427904caa6fee39734243248e73c13 SHA512 3593756eba8fd8e512ff1f0378e2768a264671dd25c139f00dc632b53d379ee6da4d63d6d94394f39ad4fde0310211d11d8c2d3167da5d576f16b299da969118
-DIST rarlinux-x64-6.0.2_p20210611.tar.gz 599150 BLAKE2B ff60f32ee5215403e622bc5c341b8212c3deee0020155043e4c7c3d5feff113da351412a91fd42f46e3293dc5975fd2beca558e3e45744cdc5356ace82af6c93 SHA512 909eb3b05c56327ccec101652d1d68ca5eb97ba3a7223954724fbccf4960b07ffa0ff5fe5405c53a248342a3ae171325e7bbf7fadeaf63c1c45bf00853e0a940
-DIST rarlinux-x64-6.10_p20220124.tar.gz 604344 BLAKE2B ab5a5b0c1e8aed44e6b55820e0d843adf526c0d48ab5128fff5e907fcc4969cd6645cef2a91abbe49b770de3104d9a8d09da34e0f9955fa9825da204ca1098c9 SHA512 56ea0f3eaf84ff41af6543056e71d9768285ceef00132fe9ea0c7ecb02e0681023b0f7940b02fe3918bf28de229d000e0209f66dd4af2e93c6d81c3bcbedc87b
-DIST winrar-x64-6.0.2_p20210611.exe 3348968 BLAKE2B 482e5c34cae9c452b539f6e9e89efc7db8e463cc58b4db43cd25caa7e3fc6ab7945a7a17e9605b9d6d505c31a9a343a29812531dc5ba319765bf80fcc775426e SHA512 4c2bd804465e6bd948de248a7a0893f4b38728665b8e67c65bfc14766475072960250057ad1afc457a0df1f128da96d69483b000a5da18826776ea0a4377230a
-DIST winrar-x64-6.10_p20220124.exe 3470848 BLAKE2B d54dc216dfcc251d9c3a06ebf49b0717954cab856231b9777597dc0d1b61b64bc5c5fbebe9546be42c44ba23a2d9dd8eaf3f5d5484678eda5d1ec3a8ebb159c1 SHA512 9968fe6b3c5df9f11690263246366da9544a5a05f535f61d9cbb6765fb81f2614a75b8b1b8c367d7b83c83a87b53b1b94f3ffaa95c38dbf368a880c16f136e63
-EBUILD rar-6.0.2_p20210611.ebuild 2232 BLAKE2B c038b494adcc5ead0eae6c03f39518221598195be4f1aa99601264d01fc22c86dfd985fb88ea6ad3697d1afc71c42404ffd06437f9b046ffb2710226a051b0eb SHA512 ed19c27d77c6b806f780f61670632e2f4f1d19e77fef3871e722a9c6c34b91a8851b9cfd30fe10c0b7b3906c01c80e635dcc82d416392182830a2765c6e39809
-EBUILD rar-6.10_p20220124.ebuild 2238 BLAKE2B 74a3e8e1b6cb69fe6532273a75583bfd52b458b6d764024b152f9d745537b4446e6378583b66f08ccf8f25ff7f2e9303182cf3163ce261b9100e77d85c1feb42 SHA512 d2ec8bfc393d647f63c6940dcc610c89d73138974c50b887cad6a94f555148ff5af2e30b17774daf3f8c7a824069971b2bbf8116f60fbf053355fd2e964db9de
-MISC metadata.xml 437 BLAKE2B 85b1f4f60295616aa991967cd5a064e5bace02ed70938c2465c95ebd386434b604af70054eae0a717b97cb6986f5b9b334e17734754c817f477506f05782f3b9 SHA512 4aa791dcf9ac69cbe18e80fda5d7cf9b885141d2011ae8658b1f645fe1e320e4e82053a7952b57146a85fee677599f56f96087070a3ad68254a952df4ec3ea3c
+DIST rarlinux-x32-612.tar.gz 616982 BLAKE2B 3ceaf625a77d6bb5543de8c2d118e6a5d679ffcdf295b4476725794277ba01c6b74179daefa2bbe1da7b3c0d29a2d368c1325b099d87955c355cc61461f893ff SHA512 8f67a365145d6fe7c9db1458a67f29a6b878f1969842f0cb43f639af1f8c304b0f4174f83b070f7d821316fdd9dcd2e1788bca2d6af5ef60fdb951924ebc71a4
+DIST rarlinux-x64-612.tar.gz 604520 BLAKE2B ad85a2a5d1b66677707491279166fa42c6f9b2b1e96f9dc8001da5e9199e50762a106991ecb27c0c4eaa72904490eebc43f21236a952da40acf866b1ce40ecd2 SHA512 bccb64b077fa044a920f02a826bafd4a07c446f2ff2ce88b7c8f27d49c6ac48108711880ad43aac89c034f582979cad8b332d675ea483eca9f76bcd892949423
+DIST winrar-x64-611.exe 3479544 BLAKE2B 84f2bf342a92b142731615d13280e36686dbd4f44d8a1c550fa6a03f2267e6ec0f8e963107b3baa5640072b399e58fe8865754b382def2183a391ca204a07333 SHA512 46c001b48be1503e1aa9f7b9540adfa210caa672ee766b3634697e23faa0b8ac140cc392adf13f1b5244ca61572c5dac2085b4a00a492774649602e4fdb6a46d
+EBUILD rar-6.12.ebuild 2313 BLAKE2B 9eb525b7a7d7b5ba90cc7c7e7f82a377bf6a903d2dd1a54327a3a974fb977cbdf5ef108f29b3b77b5b85edd3e147137b4c536e9dddd55b2dab689159543b126e SHA512 13dccab895945afbf0308962fd5671ca3a69f7eca64a25fdb512d742b2bc7f359884830d108919c65a753223594a77c3e4ec82fca54ed23b18f7a5d90afa01af
+MISC metadata.xml 436 BLAKE2B 89434fe285ad2b7be02c6e0014bb0a8fd54772e899345cb1c6de1da1e7cf5396d490af746bad1af6449183a4970c70415178765d918488f047174e64c289ceee SHA512 c9d65d30420f8febc660ad83169a8ae95c11ffcc673ca0cbc16530367e441ff72636fdbe3948065270547cb043ab0e1114dd573e4bd8716089bd01f056a63ff6
diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index b456900e42ab..950f254e370b 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<use>
-		<flag name="all_sfx">
+		<flag name="all-sfx">
 			Install all SFX (Self-Extracting) files rather than just the native
 			format (allows creation of Windows EXEs on Linux ELF systems)
 		</flag>
diff --git a/app-arch/rar/rar-6.0.2_p20210611.ebuild b/app-arch/rar/rar-6.0.2_p20210611.ebuild
deleted file mode 100644
index e94158b2ceaf..000000000000
--- a/app-arch/rar/rar-6.0.2_p20210611.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.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
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	insinto /opt/rar
-	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-	doins rarfiles.lst
-	dodoc *.txt
-}
diff --git a/app-arch/rar/rar-6.10_p20220124.ebuild b/app-arch/rar/rar-6.12.ebuild
index a78f4de2de31..c25f9479a11e 100644
--- a/app-arch/rar/rar-6.10_p20220124.ebuild
+++ b/app-arch/rar/rar-6.12.ebuild
@@ -1,44 +1,53 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
+
+MY_PV="${PV/./}"
+MY_PV_WIN64="611"
+URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
+URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
+URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV_WIN64}.exe"
+
+inherit unpacker
 
 DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-x32-${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"
+HOMEPAGE="https://www.rarlab.com/"
+SRC_URI="
+	all-sfx? (
+		${URI_AMD64}
+		${URI_X86}
+		${URI_WIN64}
+	)
+	amd64? ( ${URI_AMD64} )
+	x86? ( ${URI_X86} )
+"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD BSD-2 RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
+KEYWORDS="-* amd64 x86"
+IUSE="all-sfx"
+RESTRICT="bindist mirror"
 
-DEPEND="all_sfx? ( app-arch/unrar )"
 RDEPEND="sys-libs/glibc"
+BDEPEND="all-sfx? ( app-arch/unrar )"
 
-S="${WORKDIR}/${PN}"
+DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
 
-QA_FLAGS_IGNORED="opt/rar/default.sfx
+QA_PREBUILT="
+	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/unrar
+	opt/rar/rar
 	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
@@ -63,9 +72,7 @@ src_unpack() {
 		fi
 	done
 
-	rm -f "${S}"/license.txt
-
-	if use all_sfx ; then
+	if use all-sfx ; then
 		mkdir sfx
 		cd sfx
 		for _file in ${A}; do
@@ -78,7 +85,7 @@ src_unpack() {
 				fi
 			elif [[ "${_file}" == winrar* ]]; then
 				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack ./w64.rar
+				unpack_rar ./w64.rar
 				mv Default.SFX default-win32.sfx || die
 				mv Default64.SFX default-win64.sfx || die
 			else
@@ -94,16 +101,21 @@ src_install() {
 	exeinto /opt/rar
 	doexe rar unrar
 
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
 	insinto /opt/rar
-	if use all_sfx ; then
+	doins rarfiles.lst
+
+	if use all-sfx; then
 		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
 	else
 		doins default.sfx
 	fi
-	doins rarfiles.lst
-	dodoc *.txt
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	docinto html
+	dodoc order.htm
+
+	einstalldocs
 }