1 |
commit: 0f7add0d551daf7d75718cc67b929f404ddede4e |
2 |
Author: Guillaume Seren <guillaumeseren <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jun 24 13:43:17 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 12 17:03:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7add0d |
7 |
|
8 |
games-board/cockatrice: Clean old ebuild |
9 |
|
10 |
* Remove old patches in files. |
11 |
* Clean old ebuild in Manifest. |
12 |
|
13 |
Closes: https://github.com/gentoo/gentoo/pull/1735 |
14 |
|
15 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
16 |
|
17 |
games-board/cockatrice/Manifest | 1 - |
18 |
games-board/cockatrice/cockatrice-20120702.ebuild | 73 --------------- |
19 |
.../files/cockatrice-20120702-build.patch | 103 --------------------- |
20 |
.../files/cockatrice-20120702-underlinking.patch | 29 ------ |
21 |
4 files changed, 206 deletions(-) |
22 |
|
23 |
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest |
24 |
index a0b0cc2..beec551 100644 |
25 |
--- a/games-board/cockatrice/Manifest |
26 |
+++ b/games-board/cockatrice/Manifest |
27 |
@@ -1,2 +1 @@ |
28 |
DIST 2016-05-06-Release.tar.gz 6910937 SHA256 379835006f38b603af01cf46d508fd40e862b451045807b444042914e8736fee SHA512 5f90804270907b3a915e763e6a20c39432f76591a11df7198526fde5635314ffbb27026860053c302be1ef1dfce1efa445c5849c72d1220575314d6c3d67e94f WHIRLPOOL a13c531980da2cf172e933c5bcb179f8dc9368514fe7d2ec12a203f54c04aa5258218c6d2fc1bee30826598e1e8c057c437af6810709c26b0863cd2b665bc159 |
29 |
-DIST cockatrice_source_20120702.tar.gz 3790304 SHA256 a418124d3df255f2af70a20ff6b13f85361467abe4ea4216602bd3647cfc490e SHA512 119acd394dfe97de72b0be8d1ea8c6178f9d0150dcb50d1aba074c28c8d0f52f2be5758ac3943c49d11f655f02a70fc5f5a7e207b8a2631f73f7178ff17b5c35 WHIRLPOOL 1e5112519ddd0f4107778c97d4cf415959117d7e5854ad9760d50621a77a53d992678470772358c880e89ba35376cbf6abab4687969810c117d2851eae4ec70a |
30 |
|
31 |
diff --git a/games-board/cockatrice/cockatrice-20120702.ebuild b/games-board/cockatrice/cockatrice-20120702.ebuild |
32 |
deleted file mode 100644 |
33 |
index 931419a..0000000 |
34 |
--- a/games-board/cockatrice/cockatrice-20120702.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,73 +0,0 @@ |
37 |
-# Copyright 1999-2016 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=5 |
42 |
-inherit cmake-utils eutils gnome2-utils games |
43 |
- |
44 |
-DESCRIPTION="An open-source multiplatform software for playing card games over a network" |
45 |
-HOMEPAGE="http://cockatrice.de/" |
46 |
-SRC_URI="http://cockatrice.de/files/${PN}_source_${PV}.tar.gz" |
47 |
- |
48 |
-LICENSE="GPL-2" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="amd64 x86" |
51 |
-IUSE="dedicated server" |
52 |
- |
53 |
-DEPEND=" |
54 |
- dev-libs/libgcrypt:0 |
55 |
- dev-libs/protobuf |
56 |
- dev-qt/qtcore:4 |
57 |
- dev-qt/qtsql:4 |
58 |
- !dedicated? ( |
59 |
- dev-qt/qtmultimedia:4 |
60 |
- dev-qt/qtsvg:4 |
61 |
- dev-qt/qtgui:4 |
62 |
- )" |
63 |
-RDEPEND=${DEPEND} |
64 |
- |
65 |
-S=${WORKDIR}/${PN}_${PV} |
66 |
- |
67 |
-src_prepare() { |
68 |
- epatch "${FILESDIR}"/${P}-build.patch \ |
69 |
- "${FILESDIR}"/${P}-underlinking.patch |
70 |
-} |
71 |
- |
72 |
-src_configure() { |
73 |
- local mycmakeargs=( |
74 |
- $(usex dedicated "-DWITHOUT_CLIENT=1 -DWITH_SERVER=1" "$(usex server "-DWITH_SERVER=1" "")") |
75 |
- -DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}" |
76 |
- -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}" |
77 |
- -DDATADIR="${GAMES_DATADIR}/${PN}" |
78 |
- -DICONDIR="/usr/share/icons" |
79 |
- -DDESKTOPDIR="/usr/share/applications" |
80 |
- ) |
81 |
- |
82 |
- cmake-utils_src_configure |
83 |
-} |
84 |
- |
85 |
-src_compile() { |
86 |
- cmake-utils_src_compile |
87 |
-} |
88 |
- |
89 |
-src_install() { |
90 |
- cmake-utils_src_install |
91 |
- prepgamesdirs |
92 |
-} |
93 |
- |
94 |
-pkg_preinst() { |
95 |
- games_pkg_preinst |
96 |
- use dedicated || gnome2_icon_savelist |
97 |
-} |
98 |
- |
99 |
-pkg_postinst() { |
100 |
- games_pkg_postinst |
101 |
- elog "zonebg pictures are in ${GAMES_DATADIR}/${PN}/zonebg" |
102 |
- elog "sounds are in ${GAMES_DATADIR}/${PN}/sounds" |
103 |
- elog "you can use those directories in cockatrice settings" |
104 |
- use dedicated || gnome2_icon_cache_update |
105 |
-} |
106 |
- |
107 |
-pkg_postrm() { |
108 |
- use dedicated || gnome2_icon_cache_update |
109 |
-} |
110 |
|
111 |
diff --git a/games-board/cockatrice/files/cockatrice-20120702-build.patch b/games-board/cockatrice/files/cockatrice-20120702-build.patch |
112 |
deleted file mode 100644 |
113 |
index 6876fcd..0000000 |
114 |
--- a/games-board/cockatrice/files/cockatrice-20120702-build.patch |
115 |
+++ /dev/null |
116 |
@@ -1,103 +0,0 @@ |
117 |
-From: Julian Ospald <hasufell@g.o> |
118 |
-Date: Thu Aug 2 21:27:25 UTC 2012 |
119 |
-Subject: build system |
120 |
- |
121 |
-add install rule for cockatrice binary |
122 |
-make paths for ICONDIR and DESKTOPDIR modifiable |
123 |
- |
124 |
---- CMakeLists.txt |
125 |
-+++ CMakeLists.txt |
126 |
-@@ -8,7 +8,9 @@ |
127 |
- add_subdirectory(oracle) |
128 |
- endif(NOT WITHOUT_CLIENT) |
129 |
- |
130 |
-+set(DATADIR "share/cockatrice" CACHE PATH "Data dir") |
131 |
-+ |
132 |
- FILE(GLOB sounds "${CMAKE_CURRENT_SOURCE_DIR}/sounds/*.raw") |
133 |
--INSTALL(FILES ${sounds} DESTINATION share/cockatrice/sounds) |
134 |
-+INSTALL(FILES ${sounds} DESTINATION ${DATADIR}/sounds) |
135 |
- FILE(GLOB zonebg "${CMAKE_CURRENT_SOURCE_DIR}/zonebg/*.*") |
136 |
--INSTALL(FILES ${zonebg} DESTINATION share/cockatrice/zonebg) |
137 |
-\ No newline at end of file |
138 |
-+INSTALL(FILES ${zonebg} DESTINATION ${DATADIR}/zonebg) |
139 |
---- servatrice/CMakeLists.txt |
140 |
-+++ servatrice/CMakeLists.txt |
141 |
-@@ -2,6 +2,9 @@ |
142 |
- SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) |
143 |
- PROJECT(servatrice) |
144 |
- |
145 |
-+# cmake modules |
146 |
-+include(GNUInstallDirs) |
147 |
-+ |
148 |
- SET(servatrice_SOURCES |
149 |
- src/main.cpp |
150 |
- src/passwordhasher.cpp |
151 |
-@@ -51,3 +54,5 @@ |
152 |
- COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake |
153 |
- ) |
154 |
- |
155 |
-+# install rules |
156 |
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/servatrice DESTINATION ${CMAKE_INSTALL_BINDIR}) |
157 |
---- cockatrice/CMakeLists.txt |
158 |
-+++ cockatrice/CMakeLists.txt |
159 |
-@@ -158,7 +158,13 @@ |
160 |
- ) |
161 |
- |
162 |
- if (UNIX AND NOT APPLE) |
163 |
-- set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/cockatrice/translations\\") |
164 |
-+ if(IS_ABSOLUTE ${DATADIR}) |
165 |
-+ set(_DATADIR ${DATADIR}) |
166 |
-+ else() |
167 |
-+ set(_DATADIR ${CMAKE_INSTALL_PREFIX}/${DATADIR}) |
168 |
-+ endif() |
169 |
-+ |
170 |
-+ set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${_DATADIR}/translations\\") |
171 |
- endif (UNIX AND NOT APPLE) |
172 |
- |
173 |
- set(cockatrice_RESOURCES cockatrice.qrc) |
174 |
-@@ -201,6 +207,11 @@ |
175 |
- set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0") |
176 |
- set(CMAKE_CXX_FLAGS_RELEASE "-s -O2") |
177 |
- |
178 |
-+# paths |
179 |
-+set(ICONDIR share/icons CACHE STRING "icon dir") |
180 |
-+set(DESKTOPDIR share/applications CACHE STRING "desktop file destination") |
181 |
-+ |
182 |
-+ |
183 |
- QT4_WRAP_CPP(cockatrice_HEADERS_MOC ${cockatrice_HEADERS}) |
184 |
- QT4_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS}) |
185 |
- QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) |
186 |
-@@ -218,10 +229,10 @@ |
187 |
- |
188 |
- INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin) |
189 |
- if (NOT WIN32 AND NOT APPLE) |
190 |
-- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION share/icons/hicolor/48x48/apps) |
191 |
-- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION share/icons/hicolor/scalable/apps) |
192 |
-- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION share/applications) |
193 |
-- INSTALL(FILES ${cockatrice_QM} DESTINATION share/cockatrice/translations) |
194 |
-+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps) |
195 |
-+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps) |
196 |
-+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR}) |
197 |
-+ INSTALL(FILES ${cockatrice_QM} DESTINATION ${DATADIR}/translations) |
198 |
- ENDIF(NOT WIN32 AND NOT APPLE) |
199 |
- |
200 |
- add_custom_command( |
201 |
---- oracle/CMakeLists.txt |
202 |
-+++ oracle/CMakeLists.txt |
203 |
-@@ -1,6 +1,9 @@ |
204 |
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6) |
205 |
- PROJECT(oracle) |
206 |
- |
207 |
-+# paths |
208 |
-+set(DESKTOPDIR share/appliactions CACHE STRING "path to .desktop files") |
209 |
-+ |
210 |
- SET(oracle_SOURCES src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp) |
211 |
- SET(oracle_HEADERS src/oracleimporter.h src/window_main.h ../cockatrice/src/carddatabase.h ../cockatrice/src/settingscache.h) |
212 |
- |
213 |
-@@ -21,5 +24,5 @@ |
214 |
- |
215 |
- INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/oracle DESTINATION bin) |
216 |
- IF (NOT WIN32 AND NOT APPLE) |
217 |
-- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION share/applications) |
218 |
-+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR}) |
219 |
- ENDIF (NOT WIN32 AND NOT APPLE) |
220 |
|
221 |
diff --git a/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch b/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch |
222 |
deleted file mode 100644 |
223 |
index 2117751..0000000 |
224 |
--- a/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch |
225 |
+++ /dev/null |
226 |
@@ -1,29 +0,0 @@ |
227 |
-From: Julian Ospald <hasufell@g.o> |
228 |
-Date: Thu Aug 2 22:12:00 UTC 2012 |
229 |
-Subject: underlinking |
230 |
- |
231 |
-add -lpthread to cockatrice amd servatrice LIBS to support linkers that |
232 |
-don't permit underlinking |
233 |
- |
234 |
---- cockatrice/CMakeLists.txt |
235 |
-+++ cockatrice/CMakeLists.txt |
236 |
-@@ -219,7 +219,7 @@ |
237 |
- INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR}) |
238 |
- |
239 |
- ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_HEADERS_MOC}) |
240 |
--TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY}) |
241 |
-+TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} -lpthread) |
242 |
- |
243 |
- INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin) |
244 |
- if (NOT WIN32 AND NOT APPLE) |
245 |
---- servatrice/CMakeLists.txt |
246 |
-+++ servatrice/CMakeLists.txt |
247 |
-@@ -46,7 +46,7 @@ |
248 |
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) |
249 |
- |
250 |
- ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC}) |
251 |
--TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY}) |
252 |
-+TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY} -lpthread) |
253 |
- |
254 |
- #add_custom_target(versionheader ALL DEPENDS version_header) |
255 |
- add_custom_command( |