fix dependencies, remove broken lua useflag wrt #447056

(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 18 insertions, 17 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index fb7399819af1..3da9741917d8 100644
--- a/games-roguelike/stone-soup/ChangeLog
+++ b/games-roguelike/stone-soup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-roguelike/stone-soup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.7 2012/12/06 04:10:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.8 2012/12/13 17:18:41 hasufell Exp $
+
+  13 Dec 2012; Julian Ospald <hasufell@gentoo.org> stone-soup-0.10.3.ebuild,
+  stone-soup-0.11.0.ebuild, stone-soup-0.11.1.ebuild,
+  stone-soup-0.11.1-r1.ebuild:
+  fix dependencies, remove broken lua useflag wrt #447056
 
   06 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   stone-soup-0.11.0.ebuild:
diff --git a/games-roguelike/stone-soup/stone-soup-0.10.3.ebuild b/games-roguelike/stone-soup/stone-soup-0.10.3.ebuild
index 42c5eb0c038d..de1cdd446af6 100644
--- a/games-roguelike/stone-soup/stone-soup-0.10.3.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.10.3.ebuild,v 1.2 2012/09/04 20:19:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.10.3.ebuild,v 1.3 2012/12/13 17:18:41 hasufell Exp $
 
 ## TODO
 # add sound support (no build switch, no sound files)
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0-Universal MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +lua test +tiles"
+IUSE="debug test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
 #RESTRICT="!debug? ( test )"
@@ -39,7 +39,7 @@ RDEPEND="
 		media-libs/sdl-image[png]
 		)
 	!tiles? ( sys-libs/ncurses )
-	lua? ( >=dev-lang/lua-5.1.0 )"
+	>=dev-lang/lua-5.1.0[deprecated]"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/flex
@@ -71,7 +71,6 @@ src_compile() {
 		prefix="${GAMES_PREFIX}"
 		SAVEDIR="~/.crawl"
 		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		$(usex lua "" "NO_LUA_BINDINGS=y")
 		$(usex tiles "TILES=y" "")
 	)
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild
index fc8e7390cbbb..03e461039b6b 100644
--- a/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild,v 1.3 2012/12/06 04:10:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild,v 1.4 2012/12/13 17:18:41 hasufell Exp $
 
 ## TODO
 # add sound support (no build switch, no sound files)
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0-Universal MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug +lua +tiles"
+IUSE="debug +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
 #RESTRICT="!debug? ( test )"
@@ -39,7 +39,7 @@ RDEPEND="
 		media-libs/sdl-image[png]
 		)
 	!tiles? ( sys-libs/ncurses )
-	lua? ( >=dev-lang/lua-5.1.0 )"
+	>=dev-lang/lua-5.1.0[deprecated]"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/flex
@@ -71,7 +71,6 @@ src_compile() {
 		prefix="${GAMES_PREFIX}"
 		SAVEDIR="~/.crawl"
 		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		$(usex lua "" "NO_LUA_BINDINGS=y")
 		$(usex tiles "TILES=y" "")
 	)
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild
index ac7b61d6f50d..7d4dba33208c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild,v 1.1 2012/11/29 13:41:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild,v 1.2 2012/12/13 17:18:41 hasufell Exp $
 
 ## TODO
 # add sound support (no build switch, no sound files)
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0-Universal MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +lua ncurses test +tiles"
+IUSE="debug ncurses test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
 #RESTRICT="!debug? ( test )"
@@ -39,7 +39,7 @@ RDEPEND="
 		media-libs/sdl-image[png]
 		)
 	ncurses? ( sys-libs/ncurses )
-	lua? ( >=dev-lang/lua-5.1.0 )"
+	>=dev-lang/lua-5.1.0[deprecated]"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/flex
@@ -73,7 +73,6 @@ src_compile() {
 		prefix="${GAMES_PREFIX}"
 		SAVEDIR="~/.crawl"
 		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		$(usex lua "" "NO_LUA_BINDINGS=y")
 	)
 
 	if use ncurses ; then
diff --git a/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild
index c30669990ffb..71f7672490a5 100644
--- a/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild,v 1.1 2012/11/22 17:25:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild,v 1.2 2012/12/13 17:18:41 hasufell Exp $
 
 ## TODO
 # add sound support (no build switch, no sound files)
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0-Universal MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +lua +tiles"
+IUSE="debug +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
 #RESTRICT="!debug? ( test )"
@@ -39,7 +39,7 @@ RDEPEND="
 		media-libs/sdl-image[png]
 		)
 	!tiles? ( sys-libs/ncurses )
-	lua? ( >=dev-lang/lua-5.1.0 )"
+	>=dev-lang/lua-5.1.0[deprecated]"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/flex
@@ -71,7 +71,6 @@ src_compile() {
 		prefix="${GAMES_PREFIX}"
 		SAVEDIR="~/.crawl"
 		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		$(usex lua "" "NO_LUA_BINDINGS=y")
 		$(usex tiles "TILES=y" "")
 	)