gentoo resync : 14.07.2018

3 files changed, 2 insertions, 115 deletions

diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 970fc09fea9f..2705cd59cf87 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,5 @@
-DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
 DIST rarlinux-5.6.0_p20180624.tar.gz 552245 BLAKE2B 9988b67d545df89bb7087c2bbec5a6fc47d99f6fd8a97e3581f135dc829a43e5c044248e95f60f7cd29370a0955a3c4c8a6667bfcead17301dc0f45ddae0057f SHA512 a0baba489c9268bc25c814c94747c117de66599f91da875b0e0b8233c24910f0e831f8b407f7a9bd8d709da6bdea4ef50306ce456ea5089f893619b8ee5b780f
-DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
 DIST rarlinux-x64-5.6.0_p20180624.tar.gz 541604 BLAKE2B 2fd865af38db47c556341bb2482ee9af83857bc196e08f9b47d5a0f8ccae708931c09dcca2115866d37c03b77f7548da87cf2e778f003e9a432634b9ae378aae SHA512 e8427d12016d4298d1e3ca3dc32f367e2b7a407572e48c665eaec796c3538d50349760b5691bc6d58256a5470dc0c6637740fcdc6e8a9bd420193fae16e209eb
-DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
 DIST winrar-x64-5.6.0_p20180624.exe 3180248 BLAKE2B 3ddbef82e2ecee7960c5d282de905a2d4d279c3ebae9ceb9e5b72a822d352a80d189a76514a414840ea5ad8002d718435757c860a0935134b6eba01b70e0f444 SHA512 61896901b580476d4c12d40d42eef725de270beb0b01526e7d5d4e02847a7b67b0380f0a365e92eafe2a2303d60945146457d43430aace51c9a443a8b1ceef48
-EBUILD rar-5.5.0_p20170811.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
-EBUILD rar-5.6.0_p20180624.ebuild 2279 BLAKE2B ad6b6a2875119d5125fd8b59be5a2c6bb839938542f2cb8c8e7f5544678964e45bd81b9ecf7399a9593e8c3daa54e3f19d6b073bbea3f5ca3ccaef9b5820984f SHA512 393e1805fb47027e6f12b41a435984288816001ec6ef03a71ac482bdf816106bbea89e4dcfe81c529cb3ad17b4db9dc39f14d95e2968c654a15294d14bc337b6
+EBUILD rar-5.6.0_p20180624.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.5.0_p20170811.ebuild b/app-arch/rar/rar-5.5.0_p20170811.ebuild
deleted file mode 100644
index 763345d655c2..000000000000
--- a/app-arch/rar/rar-5.5.0_p20170811.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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 || 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.6.0_p20180624.ebuild b/app-arch/rar/rar-5.6.0_p20180624.ebuild
index dd4bfdcacc81..763345d655c2 100644
--- a/app-arch/rar/rar-5.6.0_p20180624.ebuild
+++ b/app-arch/rar/rar-5.6.0_p20180624.ebuild
@@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )
 
 LICENSE="RAR BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="all_sfx"
 RESTRICT="mirror bindist"