Add modular X deps.

(Portage version: 2.1_pre3-r1)

4 files changed, 18 insertions, 10 deletions

diff --git a/sci-calculators/hcalc/ChangeLog b/sci-calculators/hcalc/ChangeLog
index 29c2250b7d82..16a11a2b7f7c 100644
--- a/sci-calculators/hcalc/ChangeLog
+++ b/sci-calculators/hcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-calculators/hcalc
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/ChangeLog,v 1.3 2005/04/19 22:02:26 wormo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/ChangeLog,v 1.4 2006/01/19 01:04:38 spyderous Exp $
+
+  19 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; hcalc-1.0.ebuild:
+  Add modular X deps.
 
   19 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> hcalc-1.0.ebuild:
   marked ~ppc
diff --git a/sci-calculators/hcalc/hcalc-1.0.ebuild b/sci-calculators/hcalc/hcalc-1.0.ebuild
index 706e105b6862..4ed691ec71bc 100644
--- a/sci-calculators/hcalc/hcalc-1.0.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/hcalc-1.0.ebuild,v 1.2 2005/04/19 22:02:26 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/hcalc-1.0.ebuild,v 1.3 2006/01/19 01:04:38 spyderous Exp $
 
 DESCRIPTION="DJ's Hex Calculator"
 HOMEPAGE="http://www.delorie.com/store/hcalc/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="|| ( x11-libs/libXpm virtual/x11 )"
 
 S=${WORKDIR}
 
diff --git a/sci-calculators/hexcalc/ChangeLog b/sci-calculators/hexcalc/ChangeLog
index c56a9b1bc56e..2acedc9b4056 100644
--- a/sci-calculators/hexcalc/ChangeLog
+++ b/sci-calculators/hexcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-calculators/hexcalc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.4 2005/12/08 01:08:14 cryos Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.5 2006/01/19 01:07:21 spyderous Exp $
+
+  19 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; hexcalc-1.11.ebuild:
+  Add modular X deps.
 
   08 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> hexcalc-1.11.ebuild:
   Stable on amd64.
diff --git a/sci-calculators/hexcalc/hexcalc-1.11.ebuild b/sci-calculators/hexcalc/hexcalc-1.11.ebuild
index 320770c24ffe..2d20715d590a 100644
--- a/sci-calculators/hexcalc/hexcalc-1.11.ebuild
+++ b/sci-calculators/hexcalc/hexcalc-1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11.ebuild,v 1.3 2005/12/08 01:08:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11.ebuild,v 1.4 2006/01/19 01:07:21 spyderous Exp $
 
 DESCRIPTION="A simple hex calculator for X"
 HOMEPAGE="ftp://ftp.x.org/R5contrib/"
@@ -10,7 +10,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXaw virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-misc/imake virtual/x11 )"
 
 S=${WORKDIR}/${PN}