gentoo resync : 11.05.2018

4 files changed, 62 insertions, 39 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index a0885e68e44b..a177b82db212 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index bab5f2d7204c..36721103acef 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,5 +1,6 @@
-DIST openrct2-0.1.1.tar.gz 6284135 BLAKE2B 71ac2671c42fb679f5430ef0d0bd5e05d112aebd20b4b59e05e3527bacf24137b81bcedc72f9cc86cbf0b7612d6dc14c82881a828108aa5b16b8ddeeed78c46e SHA512 fd84907819ac317af88c0446afcb04acdb43cd6671f0837f1294191aacf58e93887d46e6eb28d86f558577f4e7c834bc42a9ec486f67e0b64cb7bc0cc1bda427
-DIST openrct2-title-sequence-v0.1.0.zip 1766393 BLAKE2B 19612ba78572c4f271349387a24fc9caf389552ad78841ed86ff069c20686da339c83cabe041a1ae240055721984372f1ef20bd009f1ac8b38bf3ff82297b29a SHA512 0d1b47c5fc5d1d9e5580b30d0f43d5532b388f1a5685060ca9313ec2f76c61a5fc96b8aa37689072b71edd9fb1aedddd46fa38c237ccb7198841d7bc33bf2a2b
-EBUILD openrct2-0.1.1.ebuild 2184 BLAKE2B c1eec024209ec2b6348be961416506469abc6259e2ad531764bf849e1e98b59efefcf84d7b5f01f0fcfacd022764ff46f6d0e002e86c283a2413aad6efe03354 SHA512 b3dabb2a44d2d3617db03d5049a3c29b3e03fd5c653eb6058f1470f72ac62b0d8fa8490d67f8bca932ab5094b0c500393477c0923ffbab13bc14db851d847896
-EBUILD openrct2-9999.ebuild 2184 BLAKE2B c1eec024209ec2b6348be961416506469abc6259e2ad531764bf849e1e98b59efefcf84d7b5f01f0fcfacd022764ff46f6d0e002e86c283a2413aad6efe03354 SHA512 b3dabb2a44d2d3617db03d5049a3c29b3e03fd5c653eb6058f1470f72ac62b0d8fa8490d67f8bca932ab5094b0c500393477c0923ffbab13bc14db851d847896
+DIST openrct2-0.1.2.tar.gz 6769785 BLAKE2B 0cc6ef6c68c1db6c822dd6038bc2d115f487a52b5891316273ee36db1713913baa2f119dabace88a37c16f87c90b14cf84df75a24b26b22571e98966afd2adbc SHA512 489dac96e1eda1449680f98a4b500eeb7b3f1ffbdaa5a5c701300071eb3a7862c65fa5a81e769083927b95a14914db54307724756a9841cff0c769c9e5471adc
+DIST openrct2-objects-v1.0.zip 2050225 BLAKE2B 52ae6f5ab4de5d4b121cea6a3d6711b04f1c4857795c995f7568e3be2862409104be55e233781ff6708c7e821f49af8e91f9f4c87c037b6a8a77698534747925 SHA512 a125fee04c12c49ffd16880eb5b8722e25c5fb82adae305d9904c3a6251c83e73e4a29c7e3694acee3abf336894759cfbff94018c6b210df4d794ca3ec34dc84
+DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106
+EBUILD openrct2-0.1.2.ebuild 2325 BLAKE2B 7e7f5b87be6b5182bd64a746ba2e80732309277fc635cea93b0867ba65beff9f10bf13792d3e5b31ef42d3c217a5e58aa9b643a3e6aab811281a1a7628c61839 SHA512 ec94c4ff953d139ba359cabf6c064de04b64bf17bdd9f5230ca8ed39aaf7089828425507ce8f6ad247a1f763c9a6a5b4974dd8bcd773e363eac07f61256c5efa
+EBUILD openrct2-9999.ebuild 2571 BLAKE2B b04b112df994b6ea260407bd396a724c5eb772f06fb58b0e5dc99fdf8e0c3ec792354265123db0b8ff92d6a856f6210c789949d4b4a6ab5c53f5046587fcf93e SHA512 689c71dbc7d1a297fc61e73c6fecdc678b9e800ea557e26a1cc4afbdede49e28c71cf1a3e91b15b4b7cd4ad0ec41cdfdfdedebc7e95f95d54979cc3c9ce6af4c
 MISC metadata.xml 967 BLAKE2B 6dc048c366eb9719d895ab269a207a51f233125ee0861e360bf0d65a2de0d56b8bed7147f71bbf1d8c4b286a843a3542e74e17c8e3231682742435a2b28dfef0 SHA512 874ed9f406c5219bc5c6102b775a53b4e2526ff0f7cfa0dd9b5511717d10ee1fd63012cd19a926904b556195a12a7e2328548de9d1000605afdc471db513198f
diff --git a/games-simulation/openrct2/openrct2-0.1.1.ebuild b/games-simulation/openrct2/openrct2-0.1.2.ebuild
index cc286b38589e..ae25725577a7 100644
--- a/games-simulation/openrct2/openrct2-0.1.1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
 HOMEPAGE="https://openrct2.website/"
@@ -18,22 +18,18 @@ else
 	S="${WORKDIR}/OpenRCT2-${PV}"
 fi
 
-TSV="0.1.0"
+TSV="${PV}"
 SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
 
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="libressl +multiplayer opengl test truetype +twitch"
 
-# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
-REQUIRED_USE="multiplayer? ( twitch )"
-
 RDEPEND="
 	>=dev-libs/jansson-2.5
 	>=dev-libs/libzip-1.0
 	media-libs/libpng:0=
 	media-libs/libsdl2
-	>=media-libs/speex-1.2.0
 	media-libs/speexdsp
 	multiplayer? (
 		libressl? ( dev-libs/libressl:0= )
@@ -47,15 +43,28 @@ RDEPEND="
 	twitch? ( net-misc/curl[ssl] )
 "
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	test? ( dev-cpp/gtest )
 "
 
-if [[ ${PV} == 9999 ]]; then
 src_unpack() {
-	default
-	git-r3_src_unpack
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	mkdir -p "${S}/data/title" || die
+	pushd "${S}/data/title" || die
+	unpack ${PN}-title-sequence-v${TSV}.zip
+	popd || die
+}
+
+src_prepare() {
+	sed -i CMakeLists.txt -e 's/-Werror//' || die
+
+	cmake-utils_src_prepare
 }
-fi
 
 src_configure() {
 	local mycmakeargs=(
@@ -67,18 +76,12 @@ src_configure() {
 		-DDOWNLOAD_TITLE_SEQUENCES=OFF
 		-DDISABLE_RCT2_TESTS=ON
 		-DSYSTEM_GTEST=ON
+		-DBUILD_SHARED_LIBS=ON
 	)
 
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/openrct2/title
-	doins "${WORKDIR}"/*.parkseq
-}
-
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		ewarn ""
@@ -87,8 +90,12 @@ pkg_postinst() {
 		ewarn ""
 	fi
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index cc286b38589e..1058facd68fd 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
 HOMEPAGE="https://openrct2.website/"
@@ -18,22 +18,21 @@ else
 	S="${WORKDIR}/OpenRCT2-${PV}"
 fi
 
-TSV="0.1.0"
+TSV="0.1.2"
 SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
 
+OBJV="1.0"
+SRC_URI+=" https://github.com/OpenRCT2/objects/releases/download/v${OBJV}/objects.zip -> ${PN}-objects-v${OBJV}.zip"
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="libressl +multiplayer opengl test truetype +twitch"
 
-# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
-REQUIRED_USE="multiplayer? ( twitch )"
-
 RDEPEND="
 	>=dev-libs/jansson-2.5
 	>=dev-libs/libzip-1.0
 	media-libs/libpng:0=
 	media-libs/libsdl2
-	>=media-libs/speex-1.2.0
 	media-libs/speexdsp
 	multiplayer? (
 		libressl? ( dev-libs/libressl:0= )
@@ -47,15 +46,33 @@ RDEPEND="
 	twitch? ( net-misc/curl[ssl] )
 "
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	test? ( dev-cpp/gtest )
 "
 
-if [[ ${PV} == 9999 ]]; then
 src_unpack() {
-	default
-	git-r3_src_unpack
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	mkdir -p "${S}/data/title" || die
+	pushd "${S}/data/title" || die
+	unpack ${PN}-title-sequence-v${TSV}.zip
+	popd || die
+
+	mkdir -p "${S}/data/object" || die
+	pushd "${S}/data/object" || die
+	unpack ${PN}-objects-v${OBJV}.zip
+	popd || die
+}
+
+src_prepare() {
+	sed -i CMakeLists.txt -e 's/-Werror//' || die
+
+	cmake-utils_src_prepare
 }
-fi
 
 src_configure() {
 	local mycmakeargs=(
@@ -65,20 +82,14 @@ src_configure() {
 		-DDISABLE_TTF="$(usex !truetype)"
 		-DWITH_TESTS="$(usex test)"
 		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DDISABLE_RCT2_TESTS=ON
+		-DDOWNLOAD_OBJECTS=OFF
 		-DSYSTEM_GTEST=ON
+		-DBUILD_SHARED_LIBS=ON
 	)
 
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/openrct2/title
-	doins "${WORKDIR}"/*.parkseq
-}
-
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		ewarn ""
@@ -87,8 +98,12 @@ pkg_postinst() {
 		ewarn ""
 	fi
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }