add ncurses useflag, allowing to build both variants at the same time

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 148 insertions, 19 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index 8f79c7948a61..e946d10f00fa 100644
--- a/games-roguelike/stone-soup/ChangeLog
+++ b/games-roguelike/stone-soup/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2012/11/22 17:25:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.5 2012/11/29 13:41:59 hasufell Exp $
+
+*stone-soup-0.11.1-r1 (29 Nov 2012)
+
+  29 Nov 2012; Julian Ospald <hasufell@gentoo.org>
+  +stone-soup-0.11.1-r1.ebuild, metadata.xml:
+  add ncurses useflag, allowing to build both variants at the same time
 
 *stone-soup-0.11.1 (22 Nov 2012)
 
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index b700c04cb7ca..661b8c061107 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX stone-soup-0.10.3-build.patch 3405 SHA256 ee0019200324498d32630884c9d31b207c67078d5af6e94c8cb0de7ea66ebf6c SHA512 547a1318b24c4a4f01684afacd73a680d4b983aab9a80205a35ae33e3e831427fb1273e6dc0b7936c5f594c924563d34c40d5f726976326759f8ccd20ef71a5e WHIRLPOOL 3cb6a2cc3557ea6efd6fb261ec91861b0637abf0bdc37a2192793d857ea2adbbc992073783d19be04008cb033e928b61aa8e74fc6cf6b02a6369636e3d5c8499
 AUX stone-soup-0.11.0-build.patch 3337 SHA256 7553e5133b0afc49c9ed59c270763c02c939de15e11d7bd571f93e8705d7a241 SHA512 c433cdaf55a9f128573f170540fa69b1f2f8720b6338d58d61dc341f65fbf350bb319c2091bfacf591a855c1f9d031f99b946cf3c634a6e3f81ea57a7bb23a2f WHIRLPOOL 66f02948720dc4129c77067029b28da517981e78d27e2b1e5da9863b12e657d41b3cdc99e2ace854133b93d0290abba64ff863c898a5a141ba98a3ecec6d32d9
 AUX stone-soup-0.11.1-build.patch 3337 SHA256 7553e5133b0afc49c9ed59c270763c02c939de15e11d7bd571f93e8705d7a241 SHA512 c433cdaf55a9f128573f170540fa69b1f2f8720b6338d58d61dc341f65fbf350bb319c2091bfacf591a855c1f9d031f99b946cf3c634a6e3f81ea57a7bb23a2f WHIRLPOOL 66f02948720dc4129c77067029b28da517981e78d27e2b1e5da9863b12e657d41b3cdc99e2ace854133b93d0290abba64ff863c898a5a141ba98a3ecec6d32d9
@@ -11,17 +8,7 @@ DIST stone_soup-0.11.0-nodeps.tar.xz 7516360 SHA256 2a39307c9f88608ee2a33d3b831c
 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 11eed50e4efd78c754164daaf68b6d8b1aeb36959138388f73495aa23684a95c SHA512 77e5cd6671245d5741f4e306e9f81b27370e774af43a78b99f19a6719f9756af5d99d55e939ac5d1dfdc21ccf7e4649e8bc8eb9e6687dc113e752f320ba39314 WHIRLPOOL 99ee78b2394e60db07c6a205bf93594c0f15445dc1347039a6caa8e485172c2e0e39d7088b3734ba23939189ad4f7b456bd57cf250052b4a4e383c23a03f4545
+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 897 SHA256 0891caf4afbd0fedae4dbf0d3ed8e42099c14d4af75cb43f6aa5b32827eb4791 SHA512 d27a685378ee948de4e7487df2419d6ebadd02fd1ee7fbc09f97c6b49b2cce2875e1ca64e240280b528ebaa527214762af9890512c85865ee05a029699353bbb WHIRLPOOL 4a74fa26e3548cf847d719047daa6c5d55e1b6f636696c5f214b8587059674588daca47ca35581796955569139f9c7a1791d5ccecbc8f0475005b82208cf23af
-MISC metadata.xml 1452 SHA256 1c622ae995da8eefcec3e181ed7b400f211d7ab959bbd1b79c304319f9607026 SHA512 4c793107dd763b4c3849b0210e568899f5962403b2d1e4aa609c387c35800463d6c7326e64b168d41ae634258c28b271ac4d6fefcfc01bf9bb84a7cdce9e56f1 WHIRLPOOL ed181b375934935aff218204ab004c75f35deb427541320f404b318cba893cd4937e4d7b9f0c465140ed0371b0a067989684dc99dc94b7384310008f163daba5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQrmANAAoJEFpvPKfnPDWz2TQH/0kpkjRMESR8tk7hWI5tR7UO
-xKNBAPwVvjxh0O7qRvssbqS6xFCBN3T8VWJs6ZaUI0bESH8r+iejgqixjpLew/P8
-3qpjjYE9lBqQkWC3zmXgWeN86jcR45i4M/M+YKNZtarv7mgIRep/lPJEhUvyXutK
-fxSx9WeIeYk5Y9N99hOFnCG8aUfO6+kQjAT3YQz7XXfdMG3rZPIRZtxgy20oNF9V
-AXC8s2AdWymBqHaKMSjSahaatg9oIusgeF4TlfpiETe8FhZIzFQQiI7nzWt0HpTv
-7ZzhLF7ujGbv7X2Q7HrMhf1GAx2t7YTb9Qmyhh5lcEZ98t7xVzXeP62laJ2gh+k=
-=kRQs
------END PGP SIGNATURE-----
+MISC ChangeLog 1104 SHA256 dfb7a9dd370d4b464f7bfebe05dce63f00eabda13494b4ae9af1a478fe7fd905 SHA512 837fc4a3caf7c940b97d28d517dc40251cc087a70f18acc510467837c83a8326ca7e0897b0cb8e90cdc7c6947ed31ee167ca08b2e61a4f0837985ec980dda4ec WHIRLPOOL 794c8c090a1bf261397a07c0e6abc7e4b9faaa939755ef00da8b3223d307841d60a14c1ae4775118328e3947c1062449a285d9125209090163033e124ddaa4ec
+MISC metadata.xml 1503 SHA256 aa2c7c89f65bb62311e407b2786549b917a89c3c65182dea9b47d5a8dbc1a295 SHA512 6808e1b61bbe2b4fa78699432781665919ebe01672e57838f75eca24dc79ae4126d6076daf6b2e6870886d3214a9efe4963520a0c7ae15b3b47dec32a03ad5bb WHIRLPOOL 5b71d200df668c137771b1c5d415c97cb37716633c3a346d124c56e1ac1311b1686444b2b57e6d78e2f633f561fbc1468941a1fff926d074d8d2dc33b6212031
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 20e0218170be..bca7f5ba522b 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -12,8 +12,9 @@
         <bugs-to>https://crawl.develz.org/mantis/main_page.php</bugs-to>
 	</upstream>
 	<use>
-		<flag name='tiles'>Enable for graphical (tiled) build. Uses ncurses
-			if disabled.
+		<flag name='tiles'>Enable for graphical (tiled) build.
+		</flag>
+		<flag name='ncurses'>Enable for console based build (uses ncurses).
 		</flag>
 	</use>
 	<longdescription lang="en">
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
new file mode 100644
index 000000000000..ac7b61d6f50d
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild
@@ -0,0 +1,135 @@
+# 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 $
+
+## TODO
+# add sound support (no build switch, no sound files)
+
+EAPI=5
+VIRTUALX_REQUIRED="manual"
+inherit eutils gnome2-utils virtualx games
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="http://crawl.develz.org/wordpress/"
+SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
+	http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+	http://dev.gentoo.org/~hasufell/distfiles/${PN}.svg"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0-Universal MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +lua ncurses test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+#RESTRICT="!debug? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	sys-libs/zlib
+	tiles? (
+		media-libs/freetype:2
+		media-libs/libpng:0
+		media-libs/libsdl[X,opengl,video]
+		media-libs/sdl-image[png]
+		)
+	ncurses? ( sys-libs/ncurses )
+	lua? ( >=dev-lang/lua-5.1.0 )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/flex
+	virtual/yacc
+	tiles? (
+		sys-libs/ncurses
+		virtual/pkgconfig
+		test? ( ${VIRTUALX_DEPEND} )
+		)"
+
+REQUIRED_USE="|| ( ncurses tiles )"
+
+S=${WORKDIR}/${MY_P}/source
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+
+#	if use test ; then
+#		cp -av "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_P}_test" \
+#			|| die "setting up test-dir failed"
+#	fi
+}
+
+src_compile() {
+	S_TEST=${WORKDIR}/${MY_P}_test/source
+
+	# leave DATADIR at the top
+	myemakeargs=(
+		DATADIR="${GAMES_DATADIR}/${PN}"
+		V=1
+		prefix="${GAMES_PREFIX}"
+		SAVEDIR="~/.crawl"
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		$(usex lua "" "NO_LUA_BINDINGS=y")
+	)
+
+	if use ncurses ; then
+		emake ${myemakeargs[@]}
+		# move it in case we build both variants
+		use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
+	fi
+
+	if use tiles ; then
+		emake clean
+		emake ${myemakeargs[@]} "TILES=y"
+	fi
+
+	# for test to work we need to compile with unset DATADIR
+#	if use test ; then
+#		emake ${myemakeargs[@]:1} -C "${S_TEST}"
+#	fi
+}
+
+src_install() {
+	emake ${myemakeargs[@]} $(usex tiles "TILES=y" "") DESTDIR="${D}" install
+	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dogamesbin "${WORKDIR}"/crawl-ncurses
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}${GAMES_DATADIR}"/${PN}/docs/license
+	dodoc "${WORKDIR}"/${MY_P}/README.{txt,pdf}
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}.png
+		doicon -s scalable "${DISTDIR}"/${PN}.svg
+		make_desktop_entry crawl
+	fi
+
+	prepgamesdirs
+}
+
+src_test() {
+	$(usex tiles "X" "")emake ${myemakeargs[@]:1} -C "${S_TEST}" test
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	echo
+	elog "Your old config folder under '~/.crawl' is not compatible"
+	elog "with the new version. Remove it."
+	echo
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}