Added modular X dependencies and closing bug #120077.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 39 insertions, 13 deletions

diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog
index fc6089db2dbc..803ba692183c 100644
--- a/games-server/crossfire-server/ChangeLog
+++ b/games-server/crossfire-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/crossfire-server
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.5 2005/10/19 03:19:10 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.6 2006/01/24 19:41:08 wolf31o2 Exp $
+
+  24 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  crossfire-server-1.6.0.ebuild, crossfire-server-1.8.0.ebuild:
+  Added modular X dependencies and closing bug #120077.
 
 *crossfire-server-1.8.0 (19 Oct 2005)
 
diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest
index 94f68d354f4e..05f3103c5e8f 100644
--- a/games-server/crossfire-server/Manifest
+++ b/games-server/crossfire-server/Manifest
@@ -1,6 +1,6 @@
-MD5 5144a18fa15ebd9b7924afa918e89c9e ChangeLog 870
-MD5 c01244a6e45a187fb51cda8826421ac1 crossfire-server-1.6.0.ebuild 806
-MD5 2f2146311b8924cdb2fb0e94e080d0e1 crossfire-server-1.8.0.ebuild 867
+MD5 de20832b1d24cb52854b8e63ddc67978 ChangeLog 1044
+MD5 6f95b8af9fa170fd3a999b34a383828f crossfire-server-1.6.0.ebuild 980
+MD5 b05283dd58d18715a29426c29e2fde3e crossfire-server-1.8.0.ebuild 1058
 MD5 04ee4ac8192859555fb54ce6e6486c76 files/digest-crossfire-server-1.6.0 69
 MD5 5baaa6390b37eecd7ea8934dcb2c82fa files/digest-crossfire-server-1.8.0 68
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
diff --git a/games-server/crossfire-server/crossfire-server-1.6.0.ebuild b/games-server/crossfire-server/crossfire-server-1.6.0.ebuild
index 5192cc997d10..145c3b5e4e22 100644
--- a/games-server/crossfire-server/crossfire-server-1.6.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.6.0.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-server/crossfire-server/crossfire-server-1.6.0.ebuild,v 1.5 2004/07/01 11:23:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.6.0.ebuild,v 1.6 2006/01/24 19:41:08 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -11,12 +11,22 @@ SRC_URI="mirror://sourceforge/crossfire/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="ppc x86"
 IUSE="X"
 
 DEPEND="virtual/libc
 	X? (
-		virtual/x11
+		|| (
+			(
+				x11-libs/libX11
+				x11-libs/libXext
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXt
+				x11-libs/libXmu
+				x11-libs/libXaw
+				x11-libs/libXpm )
+			virtual/x11 )
 		media-libs/libpng )"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/games-server/crossfire-server/crossfire-server-1.8.0.ebuild b/games-server/crossfire-server/crossfire-server-1.8.0.ebuild
index 8b85b1953ca0..9c6e032688df 100644
--- a/games-server/crossfire-server/crossfire-server-1.8.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.8.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/games-server/crossfire-server/crossfire-server-1.8.0.ebuild,v 1.1 2005/10/19 03:19:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.8.0.ebuild,v 1.2 2006/01/24 19:41:08 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -14,8 +14,20 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="X"
 
-DEPEND=" X? ( virtual/x11
-	media-libs/libpng )"
+DEPEND="virtual/libc
+	X? (
+		|| (
+			(
+				x11-libs/libX11
+				x11-libs/libXext
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXt
+				x11-libs/libXmu
+				x11-libs/libXaw
+				x11-libs/libXpm )
+			virtual/x11 )
+		media-libs/libpng )"
 
 S="${WORKDIR}/${MY_P}"