1 |
commit: dcc2f6b146d0060e77564f6e87e56e64b59c569d |
2 |
Author: Jan Segre <jan <AT> segre <DOT> in> |
3 |
AuthorDate: Fri Aug 11 21:12:31 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 11 22:12:24 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc2f6b1 |
7 |
|
8 |
games-simulation/openrct2: drop old |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5377 |
11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
12 |
|
13 |
games-simulation/openrct2/Manifest | 1 - |
14 |
.../openrct2-0.1.0-remove-external-gtest.patch | 67 -------------- |
15 |
.../files/openrct2-0.1.0-respect-libdir.patch | 11 --- |
16 |
games-simulation/openrct2/openrct2-0.1.0.ebuild | 100 --------------------- |
17 |
4 files changed, 179 deletions(-) |
18 |
|
19 |
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest |
20 |
index 267f4e9c3e9..178565bb243 100644 |
21 |
--- a/games-simulation/openrct2/Manifest |
22 |
+++ b/games-simulation/openrct2/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST openrct2-0.1.0.tar.gz 6253207 SHA256 0347a47d380fc18ea543928c92a13d1bdb4431573154afeb80fa33f1149e6992 SHA512 102902f47948e2dc648a48897eddbb53bbd451fd6e9a66f397c6f026012131c11e3c5a5aa208b9d719a0e75aa244c9a3967ae3b98c33ba695fd622cb1bd18f12 WHIRLPOOL 18d1fc763606b9fb85fae9ba056ef3b8ae9be68903fbd137e045f594e273c954777c2ea2f2ede65e3695d43e4c4a714df9f77afaf07b5a6555a314e616188a3d |
25 |
DIST openrct2-0.1.1.tar.gz 6284135 SHA256 5d7a6c7f3c770e7de506958f86789c438c543c27d312fd096322cde4e89f50ad SHA512 fd84907819ac317af88c0446afcb04acdb43cd6671f0837f1294191aacf58e93887d46e6eb28d86f558577f4e7c834bc42a9ec486f67e0b64cb7bc0cc1bda427 WHIRLPOOL 9e673852d653fe8e1839db96d124b1cc1e7e4f7a594ec05c1a895c883da234e536851025c75e0fcacb3be776cb3dd1dea9ad7ac028cfda6434095146ba68c5e7 |
26 |
DIST openrct2-title-sequence-v0.1.0.zip 1766393 SHA256 1df6ad253896bd09b728616f7bf12f4b797ef9db2b9bab8465b08662f47f4bef SHA512 0d1b47c5fc5d1d9e5580b30d0f43d5532b388f1a5685060ca9313ec2f76c61a5fc96b8aa37689072b71edd9fb1aedddd46fa38c237ccb7198841d7bc33bf2a2b WHIRLPOOL f78612445dda2c55aa224e4df0ece92a5f762049ca1b6bcf4e00f72f6aaf900fb944a6a1dd358900b1968a63b301af8bf4b1ca0a645c43c0ca2221279efabd9a |
27 |
|
28 |
diff --git a/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch b/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch |
29 |
deleted file mode 100644 |
30 |
index 2c1392b731f..00000000000 |
31 |
--- a/games-simulation/openrct2/files/openrct2-0.1.0-remove-external-gtest.patch |
32 |
+++ /dev/null |
33 |
@@ -1,67 +0,0 @@ |
34 |
---- a/test/tests/CMakeLists.txt 2017-07-13 14:46:34.690292993 +0200 |
35 |
-+++ b/test/tests/CMakeLists.txt 2017-07-13 14:56:57.678054368 +0200 |
36 |
-@@ -2,61 +2,13 @@ |
37 |
- |
38 |
- option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.") |
39 |
- |
40 |
--# Bootstrap GoogleTest |
41 |
--INCLUDE(ExternalProject) |
42 |
-+find_package(GTest REQUIRED) |
43 |
- |
44 |
--ExternalProject_Add( |
45 |
-- googletest-distribution |
46 |
-- URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz |
47 |
-- URL_HASH SHA1=e7e646a6204638fe8e87e165292b8dd9cd4c36ed |
48 |
-- TIMEOUT 10 |
49 |
-- CONFIGURE_COMMAND "" |
50 |
-- BUILD_COMMAND "" |
51 |
-- INSTALL_COMMAND "" |
52 |
--) |
53 |
-- |
54 |
--# Specify include dir |
55 |
--ExternalProject_Get_Property(googletest-distribution SOURCE_DIR) |
56 |
--set(GOOGLETEST_DISTRIB_SOURCE_DIR "${SOURCE_DIR}") |
57 |
-- |
58 |
--ExternalProject_Add( |
59 |
-- googletest |
60 |
-- DEPENDS googletest-distribution |
61 |
-- DOWNLOAD_COMMAND "" |
62 |
-- SOURCE_DIR "${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest" |
63 |
-- CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${TARGET_M}" |
64 |
-- BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}" |
65 |
-- BUILD_BYPRODUCTS "googletest-prefix/src/googletest-build/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}" |
66 |
-- # Disable install step |
67 |
-- INSTALL_COMMAND "" |
68 |
-- # Wrap download, configure and build steps in a script to log output |
69 |
-- LOG_DOWNLOAD ON |
70 |
-- LOG_CONFIGURE ON |
71 |
-- LOG_BUILD ON) |
72 |
-- |
73 |
-- |
74 |
--# Specify include dir |
75 |
--set(GTEST_INCLUDE_DIR ${GOOGLETEST_DISTRIB_SOURCE_DIR}/googletest/include) |
76 |
-- |
77 |
--# Library |
78 |
--ExternalProject_Get_Property(googletest BINARY_DIR) |
79 |
--set(GOOGLETEST_BINARY_DIR "${BINARY_DIR}") |
80 |
--set(GTEST_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}) |
81 |
--set(GTEST_MAIN_LIBRARY_PATH ${GOOGLETEST_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}) |
82 |
--set(GTEST_LIBRARY gtest) |
83 |
--set(GTEST_MAIN_LIBRARY gtest_main) |
84 |
--add_library(${GTEST_LIBRARY} STATIC IMPORTED) |
85 |
--add_library(${GTEST_MAIN_LIBRARY} STATIC IMPORTED) |
86 |
--set_property(TARGET ${GTEST_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}) |
87 |
--set_property(TARGET ${GTEST_MAIN_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}) |
88 |
--add_dependencies(${GTEST_LIBRARY} googletest) |
89 |
--add_dependencies(${GTEST_MAIN_LIBRARY} ${GTEST_LIBRARY}) |
90 |
-- |
91 |
--include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) |
92 |
-+include_directories(SYSTEM ${GTEST_INCLUDE_DIRS}) |
93 |
- include_directories("${ROOT_DIR}/src") |
94 |
- include_directories(${SDL2_INCLUDE_DIRS}) |
95 |
- |
96 |
--set(GTEST_LIBRARIES gtest gtest_main pthread) |
97 |
-+set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES}) |
98 |
- |
99 |
- # Some most common files required in tests |
100 |
- set(COMMON_TEST_SOURCES |
101 |
|
102 |
diff --git a/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch b/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch |
103 |
deleted file mode 100644 |
104 |
index 60695802764..00000000000 |
105 |
--- a/games-simulation/openrct2/files/openrct2-0.1.0-respect-libdir.patch |
106 |
+++ /dev/null |
107 |
@@ -1,11 +0,0 @@ |
108 |
---- a/CMakeLists.txt 2017-07-26 00:54:48.021345174 -0300 |
109 |
-+++ b/CMakeLists.txt 2017-07-26 00:54:39.510156990 -0300 |
110 |
-@@ -140,7 +140,7 @@ |
111 |
- if (PORTABLE) |
112 |
- install(TARGETS "libopenrct2" LIBRARY DESTINATION "bin") |
113 |
- else () |
114 |
-- install(TARGETS "libopenrct2" LIBRARY DESTINATION "lib") |
115 |
-+ install(TARGETS "libopenrct2" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") |
116 |
- endif () |
117 |
- endif () |
118 |
- install(TARGETS "openrct2" RUNTIME DESTINATION "bin") |
119 |
|
120 |
diff --git a/games-simulation/openrct2/openrct2-0.1.0.ebuild b/games-simulation/openrct2/openrct2-0.1.0.ebuild |
121 |
deleted file mode 100644 |
122 |
index a0f3e627052..00000000000 |
123 |
--- a/games-simulation/openrct2/openrct2-0.1.0.ebuild |
124 |
+++ /dev/null |
125 |
@@ -1,100 +0,0 @@ |
126 |
-# Copyright 1999-2017 Gentoo Foundation |
127 |
-# Distributed under the terms of the GNU General Public License v2 |
128 |
- |
129 |
-EAPI=6 |
130 |
- |
131 |
-inherit cmake-utils gnome2-utils |
132 |
- |
133 |
-DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2" |
134 |
-HOMEPAGE="https://openrct2.website/" |
135 |
-if [[ ${PV} == 9999 ]]; then |
136 |
- EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git" |
137 |
- EGIT_BRANCH="develop" |
138 |
- inherit git-r3 |
139 |
- SRC_URI="" |
140 |
-else |
141 |
- KEYWORDS="~amd64 ~x86" |
142 |
- SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
143 |
- S="${WORKDIR}/OpenRCT2-${PV}" |
144 |
-fi |
145 |
- |
146 |
-TSV="0.1.0" |
147 |
-SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip " |
148 |
- |
149 |
-LICENSE="GPL-3" |
150 |
-SLOT="0" |
151 |
-IUSE="libressl +multiplayer opengl test truetype +twitch" |
152 |
- |
153 |
-# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469 |
154 |
-REQUIRED_USE="multiplayer? ( twitch )" |
155 |
- |
156 |
-RDEPEND=" |
157 |
- >=dev-libs/jansson-2.5 |
158 |
- >=dev-libs/libzip-1.0 |
159 |
- media-libs/libpng:0= |
160 |
- media-libs/libsdl2 |
161 |
- || ( |
162 |
- media-libs/speexdsp |
163 |
- <media-libs/speex-1.2.0 |
164 |
- ) |
165 |
- multiplayer? ( |
166 |
- libressl? ( dev-libs/libressl:0= ) |
167 |
- !libressl? ( dev-libs/openssl:0= ) |
168 |
- ) |
169 |
- opengl? ( virtual/opengl ) |
170 |
- truetype? ( |
171 |
- media-libs/sdl2-ttf |
172 |
- media-libs/fontconfig |
173 |
- ) |
174 |
- twitch? ( net-misc/curl[ssl] ) |
175 |
-" |
176 |
-DEPEND="${RDEPEND} |
177 |
- test? ( dev-cpp/gtest ) |
178 |
-" |
179 |
- |
180 |
-PATCHES=( |
181 |
- "${FILESDIR}/${PN}-0.1.0-remove-external-gtest.patch" |
182 |
- "${FILESDIR}/${PN}-0.1.0-respect-libdir.patch" |
183 |
-) |
184 |
- |
185 |
-if [[ ${PV} == 9999 ]]; then |
186 |
-src_unpack() { |
187 |
- default |
188 |
- git-r3_src_unpack |
189 |
-} |
190 |
-fi |
191 |
- |
192 |
-src_configure() { |
193 |
- local mycmakeargs=( |
194 |
- -DDISABLE_HTTP_TWITCH="$(usex !twitch)" |
195 |
- -DDISABLE_NETWORK="$(usex !multiplayer)" |
196 |
- -DDISABLE_OPENGL="$(usex !opengl)" |
197 |
- -DDISABLE_TTF="$(usex !truetype)" |
198 |
- -DWITH_TESTS="$(usex test)" |
199 |
- -DDOWNLOAD_TITLE_SEQUENCES=OFF |
200 |
- -DDISABLE_RCT2_TESTS=ON |
201 |
- ) |
202 |
- |
203 |
- cmake-utils_src_configure |
204 |
-} |
205 |
- |
206 |
-src_install() { |
207 |
- cmake-utils_src_install |
208 |
- |
209 |
- insinto /usr/share/openrct2/title |
210 |
- doins "${WORKDIR}"/*.parkseq |
211 |
-} |
212 |
- |
213 |
-pkg_postinst() { |
214 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
215 |
- ewarn "" |
216 |
- ewarn "You need the original RollerCoaster Tycoon 2 files to play this game." |
217 |
- ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve" |
218 |
- ewarn "" |
219 |
- fi |
220 |
- gnome2_icon_cache_update |
221 |
-} |
222 |
- |
223 |
-pkg_postrm() { |
224 |
- gnome2_icon_cache_update |
225 |
-} |