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
commite0dbe4dee6b1c0b6349e2de4a8c10efd7d820b30 (patch)
treec326c54272fe96b70887f59512184ceddafe7709 /rox-extra
parentFix lzma-utils vs. xz-utils deps also in old version. (diff)
downloadhistorical-e0dbe4dee6b1c0b6349e2de4a8c10efd7d820b30.tar.gz
historical-e0dbe4dee6b1c0b6349e2de4a8c10efd7d820b30.tar.bz2
historical-e0dbe4dee6b1c0b6349e2de4a8c10efd7d820b30.zip
Fix xz-utils vs. lzma-utils deps.
Package-Manager: portage-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/Manifest4
-rw-r--r--rox-extra/archive/archive-2.2.ebuild6
3 files changed, 10 insertions, 7 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/Manifest b/rox-extra/archive/Manifest
index 40b624c9a6b5..0311b8acd170 100644
--- a/rox-extra/archive/Manifest
+++ b/rox-extra/archive/Manifest
@@ -1,4 +1,4 @@
DIST archive-2.2.tar.bz2 29713 RMD160 fd3129edf2b79d327d0e2b9b720721fbf92887e4 SHA1 b809c693d906b1dfd65ab5b8282713198876ab81 SHA256 b792c45ba7fb6a475ea30eb93d7477306ac053e8a525fab38a0fc14c8a466fb2
-EBUILD archive-2.2.ebuild 1535 RMD160 db1c70a3cf84e29da028fbe0a0cc0465b5f28bf4 SHA1 a630caf4dbad2dc0495830c7752453066a0041c9 SHA256 9f3dd60d6358059dab4b3c18037b382f7f82d63216ba42100036046c011338a4
-MISC ChangeLog 2930 RMD160 862fc5f018edcd08e23f8d016dc44b82c7abaa69 SHA1 f3a12926743f4371c656dc9adc33dc74875cccca SHA256 6668a6240e98f42bbc51358d257e71ae58396556ad12213b4574b06521f0635e
+EBUILD archive-2.2.ebuild 1565 RMD160 8175cfacdf5453f5f9bb87c9444ca286fc513404 SHA1 3e4036c771a108596d4c662858396180d50ed0d9 SHA256 45e1b92a6f11c095f51eb7ae720cdb158c215c2bd9cbc9499703fe2718482a9f
+MISC ChangeLog 3046 RMD160 62414dcfa5070433c2e05088d83f642004339e4e SHA1 548111222584e73471cdbfab7992d9c313f001d5 SHA256 e6c42a444b5ec3c63d8b48312517cafd439874b7e616d061247ce987d5f93732
MISC metadata.xml 814 RMD160 8b581f62b5a4893a6ed1d39379aba999c0e81c21 SHA1 341a3ba6b8d7c44cec7d0ddc423da35a5f4881e3 SHA256 d0e9a219e7f9c255b06431f2efcd24a18a5b11fed97f14e046cac5e65c821b78
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 ) )