summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-09-10 16:07:29 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-09-10 16:07:29 +0000
commit286824532ce48b687a593caa7cfd7fb4bb8c459b (patch)
tree7ebd3db362c95f462f66c0673bfb5eb65bd40924 /rox-extra
parentFix lzma-utils vs. xz-utils deps also in old version. (diff)
downloadgentoo-2-286824532ce48b687a593caa7cfd7fb4bb8c459b.tar.gz
gentoo-2-286824532ce48b687a593caa7cfd7fb4bb8c459b.tar.bz2
gentoo-2-286824532ce48b687a593caa7cfd7fb4bb8c459b.zip
Fix xz-utils vs. lzma-utils deps.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'rox-extra')
-rw-r--r--rox-extra/archive/ChangeLog7
-rw-r--r--rox-extra/archive/archive-2.2.ebuild6
2 files changed, 8 insertions, 5 deletions
diff --git a/rox-extra/archive/ChangeLog b/rox-extra/archive/ChangeLog
index 43bbf0eeacd3..6b21f55094e4 100644
--- a/rox-extra/archive/ChangeLog
+++ b/rox-extra/archive/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for rox-extra/archive
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/ChangeLog,v 1.21 2008/10/31 13:08:45 lack Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/ChangeLog,v 1.22 2009/09/10 16:07:29 ssuominen Exp $
+
+ 10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> archive-2.2.ebuild:
+ Fix xz-utils vs. lzma-utils deps.
31 Oct 2008; Jim Ramsay <lack@gentoo.org> -archive-2.1-r2.ebuild,
archive-2.2.ebuild:
diff --git a/rox-extra/archive/archive-2.2.ebuild b/rox-extra/archive/archive-2.2.ebuild
index 3df0c6a98ba6..811b9c540c21 100644
--- a/rox-extra/archive/archive-2.2.ebuild
+++ b/rox-extra/archive/archive-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/archive-2.2.ebuild,v 1.6 2008/10/31 13:08:45 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/archive-2.2.ebuild,v 1.7 2009/09/10 16:07:29 ssuominen Exp $
ROX_LIB_VER=2.0.0
inherit rox-0install
@@ -17,7 +17,7 @@ IUSE="bzip2 compress rar uuencode zip ace rpm cpio"
RDEPEND="virtual/gzip
app-arch/tar
- app-arch/lzma-utils
+ || ( app-arch/xz-utils app-arch/lzma-utils )
bzip2? ( app-arch/bzip2 )
compress? ( app-arch/ncompress )
rar? ( || ( app-arch/unrar app-arch/rar ) )