Added 'Any of many' dep for rar / unrar and arj / unarj wrt bug 157879

Package-Manager: portage-2.1.1-r2

diff --git a/xfce-extra/xarchiver/ChangeLog b/xfce-extra/xarchiver/ChangeLog
index 12abdd740c8331f85e1ee8d09b9f73e780d4be1a..75251812e678b3497114b5afe12767c54204d7ac 100644 (file)
--- a/xfce-extra/xarchiver/ChangeLog
+++ b/xfce-extra/xarchiver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xarchiver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xarchiver/ChangeLog,v 1.6 2006/12/13 21:31:16 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xarchiver/ChangeLog,v 1.7 2006/12/16 08:11:15 welp Exp $
+
+  16 Dec 2006; Peter Weller <welp@gentoo.org> xarchiver-0.4.2_rc2-r1.ebuild:
+  Added 'Any of many' dep for rar / unrar and arj / unarj wrt bug 157879
 
 *xarchiver-0.4.2_rc2-r1 (13 Dec 2006)
 

diff --git a/xfce-extra/xarchiver/Manifest b/xfce-extra/xarchiver/Manifest
index caabc9919d33a70ea72a3a9a9f53fae4cad5573c..73906476bc4a920d50f4fb917aeb06427c8ca707 100644 (file)
--- a/xfce-extra/xarchiver/Manifest
+++ b/xfce-extra/xarchiver/Manifest
@@ -1,16 +1,16 @@
 DIST xarchiver-0.4.2rc2.tar.bz2 646034 RMD160 f82a79ca73619bbab9a28b5fd72f204124467675 SHA1 8174d8e9cf178480a926ebd0dd18e6396475b769 SHA256 1ecae62e181400cdc712ceab44743dbed77e498d76e0f6045f11eaa0a433113d
-EBUILD xarchiver-0.4.2_rc2-r1.ebuild 770 RMD160 eec8e1fd25cc59c97e6e6f0d87bbfecdf78b23e5 SHA1 17e55fca61e283349873fc4d1bcd490177fb3ccc SHA256 6f8229abd847e304f89713fbe3c429164f57642b7c71c9e7f661a40fa7de4a7c
-MD5 1f0520ef4edc55d6c2e553b23654b235 xarchiver-0.4.2_rc2-r1.ebuild 770
-RMD160 eec8e1fd25cc59c97e6e6f0d87bbfecdf78b23e5 xarchiver-0.4.2_rc2-r1.ebuild 770
-SHA256 6f8229abd847e304f89713fbe3c429164f57642b7c71c9e7f661a40fa7de4a7c xarchiver-0.4.2_rc2-r1.ebuild 770
+EBUILD xarchiver-0.4.2_rc2-r1.ebuild 810 RMD160 600de3f76ae5068f1005b2c057a459073fcb7353 SHA1 a7a8fb0ab70ca5065bbf4b0faf18d17b06284aef SHA256 5833d337d0b25d5777a983278a3486554888c0454a7e7d31ad4cdbdd71ce90ff
+MD5 6fb68b04e959b99d90131e8dd62f1c09 xarchiver-0.4.2_rc2-r1.ebuild 810
+RMD160 600de3f76ae5068f1005b2c057a459073fcb7353 xarchiver-0.4.2_rc2-r1.ebuild 810
+SHA256 5833d337d0b25d5777a983278a3486554888c0454a7e7d31ad4cdbdd71ce90ff xarchiver-0.4.2_rc2-r1.ebuild 810
 EBUILD xarchiver-0.4.2_rc2.ebuild 728 RMD160 d994864be2e0c5eff2ddbffc3989b47885d01918 SHA1 6540a0e6a7c0d59e220fc800e9289349935903cf SHA256 88008a4339ba3901e8f9e71b774cef6bb396cdfcbf3fac7b86519ffc00352577
 MD5 05cbfec5b65c72b6b5d5e4a1a2fb9358 xarchiver-0.4.2_rc2.ebuild 728
 RMD160 d994864be2e0c5eff2ddbffc3989b47885d01918 xarchiver-0.4.2_rc2.ebuild 728
 SHA256 88008a4339ba3901e8f9e71b774cef6bb396cdfcbf3fac7b86519ffc00352577 xarchiver-0.4.2_rc2.ebuild 728
-MISC ChangeLog 1005 RMD160 594308cb71b16e89fd76c4bbacf8f48548d8033c SHA1 b40fc3292375252a4a6d88fde8597d4c4f9949e9 SHA256 b7a21458e64dfabd425676c9b8964b6b30c37ce77c87d4c3b55a8259ed58e5ee
-MD5 e5b1f6a90ff94d88b9522666dd22f62d ChangeLog 1005
-RMD160 594308cb71b16e89fd76c4bbacf8f48548d8033c ChangeLog 1005
-SHA256 b7a21458e64dfabd425676c9b8964b6b30c37ce77c87d4c3b55a8259ed58e5ee ChangeLog 1005
+MISC ChangeLog 1156 RMD160 49925af7706f58d77e91b290d28e278a3ced62ff SHA1 84d00cf8687510d6d91572a3c7588621fa72ca78 SHA256 2e02d1b891e2e5013c870a8e418ce254f9f84e7663bf8fadd85b38e551082925
+MD5 73daccffa66bdedca5608c1c913cbda0 ChangeLog 1156
+RMD160 49925af7706f58d77e91b290d28e278a3ced62ff ChangeLog 1156
+SHA256 2e02d1b891e2e5013c870a8e418ce254f9f84e7663bf8fadd85b38e551082925 ChangeLog 1156
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157

diff --git a/xfce-extra/xarchiver/xarchiver-0.4.2_rc2-r1.ebuild b/xfce-extra/xarchiver/xarchiver-0.4.2_rc2-r1.ebuild
index 6dbf87eae5b998d10211b937a16abdc6fd6b7129..4e0bc03ef4c3dfbf660cc05bc6311b1b550192e6 100644 (file)
--- a/xfce-extra/xarchiver/xarchiver-0.4.2_rc2-r1.ebuild
+++ b/xfce-extra/xarchiver/xarchiver-0.4.2_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xarchiver/xarchiver-0.4.2_rc2-r1.ebuild,v 1.1 2006/12/13 21:31:16 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xarchiver/xarchiver-0.4.2_rc2-r1.ebuild,v 1.2 2006/12/16 08:11:15 welp Exp $
 
 inherit eutils xfce44 versionator
 
@@ -22,8 +22,8 @@ DEPEND=">=x11-libs/gtk+-2.6
        app-arch/zip
        app-arch/bzip2"
 RDEPEND="${DEPEND}
-       arj? ( app-arch/unarj )
+       arj? ( || ( app-arch/unarj app-arch/arj ) )
        ace? ( app-arch/unace )
-       rar? ( app-arch/unrar )
+       rar? ( || ( app-arch/unrar app-arch/rar ) )
        7zip? ( app-arch/p7zip )
        rpm? ( app-arch/rpm )"