modular X deps

Package-Manager: portage-2.1_pre6-r2

diff --git a/games-strategy/xbattle/ChangeLog b/games-strategy/xbattle/ChangeLog
index ffc24eb081690ede3ad51c02772ee8c6fa69f5ef..535cb0c28f687f0165c121f0e818da2f0a992f92 100644 (file)
--- a/games-strategy/xbattle/ChangeLog
+++ b/games-strategy/xbattle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/xbattle
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/ChangeLog,v 1.3 2004/12/30 05:10:23 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/ChangeLog,v 1.4 2006/03/14 23:04:48 mr_bones_ Exp $
+
+  14 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org> xbattle-5.4.1.ebuild:
+  modular X deps
 
   29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> xbattle-5.4.1.ebuild:
   official homepage went away so use a replacement (bug #72885); tidy

diff --git a/games-strategy/xbattle/Manifest b/games-strategy/xbattle/Manifest
index f41c13818f39dcaec1257694343f7482a27344d3..06a003e50c073166638ebf4d02e808e06e09cde3 100644 (file)
--- a/games-strategy/xbattle/Manifest
+++ b/games-strategy/xbattle/Manifest
@@ -1,4 +1,12 @@
-MD5 fb547543369f8151587615ac1ae63cd6 ChangeLog 556
-MD5 053adb5a213c70eef1becc4974c7ade4 metadata.xml 1360
-MD5 7e85ed0a9699eb7cd8d0fb7ff21eca1e xbattle-5.4.1.ebuild 1321
+MD5 88cf268ea6d617a685afeb98aafc1b4a ChangeLog 651
+RMD160 55b0dd3fada3fbab9e7372d3f0e6965fded7beca ChangeLog 651
+SHA256 9810e246fac73524e3a81ec989036553de6ed551eb67416f11aab9b293854830 ChangeLog 651
 MD5 9430b48ce6fae1abaa361a27350a99e0 files/digest-xbattle-5.4.1 65
+RMD160 47849c1d7d10db9169b070d03e67c563e8e7bdfb files/digest-xbattle-5.4.1 65
+SHA256 07a5635100b78bb12ad24ac850f4f9dc8e2b1d6356b17c6e05b5e1218e3ba28d files/digest-xbattle-5.4.1 65
+MD5 053adb5a213c70eef1becc4974c7ade4 metadata.xml 1360
+RMD160 21f3335fb7d0a292d70c9e5062d189e5573a786a metadata.xml 1360
+SHA256 49efcf76d81f70450581242e49c24ace5ee353ee2ccd308aba553447c927efda metadata.xml 1360
+MD5 5aa7abe0c259ede48054e5e372dabd0a xbattle-5.4.1.ebuild 1480
+RMD160 f226140e81b8a94eb07a5aedc098b38dff93a4e0 xbattle-5.4.1.ebuild 1480
+SHA256 c39ecfb8e437fc35fbf46506cdec68370fbf043de2e2dc1bd908b90ce7265a0c xbattle-5.4.1.ebuild 1480

diff --git a/games-strategy/xbattle/xbattle-5.4.1.ebuild b/games-strategy/xbattle/xbattle-5.4.1.ebuild
index 47393f62edf7ef58f65f92b07205eb48b51e4080..59452c8ab613073006a7df8530a1bd973fee64f9 100644 (file)
--- a/games-strategy/xbattle/xbattle-5.4.1.ebuild
+++ b/games-strategy/xbattle/xbattle-5.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/xbattle-5.4.1.ebuild,v 1.4 2004/12/30 05:10:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/xbattle-5.4.1.ebuild,v 1.5 2006/03/14 23:04:48 mr_bones_ Exp $
 
 inherit games
 
@@ -13,7 +13,13 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="
+       || ( ( x11-libs/libXext x11-libs/libX11 )
+               virtual/x11 )"
+DEPEND="${RDEPENDS}
+       || ( ( x11-proto/xproto x11-libs/libX11 app-text/rman x11-misc/imake )
+               virtual/x11 )"
+
 
 src_unpack() {
        unpack ${A}