Make unrar dependency optional (bug #476254, thanks to Ulrich Müller).

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 32 insertions, 24 deletions

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 24d612311786..79da65510305 100644
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/winetricks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.24 2013/07/09 02:29:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.25 2013/07/09 12:41:56 tetromino Exp $
+
+  09 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  winetricks-20130629.ebuild, winetricks-99999999.ebuild, metadata.xml:
+  Make unrar dependency optional (bug #476254, thanks to Ulrich Müller).
 
   09 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   winetricks-20130629.ebuild, winetricks-99999999.ebuild:
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 760d009f1a89..db052dce1f26 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -5,19 +5,19 @@ DIST winetricks-20130629.tar.gz 158364 SHA256 4ded5b85b0827da78ea19fef66af88441e
 DIST winetricks-960 619092 SHA256 71303e5a7fb5e13b11f3be7168e8a470427241a6538dc21a621188f068af8a36 SHA512 901b5a6e1d9dfce1e95a1b1a5d2240724988f15c3ca73b0a5a36ecbc24a889075f1c2df91f889ca510cd6cc8e9f6c05de1537b27ed81f62b92af6a343191e0fe WHIRLPOOL 0d17fe704016ab6be478473bbc4fa01a0e688268f60cf61e628a77b6f1e95a36fa025d60291434387ecd3c89830f7f9a9a8f71e35ff85da68d0fb59624488af3
 DIST winetricks-960.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
-EBUILD winetricks-20130629.ebuild 1940 SHA256 d4dd03b159886a534f5db0c1dda4992e327309350f1535271c234327c7e70e7b SHA512 3f467271d86e945417ba111475cd5f6b2566f1693de6be4ce03a59ca39e1065c9a66ef7d84c0d642b20bac0158899c09321868cbb83b0e5fd665c6456597400c WHIRLPOOL 36a7d81a731ff0c3f1daeeeb7dc68524d72ec3281ccb28127186b70992b247c1e8beaeb5e893652fc3505c2c23c4de2b41e55ead2d4453fb75e27b39b3bb899d
+EBUILD winetricks-20130629.ebuild 1953 SHA256 ea89014048139190ddf5383bd7849ca70ca8fa12fff0c665e8c52fe8aca3f7dc SHA512 764b274abdb721707d86bafd23533e67e6bbfff2846afa27f9d671ddef8c03b64304d97dba442d0b95e604beab23a4b4e5e6fb8be585d7ef30c14e6712039bc8 WHIRLPOOL 129eb4ada6b7dd9f826c8594c5f4b4f8b61957fa5be7e54068ee8583989f3d914894b2b370bb2d6d5fa05b414067be1aecc5b0a2d39eaff35a8bdcf362e0b2d5
 EBUILD winetricks-960.ebuild 1988 SHA256 10382f19eb2480facbeaf6014cf3ee45c72320e09696d9614badb63ca405290e SHA512 c27aaf48372b8dca4da37599399537971256894c7157ad7f372c068f43a0f51da523311a47466e65434df1c8a6ea4c253b5a06d09fd9bf3a998b179f4fdfbb68 WHIRLPOOL 19474994568395ef18a69dc7f74663e1d7f22d1da02bfc5964155f5d98f8a28ecd6089d7c7fa5e958645f9568376f8f7047d9ff92439aa08ea75b20bcbd35a0a
-EBUILD winetricks-99999999.ebuild 1941 SHA256 7b66a466a2aa705dfedf098a43f37ea24ef734feb632d6d9e3a1eb36d5ea5116 SHA512 4155e02cbc80fb0ad4c62b3ea2e52faf9f58559f25aa348e41793740c02f939631d50bf31a8d5e56879396d289321c9e89dff4d443ad3db01042cbe41462155a WHIRLPOOL 5d6789abb5c5224c7713d26b72bf9de78e2995ce17a3b4052ff3aa819e0dbcd67ae0aa2743ae1d98f95869e8c533705f68ed276e1633be7ea36f1d3414ef8ac7
-MISC ChangeLog 5318 SHA256 161c786de05d1c0debde89d704ab25d54b17318c3368cacc6fd94f72deaf4060 SHA512 50bb4b571d4936a9ced3ed5ee34bb6a8d1f99aca839d02aaf229a12d59c5a6518c6ebe478c43b5866deea1adc4a3f5dd3a8076bdbb82cfd7479b1b8b14c4518a WHIRLPOOL 2a1d65c3ff62866dff259c7e661be21fafcb8ce9bafe7a32f249edd56124aa1cbbfc7f5e253ac4a4fb099c18a750f8594d40073283ad5cd47c84b59308aaccf8
-MISC metadata.xml 238 SHA256 89eb94f543aa923d1627ce6ad4b70039815f7d01d795beb58a8f9a1c7de97252 SHA512 17e2bfa0f3b04f33b520be8ce9892a8c11fe027178a1315b2b48d3268296d4f017890bcdcc2a25f1dbd6acad78ef47924679aa5c87d4c3c66f65bf1b03bbeafc WHIRLPOOL 8ebb3ae5a0560a7cbccd13183d6d5fcb3a7afcf2ddbca0c7d224d0951f5223a6ac53c9f7bb7cce5583e257cf4b6a94b0e710c98bec00a57f042c3568ee4274f9
+EBUILD winetricks-99999999.ebuild 1954 SHA256 6dea475ea7063107db021cce551e4e160b76bc0b357823f957142bfef42c8080 SHA512 1fe7007919d3d4511e141da4c8bef0d0bb25e635159a47da79dae57c8a1ac997880039b01a73e95bdadce56c72614a994fec7bb63b213d28630f05485819bc04 WHIRLPOOL 22324b6c6a67b9391f0719a0f445436dd608bc3ee2f9d7a8d1e83f2c1eff6778d772df4b18b8b9b41d09a92a53fed4ed15a6ea3d7377888398cceb403c7a76c1
+MISC ChangeLog 5524 SHA256 6aac6baae7bc8c28e10f87a2ddb37a718c74798093e63f19a9b60523f6524c39 SHA512 799b50e88c4e38dcd098e2ed637dad7a24491dafa26c462ca4b6d3da3aae6b8ccfd8e529ee1bc1f9fb770570e1f457426e7551804b776e1b300a587a6add0aef WHIRLPOOL ea295e1fc214f7066f051209c3b06ba41d35ffea3e0ff9776cd2e9da1eacf0c596da05f922a9eadd67b26756b0891a79099f7133aeb1f2fc529e5da1f56d5256
+MISC metadata.xml 352 SHA256 2053c7fa6dc44c98e9e1d66861bbf5c96b1116931a97b39a21547127d1b655ec SHA512 1e39d4b4c4756ff6bf0dbfdb9cd42cee1e4a355e700db0ed6abd9a4e89da72b8f20c878be2ac5f5038b9b5670f830ddfde938a3a03e522576375a532adeb26fe WHIRLPOOL 116a258ec836b0e552f304eb98b51da0474e0cde262bc1921b5ff9bb817393a650f845b456a2fdf6f6de73c5354777d45ce0483ace31661e1a461ec926b7776c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR23WEAAoJEJ0WA1zPCt1hc+kH/3PTW8yj/2Pr0sYa6JcKaeR1
-tCcbBnh4zVhuch4Gsawl/fzMiTgOxr7dK+/UF09VKbHcU3G3K2daUDJLM4eu4G9w
-TTbwVRjmJ1ej4tN3AcssibeFIl13K1hnV5c3QZtLfbJatW2Zcu+Vw6BoUzo2FGLL
-nlTDAZ5xfnkA9iB2o/0I4lFD5Rieam1Z/80KvQIlqrzxbZ+/So8xx4zYUpgp5ivf
-+HFeJ46DQzmwjncPQEKLyoXZMcjWUj3PQfzmfSuTuExyU3ILbm9P307hyKWUrTjC
-YqwuGjsZWOOn2o0xJAyGadqCm7vRjiWRMkCfDxkANcJQWa/NjMvsUwPSGIoxeIg=
-=FD4f
+iQEcBAEBCAAGBQJR3AUVAAoJEJ0WA1zPCt1hrtIIAJ7AuEuOaEtxs7a7MB71zdER
+gy9Hb7AE6JKDjfh2RVHxoBEkhG0fLLm3TlDKbU8oEVA35cCaHIbkmVafhatuIvDi
+38X7Syf6xAcJV7c+lEuaZdXQEs6QqdqBfZSp2nBeo4Ez2F49WDa0yz7b9AYicqKO
+vwVlZ7kUwCQWMdhJN3J8Q/28Wk80BoscT32JmubT+UBqXpOsSQUqFVlySAyVmozK
+UFsmXu7mBh7mtP84FsxX/aLb7ft91mrZlw3OkMRz1O/amo+YFVqCaDUk0/q3A6Zz
+LMlGxzaTA0XTgZC5QUO6QjpLUcg4FsaMebGWhcfpBAjE6gY5TVwW/jhbsUWQhGE=
+=45uS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/winetricks/metadata.xml b/app-emulation/winetricks/metadata.xml
index e189b9682bae..c2276f06266e 100644
--- a/app-emulation/winetricks/metadata.xml
+++ b/app-emulation/winetricks/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>wine</herd>
-	<upstream>
-		<remote-id type="google-code">winetricks</remote-id>
-	</upstream>
+<herd>wine</herd>
+<upstream>
+	<remote-id type="google-code">winetricks</remote-id>
+</upstream>
+<use>
+	<flag name="rar">Pull in <pkg>app-arch/unrar</pkg> for extraction of
+		rar-compressed game files</flag>
+</use>
 </pkgmetadata>
diff --git a/app-emulation/winetricks/winetricks-20130629.ebuild b/app-emulation/winetricks/winetricks-20130629.ebuild
index 1453eb20c417..6b4ffa929896 100644
--- a/app-emulation/winetricks/winetricks-20130629.ebuild
+++ b/app-emulation/winetricks/winetricks-20130629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130629.ebuild,v 1.2 2013/07/09 02:29:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130629.ebuild,v 1.3 2013/07/09 12:41:56 tetromino Exp $
 
 EAPI=5
 
@@ -23,18 +23,18 @@ HOMEPAGE="http://code.google.com/p/winetricks/ http://wiki.winehq.org/winetricks
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="gtk kde"
+IUSE="gtk kde rar"
 
 DEPEND=""
 RDEPEND="app-arch/cabextract
 	app-arch/p7zip
-	app-arch/unrar
 	app-arch/unzip
 	app-emulation/wine
 	net-misc/wget
 	x11-misc/xdg-utils
 	gtk? ( gnome-extra/zenity )
-	kde? ( kde-base/kdialog )"
+	kde? ( kde-base/kdialog )
+	rar? ( app-arch/unrar )"
 
 # Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
 QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 4320aaea783e..2b17407c633e 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.10 2013/07/09 02:29:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.11 2013/07/09 12:41:56 tetromino Exp $
 
 EAPI=5
 
@@ -23,18 +23,18 @@ HOMEPAGE="http://code.google.com/p/winetricks/ http://wiki.winehq.org/winetricks
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="gtk kde"
+IUSE="gtk kde rar"
 
 DEPEND=""
 RDEPEND="app-arch/cabextract
 	app-arch/p7zip
-	app-arch/unrar
 	app-arch/unzip
 	app-emulation/wine
 	net-misc/wget
 	x11-misc/xdg-utils
 	gtk? ( gnome-extra/zenity )
-	kde? ( kde-base/kdialog )"
+	kde? ( kde-base/kdialog )
+	rar? ( app-arch/unrar )"
 
 # Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
 QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"