From: Michael Sterrett Date: Tue, 27 Apr 2010 06:38:00 +0000 (+0000) Subject: add required ggz deps (bug #317289) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b3a2857ce63cc3f0302bec237f597a4dc11f3098;p=gentoo.git add required ggz deps (bug #317289) Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog index a706ecd67e7a..74233a36e045 100644 --- a/games-strategy/freeciv/ChangeLog +++ b/games-strategy/freeciv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/freeciv # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.102 2010/04/13 15:49:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.103 2010/04/27 06:38:00 mr_bones_ Exp $ + + 27 Apr 2010; Michael Sterrett freeciv-2.2.0.ebuild: + add required ggz deps (bug #317289); drop mips due to missing keywords 13 Apr 2010; Michael Sterrett freeciv-2.2.0.ebuild: fix deps for auth support (bug #315005) diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index c3f4b6d6a638..4f5d0d537dba 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -5,6 +5,6 @@ DIST freeciv-2.2.0.tar.bz2 33049084 RMD160 900e7a7e80a37e9faaf2a5eba4a0b35d81ab1 DIST stdsounds3.tar.gz 118278 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 SHA1 103d02a0702687fb038f5187a321f8074b4ebfb5 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa EBUILD freeciv-2.1.11.ebuild 3580 RMD160 0a97435beba5928802e9233526004c9dc5a8b89b SHA1 eda027c2c6a7e16bc430265ed63829f64f5eecc1 SHA256 98569c454d1197d2bf130c3c32b8376315080c000f2f69126390ca1fc97f6d74 EBUILD freeciv-2.1.9.ebuild 4942 RMD160 55d85709540316671ed8d935fb5cf0983d5483e9 SHA1 086b5ceba8b9fd10ef5c5aeb3eb44635c5bf6718 SHA256 14d5c043d8b64478e03971d68d02ed403b5654fdf0ba1a9947d8c6404ae3cb7a -EBUILD freeciv-2.2.0.ebuild 3088 RMD160 0cd981e5cd5148bd72d703ee22fcd7068a643a64 SHA1 e4d7b20966b481b918253291654e7a258d8b03ae SHA256 4559986196c249e598f51c3c73d9cfe305555b64cb56c9ad6a68c3bd5cfd47fd -MISC ChangeLog 14786 RMD160 25a61f8597749baa8cdb3f3ff9fbc90bee7f34cb SHA1 6a43d8fce9859ed600b72766c2ca1d737517e2de SHA256 ca27f623fa822b8e56b54de96ae8e35dea0b3af91d758976245a527210465bbc +EBUILD freeciv-2.2.0.ebuild 3157 RMD160 ca1d81c6c410981f30e87eaa302b44761fe80955 SHA1 ac53abb0a37405997dbb7e14d611ff560951ac01 SHA256 a2eefcac4677da6139b54c2309ec98011d8a2c017c6acdd534ef0a29c24801fc +MISC ChangeLog 14937 RMD160 222f560ddccb3561cf07a89bc647a6de4de123d8 SHA1 217c16fdd416a7655310933c6efb5f71f6c55d26 SHA256 8a888843b79aefe62e8d1cf1ade9096bce006cac27f12cdd9aff8d2a692fa67e MISC metadata.xml 389 RMD160 8df0338ed8960825740eb0a12e30725d238855dd SHA1 dcf97dda6c3ca4a024638c1f42914084d4d67984 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f diff --git a/games-strategy/freeciv/freeciv-2.2.0.ebuild b/games-strategy/freeciv/freeciv-2.2.0.ebuild index b76b46c74197..e222a53a87bf 100644 --- a/games-strategy/freeciv/freeciv-2.2.0.ebuild +++ b/games-strategy/freeciv/freeciv-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.0.ebuild,v 1.4 2010/04/13 15:49:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.0.ebuild,v 1.5 2010/04/27 06:38:00 mr_bones_ Exp $ EAPI=2 inherit eutils gnome2-utils games @@ -11,12 +11,13 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="auth dedicated ggz gtk ipv6 nls readline sdl +sound" RDEPEND="readline? ( sys-libs/readline ) sys-libs/zlib app-arch/bzip2 + dev-games/libggz auth? ( virtual/mysql ) !dedicated? ( nls? ( virtual/libintl ) @@ -31,7 +32,7 @@ RDEPEND="readline? ( sys-libs/readline ) media-libs/libsdl[audio] media-libs/sdl-mixer ) - ggz? ( dev-games/ggz-client-libs ) + ggz? ( games-board/ggz-gtk-client ) media-libs/libpng )" DEPEND="${RDEPEND} @@ -61,7 +62,7 @@ src_prepare() { } src_configure() { - local myclient + local myclient myopts if use dedicated ; then myclient="no" @@ -69,17 +70,19 @@ src_configure() { use sdl && myclient="${myclient} sdl" use gtk && myclient="${myclient} gtk" [[ -z ${myclient} ]] && myclient="gtk" # default to gtk if none specified + myopts=$(use_with ggz ggz-client) fi egamesconf \ --disable-dependency-tracking \ --localedir=/usr/share/locale \ + --with-ggzconfig=/usr/bin \ $(use_enable auth) \ $(use_enable ipv6) \ $(use_enable nls) \ $(use_with readline) \ $(use_enable sound sdl-mixer) \ - $(use_with ggz ggz-client) \ + ${myopts} \ --enable-client="${myclient}" }