summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-03-05 20:23:25 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-03-05 20:23:25 +0000
commit329734293dadfc1eac8043fed96f6aad5ff398f7 (patch)
tree97c7289346219dbdc9a62852ab4453066398cb0a /games-strategy
parentVersion bump #306463 by ScytheMan. (diff)
downloadgentoo-2-329734293dadfc1eac8043fed96f6aad5ff398f7.tar.gz
gentoo-2-329734293dadfc1eac8043fed96f6aad5ff398f7.tar.bz2
gentoo-2-329734293dadfc1eac8043fed96f6aad5ff398f7.zip
put sound behind sound use flag; pass ipv6 choice to configure (bug #307153)
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/freeciv/ChangeLog7
-rw-r--r--games-strategy/freeciv/freeciv-2.2.0.ebuild14
-rw-r--r--games-strategy/freeciv/metadata.xml1
3 files changed, 16 insertions, 6 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 20e0b41f49d1..df003e821984 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,11 @@
# 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.100 2010/02/27 22:11:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.101 2010/03/05 20:23:25 mr_bones_ Exp $
+
+ 05 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.2.0.ebuild,
+ metadata.xml:
+ put sound behind sound use flag; pass ipv6 choice to configure (bug
+ #307153)
27 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.2.0.ebuild:
fix default client logic (bug #307117)
diff --git a/games-strategy/freeciv/freeciv-2.2.0.ebuild b/games-strategy/freeciv/freeciv-2.2.0.ebuild
index 6d504214877d..dc06a8f6adc2 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.2 2010/02/27 22:11:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.0.ebuild,v 1.3 2010/03/05 20:23:25 mr_bones_ Exp $
EAPI=2
inherit eutils gnome2-utils games
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="auth dedicated ggz gtk nls readline sdl"
+IUSE="auth dedicated ggz gtk ipv6 nls readline sdl +sound"
RDEPEND="readline? ( sys-libs/readline )
sys-libs/zlib
@@ -21,12 +21,15 @@ RDEPEND="readline? ( sys-libs/readline )
nls? ( virtual/libintl )
gtk? ( x11-libs/gtk+:2 )
sdl? (
- media-libs/libsdl[audio,video]
+ media-libs/libsdl[video]
media-libs/sdl-image[png]
media-libs/freetype
- media-libs/sdl-mixer
)
!gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
+ sound? (
+ media-libs/libsdl[audio]
+ media-libs/sdl-mixer
+ )
ggz? ( dev-games/ggz-client-libs )
media-libs/libpng
auth? ( virtual/mysql )
@@ -72,9 +75,10 @@ src_configure() {
--disable-dependency-tracking \
--localedir=/usr/share/locale \
$(use_enable auth) \
+ $(use_enable ipv6) \
$(use_enable nls) \
$(use_with readline) \
- $(use_enable sdl sdl-mixer) \
+ $(use_enable sound sdl-mixer) \
$(use_with ggz ggz-client) \
--enable-client="${myclient}"
}
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
index 58799a4955ca..8bd84f44148b 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/metadata.xml
@@ -5,5 +5,6 @@
<use>
<flag name="auth">Add authentication capability</flag>
<flag name="ggz">Add support for GGZ Gaming Zone</flag>
+ <flag name="sound">Add support for sound provided by <pkg>media-libs/sdl-mixer</pkg></flag>
</use>
</pkgmetadata>