app-arch/rar: Rev bump to remove rar_static (bug #615848)

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --force

4 files changed, 95 insertions, 120 deletions

diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index c266ee98f491..c776d238d240 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,6 @@
-DIST rarlinux-5.3.0.tar.gz 1114667 SHA256 7638f20ba68a49e9d9b3b247d9922f3d36c248eaa2e784bd2f0fad0aa1fd7ba8 SHA512 b2eb9831cac88f7f72a169c081a35fc688aa82a5e80cf681440b38f7d5f7691511ca1b85960b3949668faa4c1fe0921fb170d7a1ffb52d77db124fd073f1516b WHIRLPOOL 42ee7ef6f4a186b6284490e04378d24fcdbdea2406724137522ce2c18ebc62f8321e7092673ce4ea3e917b0ea393145b8f496ba06e780bdf2526b3223d5474aa
-DIST rarlinux-5.4.0.tar.gz 1121998 SHA256 18b4aa6b22a5460cae6dd4372fa1a6d69e0726e693c04993cc5e124d7c0a7db6 SHA512 6dd905de5fae268bf65d7fc803d03919db96d0489ea5351c5deac8dd12e4a7da295ea9342b26a9603efaad7cfec780094c64c0e82ea9c72967b5e43286a40ee8 WHIRLPOOL aefb8cc47d37ab2c60ffda82f6311233998f0d3b263628341cbeaa9c21d7249b75906e56e3c6ea92008423d76b1f8d840feb92d77d34f9987a01171f1c010940
-DIST rarlinux-5.5.b1.tar.gz 1125936 SHA256 175138d7476734572d4baac3e1d67ee1e23ad4112e5eb4bd72c6056f2cc49fc3 SHA512 5f96a05d733f36c3ee9e7325a830d1fa0a2d1fe5b11997e3965f3a66435a711c54c83be256e3d983fcf731e7dbcb5a2a84a7b3e65eba21eaf5089bb1156e9d45 WHIRLPOOL 1ed9d8d76efc2501548a69ecf1fcea19853e3dc922ffb40fdc523707bfd6f035668672b4ad3e65b7cde6c83eb8c7c4738fff2011ebd287f6f6fa02a19b26b1bf
-DIST rarlinux-x64-5.3.0.tar.gz 1149037 SHA256 8075b01d29ba0fc0c927f08e2a1b2149921bdb42c9457b7a7ef0950e387b5131 SHA512 3391db53adcdc355b6c58843a59f17a0adc2abc874ba8828cb985f27d33d27804d6a8c4db642fbef6a09d513858a6b507f6b49f9097a499d800f4cdd953f1f3e WHIRLPOOL b450bf85d36627c0b03be1523cdee980ac771ea5acd9786264fc10efd8473b1cec031dec57d1b1f345ea601fed94f0505d300d106800076c20bc97a437b6fd26
-DIST rarlinux-x64-5.4.0.tar.gz 1156900 SHA256 bf3e718df88cac8da631e34b3b2cc3185ca111e11d945e6bb91c0c038b8aa945 SHA512 6b4a9f9ba454e6f40bd8ec391a11790dc43d1a54733e1c8de0ac2cf969193959df327f5fee22c9b403cc838dfb92906c1b47d001b41522983fb0cf21b73da696 WHIRLPOOL 31427c056662619790e939b9f9a6904422a2bcbead8589279c206cf36c7a8726176061351d91c9dd8fdf9b7357d0fe20b94e7e67376e14324222f0c47a13c938
-DIST rarlinux-x64-5.5.b1.tar.gz 1160046 SHA256 6b2b0e986356ac25e55c22875acebc5f8e530d6beae92ede178f0faeb95502fd SHA512 d2fedcd7f081d03216cd5a1a9a5b599d6bff93b83410f975169eac4b0128b6717a6376b9d8d0c106f80dc6aeb84c55212a00dbe098caba5798ed65cb5696de61 WHIRLPOOL 9254cc5c9cc73bda1b94b9855c48cb48c6bb08af6c55164caf5d61ec8756a128496c74157a313f0db462a8b80a56bc9fc60a5346034074486d272487f96ba178
-DIST winrar-x64-530.exe 1964912 SHA256 951b53d30aa7d40f5fd4720ddd7385d431ede0e18df496fcb9c255ee1520d668 SHA512 ebe7ba3e3bc36941a6cf4f27f00edfd62e2297fda6de64a3718da10f10c9a9510b1dea96e5d128602e3b4069e276c88f79914b535a0acb390158a620510501ca WHIRLPOOL ac463202b33f4130e45da5df85b47a0eaf268686aefb5bcd8b09da729f1348d000d513f8297c67520515321b0d6632a16d6ed23ccc73efbd18c605cb624981d1
-DIST winrar-x64-540.exe 2179856 SHA256 d73cc6a97c3edde637c7d952ee2e0efc5b09937e5300cb0ecaffda70f4efdef0 SHA512 27082f2aa1fde0b82611360bece85b984258a3e81fb20249122a643ae1d6d9878ca248e854899a7ceffa4363aa032fc5360eba80c19e700292b5a261040d75c0 WHIRLPOOL 62bd28cb0ef7c4b5294f44cf15d697f15a69aaaa898865b006d3ff3984378cb688907481dab738e2f25737cec9fe199dc157b48b66f28ae6a66fb1dd27018d7b
-DIST winrar-x64-55b1.exe 2195920 SHA256 5aec34a4c159302b0b549d9e016e37b2cd7ca9c022239734d9d689ca2c377f14 SHA512 bf96a7a8cce774a6769df203ac5a0adce472e5dd0440aff1026ba2fa9866690172c289744315f98a869758de4cb0dc2eec90321ad186b9e44653767179f766f8 WHIRLPOOL 99d69446890a89306f170a551fc0a0e8a4e5bac86344e9b2dfd82909ab77d10eeda6231b7beb557c0e11a99ccc7fc51ce37aa480d69492cc9c8efc7d5309edbe
+DIST rarlinux-5.4.0-r1.tar.gz 541123 SHA256 ea4ec74f1692ceff09e890a427eed3257400124a1e0c173f53737a37993ade6e SHA512 fa6d5abb02c22eeb5c75b6ec84be7247e5629f4d278a7a836265e21e13626d16a00e60793bc8cfb58a1efaf0d8d717e0cbd43a250f64b03ea366d78a21dcc686 WHIRLPOOL e3d9553baabf496e73fee6314b5d06b73f5261ba5fc18d9bb90230a83bb590616899c8d1e747a1718171cf8933fe4aa8ad955f3f211533c71d6f47b96e4c11fd
+DIST rarlinux-5.5.b1-r1.tar.gz 544081 SHA256 e95bc5e30c44405b2d90d08565a85fe3c54f81c4090a796ea2fa19c65f9af1a6 SHA512 9fc548a6ccd8602162625ecb10bbf7b0748f1fee30c13bd2e63c47ec44405125ef8302e3e8191b4b899189fab35c269995afb24c1f1149c012dabd81953a9cc1 WHIRLPOOL 58f3136a96b85d11391e9593b51f76c610fbe196b7c3cc60f32397d686d09a1b92e244d10df55f42f3d5f084b3da4dd928dac5faa78ef331d175adab4b331d7f
+DIST rarlinux-x64-5.4.0-r1.tar.gz 531782 SHA256 264b7f09270c44ee9be5f0e8e8cab48781822c9d3aa6caf078af01719511b6de SHA512 8b6b83bebfb8421bf9f1c25313ffa985683309fecafb07260b1a3bd889e2aa922d3a137ff97f47638dac4c2299e76c00e28c27e3e40b413e7d40280e61af9e47 WHIRLPOOL 0a2b2d3ae2e750c0a624d55edc10191536d32d963d1bc1298da349709b6a98032a033f034970d1f2fbb1c2dae0537681186b8fb9c1b1409dae023c8351fb1303
+DIST rarlinux-x64-5.5.b1-r1.tar.gz 534153 SHA256 4d699bf1ed6320df13b7e7881164ebc49aa7709187b79c93f65f1110f9a29933 SHA512 966f372fff66ff8d21148f954dc75a46172072c71d3d0317bb6eeb93f7a58730b60b49a94360b1aea3cde8fc7c14f4817e9e2a80f131d4c2044bfc7111e1f95f WHIRLPOOL 4fbf9a6cde515f6e0d8da0bc162b95bd4394b19a841bff6740ce997aee32e30620eb01315956eff0813b1d8e87901346713bfac56180e5e353259d43f9c629bd
+DIST winrar-x64-540-r1.exe 2179856 SHA256 d73cc6a97c3edde637c7d952ee2e0efc5b09937e5300cb0ecaffda70f4efdef0 SHA512 27082f2aa1fde0b82611360bece85b984258a3e81fb20249122a643ae1d6d9878ca248e854899a7ceffa4363aa032fc5360eba80c19e700292b5a261040d75c0 WHIRLPOOL 62bd28cb0ef7c4b5294f44cf15d697f15a69aaaa898865b006d3ff3984378cb688907481dab738e2f25737cec9fe199dc157b48b66f28ae6a66fb1dd27018d7b
+DIST winrar-x64-55b1-r1.exe 2214240 SHA256 6b08dea9f9b138574c37fb49e211ba201ea81dc54aae4b946428fe16427ec73e SHA512 702e48acdda583a6aaa6f2f80c06260aa83c0742fc1595ece8fc97517c8d891aa51a78ba142cae60153aa51c4ab8efc048bb557a7e375bf0156fcf3c43b96416 WHIRLPOOL 14e3e690a7f37f2f8144d275af9ad23e8f9646663a547fa6b6e3728e25db9429eb9d59ceee962c4dd867448a6e92f059773247c79a5f6a1749956d41422ffb00
diff --git a/app-arch/rar/rar-5.3.0.ebuild b/app-arch/rar/rar-5.3.0.ebuild
deleted file mode 100644
index 763ee4038149..000000000000
--- a/app-arch/rar/rar-5.3.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PV="${PV/0_beta/b}"
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="http://www.rarsoft.com/"
-URI_x86="http://www.rarsoft.com/rar/rarlinux-${MY_PV}.tar.gz"
-URI_amd64="http://www.rarsoft.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_w64="http://www.rarsoft.com/rar/winrar-x64-${MY_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 static"
-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() {
-	use x86 && unpack ${URI_x86##*/}
-	use amd64 && unpack ${URI_amd64##*/}
-	rm -f "${S}"/license.txt
-	if use all_sfx ; then
-		mkdir sfx
-		cd sfx
-		unpack ${URI_x86##*/}
-		mv rar/default.sfx default-elf32.sfx || die
-		unpack ${URI_amd64##*/}
-		mv rar/default.sfx default-elf64.sfx || die
-		ln -s "${DISTDIR}"/${URI_w64##*/} w64.rar
-		unpack ./w64.rar
-		mv Default.SFX default-win32.sfx || die
-		mv Default64.SFX default-win64.sfx || die
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar || die
-	use static && { newexe rar_static rar || die ; }
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar || die
-	dosym ../rar/unrar /opt/bin/unrar || die
-
-	insinto /opt/rar
-	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
-	else
-		doins default.sfx || die
-	fi
-	doins rarfiles.lst || die
-	dodoc *.txt
-}
diff --git a/app-arch/rar/rar-5.4.0.ebuild b/app-arch/rar/rar-5.4.0-r1.ebuild
index 66522431d643..b7a54ecb95f0 100644
--- a/app-arch/rar/rar-5.4.0.ebuild
+++ b/app-arch/rar/rar-5.4.0-r1.ebuild
@@ -6,9 +6,9 @@ EAPI="6"
 MY_PV="${PV/0_beta/b}"
 DESCRIPTION="RAR compressor/uncompressor"
 HOMEPAGE="http://www.rarsoft.com/"
-URI_x86="http://www.rarsoft.com/rar/rarlinux-${MY_PV}.tar.gz"
-URI_amd64="http://www.rarsoft.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_w64="http://www.rarsoft.com/rar/winrar-x64-${MY_PV//.}.exe"
+URI_x86="http://www.rarsoft.com/rar/rarlinux-${MY_PV}.tar.gz -> rarlinux-${MY_PV}-r1.tar.gz"
+URI_amd64="http://www.rarsoft.com/rar/rarlinux-x64-${MY_PV}.tar.gz -> rarlinux-x64-${MY_PV}-r1.tar.gz"
+URI_w64="http://www.rarsoft.com/rar/winrar-x64-${MY_PV//.}.exe -> winrar-x64-${MY_PV//.}-r1.exe"
 SRC_URI="x86? ( ${URI_x86} )
 	amd64? ( ${URI_amd64} )
 	all_sfx? (
@@ -20,7 +20,7 @@ SRC_URI="x86? ( ${URI_x86} )
 LICENSE="RAR BSD BSD-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="all_sfx static"
+IUSE="all_sfx"
 RESTRICT="mirror bindist"
 
 DEPEND="all_sfx? ( app-arch/unrar )"
@@ -42,20 +42,50 @@ QA_FLAGS_IGNORED="opt/rar/default.sfx
 QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
 
 src_unpack() {
-	use x86 && unpack ${URI_x86##*/}
-	use amd64 && unpack ${URI_amd64##*/}
+	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
-		unpack ${URI_x86##*/}
-		mv rar/default.sfx default-elf32.sfx || die
-		unpack ${URI_amd64##*/}
-		mv rar/default.sfx default-elf64.sfx || die
-		ln -s "${DISTDIR}"/${URI_w64##*/} w64.rar
-		unpack ./w64.rar
-		mv Default.SFX default-win32.sfx || die
-		mv Default64.SFX default-win64.sfx || die
+		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
 }
 
@@ -64,7 +94,6 @@ src_compile() { :; }
 src_install() {
 	exeinto /opt/rar
 	doexe rar unrar || die
-	use static && { newexe rar_static rar || die ; }
 
 	dodir /opt/bin
 	dosym ../rar/rar /opt/bin/rar || die
diff --git a/app-arch/rar/rar-5.5.0_beta1.ebuild b/app-arch/rar/rar-5.5.0_beta1-r1.ebuild
index d840b7c6f850..b7a54ecb95f0 100644
--- a/app-arch/rar/rar-5.5.0_beta1.ebuild
+++ b/app-arch/rar/rar-5.5.0_beta1-r1.ebuild
@@ -6,9 +6,9 @@ EAPI="6"
 MY_PV="${PV/0_beta/b}"
 DESCRIPTION="RAR compressor/uncompressor"
 HOMEPAGE="http://www.rarsoft.com/"
-URI_x86="http://www.rarsoft.com/rar/rarlinux-${MY_PV}.tar.gz"
-URI_amd64="http://www.rarsoft.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_w64="http://www.rarsoft.com/rar/winrar-x64-${MY_PV//.}.exe"
+URI_x86="http://www.rarsoft.com/rar/rarlinux-${MY_PV}.tar.gz -> rarlinux-${MY_PV}-r1.tar.gz"
+URI_amd64="http://www.rarsoft.com/rar/rarlinux-x64-${MY_PV}.tar.gz -> rarlinux-x64-${MY_PV}-r1.tar.gz"
+URI_w64="http://www.rarsoft.com/rar/winrar-x64-${MY_PV//.}.exe -> winrar-x64-${MY_PV//.}-r1.exe"
 SRC_URI="x86? ( ${URI_x86} )
 	amd64? ( ${URI_amd64} )
 	all_sfx? (
@@ -19,8 +19,8 @@ SRC_URI="x86? ( ${URI_x86} )
 
 LICENSE="RAR BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="all_sfx static"
+KEYWORDS="-* amd64 x86"
+IUSE="all_sfx"
 RESTRICT="mirror bindist"
 
 DEPEND="all_sfx? ( app-arch/unrar )"
@@ -42,20 +42,50 @@ QA_FLAGS_IGNORED="opt/rar/default.sfx
 QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
 
 src_unpack() {
-	use x86 && unpack ${URI_x86##*/}
-	use amd64 && unpack ${URI_amd64##*/}
+	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
-		unpack ${URI_x86##*/}
-		mv rar/default.sfx default-elf32.sfx || die
-		unpack ${URI_amd64##*/}
-		mv rar/default.sfx default-elf64.sfx || die
-		ln -s "${DISTDIR}"/${URI_w64##*/} w64.rar
-		unpack ./w64.rar
-		mv Default.SFX default-win32.sfx || die
-		mv Default64.SFX default-win64.sfx || die
+		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
 }
 
@@ -64,7 +94,6 @@ src_compile() { :; }
 src_install() {
 	exeinto /opt/rar
 	doexe rar unrar || die
-	use static && { newexe rar_static rar || die ; }
 
 	dodir /opt/bin
 	dosym ../rar/rar /opt/bin/rar || die