diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2006-10-05 20:49:08 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2006-10-05 20:49:08 +0000 |
| commit | 1ee1dc261531dcc0be2f90f2ecc0d64dd2d2250e (patch) | |
| tree | af52cca57acdb3536af78da5293bae25d57be61a /games-strategy/freeciv | |
| parent | Add a sessionsaver extension (diff) | |
| download | gentoo-2-1ee1dc261531dcc0be2f90f2ecc0d64dd2d2250e.tar.gz gentoo-2-1ee1dc261531dcc0be2f90f2ecc0d64dd2d2250e.tar.bz2 gentoo-2-1ee1dc261531dcc0be2f90f2ecc0d64dd2d2250e.zip | |
Fix gettext dependency
(Portage version: 2.1.2_pre2-r3)
Diffstat (limited to 'games-strategy/freeciv')
| -rw-r--r-- | games-strategy/freeciv/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.0.8-r1.ebuild | 32 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.0.8-r2.ebuild | 6 |
3 files changed, 22 insertions, 22 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog index 3b745679d1ab..240b28e53ea4 100644 --- a/games-strategy/freeciv/ChangeLog +++ b/games-strategy/freeciv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/freeciv # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.51 2006/10/03 13:38:41 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.52 2006/10/05 20:49:08 nyhm Exp $ + + 05 Oct 2006; Tristan Heaven <nyhm@gentoo.org> freeciv-2.0.8-r1.ebuild, + freeciv-2.0.8-r2.ebuild: + Fix gettext dependency 03 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> freeciv-2.0.8-r2.ebuild: diff --git a/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild b/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild index ce9952a4a015..059d53908749 100644 --- a/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild +++ b/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild @@ -1,6 +1,6 @@ # 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.8-r1.ebuild,v 1.2 2006/08/28 00:43:00 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild,v 1.3 2006/10/05 20:49:08 nyhm Exp $ inherit eutils games @@ -21,11 +21,10 @@ SLOT="0" KEYWORDS="alpha amd64 mips ppc sparc x86" IUSE="alsa dedicated esd gtk nls readline sdl Xaw3d" -RDEPEND="sys-libs/zlib - readline? ( sys-libs/readline ) +RDEPEND="readline? ( sys-libs/readline ) !dedicated? ( + nls? ( virtual/libintl ) gtk? ( - >=dev-util/pkgconfig-0.9 >=x11-libs/gtk+-2.0.0 >=dev-libs/glib-2.0.0 >=dev-libs/atk-1.0.3 @@ -35,18 +34,15 @@ RDEPEND="sys-libs/zlib 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 ) ) + x11-libs/libXaw ) + x11-libs/libX11 + x11-libs/libICE + x11-libs/libSM + x11-libs/libXt + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + ) alsa? ( >=media-libs/alsa-lib-1.0 >=media-libs/audiofile-0.2 @@ -59,8 +55,8 @@ RDEPEND="sys-libs/zlib )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) - || ( ( x11-proto/xextproto ) - virtual/x11 )" + !dedicated? ( gtk? ( >=dev-util/pkgconfig-0.9 ) ) + x11-proto/xextproto" S=${WORKDIR}/${MY_P} diff --git a/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild b/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild index 9fb68d4bdc15..9ca8eea6f122 100644 --- a/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild +++ b/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild @@ -1,6 +1,6 @@ # 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.8-r2.ebuild,v 1.3 2006/10/03 13:38:41 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild,v 1.4 2006/10/05 20:49:08 nyhm Exp $ inherit eutils games @@ -21,9 +21,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~mips ~ppc sparc x86" IUSE="alsa auth dedicated esd gtk nls readline sdl Xaw3d" -RDEPEND="sys-libs/zlib - readline? ( sys-libs/readline ) +RDEPEND="readline? ( sys-libs/readline ) !dedicated? ( + nls? ( virtual/libintl ) gtk? ( >=x11-libs/gtk+-2.0.0 ) !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) |