1 |
commit: 5491d810d06b16b7606169535c25c74ced1adb49 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 27 21:50:45 2018 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 21:50:45 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5491d810 |
7 |
|
8 |
games-board/pokerth: Drop old 1.1.1-r2 |
9 |
|
10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
11 |
|
12 |
games-board/pokerth/Manifest | 1 - |
13 |
.../pokerth/files/pokerth-1.1.1-boost-1.60.patch | 150 --------------------- |
14 |
.../files/pokerth-1.1.1-boost-noexcept.patch | 80 ----------- |
15 |
.../pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch | 86 ------------ |
16 |
games-board/pokerth/files/pokerth-1.1.1-qt5.patch | 19 --- |
17 |
games-board/pokerth/pokerth-1.1.1-r2.ebuild | 76 ----------- |
18 |
6 files changed, 412 deletions(-) |
19 |
|
20 |
diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest |
21 |
index 75c22499163..1e96e868f0e 100644 |
22 |
--- a/games-board/pokerth/Manifest |
23 |
+++ b/games-board/pokerth/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST PokerTH-1.1.1-src.tar.bz2 19326922 BLAKE2B 43c94c1330ca11eaa52e4729e52fed3ee4022b8486b626168933a20658bf0c79028adb39b68433e5ccb7c8618b610366f193720f821039adc0e9a84eff0488b7 SHA512 bd822d15747d94b67657ea2fd0b9c8c1bdad0031a6eae30380217387a702e5f648d6f612b1bff0355c3c301ecaf47ca9d635a526e575f1bc1c5f88e38a7f73c1 |
26 |
DIST pokerth-1.1.2.tar.gz 21354306 BLAKE2B d8e1ecc46e61d9c16ae3949099f6e72271a5ab2def9799652b0c612980e0c5e96cb2ccf4d659c1a90b9ac6433af95587fa5d44af80c16fb6a34a272751c9fc4a SHA512 d54c84f199636eb5a53580213e5e4ccc828cf565bf4b055797daa82e2ad54d8c52c7a16a781b82c8cc89d184a2b3c4105922394d08c7d2e06383b96963c36b5a |
27 |
|
28 |
diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch |
29 |
deleted file mode 100644 |
30 |
index daaeca013b3..00000000000 |
31 |
--- a/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch |
32 |
+++ /dev/null |
33 |
@@ -1,150 +0,0 @@ |
34 |
-From 69f820bb3d7c4dc8c838f115cb4c7ee5fd188721 Mon Sep 17 00:00:00 2001 |
35 |
-From: Jonathan Wakely <github@××××××.org> |
36 |
-Date: Thu, 26 Nov 2015 16:27:52 +0000 |
37 |
-Subject: [PATCH] Qualify std::ifstream and std::ofstream |
38 |
- |
39 |
-Starting with Boost 1.60.0 <boost/filesystem.hpp> includes |
40 |
-<boost/filesystem/fstream.hpp>, which declares ifstream and ofstream |
41 |
-types that make the unqualified names ifstream and ofstream ambiguous. |
42 |
-The names must be qualified to refer to the std versions. |
43 |
---- |
44 |
- src/core/common/avatarmanager.cpp | 4 ++-- |
45 |
- src/core/common/loghelper_server.cpp | 6 +++--- |
46 |
- src/net/common/clientstate.cpp | 4 ++-- |
47 |
- src/net/common/clientthread.cpp | 4 ++-- |
48 |
- src/net/common/downloaderthread.cpp | 2 +- |
49 |
- src/pokerth_server.cpp | 2 +- |
50 |
- src/zlib_compress.cpp | 4 ++-- |
51 |
- 7 files changed, 13 insertions(+), 13 deletions(-) |
52 |
- |
53 |
-diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp |
54 |
-index a8a52e4..0246b72 100644 |
55 |
---- a/src/core/common/avatarmanager.cpp |
56 |
-+++ b/src/core/common/avatarmanager.cpp |
57 |
-@@ -61,7 +61,7 @@ using namespace std; |
58 |
- using namespace boost::filesystem; |
59 |
- |
60 |
- struct AvatarFileState { |
61 |
-- ifstream inputStream; |
62 |
-+ std::ifstream inputStream; |
63 |
- }; |
64 |
- |
65 |
- AvatarManager::AvatarManager(bool useExternalServer, const std::string &externalServerAddress, |
66 |
-@@ -371,7 +371,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil |
67 |
- path tmpPath(cacheDir); |
68 |
- tmpPath /= (md5buf.ToString() + ext); |
69 |
- string fileName(tmpPath.file_string()); |
70 |
-- ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); |
71 |
-+ std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); |
72 |
- if (!o.fail()) { |
73 |
- o.write((const char *)data, size); |
74 |
- o.close(); |
75 |
-diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp |
76 |
-index f79e4ca..a0d0350 100644 |
77 |
---- a/src/core/common/loghelper_server.cpp |
78 |
-+++ b/src/core/common/loghelper_server.cpp |
79 |
-@@ -67,7 +67,7 @@ void |
80 |
- internal_log_err(const string &msg) |
81 |
- { |
82 |
- if (!g_logFile.empty()) { |
83 |
-- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); |
84 |
-+ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); |
85 |
- if (!o.fail()) { |
86 |
- o << second_clock::local_time() << " ERR: " << msg; |
87 |
- o.flush(); |
88 |
-@@ -80,7 +80,7 @@ internal_log_msg(const std::string &msg) |
89 |
- { |
90 |
- if (g_logLevel) { |
91 |
- if (!g_logFile.empty()) { |
92 |
-- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); |
93 |
-+ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); |
94 |
- if (!o.fail()) |
95 |
- o << second_clock::local_time() << " MSG: " << msg; |
96 |
- } |
97 |
-@@ -92,7 +92,7 @@ internal_log_level(const std::string &msg, int logLevel) |
98 |
- { |
99 |
- if (g_logLevel >= logLevel) { |
100 |
- if (!g_logFile.empty()) { |
101 |
-- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); |
102 |
-+ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); |
103 |
- if (!o.fail()) |
104 |
- o << second_clock::local_time() << " OUT: " << msg; |
105 |
- } |
106 |
-diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp |
107 |
-index 143773b..080da2d 100644 |
108 |
---- a/src/net/common/clientstate.cpp |
109 |
-+++ b/src/net/common/clientstate.cpp |
110 |
-@@ -308,8 +308,8 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client) |
111 |
- |
112 |
- // Unzip the file using zlib. |
113 |
- try { |
114 |
-- ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); |
115 |
-- ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); |
116 |
-+ std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); |
117 |
-+ std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); |
118 |
- boost::iostreams::filtering_streambuf<boost::iostreams::input> in; |
119 |
- in.push(boost::iostreams::zlib_decompressor()); |
120 |
- in.push(inFile); |
121 |
-diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp |
122 |
-index d60a535..1f3a619 100644 |
123 |
---- a/src/net/common/clientthread.cpp |
124 |
-+++ b/src/net/common/clientthread.cpp |
125 |
-@@ -1695,7 +1695,7 @@ void |
126 |
- ClientThread::ReadSessionGuidFromFile() |
127 |
- { |
128 |
- string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME); |
129 |
-- ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary); |
130 |
-+ std::ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary); |
131 |
- if (guidStream.good()) { |
132 |
- std::vector<char> tmpGuid(CLIENT_GUID_SIZE); |
133 |
- guidStream.read(&tmpGuid[0], CLIENT_GUID_SIZE); |
134 |
-@@ -1707,7 +1707,7 @@ void |
135 |
- ClientThread::WriteSessionGuidToFile() const |
136 |
- { |
137 |
- string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME); |
138 |
-- ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary); |
139 |
-+ std::ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary); |
140 |
- if (guidStream.good()) { |
141 |
- guidStream.write(GetContext().GetSessionGuid().c_str(), GetContext().GetSessionGuid().size()); |
142 |
- } |
143 |
-diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp |
144 |
-index e58e3f8..56a9526 100644 |
145 |
---- a/src/net/common/downloaderthread.cpp |
146 |
-+++ b/src/net/common/downloaderthread.cpp |
147 |
-@@ -96,7 +96,7 @@ DownloaderThread::Main() |
148 |
- // Previous download was finished. |
149 |
- if (m_curDownloadData) { |
150 |
- path filepath(m_curDownloadData->filename); |
151 |
-- ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); |
152 |
-+ std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); |
153 |
- // Find out file size. |
154 |
- // Not fully portable, but works on win/linux/mac. |
155 |
- instream.seekg(0, ios_base::beg); |
156 |
-diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp |
157 |
-index 3b93d46..450a47e 100644 |
158 |
---- a/src/pokerth_server.cpp |
159 |
-+++ b/src/pokerth_server.cpp |
160 |
-@@ -161,7 +161,7 @@ main(int argc, char *argv[]) |
161 |
- pidFile = tmpPidPath.directory_string(); |
162 |
- } |
163 |
- { |
164 |
-- ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); |
165 |
-+ std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); |
166 |
- if (!pidStream.fail()) |
167 |
- pidStream << getpid(); |
168 |
- else |
169 |
-diff --git a/src/zlib_compress.cpp b/src/zlib_compress.cpp |
170 |
-index e3fd72d..4b04817 100644 |
171 |
---- a/src/zlib_compress.cpp |
172 |
-+++ b/src/zlib_compress.cpp |
173 |
-@@ -59,8 +59,8 @@ main(int argc, char *argv[]) |
174 |
- return 2; |
175 |
- } |
176 |
- try { |
177 |
-- ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in); |
178 |
-- ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary); |
179 |
-+ std::ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in); |
180 |
-+ std::ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary); |
181 |
- boost::iostreams::filtering_streambuf<boost::iostreams::output> out; |
182 |
- out.push(boost::iostreams::zlib_compressor()); |
183 |
- out.push(outFile); |
184 |
|
185 |
diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-noexcept.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-noexcept.patch |
186 |
deleted file mode 100644 |
187 |
index ab112e831a0..00000000000 |
188 |
--- a/games-board/pokerth/files/pokerth-1.1.1-boost-noexcept.patch |
189 |
+++ /dev/null |
190 |
@@ -1,80 +0,0 @@ |
191 |
-Keep dynamic exception specifications in sync with boost. |
192 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=603354 |
193 |
- |
194 |
---- a/src/third_party/websocketpp/websocketpp/error.hpp |
195 |
-+++ b/src/third_party/websocketpp/websocketpp/error.hpp |
196 |
-@@ -122,7 +122,7 @@ |
197 |
- public: |
198 |
- category() {} |
199 |
- |
200 |
-- char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { |
201 |
-+ char const * name() const BOOST_SYSTEM_NOEXCEPT { |
202 |
- return "websocketpp"; |
203 |
- } |
204 |
- |
205 |
---- a/src/third_party/websocketpp/websocketpp/extensions/extension.hpp |
206 |
-+++ b/src/third_party/websocketpp/websocketpp/extensions/extension.hpp |
207 |
-@@ -62,7 +62,7 @@ |
208 |
- public: |
209 |
- category() {} |
210 |
- |
211 |
-- const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { |
212 |
-+ const char *name() const BOOST_SYSTEM_NOEXCEPT { |
213 |
- return "websocketpp.extension"; |
214 |
- } |
215 |
- |
216 |
---- a/src/third_party/websocketpp/websocketpp/processors/base.hpp |
217 |
-+++ b/src/third_party/websocketpp/websocketpp/processors/base.hpp |
218 |
-@@ -159,7 +159,7 @@ |
219 |
- public: |
220 |
- processor_category() {} |
221 |
- |
222 |
-- char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { |
223 |
-+ char const * name() const BOOST_SYSTEM_NOEXCEPT { |
224 |
- return "websocketpp.processor"; |
225 |
- } |
226 |
- |
227 |
---- a/src/third_party/websocketpp/websocketpp/transport/asio/base.hpp |
228 |
-+++ b/src/third_party/websocketpp/websocketpp/transport/asio/base.hpp |
229 |
-@@ -202,7 +202,7 @@ |
230 |
- /// Asio transport error category |
231 |
- class category : public lib::error_category { |
232 |
- public: |
233 |
-- char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { |
234 |
-+ char const * name() const BOOST_SYSTEM_NOEXCEPT { |
235 |
- return "websocketpp.transport.asio"; |
236 |
- } |
237 |
- |
238 |
---- a/src/third_party/websocketpp/websocketpp/transport/asio/security/base.hpp |
239 |
-+++ b/src/third_party/websocketpp/websocketpp/transport/asio/security/base.hpp |
240 |
-@@ -102,7 +102,7 @@ |
241 |
- /// Error category related to asio transport socket policies |
242 |
- class socket_category : public lib::error_category { |
243 |
- public: |
244 |
-- const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { |
245 |
-+ const char *name() const BOOST_SYSTEM_NOEXCEPT { |
246 |
- return "websocketpp.transport.asio.socket"; |
247 |
- } |
248 |
- |
249 |
---- a/src/third_party/websocketpp/websocketpp/transport/base/connection.hpp |
250 |
-+++ b/src/third_party/websocketpp/websocketpp/transport/base/connection.hpp |
251 |
-@@ -179,7 +179,7 @@ |
252 |
- public: |
253 |
- category() {} |
254 |
- |
255 |
-- char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { |
256 |
-+ char const * name() const BOOST_SYSTEM_NOEXCEPT { |
257 |
- return "websocketpp.transport"; |
258 |
- } |
259 |
- |
260 |
---- a/src/third_party/websocketpp/websocketpp/transport/iostream/base.hpp |
261 |
-+++ b/src/third_party/websocketpp/websocketpp/transport/iostream/base.hpp |
262 |
-@@ -64,7 +64,7 @@ |
263 |
- public: |
264 |
- category() {} |
265 |
- |
266 |
-- char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { |
267 |
-+ char const * name() const BOOST_SYSTEM_NOEXCEPT { |
268 |
- return "websocketpp.transport.iostream"; |
269 |
- } |
270 |
- |
271 |
|
272 |
diff --git a/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch b/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch |
273 |
deleted file mode 100644 |
274 |
index aebf2b0ab94..00000000000 |
275 |
--- a/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch |
276 |
+++ /dev/null |
277 |
@@ -1,86 +0,0 @@ |
278 |
-From: Markus Koschany <apo@××××××.org> |
279 |
-Date: Tue, 23 Aug 2016 17:50:52 +0200 |
280 |
-Subject: qmake gcc-6 |
281 |
- |
282 |
---- |
283 |
- chatcleaner.pro | 1 - |
284 |
- pokerth_db.pro | 1 - |
285 |
- pokerth_game.pro | 1 - |
286 |
- pokerth_lib.pro | 2 +- |
287 |
- pokerth_protocol.pro | 1 - |
288 |
- pokerth_server.pro | 1 - |
289 |
- 6 files changed, 1 insertion(+), 6 deletions(-) |
290 |
- |
291 |
-diff --git a/chatcleaner.pro b/chatcleaner.pro |
292 |
-index 6d63b4a..56070d8 100644 |
293 |
---- a/chatcleaner.pro |
294 |
-+++ b/chatcleaner.pro |
295 |
-@@ -49,7 +49,6 @@ win32 { |
296 |
- !win32{ |
297 |
- ##### My release static build options |
298 |
- #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections |
299 |
-- INCLUDEPATH += $${PREFIX}/include |
300 |
- } |
301 |
- mac { |
302 |
- # make it x86_64 only |
303 |
-diff --git a/pokerth_db.pro b/pokerth_db.pro |
304 |
-index 7c2d142..c524ee3 100644 |
305 |
---- a/pokerth_db.pro |
306 |
-+++ b/pokerth_db.pro |
307 |
-@@ -49,7 +49,6 @@ win32{ |
308 |
- !win32{ |
309 |
- ##### My release static build options |
310 |
- #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections |
311 |
-- INCLUDEPATH += $${PREFIX}/include |
312 |
- } |
313 |
- |
314 |
- mac{ |
315 |
-diff --git a/pokerth_game.pro b/pokerth_game.pro |
316 |
-index e3ddb03..e0e8660 100644 |
317 |
---- a/pokerth_game.pro |
318 |
-+++ b/pokerth_game.pro |
319 |
-@@ -404,7 +404,6 @@ unix:!mac { |
320 |
- # #### My release static build options |
321 |
- # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections |
322 |
- # QMAKE_LFLAGS += -Wl,--gc-sections |
323 |
-- INCLUDEPATH += $${PREFIX}/include |
324 |
- QMAKE_LIBDIR += lib |
325 |
- !android{ |
326 |
- LIBPATH += $${PREFIX}/lib /opt/gsasl/lib |
327 |
-diff --git a/pokerth_lib.pro b/pokerth_lib.pro |
328 |
-index 6db489d..498d06e 100644 |
329 |
---- a/pokerth_lib.pro |
330 |
-+++ b/pokerth_lib.pro |
331 |
-@@ -243,7 +243,7 @@ win32{ |
332 |
- !win32{ |
333 |
- ##### My release static build options |
334 |
- #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections |
335 |
-- INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include |
336 |
-+ INCLUDEPATH += /opt/gsasl/include |
337 |
- } |
338 |
- |
339 |
- mac{ |
340 |
-diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro |
341 |
-index 7a331df..2ead0ec 100644 |
342 |
---- a/pokerth_protocol.pro |
343 |
-+++ b/pokerth_protocol.pro |
344 |
-@@ -33,7 +33,6 @@ win32 { |
345 |
- DEFINES += _WIN32_WINNT=0x0501 |
346 |
- } |
347 |
- unix : !mac { |
348 |
-- INCLUDEPATH += $${PREFIX}/include |
349 |
- system(protoc pokerth.proto --cpp_out=src/third_party/protobuf) |
350 |
- system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf) |
351 |
- system(protoc pokerth.proto --java_out=tests/src) |
352 |
-diff --git a/pokerth_server.pro b/pokerth_server.pro |
353 |
-index 706475f..43b30f3 100644 |
354 |
---- a/pokerth_server.pro |
355 |
-+++ b/pokerth_server.pro |
356 |
-@@ -174,7 +174,6 @@ unix : !mac { |
357 |
- #QMAKE_LFLAGS += -Wl,--gc-sections |
358 |
- |
359 |
- LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib |
360 |
-- INCLUDEPATH += $${PREFIX}/include |
361 |
- LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) |
362 |
- BOOST_FS = boost_filesystem boost_filesystem-mt |
363 |
- BOOST_THREAD = boost_thread boost_thread-mt |
364 |
|
365 |
diff --git a/games-board/pokerth/files/pokerth-1.1.1-qt5.patch b/games-board/pokerth/files/pokerth-1.1.1-qt5.patch |
366 |
deleted file mode 100644 |
367 |
index 1d3dd63922f..00000000000 |
368 |
--- a/games-board/pokerth/files/pokerth-1.1.1-qt5.patch |
369 |
+++ /dev/null |
370 |
@@ -1,19 +0,0 @@ |
371 |
-From 731f5f05f54065a67fa7c9f9bc8fe992390cb979 Mon Sep 17 00:00:00 2001 |
372 |
-From: Felix Hammer <f.hammer@×××.de> |
373 |
-Date: Fri, 7 Aug 2015 00:57:51 +0200 |
374 |
-Subject: [PATCH] Qt 5.5.0 patch for qtsingleapplication |
375 |
- |
376 |
---- |
377 |
- src/third_party/qtsingleapplication/qtlocalpeer.cpp | 1 + |
378 |
- 1 file changed, 1 insertion(+) |
379 |
- |
380 |
---- a/src/third_party/qtsingleapplication/qtlocalpeer.cpp |
381 |
-+++ b/src/third_party/qtsingleapplication/qtlocalpeer.cpp |
382 |
-@@ -31,6 +31,7 @@ |
383 |
- |
384 |
- #include <QCoreApplication> |
385 |
- #include <QTime> |
386 |
-+#include <QDataStream> |
387 |
- |
388 |
- #if defined(Q_OS_WIN) |
389 |
- #include <QLibrary> |
390 |
|
391 |
diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild |
392 |
deleted file mode 100644 |
393 |
index a7c17d19809..00000000000 |
394 |
--- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild |
395 |
+++ /dev/null |
396 |
@@ -1,76 +0,0 @@ |
397 |
-# Copyright 1999-2018 Gentoo Foundation |
398 |
-# Distributed under the terms of the GNU General Public License v2 |
399 |
- |
400 |
-EAPI=6 |
401 |
- |
402 |
-inherit eutils flag-o-matic qmake-utils |
403 |
- |
404 |
-MY_P="PokerTH-${PV}-src" |
405 |
-DESCRIPTION="Texas Hold'em poker game" |
406 |
-HOMEPAGE="https://www.pokerth.net/" |
407 |
-SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" |
408 |
- |
409 |
-LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" |
410 |
-SLOT="0" |
411 |
-KEYWORDS="~amd64 ~x86" |
412 |
-IUSE="dedicated" |
413 |
- |
414 |
-RDEPEND="dev-db/sqlite:3 |
415 |
- dev-libs/boost:=[threads(+)] |
416 |
- dev-libs/libgcrypt:0 |
417 |
- dev-libs/protobuf |
418 |
- dev-libs/tinyxml[stl] |
419 |
- dev-qt/qtcore:5 |
420 |
- dev-qt/qtnetwork:5 |
421 |
- >=net-libs/libircclient-1.6-r2 |
422 |
- >=net-misc/curl-7.16 |
423 |
- virtual/gsasl |
424 |
- !dedicated? ( |
425 |
- dev-qt/qtgui:5 |
426 |
- dev-qt/qtwidgets:5 |
427 |
- media-libs/libsdl:0 |
428 |
- media-libs/sdl-mixer[mod,vorbis] |
429 |
- )" |
430 |
-DEPEND="${RDEPEND} |
431 |
- !dedicated? ( dev-qt/qtsql:5 ) |
432 |
- virtual/pkgconfig" |
433 |
- |
434 |
-S=${WORKDIR}/${MY_P} |
435 |
- |
436 |
-PATCHES=( |
437 |
- "${FILESDIR}"/${PN}-1.1.1-qt5.patch |
438 |
- "${FILESDIR}"/${PN}-1.1.1-boost-1.60.patch |
439 |
- "${FILESDIR}"/${PN}-1.1.1-qmake-gcc-6.patch |
440 |
- "${FILESDIR}"/${PN}-1.1.1-boost-noexcept.patch |
441 |
- "${FILESDIR}"/${PN}-1.1.1-boost-1.65-ambiguous-advance.patch |
442 |
-) |
443 |
- |
444 |
-src_prepare() { |
445 |
- default |
446 |
- |
447 |
- if use dedicated; then |
448 |
- sed -i -e 's/pokerth_game.pro//' pokerth.pro || die |
449 |
- fi |
450 |
- |
451 |
- sed -i -e '/no_dead_strip_inits_and_terms/d' *pro || die |
452 |
-} |
453 |
- |
454 |
-src_configure() { |
455 |
- eqmake5 pokerth.pro |
456 |
-} |
457 |
- |
458 |
-src_install() { |
459 |
- dobin bin/pokerth_server |
460 |
- if ! use dedicated; then |
461 |
- dobin ${PN} |
462 |
- insinto /usr/share/${PN} |
463 |
- doins -r data |
464 |
- domenu ${PN}.desktop |
465 |
- doicon ${PN}.png |
466 |
- fi |
467 |
- |
468 |
- einstalldocs |
469 |
- dodoc docs/{gui_styling,server_setup}_howto.txt |
470 |
- |
471 |
- doman docs/pokerth.1 |
472 |
-} |