fix dependencies, remove broken lua useflag wrt #447056

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 30 insertions, 25 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/Manifest b/games-roguelike/stone-soup/Manifest
index 6f3bd05240a9..097a90206a29 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -9,16 +9,20 @@ DIST stone-soup.svg 68546 SHA256 f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4d
 DIST stone_soup-0.10.3-nodeps.tar.xz 6486324 SHA256 c61801030486bb7020992d95573fb9378e80355c400b82cfa0f476dbd823c4a2 SHA512 57f93c0a5c541aadd426ac918b6db4ec38e5e098f2aa33d70e0b5980f8d753f54c9e4da23d47311b1acf93443e3de4b8e480ab9762c1e922edcf27de0a8ead7c WHIRLPOOL 9070a2ba8825a074578e2179a226ab259e51905d370f8cf66fab9e8485de136aabc84d7ef0fe9677b7c3905660843537524f04ee050a566f9ddccf10fcd6f5b5
 DIST stone_soup-0.11.0-nodeps.tar.xz 7516360 SHA256 2a39307c9f88608ee2a33d3b831c51d9190c91ccdedadececda5edae6dd69002 SHA512 3fb5ef82aea5c7445c39f9f993436bf228552ab5e87a9752c3a275a9ae4c69519c37318dc5fcc6fae9237ceadbe02b67496dfb8c2d82fefb4434d94df61950db WHIRLPOOL e9e2b9131a7700528bec3e8fb3327a4a72dcd8941f76f2499713c9e1cef6f33b0281a9121c128854fa71470e9c77b3b90a1d076a2986d805855ebb36cd7baa85
 DIST stone_soup-0.11.1-nodeps.tar.xz 7519768 SHA256 377d738cff21165763b252a57cd84049361d44db6d8d10f08f789cc9e7bb82b6 SHA512 0ceff12dcc3d4a17ea56d18b451cac4fa7805fa795551ca251ea8f3c60f25696083e602f337971f8f19ddbd2a5b7b0fc420e3ed11fc2b731de1ae0eeba1281c2 WHIRLPOOL a86d94118c131ab057258e8e9fcf8fe3d4b9024a9c4b4fabcdf0ec2cf8d26f5ddd83a1cb3d6ada90d146201bd816e74570c6d3eb55e09f371e214a7e7eea39b3
-EBUILD stone-soup-0.10.3.ebuild 2883 SHA256 5b008bbf1af9f6e6c9de137eb0815efdd26fb91263cc6a35ad5d5ca7b8739479 SHA512 5800c7b6fe5b77d46f4ca436b2b7f60453d5bc5122f214a786da1cb51c536a1abe89a0292a9d508d904c5fa422fae8e9ee6843cd507ed6d40fd432e0da44c5ab WHIRLPOOL 648f4f3c1fcb36eb399e3dbdd1e3b72d1cddd8d0ba83f12f83b548611bd520a2ef3e2bc22c486309a6d57874d545c3ffca00437d30e1b27950541dabed47b522
-EBUILD stone-soup-0.11.0.ebuild 2997 SHA256 ff8afb190dde6b559b6103e781d7b229b774fd4923c8a81ad5aaa1966d54c284 SHA512 f9d12639500044ed20bf1e4fcba7901a6a3ea235303ebe90a964a73a810f1fd2bdfe8407829accfeb68f791fad35dd87f3aaaf60c13d4efe1f76def00488973a WHIRLPOOL 09e6f6970e526421323ac2f903d9244afb2ca29782569fe84628d15d91cd53a66d6ba3d5a8a9b2a947f3e27652ffbc7dd5b934ade9cb0a4c87d2e6d338bb2742
-EBUILD stone-soup-0.11.1-r1.ebuild 3337 SHA256 ee61e10f78b1886edd828d83c0752b46466b846bbbe03a78e62918a181ae17a9 SHA512 bcd10508b75b86d25bf67555f751dbbb760ef7ed87bbbae5001a7a931ffd47bb557abd30eb4ea0acba6b627c688035444fa00782a808f1c177e0c3843d11d0d8 WHIRLPOOL 4c60b1a06388bebc1258a8b7efe192a573041395349134e10da1ea1efcc3f33190231ca440bb5197a030169ab2d6e7e512cce8e3f72a35580a00ae8de892b962
-EBUILD stone-soup-0.11.1.ebuild 2997 SHA256 5de439a44fa343aac08c73ccb3b35ae569fb0c8be68e2ae53374839eda8582b0 SHA512 27571a44a428ae3f3eac7678b080edc8a3d90b0ca46e0ccf0d26b5359340df189dda51cc0cfa60d9594c4cf452cba407b378730917b7fe9f1686a4a52dd0ec2e WHIRLPOOL 707499b9cd34fdf7c42483a3e8df9723542e09cfcb1beba6cca3cbdfc9c819a8649a7ab959da8a15454d34a1d7c9b1e446b6b3b9492833543beb867f6ca87fd7
-MISC ChangeLog 1331 SHA256 83ccc41d50a4565e83ae524406ed95977d8f4bec4e159714fdd18528cfee9e65 SHA512 4a355eb0f743733af01d03740245363f3a30c6eb7158c0969c5ce375156fc38b74860af7184c85bd235419263046b1c17614a6087d7d5d63257025ad310e7408 WHIRLPOOL caa30633aad87dd866ba03d37e33f3f3a311d54bd195a4dd314e006ec6f64b821dfff191915fcdfabe689de6fc6297f3dbf251c2564aa99890759f0995c9174d
+EBUILD stone-soup-0.10.3.ebuild 2843 SHA256 ca4544fd486705bf19c9a3bca0d636b836609228ad5d68070b387a8e485a7421 SHA512 f272d1ed69096288829621f67b448e29e29bf3af77857832cff79d2e2fbf12463737c7befd14c0b45a17d483ca0bec4d79d25bf3433e70e4cae7f5237c627cd5 WHIRLPOOL 408cc11936172272de7cb85cb93cdafdffb027bcdb75dc21534fea836e54a2944e7d9f5c66c37721d6f1a6fb2f8f6402cb32c0c103762b5fca39684693c7b773
+EBUILD stone-soup-0.11.0.ebuild 2956 SHA256 989ef3a1de2cbce9351db2c2497952b509114994f63b38f1b0e5f81fc915212e SHA512 feb2660bcb1ec9d9674a85270ddeafc791fcc55e95a8ab1c1f9fef900d6c6a83a21e74414448dfc95779fc8a327d5ad00cca4f1642f3610c9e2abae57f1522cd WHIRLPOOL 9c30814f2f420be1e6827caba18862676e736435849f4e8b1a312d8abfe009d9a4ab21c3d972d9cfcd5b3fbbb21ea4ba840d2f6318f72e9238410708e22b4b45
+EBUILD stone-soup-0.11.1-r1.ebuild 3298 SHA256 07b728209fe220fba541a5e908668d8472780eaf4a5351e0b9e0fc682b8cd9ba SHA512 5a0d9953a70ac45e3699a39bb3e10914c2e97aab46effdccc19ae7eb8ec26e33b27a757e7d67b593a03fa839a3a040c475a3e837a032d8f774d0373f9c66c86f WHIRLPOOL e55c70aa63971e039cb241abd29baa42f6a56b023af4becf47cdd68e8240b9877b51f78d76107fdb309b7d88782005b655af57f7e7c2d5211615d530bfe3c532
+EBUILD stone-soup-0.11.1.ebuild 2958 SHA256 9f5d8cf2b96ca4621e2140a0d43fe2bf470da07d1ff4771390309dbd0812d210 SHA512 8ab5d5cd35c5879754bceff265ace62e8f9a428e9af1769a9706509e7fd9b3242b747be6fc0dfe54b758ee051bc4b5160e3e6448de4844b402e11758de3c496a WHIRLPOOL a7d66b8b15f37b9178b67442bf3e11cbfccc6581ec43487c9935a1778a7711d0f4e3e0d018dac7d2cf264304059ec7890bad6952e1756aebc3a2d25e8e98b842
+MISC ChangeLog 1550 SHA256 68738ff88ec4d3ee5455ae1ce46cc8cbe70ac14aade2191420fa399b9aa0d2a2 SHA512 d80d4630cb8a3054cd0bff9ce9ee09f2454cb2ee310a6d5aa88ad7f2616631bcf13e617fe502721abc0fb8de8482b0086f0010ad166a18beb1082c5311ef9598 WHIRLPOOL 372b04fcbed0f43853e8627efb8e103dad67f0e3513154e4111ae07d6a279c98ec78444b1e75c6547a0ec82a38b18042ae9f7ae868ba8d82d71ccebbb78c7a5b
 MISC metadata.xml 1503 SHA256 aa2c7c89f65bb62311e407b2786549b917a89c3c65182dea9b47d5a8dbc1a295 SHA512 6808e1b61bbe2b4fa78699432781665919ebe01672e57838f75eca24dc79ae4126d6076daf6b2e6870886d3214a9efe4963520a0c7ae15b3b47dec32a03ad5bb WHIRLPOOL 5b71d200df668c137771b1c5d415c97cb37716633c3a346d124c56e1ac1311b1686444b2b57e6d78e2f633f561fbc1468941a1fff926d074d8d2dc33b6212031
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDAGtkACgkQuUQtlDBCeQLiNQCdGeHMAatwI26btG86y4kHGsss
-l04AnAyod4h6kdknat8emL5sbh/P/33I
-=I6if
+iQEcBAEBCAAGBQJQyg31AAoJEFpvPKfnPDWz6+MH/3NbzCGEZ/4DOaqv+Zt7J5IV
+9d//ouYc3RfD5a2INbiCCU1gK7U2xJiJa5IJymYFwIJwywzj1A1ikzpsrbKc9EqH
+ppVwCwTJqDXtPbNGTRaE9wBt0m7/YIV1Y4jWxXC29oZAO8DjL0uMMYTzNuvqPf6g
+mE6IpL2ayvQfPwfd3k0IbaQO/5bpeLs6gxRBnQnhq2MpWW6azt/JlkuzEdygZK8j
+RxbUGA+noP4Ul1j1JifWGPyJunSawbzsd2hNA2sTXJjoH/EO4RDNMq6RVbMg/Jrv
+rT6oIUGBG55ZgzJHNs8vWUN20/y6QjVoWtIu2CZNl89nopvvSDXXGflYGlGgLek=
+=h/7m
 -----END PGP SIGNATURE-----
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" "")
 	)