diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2005-09-20 20:32:38 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2005-09-20 20:32:38 +0000 |
commit | adef06a0d606b72ddbf73894e67f02997e65c49b (patch) | |
tree | c413f1a10783b4aabb859bc717126677cf3e7d36 /games-strategy/freeciv | |
parent | Fixing ggz mask. (diff) | |
download | historical-adef06a0d606b72ddbf73894e67f02997e65c49b.tar.gz historical-adef06a0d606b72ddbf73894e67f02997e65c49b.tar.bz2 historical-adef06a0d606b72ddbf73894e67f02997e65c49b.zip |
remove gtk2 use flag; fix src_install; tidy
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'games-strategy/freeciv')
-rw-r--r-- | games-strategy/freeciv/ChangeLog | 5 | ||||
-rw-r--r-- | games-strategy/freeciv/Manifest | 4 | ||||
-rw-r--r-- | games-strategy/freeciv/freeciv-2.0.5.ebuild | 34 |
3 files changed, 17 insertions, 26 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog index 3935798c6b33..c265e04c871b 100644 --- a/games-strategy/freeciv/ChangeLog +++ b/games-strategy/freeciv/ChangeLog @@ -1,6 +1,9 @@ # 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.32 2005/09/19 23:12:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.33 2005/09/20 20:32:38 mr_bones_ Exp $ + + 20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.0.5.ebuild: + remove gtk2 use flag; fix src_install; tidy 19 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> -freeciv-2.0.3.ebuild, -freeciv-2.0.4.ebuild: diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index a8119ce9c778..4bc529874c42 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,6 +1,6 @@ MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 MD5 8ba6f0937fdbd16de6e906c841a23f6a freeciv-1.14.2.ebuild 2063 -MD5 9f0613cd4e121ea3b7e8b95b7cd5596a freeciv-2.0.5.ebuild 4572 -MD5 5136e264786c605b3b0c131a4b9a764b ChangeLog 5788 +MD5 7f5ab55771584dc457c6f112d416e7a9 freeciv-2.0.5.ebuild 4299 +MD5 99b3d7bc0b526465266e954bf78e7135 ChangeLog 5912 MD5 439e954e20f13b112d572ff57700ce00 files/digest-freeciv-1.14.2 131 MD5 7b03506340a683cb71edfc8a8f9fa1d6 files/digest-freeciv-2.0.5 129 diff --git a/games-strategy/freeciv/freeciv-2.0.5.ebuild b/games-strategy/freeciv/freeciv-2.0.5.ebuild index b1970c7173a8..6a951aabb511 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 # 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.2 2005/09/11 05:37:57 agriffis Exp $ +# $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 $ inherit games @@ -17,26 +17,21 @@ SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ppc sparc x86" -IUSE="alsa dedicated esd gtk gtk2 nls readline sdl Xaw3d" +IUSE="alsa dedicated esd gtk nls readline sdl Xaw3d" RDEPEND="sys-libs/zlib readline? ( sys-libs/readline ) !dedicated? ( virtual/x11 gtk? ( - gtk2? ( - >=x11-libs/gtk+-2.0.0 - >=dev-libs/glib-2.0.0 - >=dev-libs/atk-1.0.3 - >=x11-libs/pango-1.0.5 - ) - !gtk2? ( - =x11-libs/gtk+-1* - >=dev-libs/glib-1.2.5 - >=media-libs/imlib-1.9.2 - ) + >=x11-libs/gtk+-2.0.0 + >=dev-libs/glib-2.0.0 + >=dev-libs/atk-1.0.3 + >=x11-libs/pango-1.0.5 + ) + !gtk? ( + Xaw3d? ( x11-libs/Xaw3d ) ) - !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) alsa? ( >=media-libs/alsa-lib-1.0 >=media-libs/audiofile-0.2 @@ -56,11 +51,7 @@ pkg_setup() { games_pkg_setup if ! use dedicated ; then if use gtk ; then - if use gtk2 ; then - einfo "The Freeciv Client will be built with the GTK+-2 toolkit" - else - einfo "The Freeciv Client will be built with the GTK+-1.2 toolkit" - fi + einfo "The Freeciv Client will be built with the GTK+-2 toolkit" elif use Xaw3d ; then einfo "The Freeciv Client will be built with the Xaw3d toolkit" else @@ -78,7 +69,6 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - return 0 # install locales in /usr/share/locale sed -i \ @@ -116,9 +106,7 @@ src_compile() { myclient="xaw" use Xaw3d && myclient="xaw3d" if use gtk ; then - use gtk2 \ - && myclient="gtk-2.0" \ - || myclient="gtk" + myclient="gtk-2.0" fi #FIXME --enable-{alsa,esd,sdl-mixer} actually disable them... #FIXME ==> use --disable-* only, and autodetect to enable. |