summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-01-24 19:41:08 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-01-24 19:41:08 +0000
commit9ab233adb03bf34b5953b8e6bdd01899822192cf (patch)
treec94021fb6b3a161e407c65570850a00a41e4f3d1 /games-server/crossfire-server
parentStable on x86 (bug #120111). (diff)
downloadgentoo-2-9ab233adb03bf34b5953b8e6bdd01899822192cf.tar.gz
gentoo-2-9ab233adb03bf34b5953b8e6bdd01899822192cf.tar.bz2
gentoo-2-9ab233adb03bf34b5953b8e6bdd01899822192cf.zip
Added modular X dependencies and closing bug #120077.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'games-server/crossfire-server')
-rw-r--r--games-server/crossfire-server/ChangeLog8
-rw-r--r--games-server/crossfire-server/crossfire-server-1.6.0.ebuild18
-rw-r--r--games-server/crossfire-server/crossfire-server-1.8.0.ebuild20
3 files changed, 36 insertions, 10 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/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}"