gentoo resync : 03.11.2019

5 files changed, 5 insertions, 178 deletions

diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 590d72937258..903e8825a806 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,12 +1,8 @@
-AUX openrct2-0.2.0-disable-tests-with-assets.patch 2171 BLAKE2B 21088b495036926e20d4861a8ad270b8b4a9a6119d60de7653e0af8bbb9831f86c1226f7e4058a181eb89dd30418c19ccf53966a45672643f30eb9284c08661f SHA512 8c185950ab475e1ba09bca5ce85e4623e77fb01cd2ff661e50b6dd7e3a7a4c17b701e955bdc2e306bfeb70c7da11e2dbb00eafd3f58623b0f5aff344850288c8
 AUX openrct2-0.2.1-disable-tests-with-assets.patch 2166 BLAKE2B c7055da8e933f4f07433e9dad8b23e12d435d9fb4dbf694a9b36fc56ff8e939aef2667a7642be0fea7cafb824a9ffc5721e11aec28dad48c7bdc03064d0d32d1 SHA512 405530efe21b33f1b01b0770085ec5d81d3c46a3fc4e1e30c3b89e6048fb55821b45d68eab588ef0a5f07b78d93f8ffc8c620de3139fce0cf8d483eea94ad10e
-DIST openrct2-0.2.0.tar.gz 6481521 BLAKE2B b3a17d4dd7b0d3e68d4a0a200a81307fa598ac9bafd0636fc2fe62cc0921d1e620cf29a31f2fd5d9258d5b79cd952887e853c005ed719f5990744e9849ad0ee8 SHA512 ac42509ceb52eab20964bf95d7a140dc00d9b4c2569fab1200faff31548f063e209acde29f8ca4ee14858fcf5f6781eebe6d5f7de3d4e01fd43c43ee8905863b
 DIST openrct2-0.2.1.tar.gz 6571807 BLAKE2B f5a72072ce4cda9b68d1f82f56932f1a074c4ea4050d63e4bf39de1220544d543265c67f764f85d0cc85b6ff42f3fa67fc71e7dd9c5eacb1881be47e2d79a84f SHA512 04bf2cfbb2d3b9fb0a8423cfffc70b81a2a2518af73b9a2c2c65b2a4e5ef2380621d4d3aaefaea73d926a99259dfb047d6fcc330cd0d7227541cffead28ba540
-DIST openrct2-objects-v1.0.2.zip 2068705 BLAKE2B 4f291289a7f331bad19080ffc63d204819973682710ea62c3fc66fb9d05b63c267e2146d6c533f59eac3baa9760b85953ae344b6da4bb778e5ccd249f6160525 SHA512 814d52ee5c071f33c17d88bc53711a509d7988ece12381996b3d233b9b46c79739fd2dafbed57f00537b19c78e290e2481d72b2824b5574734f6876a0af0c359
 DIST openrct2-objects-v1.0.7.zip 2164242 BLAKE2B 003baf3400c52e3b2efdc208f6c64a45f7c9274aca3b729856a60fc1e72c8b6440b663d3fd791ebde7412df9920095367763bcad58257534b32c222d97976dcb SHA512 8e77adae59062582a22be69e81d144477482148c839abbea76e6bbbc65ca6426a8354bd4726176702a41684f01a62c5bddc0f6c2c6e42fa91c88815879c91fe5
 DIST openrct2-objects-v1.0.8.zip 2167920 BLAKE2B 551fd825a0bfb6bd2fce8a34aab393ea91f815508f51523a3839a3d2054afe96efac09976f1defd046be55fa14806b05c9cd5a9484d7e3ce1a86c54335a0741a SHA512 29e60a2d72e0c7774993e9d70aeb1c931b359e35776049a1baafd2d0bdfc56c1374e577e43f596c31ee146bd38b87eeeb8acc3ea03fdd9c9bc3be08436b7aa6a
 DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106
-EBUILD openrct2-0.2.0.ebuild 2708 BLAKE2B 638b3a66b3e68f85bc9da8be330da58e550721d24f1e1b0199d1dcf34294933f5fd923821f83722e8fa38b5d2c95e9d74896f8e3f0bc6d83c7df35fc313561ca SHA512 6ea12f1460723acbe7339e9207e7137601d3a0ac37fe4f4f982201e4302cff4ee6049e24912e1975648d815e6248b64e193c5f89c666396a517089f54cb5067f
-EBUILD openrct2-0.2.1.ebuild 2708 BLAKE2B 9e5605dcc6967010e31f1d67a7a1d54f4c6c4b40d86af3a56b7ff29cc49438c5e1a1ea0878a98dbcca6e8aff619f711a5080c84b0ffa51df50157ff79a0d82d0 SHA512 57d48664a885fc3d511a3b6a72d0d3bef54dc1b9ff63cfc015cc2e57c5e486b3ec401b4f5f1b0d9eb66703961d161eb283b6225ca13a8d013d43fc0c7a41d293
-EBUILD openrct2-9999.ebuild 2588 BLAKE2B 9f21ac2ef2d737c9d80108c1c6288747f11055d75886986089ebcd36d3432251342ec4ced5c7a15cc7456536f61743a2ab9b10e56f464bc71258bd7d79f74d2e SHA512 59cddab56bdf58fe9dc32197b4d5765cf30daa1d0eac9bca74c91879a5333ba7e6af1144b50ae700f2e6d74ae9fa548706a615113c4b62ca8aa71e7405ea7911
+EBUILD openrct2-0.2.1.ebuild 2763 BLAKE2B f29ed9beac734a41ada806d6aa6677989caffa0eeb16f50aa7fb990f3b016bb7901ee505ad00de6bcbc3b728c70c78c093926dcbcd3d03cf4432a79d472373e0 SHA512 211351f5c85a63406a3a8cf2caa9905830c7d6ece7072e17837806dda99857edb980a3c8006f40a38399ef1e8bac540a047d35b63d5731701ac8ec385e39a07e
+EBUILD openrct2-9999.ebuild 2646 BLAKE2B 971aa2c299d744c1639b5dde823b5e8652fa398e8b288b78dfd2747c3e2c8753ded2658c99f1421bdc29d3c7ce5dc68287ab68ba08f86bc25d22556179672e4d SHA512 08a1b2e4b8ccbd7e9bc2caee95da94790a33c503c5e1ae1fa90ca555f3b96a0cbb7b7edc54bf376bdb3fb4f3488aa170f38bf32f06e2e7d68514c1e0fc361c10
 MISC metadata.xml 967 BLAKE2B 6dc048c366eb9719d895ab269a207a51f233125ee0861e360bf0d65a2de0d56b8bed7147f71bbf1d8c4b286a843a3542e74e17c8e3231682742435a2b28dfef0 SHA512 874ed9f406c5219bc5c6102b775a53b4e2526ff0f7cfa0dd9b5511717d10ee1fd63012cd19a926904b556195a12a7e2328548de9d1000605afdc471db513198f
diff --git a/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch b/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch
deleted file mode 100644
index 0b4c7275558c..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.2.0-disable-tests-with-assets.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 86b45a7a4a4fc9b038bcd0e720cf575b934fb462 Mon Sep 17 00:00:00 2001
-From: "Hendrik v. Raven" <hendrik@consetetur.de>
-Date: Sat, 4 Aug 2018 13:58:31 +0200
-Subject: [PATCH] reintroduce DISABLE_RCT2_TESTS compile option
-
-the option was removing when restructuring the CI system, but it is
-still usefull for package maintainers.
----
- test/tests/CMakeLists.txt | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt
-index 1f862153d..34ab5c884 100644
---- a/test/tests/CMakeLists.txt
-+++ b/test/tests/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 2.6)
- 
-+option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.")
- option(SYSTEM_GTEST "Use the googletest library provided by the system.")
- 
- if (SYSTEM_GTEST)
-@@ -172,18 +173,21 @@ set(RIDE_RATINGS_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/RideRatings.cpp"
-                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_ride_ratings ${RIDE_RATINGS_TEST_SOURCES})
- target_link_libraries(test_ride_ratings ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME ride_ratings COMMAND test_ride_ratings)
- 
- # Multi-launch test
- set(MULTILAUNCH_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/MultiLaunch.cpp"
-                              "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_multilaunch ${MULTILAUNCH_TEST_SOURCES})
- target_link_libraries(test_multilaunch ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME multilaunch COMMAND test_multilaunch)
- 
- # Tile element test
- set(TILE_ELEMENT_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/TileElements.cpp"
-                               "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_tile_elements ${TILE_ELEMENT_TEST_SOURCES})
- target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME tile_elements COMMAND test_tile_elements)
-+
-+if (NOT DISABLE_RCT2_TESTS)
-+    add_test(NAME ride_ratings COMMAND test_ride_ratings)
-+    add_test(NAME multilaunch COMMAND test_multilaunch)
-+    add_test(NAME tile_elements COMMAND test_tile_elements)
-+endif ()
--- 
-2.18.0
-
diff --git a/games-simulation/openrct2/openrct2-0.2.0.ebuild b/games-simulation/openrct2/openrct2-0.2.0.ebuild
deleted file mode 100644
index e0f361457bf9..000000000000
--- a/games-simulation/openrct2/openrct2-0.2.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/OpenRCT2-${PV}"
-fi
-
-TSV="0.1.2"
-OBJV="1.0.2"
-SRC_URI+="
-	https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip
-		-> ${PN}-title-sequence-v${TSV}.zip
-	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"
-
-RDEPEND="
-	>=dev-libs/jansson-2.5
-	>=dev-libs/libzip-1.0
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	media-libs/speexdsp
-	multiplayer? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	opengl? ( virtual/opengl )
-	truetype? (
-		media-libs/sdl2-ttf
-		media-libs/fontconfig
-	)
-	twitch? ( net-misc/curl[ssl] )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.0-disable-tests-with-assets.patch"
-)
-
-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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
-		-DDISABLE_NETWORK="$(usex !multiplayer)"
-		-DDISABLE_OPENGL="$(usex !opengl)"
-		-DDISABLE_TTF="$(usex !truetype)"
-		-DWITH_TESTS="$(usex test)"
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DDOWNLOAD_OBJECTS=OFF
-		-DBUILD_SHARED_LIBS=ON
-	)
-	if use test ; then
-		mycmakeargs+=(
-			-DSYSTEM_GTEST=ON
-			-DDISABLE_RCT2_TESTS=ON
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn ""
-		ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
-		ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
-		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-0.2.1.ebuild b/games-simulation/openrct2/openrct2-0.2.1.ebuild
index 95681d9a2ce6..d8620527030b 100644
--- a/games-simulation/openrct2/openrct2-0.2.1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -83,6 +83,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
 		-DDISABLE_NETWORK="$(usex !multiplayer)"
 		-DDISABLE_OPENGL="$(usex !opengl)"
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 36be8a5dcec7..cb037d692f2a 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -79,6 +79,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
 		-DDISABLE_NETWORK="$(usex !multiplayer)"
 		-DDISABLE_OPENGL="$(usex !opengl)"