put sound behind sound use flag; pass ipv6 choice to configure (bug #307153)
authorMichael Sterrett <mr_bones_@gentoo.org>
Fri, 5 Mar 2010 20:23:25 +0000 (20:23 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Fri, 5 Mar 2010 20:23:25 +0000 (20:23 +0000)
Package-Manager: portage-2.1.7.17/cvs/Linux i686

games-strategy/freeciv/ChangeLog
games-strategy/freeciv/Manifest
games-strategy/freeciv/freeciv-2.2.0.ebuild
games-strategy/freeciv/metadata.xml

index 20e0b41f49d1287d7e4a07c926d465fe04952811..df003e8219848dcd42e33552d93eab1ae49aa925 100644 (file)
@@ -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)
index 6b283faaf55e8c4b774f131fa1c8916d96751d42..04a23d9f08cc85d44295da09867dfe71b3e2298d 100644 (file)
@@ -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 3015 RMD160 8aa801fac12fc7cb54fe315d2174e44642b06f93 SHA1 c0e10098fa94ad454068fb03a31a916748497e08 SHA256 d07639142c407217f2af9f6caa6186cee5630e19c3478ebf8dea04156e319f97
-MISC ChangeLog 14491 RMD160 7f0fcd1eb57448f0d74ed03df1436491a10bcff4 SHA1 47089ab03ba1246e3f7587b5df6080bab2cc7734 SHA256 2ef0f2ec4437c1d4b6323ac67eaba98f73c3332200d0a5ca4e20712b8994fb5f
-MISC metadata.xml 296 RMD160 4731eabd213e1faee5f3c3eae53076eb586a9ff4 SHA1 21d2ebe86e2f6ce406a29b68355040ecc7c788b6 SHA256 0d34de77af9814418b5e1ac89ed6d6caf100ffa2a1faaa51bd900a53f51860bf
+EBUILD freeciv-2.2.0.ebuild 3089 RMD160 25d2c9263b9bdfc2fdda939385b0b7b85d351664 SHA1 5015e11abd42f00b4474820b5a4e55ec1f8e6fa5 SHA256 6e57021243c0c02a8e9d893e93a0b2d6ef94c1ac37781b930ec140055d384fe1
+MISC ChangeLog 14666 RMD160 cbaf898cdbe0ce7a90e8aba08ee5c7b5f08f6736 SHA1 a9b0c9c496fc90a1cf1a206043375cdb94c078ea SHA256 830cfa1e9e118ae70d7620d63451653a8f8994005b348c749d4519a3dca56d46
+MISC metadata.xml 389 RMD160 8df0338ed8960825740eb0a12e30725d238855dd SHA1 dcf97dda6c3ca4a024638c1f42914084d4d67984 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f
index 6d504214877daec6869ec14f86de0e80c98a65ca..dc06a8f6adc2509fcdf4b6f8c644942a3b7767a2 100644 (file)
@@ -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}"
 }
index 58799a4955ca0f07b4883ebb7f6177941e51750f..8bd84f44148b0720559ac8533cec9fbe74721b94 100644 (file)
@@ -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>