[gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/

[Conrad Kostecki]

commit:     7b0cfd8d335cfa1f7f5b1159d156d57804e571ef
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 22:14:27 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 22:44:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0cfd8d

games-simulation/openrct2: update live ebuild

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-simulation/openrct2/metadata.xml         |  1 +
 games-simulation/openrct2/openrct2-9999.ebuild | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
index 4e87269e0d5..533b34deeec 100644
--- a/games-simulation/openrct2/metadata.xml
+++ b/games-simulation/openrct2/metadata.xml
@@ -16,6 +16,7 @@
 	</longdescription>
 	<use>
 		<flag name="lightfx">Enables LightFX for better lightning effects.</flag>
+		<flag name="scripting">Enable the <pkg>dev-lang/duktape</pkg> scripting engine for executing user scripts.</flag>
 		<flag name="twitch">Enables streaming of ingame content to Twitch.</flag>
 	</use>
 	<upstream>

diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index edadb738265..f0a1d342c95 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -27,25 +27,23 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="dedicated libressl +lightfx +opengl test +truetype twitch"
+IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
 
 COMMON_DEPEND="
-	dev-lang/duktape
 	dev-libs/icu:=
 	dev-libs/jansson
 	dev-libs/libzip:=
 	media-libs/libpng:0=
+	net-misc/curl[ssl]
 	sys-libs/zlib
 	!dedicated? (
 		media-libs/libsdl2
 		media-libs/speexdsp
 		opengl? ( virtual/opengl )
-		twitch? (
-			net-misc/curl[ssl]
-		)
 	)
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
+	scripting? ( dev-lang/duktape )
 	truetype? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
@@ -74,13 +72,14 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
 )
 
 src_unpack() {
 	git-r3_src_unpack
 
-	mkdir -p "${S}"/data/title || die
-	cd "${S}"/data/title || die
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
 	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
 
 	mkdir -p "${S}"/data/object || die
@@ -108,7 +107,7 @@ src_configure() {
 		-DDISABLE_DISCORD_RPC=ON
 		-DDISABLE_GOOGLE_BENCHMARK=ON
 		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP_TWITCH=$(usex !twitch)
+		-DDISABLE_HTTP=OFF
 		-DDISABLE_NETWORK=OFF
 		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
 		-DDISABLE_TTF=$(usex !truetype)
@@ -116,6 +115,8 @@ src_configure() {
 		-DDOWNLOAD_REPLAYS=OFF
 		-DDOWNLOAD_TITLE_SEQUENCES=OFF
 		-DENABLE_LIGHTFX=$(usex lightfx)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
 		-DPORTABLE=OFF
 		-DSTATIC=OFF
 		$(usex test "-DSYSTEM_GTEST=ON" "")
@@ -138,6 +139,8 @@ src_test() {
 }
 
 src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
 	cmake_src_install
 
 	if use dedicated; then