diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-01-20 21:36:14 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-01-20 21:36:14 +0000 |
| commit | 5e9d5d6d9692e5d92dda6a1af0805c0af0196674 (patch) | |
| tree | 356bb843bb07020704cd325647fb12e05273772e /games-strategy/freeciv | |
| parent | Stable on sparc wrt #119634 (diff) | |
| download | gentoo-2-5e9d5d6d9692e5d92dda6a1af0805c0af0196674.tar.gz gentoo-2-5e9d5d6d9692e5d92dda6a1af0805c0af0196674.tar.bz2 gentoo-2-5e9d5d6d9692e5d92dda6a1af0805c0af0196674.zip | |
Added modular X dependencies and closing bug #119730.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'games-strategy/freeciv')
| -rw-r--r-- | games-strategy/freeciv/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.0.5.ebuild | 32 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.0.7.ebuild | 32 |
3 files changed, 52 insertions, 20 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog index 12f137486caf..4ecab2875a25 100644 --- a/games-strategy/freeciv/ChangeLog +++ b/games-strategy/freeciv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/freeciv -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.36 2005/11/07 09:11:35 mr_bones_ Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.37 2006/01/20 21:36:14 wolf31o2 Exp $ + + 20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> freeciv-2.0.5.ebuild, + freeciv-2.0.7.ebuild: + Added modular X dependencies and closing bug #119730. *freeciv-2.0.7 (07 Nov 2005) diff --git a/games-strategy/freeciv/freeciv-2.0.5.ebuild b/games-strategy/freeciv/freeciv-2.0.5.ebuild index 6a951aabb511..e8bbb24dda2a 100644 --- a/games-strategy/freeciv/freeciv-2.0.5.ebuild +++ b/games-strategy/freeciv/freeciv-2.0.5.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-strategy/freeciv/freeciv-2.0.5.ebuild,v 1.3 2005/09/20 20:32:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.5.ebuild,v 1.4 2006/01/20 21:36:14 wolf31o2 Exp $ inherit games @@ -9,10 +9,12 @@ DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2 !dedicated? ( - alsa? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - esd? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - sdl? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - )" + alsa? ( + http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) + esd? ( + http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) + sdl? ( + http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ))" LICENSE="GPL-2" SLOT="0" @@ -22,7 +24,6 @@ IUSE="alsa dedicated esd gtk nls readline sdl Xaw3d" RDEPEND="sys-libs/zlib readline? ( sys-libs/readline ) !dedicated? ( - virtual/x11 gtk? ( >=x11-libs/gtk+-2.0.0 >=dev-libs/glib-2.0.0 @@ -30,8 +31,21 @@ RDEPEND="sys-libs/zlib >=x11-libs/pango-1.0.5 ) !gtk? ( - Xaw3d? ( x11-libs/Xaw3d ) - ) + Xaw3d? ( + x11-libs/Xaw3d ) + !Xaw3d? ( + || ( + x11-libs/libXaw + virtual/x11 ) ) + || ( ( + x11-libs/libX11 + x11-libs/libICE + x11-libs/libSM + x11-libs/libXt + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm ) + virtual/x11 ) ) alsa? ( >=media-libs/alsa-lib-1.0 >=media-libs/audiofile-0.2 diff --git a/games-strategy/freeciv/freeciv-2.0.7.ebuild b/games-strategy/freeciv/freeciv-2.0.7.ebuild index 3a8402435f2d..cec1fa798575 100644 --- a/games-strategy/freeciv/freeciv-2.0.7.ebuild +++ b/games-strategy/freeciv/freeciv-2.0.7.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-strategy/freeciv/freeciv-2.0.7.ebuild,v 1.1 2005/11/07 09:11:35 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.7.ebuild,v 1.2 2006/01/20 21:36:14 wolf31o2 Exp $ inherit games @@ -9,10 +9,12 @@ DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2 !dedicated? ( - alsa? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - esd? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - sdl? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - )" + alsa? ( + http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) + esd? ( + http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) + sdl? ( + http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ))" LICENSE="GPL-2" SLOT="0" @@ -22,7 +24,6 @@ IUSE="alsa dedicated esd gtk nls readline sdl Xaw3d" RDEPEND="sys-libs/zlib readline? ( sys-libs/readline ) !dedicated? ( - virtual/x11 gtk? ( >=x11-libs/gtk+-2.0.0 >=dev-libs/glib-2.0.0 @@ -30,8 +31,21 @@ RDEPEND="sys-libs/zlib >=x11-libs/pango-1.0.5 ) !gtk? ( - Xaw3d? ( x11-libs/Xaw3d ) - ) + Xaw3d? ( + x11-libs/Xaw3d ) + !Xaw3d? ( + || ( + x11-libs/libXaw + virtual/x11 ) ) + || ( ( + x11-libs/libX11 + x11-libs/libICE + x11-libs/libSM + x11-libs/libXt + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm ) + virtual/x11 ) ) alsa? ( >=media-libs/alsa-lib-1.0 >=media-libs/audiofile-0.2 |