summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-09-10 15:35:52 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-09-10 15:35:52 +0000
commit87a687f3dc74c6aa45549f4587e9e70c6caf0e74 (patch)
tree584897225c4530bb9619507ea9955d243b1ebf53 /sci-electronics
parentRemove all 10.* ebuilds pre 4585. (diff)
downloadgentoo-2-87a687f3dc74c6aa45549f4587e9e70c6caf0e74.tar.gz
gentoo-2-87a687f3dc74c6aa45549f4587e9e70c6caf0e74.tar.bz2
gentoo-2-87a687f3dc74c6aa45549f4587e9e70c6caf0e74.zip
Fix xz-utils vs. lzma-utils deps.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/kicad/ChangeLog6
-rw-r--r--sci-electronics/kicad/kicad-20090320.1666-r1.ebuild4
-rw-r--r--sci-electronics/kicad/kicad-20090320.1666.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 5a242c63046a..c9e91c8743ab 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-electronics/kicad
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.39 2009/05/07 15:54:31 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.40 2009/09/10 15:35:52 ssuominen Exp $
+
+ 10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+ kicad-20090320.1666.ebuild, kicad-20090320.1666-r1.ebuild:
+ Fix xz-utils vs. lzma-utils deps.
*kicad-20090320.1666-r1 (07 May 2009)
diff --git a/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild b/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild
index e64982238bbf..d0366cc1d29c 100644
--- a/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild
+++ b/sci-electronics/kicad/kicad-20090320.1666-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/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild,v 1.1 2009/05/07 15:54:31 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild,v 1.2 2009/09/10 15:35:52 ssuominen Exp $
EAPI="2"
WX_GTK_VER="2.8"
@@ -26,7 +26,7 @@ CDEPEND=">=dev-util/cmake-2.6.0
x11-libs/wxGTK:2.8[X,opengl]
sys-libs/zlib"
DEPEND="${CDEPEND}
- app-arch/lzma-utils"
+ || ( app-arch/xz-utils app-arch/lzma-utils )"
RDEPEND="${CDEPEND}
python? ( dev-lang/python )"
diff --git a/sci-electronics/kicad/kicad-20090320.1666.ebuild b/sci-electronics/kicad/kicad-20090320.1666.ebuild
index a4f99c29dcce..cc6bf26a3a3e 100644
--- a/sci-electronics/kicad/kicad-20090320.1666.ebuild
+++ b/sci-electronics/kicad/kicad-20090320.1666.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/sci-electronics/kicad/kicad-20090320.1666.ebuild,v 1.2 2009/04/21 21:53:16 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20090320.1666.ebuild,v 1.3 2009/09/10 15:35:52 ssuominen Exp $
EAPI="2"
WX_GTK_VER="2.8"
@@ -26,7 +26,7 @@ CDEPEND=">=dev-util/cmake-2.6.0
x11-libs/wxGTK:2.8[X,opengl]
sys-libs/zlib"
DEPEND="${CDEPEND}
- app-arch/lzma-utils"
+ || ( app-arch/xz-utils app-arch/lzma-utils )"
RDEPEND="${CDEPEND}
python? ( dev-lang/python )"