diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-10-13 22:13:56 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-10-13 22:13:56 +0000 |
| commit | 28637c0c602754504a2c04d92830784e8c2c5c1c (patch) | |
| tree | 9a96016623f0cac62fb33203ee6088ba8fa127fa /games-strategy/freeciv | |
| parent | mark as stable (diff) | |
| download | gentoo-2-28637c0c602754504a2c04d92830784e8c2c5c1c.tar.gz gentoo-2-28637c0c602754504a2c04d92830784e8c2c5c1c.tar.bz2 gentoo-2-28637c0c602754504a2c04d92830784e8c2c5c1c.zip | |
fix gtk funkiness
Diffstat (limited to 'games-strategy/freeciv')
| -rw-r--r-- | games-strategy/freeciv/freeciv-1.14.0-r1.ebuild | 48 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-1.15.0_alpha20030901.ebuild | 16 |
2 files changed, 31 insertions, 33 deletions
diff --git a/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild b/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild index 8c026a5f0e96..19d9d05a94ee 100644 --- a/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild +++ b/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild,v 1.2 2003/10/13 22:13:56 vapier Exp $ DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" @@ -12,16 +12,16 @@ KEYWORDS="x86 ppc sparc" IUSE="X Xaw3d gtk2 nls" DEPEND="X? ( virtual/x11 ) - Xaw3d? ( x11-libs/Xaw3d ) - gtk? ( ~x11-libs/gtk+-1.2.10-r4 - >=media-libs/imlib-1.9.2 - >=media-libs/libogg-1.0 - >=media-libs/libvorbis-1.0-r2 ) - gtk2? ( >=x11-libs/gtk+-2.0.0 - >=dev-libs/atk-1.0.3 - >=x11-libs/pango-1.2.1-r1 - >=media-libs/libogg-1.0 - >=media-libs/libvorbis-1.0-r2 )" + Xaw3d? ( x11-libs/Xaw3d ) + gtk? ( ~x11-libs/gtk+-1.2.10-r4 + >=media-libs/imlib-1.9.2 + >=media-libs/libogg-1.0 + >=media-libs/libvorbis-1.0-r2 ) + gtk2? ( >=x11-libs/gtk+-2.0.0 + >=dev-libs/atk-1.0.3 + >=x11-libs/pango-1.2.1-r1 + >=media-libs/libogg-1.0 + >=media-libs/libvorbis-1.0-r2 )" RDEPEND="sys-libs/zlib" src_compile() { @@ -35,24 +35,22 @@ src_compile() { use Xaw3d \ && myconf="${myconf} --enable-client=xaw3d --disable-gtktest" - use gtk \ - && myconf="${myconf} --enable-client=gtk --enable-gtktest" - - use gtk2 \ - && myconf="${myconf} --enable-client=gtk-2.0 --enable-gtktest" - + if [ `use gtk2` ] ; then + myconf="${myconf} --enable-client=gtk-2.0 --enable-gtktest" + elif [ `use gtk` ] ; then + myconf="${myconf} --enable-client=gtk --enable-gtktest" + fi use nls \ || myconf="${myconf} --disable-nls" - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --with-zlib \ - ${myconf} || die - + ./configure \ + --host=${CHOST} \ + --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --with-zlib \ + ${myconf} || die emake || die } diff --git a/games-strategy/freeciv/freeciv-1.15.0_alpha20030901.ebuild b/games-strategy/freeciv/freeciv-1.15.0_alpha20030901.ebuild index 4a232931896f..492bab47e515 100644 --- a/games-strategy/freeciv/freeciv-1.15.0_alpha20030901.ebuild +++ b/games-strategy/freeciv/freeciv-1.15.0_alpha20030901.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.15.0_alpha20030901.ebuild,v 1.3 2003/10/13 22:09:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.15.0_alpha20030901.ebuild,v 1.4 2003/10/13 22:13:56 vapier Exp $ inherit games @@ -46,13 +46,13 @@ src_compile() { use Xaw3d \ && myconf="${myconf} --enable-client=xaw3d --disable-gtktest" - use gtk \ - && myconf="${myconf} --enable-client=gtk --enable-gtktest" \ - || myconf="${myconf} --disable-client=gtk --disable-gtktest" - - use gtk2 \ - && myconf="${myconf} --enable-client=gtk-2.0 --enable-gtktest" \ - || myconf="${myconf} --disable-client=gtk-2.0 --disable-gtktest" + if [ `use gtk2` ] ; then + myconf="${myconf} --enable-client=gtk-2.0 --enable-gtktest" + elif [ `use gtk` ] ; then + myconf="${myconf} --enable-client=gtk --enable-gtktest" + else + myconf="${myconf} --disable-client --disable-gtktest" + fi use sdl \ && myconf="${myconf} --enable-client=sdl" \ |