Allow unrar-gpl for unrar needs #270728 by Mathy Vanvoorden.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 15 insertions, 11 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 6a1b8e28820f..9b9dc55e0d64 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.18 2009/05/16 14:49:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.19 2009/05/29 20:58:22 vapier Exp $
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9.04.ebuild,
+  xbmc-9999.ebuild:
+  Allow unrar-gpl for unrar needs #270728 by Mathy Vanvoorden.
 
 *xbmc-9.04 (16 May 2009)
 
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 28ff2d32dd03..6d919e87312d 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 AUX xbmc-9.04-gcc.patch 252 RMD160 579d33427df995235569de17aaf013e5120b9b5f SHA1 bd6f5a6055d00bda6672f16f68219e1e3ce87155 SHA256 b5d1e9085fddf033b8eefb241d585dd3e4daac230d25e9f3b3260fe0299bc025
 DIST XBMC_9.04_Babylon-linux-osx-win32.tar.bz2 111993901 RMD160 7b108c0d22ca31895008d056e3f681e3c98386e2 SHA1 097db32fa4ae4ced0c8d101195d040a81a6ca105 SHA256 2a477b51578e345112859ea06d20abea03a7e6d079ac4012670b1b1b82b3faed
-EBUILD xbmc-9.04.ebuild 3507 RMD160 3eefd934e0de35cb1c23edf83cba823b9440ab43 SHA1 b0e070e1cc599f7ca996aa2f978d6fd47d640989 SHA256 8b0ba50063f1c1f77008ccb151d270e2c8e92ec68be3143e52514c6ad186a5ac
-EBUILD xbmc-9999.ebuild 3429 RMD160 31bc0bad71d87eb592f6f7b9e20f38ea7c7e2bc4 SHA1 298bda330f79b025e7fbac5b08aa951e8ad6e490 SHA256 7859059718171061ba474efd1094e117bdf7df6c38e5d9ee569ed1cc3e38ff52
-MISC ChangeLog 2918 RMD160 5775c71c150d355b64dd6bb65604887b0e26acd6 SHA1 b0997d29998dfe184fd583a3ade1653abc1c9660 SHA256 21d6b71214b1091e9628ccd799e3b0fc4a6f9e3a09f5dc50540c657bf696e41e
+EBUILD xbmc-9.04.ebuild 3533 RMD160 35d4e6c0cd2bd162bc9ff56cf0ee77b6d7eb39ea SHA1 3536e4f1d0ec7890457d5a97115b84a9ed963d46 SHA256 f44eef67edebc0049422fe8c64ef6c68b82e2019c3dffd74fe01a1cf2aaaf948
+EBUILD xbmc-9999.ebuild 3289 RMD160 bce71de8e1bdb3f2580a0e33a7f40ee844e61f5c SHA1 a98ee77060f1a7f0e64c33b28e38fea174d5ca41 SHA256 52fc4e7e7716ba3c91ab9d8018322195716e122cba0b34368045b4a95f5f580a
+MISC ChangeLog 3070 RMD160 ccf822dc7d72f151bba7adc13cba42387c8982e5 SHA1 a61ca883aa2e52aca41753d6e36e29a9f49e42ba SHA256 41081ba06136c4f01778a89462c9a76424813cb64163c2b9585e3bfdba45967f
 MISC metadata.xml 259 RMD160 1451e37fea39b948f3e6f0c0eb20c8d9e41801f0 SHA1 73240b8832bc707628304061d6980bdf7d6baa28 SHA256 31764ed43ab7fbf241987d089733cd337e410b53f3135ff020a13ed24793af64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoO3/kACgkQn/5bYzqsSmHJ/ACfYTFL3GzIIltXcMTcsoTI7W3o
-PIoAmwUFPeat1q7NJwssJAkoCErR18Cz
-=o1e9
+iEYEARECAAYFAkogTHQACgkQn/5bYzqsSmHXegCgif1ZDNnFdukCAN7YVkStLsQR
+ZO4AoJOC5sNQpjufa/c7ysdTwtEv0TAh
+=5TdK
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9.04.ebuild b/media-tv/xbmc/xbmc-9.04.ebuild
index 151b4e212717..c59918dc5a2f 100644
--- a/media-tv/xbmc/xbmc-9.04.ebuild
+++ b/media-tv/xbmc/xbmc-9.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.04.ebuild,v 1.1 2009/05/16 14:49:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.04.ebuild,v 1.2 2009/05/29 20:58:22 vapier Exp $
 
 # XXX: be nice to split out packages that come bundled and use the
 #      system libraries ...
@@ -32,7 +32,7 @@ IUSE="alsa debug joystick opengl profile pulseaudio vdpau"
 
 RDEPEND="opengl? ( virtual/opengl )
 	app-arch/bzip2
-	app-arch/unrar
+	|| ( app-arch/unrar app-arch/unrar-gpl )
 	app-arch/unzip
 	app-arch/zip
 	app-i18n/enca
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 67b647060fab..367784e99f6d 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.24 2009/05/29 20:57:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.25 2009/05/29 20:58:22 vapier Exp $
 
 # XXX: be nice to split out packages that come bundled and use the
 #      system libraries ...
@@ -30,7 +30,7 @@ IUSE="alsa debug joystick opengl profile pulseaudio vdpau"
 
 RDEPEND="opengl? ( virtual/opengl )
 	app-arch/bzip2
-	app-arch/unrar
+	|| ( app-arch/unrar app-arch/unrar-gpl )
 	app-arch/unzip
 	app-arch/zip
 	app-i18n/enca