summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-09-10 15:59:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-09-10 15:59:05 +0000
commit8f24faf51f6af6700e7ca3d1a95de276fa9035b9 (patch)
tree190071066fd657f43d657050b828f78a3b32fbca /app-office
parentFix lzma-utils vs. xz-utils deps. (diff)
downloadgentoo-2-8f24faf51f6af6700e7ca3d1a95de276fa9035b9.tar.gz
gentoo-2-8f24faf51f6af6700e7ca3d1a95de276fa9035b9.tar.bz2
gentoo-2-8f24faf51f6af6700e7ca3d1a95de276fa9035b9.zip
Fix lzma-utils vs. xz-utils deps.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/gnucash/ChangeLog6
-rw-r--r--app-office/gnucash/gnucash-2.2.9-r1.ebuild4
-rw-r--r--app-office/gnucash/gnucash-2.2.9.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index ea65c12d0685..96e3842fc2b0 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/gnucash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.198 2009/09/06 19:23:43 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.199 2009/09/10 15:59:05 ssuominen Exp $
+
+ 10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> gnucash-2.2.9.ebuild,
+ gnucash-2.2.9-r1.ebuild:
+ Fix lzma-utils vs. xz-utils deps.
06 Sep 2009; Torsten Veller <tove@gentoo.org> -gnucash-2.3.2.ebuild:
Cleanup
diff --git a/app-office/gnucash/gnucash-2.2.9-r1.ebuild b/app-office/gnucash/gnucash-2.2.9-r1.ebuild
index 66ddabed558e..268e4ac1a228 100644
--- a/app-office/gnucash/gnucash-2.2.9-r1.ebuild
+++ b/app-office/gnucash/gnucash-2.2.9-r1.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/app-office/gnucash/gnucash-2.2.9-r1.ebuild,v 1.6 2009/08/02 15:30:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9-r1.ebuild,v 1.7 2009/09/10 15:59:05 ssuominen Exp $
EAPI=2
@@ -44,7 +44,7 @@ RDEPEND=">=dev-libs/glib-2.6.3
x11-libs/pango"
DEPEND="${RDEPEND}
- app-arch/lzma-utils
+ || ( app-arch/xz-utils app-arch/lzma-utils )
dev-util/pkgconfig
dev-util/intltool
sys-devel/libtool
diff --git a/app-office/gnucash/gnucash-2.2.9.ebuild b/app-office/gnucash/gnucash-2.2.9.ebuild
index c453b3bb8a8b..134259c4da23 100644
--- a/app-office/gnucash/gnucash-2.2.9.ebuild
+++ b/app-office/gnucash/gnucash-2.2.9.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/app-office/gnucash/gnucash-2.2.9.ebuild,v 1.6 2009/04/27 13:07:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9.ebuild,v 1.7 2009/09/10 15:59:05 ssuominen Exp $
EAPI=2
@@ -43,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.6.3
x11-libs/pango"
DEPEND="${RDEPEND}
- app-arch/lzma-utils
+ || ( app-arch/xz-utils app-arch/lzma-utils )
dev-util/pkgconfig
dev-util/intltool
sys-devel/libtool