version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 97 insertions, 11 deletions

diff --git a/games-engines/solarus/ChangeLog b/games-engines/solarus/ChangeLog
index f83a3a2c5d08..e951ad23fc3f 100644
--- a/games-engines/solarus/ChangeLog
+++ b/games-engines/solarus/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for games-engines/solarus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/solarus/ChangeLog,v 1.1 2014/01/29 20:15:11 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/solarus/ChangeLog,v 1.2 2014/05/22 17:10:02 hasufell Exp $
+
+*solarus-1.2.0 (22 May 2014)
+
+  22 May 2014; Julian Ospald <hasufell@gentoo.org>
+  +files/solarus-1.2.0-paths.patch, +solarus-1.2.0.ebuild, metadata.xml:
+  version bump
 
 *solarus-1.1.1 (29 Jan 2014)
 
   29 Jan 2014; Julian Ospald <hasufell@gentoo.org> +solarus-1.1.1.ebuild,
   +files/solarus-1.1.1-paths.patch, +metadata.xml:
   initial import
-
diff --git a/games-engines/solarus/Manifest b/games-engines/solarus/Manifest
index cf40a095c380..ce7007671029 100644
--- a/games-engines/solarus/Manifest
+++ b/games-engines/solarus/Manifest
@@ -2,18 +2,29 @@
 Hash: SHA256
 
 AUX solarus-1.1.1-paths.patch 476 SHA256 b629d9918912ecd59cb15c45b2e59be6306c08eca5b634f9002b296bc6e6698a SHA512 3ce4e0a564d721b540292a2760d4c8a7efbecf960379b93395b04bf546cffdca5c35f88d484b51f2a64de2e30b3ef0e9805abc96342dbd686f8d241173408699 WHIRLPOOL bd125622dc2564d0ac471111d4fb0225eeaf64f043d1bed890c24ba2f5dc84b1496899564c000d16d4db90ac3b25e1a43be3c2b362b55b0f069e094bb0b7510a
+AUX solarus-1.2.0-paths.patch 453 SHA256 6317937dc9d723073fb648cac3298b30989150aa473217571e24dd2b14ab8971 SHA512 9e57c5b240770d49372bc03e4ee90f2da3fcd82dd4b7e7c9394069e5cba31e948e44bdff43c8f3356b1504aef8e6fe94a54254d5c3456a3d72ff5ac27e16e326 WHIRLPOOL 2efbc3e4d56fca3eb7bf009871097b39c7874814e438ea4ea282d986d8f9b56aa231607cab1e2f5b06a84093c5dabb632136246613b0e951f798e9bcae99495a
 DIST solarus-1.1.1-src.tar.gz 2394595 SHA256 5355e95edbd5234f57a8748d1417ca346468e5804e44293d2523b57367eb5615 SHA512 64cfc098143c6126f08aa8d8914480609d29bbfe3bf7f7895418df2c5672a2d61b356767bdb6c955e41a0b98c6a7faba9b59737904528f901225ffc3f549c9db WHIRLPOOL d0f871bc13f4450c222f4d60ad8f25fa1ee3d52c8d17698b9433a6857130abdc667d871c283972bd5dc1bd94daf2f569d678f6a94398651665537661ed6b7caa
+DIST solarus-1.2.0-src.tar.gz 2417570 SHA256 a9e01686190b9c9258bbf15469b0eec7c6f07d1641236438701bef844b67261f SHA512 b202831a126ff6203066105accf28ac71c80eb17d39054d5a45e4730610424685a8fcd02cbd607ca7193464928285cca4df9debd8051bf9e52b37bb44ff56abe WHIRLPOOL e579bae2ff0fbe8a45ada1a2e8567e1d127c29aaf31eecb2787bb03aa6111f24145a18b6f49ad94329635a5ab38a79dd5de7c497c791bdac38bc3fd9fcf21999
 EBUILD solarus-1.1.1.ebuild 1041 SHA256 26084268c6fe6e412e873da712a7b65fb727ef473f6161fe560daccf4eaa5a5b SHA512 65a8afda67dfe9cf04b2a86925f6277b91207f58cd93c76efafe230b0c8910eeffacfc0a0acc6d67b806c92f0aa313220d29163ff8ef7191d3df6f3c7fd99be4 WHIRLPOOL 669059b813d4dad6f4a9259c1b6045784c847c7fa810084f5c8fee457f6bfaeda12856826a472d272555fa183980302194f716ac4f7566b0d653533032055402
-MISC ChangeLog 390 SHA256 75faf26b3bf50f6babec63f764bc5773f25917e347d6ebaf1af02c6ab3ed9f7f SHA512 de6b168d6e90eff59f6642e3c58c849a59d886ef1b0c3f78a15ec7fb81d028db7dc828f58ca9ab1144d03bf9cd5743e732d52df0b2f3ad20635d4ed46f0db730 WHIRLPOOL e23510ab8705962958118b7a7490fc7e6df33022863fd4d50c4cc1335e109486844e48971fbfc92bcfc3096b8e3b52d5d84e3c232330a5e5a0f827147b9b5345
-MISC metadata.xml 337 SHA256 91e41c94345a04ed1254e17f6d56535f30f1b25513554ac4747c00b28165e356 SHA512 df9ddccf5b3a4d6e33605799f555bfd902b24068161269c56083c70e60582840580b6cdc01a7b8889c20c5c9e9f84ea462e2b75df3850dcabebe1c0816cc9c43 WHIRLPOOL a751f8434ef569d09e35edbc5653a3677a29f425f6033b33077547f1b4abdfcbc994abdb36a754c5bdab47f488438290f5b9c50456b057b04300d9ace791601e
+EBUILD solarus-1.2.0.ebuild 1158 SHA256 7f571397d8496a1caab6f7067bc8a45c41317ad478eca47806fde9298a1ee473 SHA512 82effbeae4a1ae47a0033b9b9b35b3108d0c42ad3b96c67f9a3e4d9547d26dac6a5a72d76197d36b0f14c01d0719c1348c958b7255693aa3807223eea5fcb957 WHIRLPOOL ebf14a1cc1280bbb51b9af1931a48c1b15cc79e57d246f2356246c37e60feff3043e28bd7b19f239df226859a39f1b992111b465e28878d1ec09699d31e5acd3
+MISC ChangeLog 559 SHA256 15d6c65a6e4c4f4043ee50835bfbeefef4e5538292c79049d40cda2b4b4b4f17 SHA512 4be97b841aeb88e6cbf0369c1d257fb31a7f721c62f0e0d7ba2c0f60f857d1c4a108d41a87a72266ba699d5db2e4637bd6b1546c65d270757812672b2afe6871 WHIRLPOOL a05f7c73e0032cb777644067201d301b1eaf1defea9cb63e5f3ddd2733a4fcb5723d267188eaac93c486f912d99aa9c52c6363a1ef1fdb2667c03d211b4249f6
+MISC metadata.xml 415 SHA256 337c5a5de58878fbe467e2dbf75d29f07b7b20a5f3447ab2413f8c1734f53193 SHA512 ba836b459c2d65a7824060d47632fb9e7ea27f55e53b6591efe081c6c9a92266b6fde553ba119a80b7382679dcfc42fcc2c810286a259d6ff99b919389ed81a0 WHIRLPOOL 467c738e5a5b4a384f556e37048288f42d459e31b135e2d8c6fd5ade75321c489f9a15133aea51bc94c56aec067068f82d1a6a5b0876bdb5c21ed0777e3b7817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS6WGfAAoJEFpvPKfnPDWzGCQIAJvgVNs3l+odogKkEYH3dtTn
-fNA90jClOlp8ZjTOoR9wzBxlxdJ8qPFdh7Mpt3H4pcLLqPjIXl42ss14WqcLjocA
-GE5Ln5tqGpSUZGtiEdXITMc06GjW/4gR0CWWWVndxPZsnX+BOKsmhnvYIBXVv/tf
-e20YdybWWU5G8TxgbO0e0FItx3Svq36MBV+p9oLjf2ufNyxt0WL/YnEvE4d1toQu
-ZOhnpdk5d1zTuXZwA04g60yvoL01u3zJcHXxZBWGeJNATxZISpZkLqyTSKK+FFg5
-j7uDCiRyPu9DPz1WSIx/riYZS9yaDKkj29w5YCBX9RY4/gU2A3kk7hV/RwlJ4WU=
-=/Qf3
+iQJ8BAEBCABmBQJTfi9qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgRs0QAKO/n8TXNC7TAuuzv+jbfmIH
+JejHRWAylfxItYL9sFIswPwBKSqUgbsVQtamyDw9dHhWTawU2Lf8KuhElysrb0Gg
+csGbAJBZTV3aS763aTo79LzWWtUwvU9R+vL6XpzZgSmwUj8l3n3maoSHrEe2ZNwK
+CKbYFGqr8yXLs4BvVuEheiVs1i7v+T01Q9EeLhc/VA0fw6WpOj1hHYfohU1oMgEi
+012PMwmlJ1dO26dvn323wXmj0AZTXtiQpLJOhChjIPpCDyLFTyIdQXYn+GlzMvgE
+s5VtCxEfvVB0U24rRCic2V6A5eFws91jPC4LWLBronxmNfU+WPwUdCQ14StqoGb0
+HiMRMIAHTUfUdlOd7n41l7XWrlHz2FumUC94ozlmsLC4a4wF9LFlxt3H17OD6U04
+3yRhoe3uz5cYTEHRCW4UzGXM8ymr+dnt/PVas71E7wHtWgWOo30fUDiI33/G9ST8
+GQhY83cWW+gcpAdPDbc8wR+8b47Qmcx/1OZTWWEOIVDnLE1YKTkZ7m+WINSgYeKF
+g1Lwf5k08a0n4pF3VF9glfj5StOhYm1pa0+yNnJMCvjkOIai7VlWMNyx2M9+hxx9
+SzDdsdFe54UZqsYh3a9X5aUiGZjDHljilwxQdiOIpJa45WTENmtl9d5yyheiwgaP
+lknVpDooBXOdZZ71w29k
+=+wdE
 -----END PGP SIGNATURE-----
diff --git a/games-engines/solarus/files/solarus-1.2.0-paths.patch b/games-engines/solarus/files/solarus-1.2.0-paths.patch
new file mode 100644
index 000000000000..23b7635a1d0c
--- /dev/null
+++ b/games-engines/solarus/files/solarus-1.2.0-paths.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Jan 29 02:31:24 UTC 2014
+Subject: make paths modifiable
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ endif()
+ 
+ set(CMAKE_MODULE_PATH "${SOLARUS_ENGINE_SOURCE_DIR}/cmake/modules/")
+-set(SOLARUS_INSTALL_DESTINATION "bin")
++set(SOLARUS_INSTALL_DESTINATION "bin" CACHE PATH "binary install destination")
+ 
+ option(SOLARUS_USE_LUAJIT "Use LuaJIT instead of default Lua (recommended)" ON)
+ 
diff --git a/games-engines/solarus/metadata.xml b/games-engines/solarus/metadata.xml
index 44ca0fccca79..7367fdb6d502 100644
--- a/games-engines/solarus/metadata.xml
+++ b/games-engines/solarus/metadata.xml
@@ -6,6 +6,9 @@
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<use>
+		<flag name='luajit'>Use LuaJIT instead of default Lua</flag>
+	</use>
 	<upstream>
 		<remote-id type='github'>christopho/solarus</remote-id>
 	</upstream>
diff --git a/games-engines/solarus/solarus-1.2.0.ebuild b/games-engines/solarus/solarus-1.2.0.ebuild
new file mode 100644
index 000000000000..5fa20d171ccf
--- /dev/null
+++ b/games-engines/solarus/solarus-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/solarus/solarus-1.2.0.ebuild,v 1.1 2014/05/22 17:10:02 hasufell Exp $
+
+EAPI=5
+
+inherit cmake-utils games
+
+DESCRIPTION="An open-source Zelda-like 2D game engine"
+HOMEPAGE="http://www.solarus-games.org/"
+SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+RDEPEND="
+	dev-games/physfs
+	media-libs/libmodplug
+	>=media-libs/libsdl2-2.0.1[X,joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png]
+	>=media-libs/sdl2-ttf-2.0.12
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua )"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog readme.txt )
+PATCHES=( "${FILESDIR}"/${P}-paths.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSOLARUS_INSTALL_DESTINATION="${GAMES_BINDIR}"
+		$(cmake-utils_use luajit SOLARUS_USE_LUAJIT)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	prepgamesdirs
+}