games-board/cockatrice: Fix issues with games-board/cockatrice

8 files changed, 191 insertions, 64 deletions

diff --git a/games-board/cockatrice/ChangeLog b/games-board/cockatrice/ChangeLog
index f10950715..6a7052dcc 100644
--- a/games-board/cockatrice/ChangeLog
+++ b/games-board/cockatrice/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cockatrice-20120702 (04 Aug 2012)
+
+  04 Aug 2012; Alexander Berntsen (alexander__b) <alexanderberntsen@linux.com>
+  -cockatrice-20120624.ebuild,
+  -files/cockatrice-20120630-servatrice-cmakelists.patch,
+  +cockatrice-20120702.ebuild, +files/cockatrice-20120702-build.patch,
+  +files/cockatrice-20120702-underlinking.patch:
+  Fix issues with games-board/cockatrice
+
 *cockatrice-20120624 (02 Aug 2012)
 
   02 Aug 2012; Alexander Berntsen (alexander__b) <alexanderberntsen@linux.com>
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index 5f85f643a..39c94e3eb 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,5 +1,6 @@
-AUX cockatrice-20120630-servatrice-cmakelists.patch 614 SHA256 94eb118da8851647ab578eae9de869c25d06c2218fda5dca9f03d0bbb0cf8f47 SHA512 6bd6d1925cd2c10def635670d15442b1aff889acaa37c82fe108b56ca710e8054af3b3e345fac0b8d5bfb99efe9919ff84a4d5899b0400368ea9c436109d471e WHIRLPOOL b85d98973ca27d2dcfcc866631dce3f639a9a4bd4f73fa1f814de75af1194b8539df30fd00e77737286a84a41f3bff6d5c3b350c0312e591ad3d2962d7fa8f90
-DIST cockatrice_source_20120624.tar.gz 3740785 SHA256 7be94ba7625e4099f182740f5a96638d84a9ea4d9a04c2ac29fab7caae8ab43e SHA512 5e2d10b9409097e7245e81c710d2c17bf23a2f692c0ec378905ec144d881fa409f9c8bc9e49aac7a7a2942ee04639dc3d43ba39dbab5b6248bc45bf52736b38c WHIRLPOOL dfe8d6adef0ef44a4aa6f1c38a1f63179967a81a96c712093a7e2a8a7f9ec03e58ebe1b13653e352bf113dd092f97bfe8a1d845735d0f6bcb49471005f9e3794
-EBUILD cockatrice-20120624.ebuild 983 SHA256 b467bb05b79af776f55a17e4217dcbc30ba8f2083599160955f86461be224bfb SHA512 bf524c5e76e42c4c9dedab2ca256c11e01c08fc90b0d8a18f78dc84e003716b944b69424711869d20b3af31a5c7a277d2b8dff7f94e6df5f0061818cb69d4fb1 WHIRLPOOL 1607fe377f6717e4920ea0982132d65402b96dc51564e3ad13f95f99d0df81d29643382f3dbc3a15d2903c6f0fa9e2a7ac49b3f659158d643f44ecc95ba633b0
-MISC ChangeLog 395 SHA256 e4856b4fad3495780e9029b55c2c43528ee6d458ca4ddaa6facf8c1f70ac722d SHA512 cf6aa208f0db7286a15002a49821fc7e7e5d5f7b278163f2a28478f78b1c893bce1b2cb159da2976fe45138b165d1cc1faaadce291c6be9066c0d90ed03a1744 WHIRLPOOL 676fc9a3c98da597349a36bbf90185120109c3c719c2a7ff105479e85aff95beecb6e2803c8406b9f0605c8948259111f92c41489b9f0b4d58367dca3db0f9f1
-MISC metadata.xml 279 SHA256 adfe23ddafab0ab12da5d14157cd03e98037e250f037ed5591f1168b8ecc0f02 SHA512 153e7d1c9adf977bc3f7b9359ed1b97e9725668774098d0d9327a56400185aeb61ae5a9603212fbf42a0e6030b30c028ac980d73de6c7e2483b4e4d0b8b3052b WHIRLPOOL 12844cc3a36da1195ce8dc37666fb4eb8aec7203a1d6b83dffbf8794d79bfdb30d15203f73dce1ce083e19d5eafe36c767a64a5b0e842d34828cf1a89459a5f5
+AUX cockatrice-20120702-build.patch 2972 SHA256 2e2cbfeea3d2466428b9fa164510b8919c44744fcdd7c3d15cdb0b066bfe1a80 SHA512 b1df28c32d1a29379b96d8ae8aa7a3cd33b764ba58d7122c14e6e2890e45ca280ef9b87dc728d1625d5366be1c6d86b212c09669407954650a3a3ba1bb96f1d4 WHIRLPOOL 25f222882862b27680396c6f65260408c974aa938f950ab1e3f73f4fee4610c986376238e4ee8ab0704cbe99f7c408d1c4c651f75c6f0d94ca05e09e872726b1
+AUX cockatrice-20120702-underlinking.patch 1294 SHA256 fb17a2daac471517fecc997141849a9b9ce551adc790e510f024aaa5d9e368bf SHA512 8d20d0612b4682444cbef4d803e0fc4e0c6468138e11256be0f139390939d4774f74ab906ef49695c5f1f36f2ba0fc51a8828d471a6fcc3046c7de84e2574942 WHIRLPOOL f7fcc1735818f520e9ecf286dd49a3847076e37b43c059121f1bcdc0bb0a4becb8c0fb9524a6d46ffa6044959f94eaa1c8be004117c0777266b3f75ba0603062
+DIST cockatrice_source_20120702.tar.gz 3790304 SHA256 a418124d3df255f2af70a20ff6b13f85361467abe4ea4216602bd3647cfc490e SHA512 119acd394dfe97de72b0be8d1ea8c6178f9d0150dcb50d1aba074c28c8d0f52f2be5758ac3943c49d11f655f02a70fc5f5a7e207b8a2631f73f7178ff17b5c35 WHIRLPOOL 1e5112519ddd0f4107778c97d4cf415959117d7e5854ad9760d50621a77a53d992678470772358c880e89ba35376cbf6abab4687969810c117d2851eae4ec70a
+EBUILD cockatrice-20120702.ebuild 1400 SHA256 0ff160f0ceb4c2e076cf43354914e375d0964367b80095cd8ccfbcd2a9b88552 SHA512 cb79a0f7fbd49bbf0a8d0bda2990c919a9d98621a3f102c3123a2dd915c123843f62233239008cddc4c152b8b73a74d8e28f6c8578982db486d235d018032811 WHIRLPOOL 26544e072f9350e3d43007046738ceddb3119d87f13d8094889a0ab1b7eb10bd7dea0709f324dc42d8b2d2a3244713ceee876bfb3569b6295cf655c71a20895c
+MISC ChangeLog 761 SHA256 54df11983d8ad0866d94f3ddfd6ad985f14b2699fa217a6bc1d614e10f016369 SHA512 d9231895d5675520669cf32e5168f0da986c04a94835a8c93a52a2e72ed77c593038a88b318d41d7388b7da1b0f531e490b477658a4b030b25dd97275500db7a WHIRLPOOL 4703b2dc7857e9c11563f6843b49ac2cdd6dc169cf250a2092ef9bdeec6c9db17445567b59d8fb529487e24e1ad5196d29d6b6640207182059f67e06a78a8aff
+MISC metadata.xml 334 SHA256 41a67cc46f370e295fce1757a51da3e21e5fd9031062c9400aeec8f4f34039d4 SHA512 934c8399959fa3ecbf38e1a1f2fe5cb5b8daf61b2397564e0fc6954375029a637adfcfc9411af6db898a30541e8a5304e389eee3c43e13091d4eb8107a486baf WHIRLPOOL f4cc67911f3057e3a4536f9505f4d3a6592531a6a8036fbff0eff376c5b22f732f9e031cff83139400c06574d297fe230c36ed9845f78bdd9e4615da1cad0e27
diff --git a/games-board/cockatrice/cockatrice-20120624.ebuild b/games-board/cockatrice/cockatrice-20120624.ebuild
deleted file mode 100644
index 6006817ad..000000000
--- a/games-board/cockatrice/cockatrice-20120624.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit games cmake-utils
-
-DESCRIPTION="Cockatrice is an open-source multiplatform software for playing card games over a network"
-HOMEPAGE="http://cockatrice.de/"
-SRC_URI="${HOMEPAGE}files/${PN}_source_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+client"
-
-RDEPEND="
-	dev-libs/libgcrypt
-	dev-libs/protobuf
-	x11-libs/qt-core:4
-	x11-libs/qt-sql:4
-	client? (
-		x11-libs/qt-multimedia:4
-		x11-libs/qt-svg:4
-		x11-libs/qt-gui:4
-	)
-	"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-src_prepare() {
-	# Patch CMakeLists.txt to install servatrice.
-	epatch "${FILESDIR}/${PN}-20120630-servatrice-cmakelists.patch"
-}
-
-src_configure() {
-	# Always compile server support.
-	local mycmakeargs="-DWITH_SERVER=1"
-	if ! use client; then
-		# Compile client UI, if client use-flag is set.
-		mycmakeargs="${mycmakeargs} -DWITHOUT_CLIENT=1"
-	fi
-	cmake-utils_src_configure
-}
diff --git a/games-board/cockatrice/cockatrice-20120702.ebuild b/games-board/cockatrice/cockatrice-20120702.ebuild
new file mode 100644
index 000000000..a8ad59ba3
--- /dev/null
+++ b/games-board/cockatrice/cockatrice-20120702.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit cmake-utils eutils gnome2-utils games
+
+DESCRIPTION="Cockatrice is an open-source multiplatform software for playing card games over a network"
+HOMEPAGE="http://cockatrice.de/"
+SRC_URI="${HOMEPAGE}files/${PN}_source_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated server"
+
+RDEPEND="
+	dev-libs/libgcrypt
+	dev-libs/protobuf
+	x11-libs/qt-core:4
+	x11-libs/qt-sql:4
+	!dedicated? (
+		x11-libs/qt-multimedia:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-gui:4
+	)
+	"
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch \
+			"${FILESDIR}"/${P}-underlinking.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+			$(usex dedicated "-DWITHOUT_CLIENT=1 -DWITH_SERVER=1" "$(usex server "-DWITH_SERVER=1" "")")
+			-DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}"
+			-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+			-DICONDIR="/usr/share/icons"
+			-DDESKTOPDIR="/usr/share/applications"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	use dedicated || gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	use dedicated || gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use dedicated || gnome2_icon_cache_update
+}
diff --git a/games-board/cockatrice/files/cockatrice-20120630-servatrice-cmakelists.patch b/games-board/cockatrice/files/cockatrice-20120630-servatrice-cmakelists.patch
deleted file mode 100644
index ef62362fd..000000000
--- a/games-board/cockatrice/files/cockatrice-20120630-servatrice-cmakelists.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-*** servatrice/CMakeLists.txt	2012-06-24 21:48:27.000000000 +0200
---- servatrice/CMakeLists.txt	2012-06-30 03:09:45.000000000 +0200
-***************
-*** 45,50 ****
---- 45,52 ----
-  ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC})
-  TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY})
-  
-+ INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/servatrice DESTINATION bin)
-+ 
-  #add_custom_target(versionheader ALL DEPENDS version_header)
-  add_custom_command(
-  	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_string.h ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
diff --git a/games-board/cockatrice/files/cockatrice-20120702-build.patch b/games-board/cockatrice/files/cockatrice-20120702-build.patch
new file mode 100644
index 000000000..f374bac5a
--- /dev/null
+++ b/games-board/cockatrice/files/cockatrice-20120702-build.patch
@@ -0,0 +1,75 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Aug  2 21:27:25 UTC 2012
+Subject: build system
+
+add install rule for cockatrice binary
+make paths for ICONDIR and DESKTOPDIR modifiable
+
+--- servatrice/CMakeLists.txt
++++ servatrice/CMakeLists.txt
+@@ -2,6 +2,9 @@
+ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+ PROJECT(servatrice)
+ 
++# cmake modules
++include(GNUInstallDirs)
++
+ SET(servatrice_SOURCES
+  src/main.cpp
+  src/passwordhasher.cpp
+@@ -51,3 +54,5 @@
+ 	COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake
+ )
+ 
++# install rules
++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/servatrice DESTINATION ${CMAKE_INSTALL_BINDIR})
+--- cockatrice/CMakeLists.txt
++++ cockatrice/CMakeLists.txt
+@@ -201,6 +201,11 @@
+ set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
+ set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+ 
++# paths
++set(ICONDIR share/icons CACHE STRING "icon dir")
++set(DESKTOPDIR share/applications CACHE STRING "desktop file destination")
++
++
+ QT4_WRAP_CPP(cockatrice_HEADERS_MOC ${cockatrice_HEADERS})
+ QT4_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS})
+ QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+@@ -218,9 +223,9 @@
+ 
+ INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin)
+ if (NOT WIN32 AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION share/icons/hicolor/48x48/apps)
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION share/icons/hicolor/scalable/apps)
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION share/applications)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR})
+ 	INSTALL(FILES ${cockatrice_QM} DESTINATION share/cockatrice/translations)
+ ENDIF(NOT WIN32 AND NOT APPLE)
+ 
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Aug  2 22:50:59 UTC 2012
+Subject: 
+
+--- oracle/CMakeLists.txt
++++ oracle/CMakeLists.txt
+@@ -1,6 +1,9 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+ PROJECT(oracle)
+ 
++# paths
++set(DESKTOPDIR share/appliactions CACHE STRING "path to .desktop files")
++
+ SET(oracle_SOURCES src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp)
+ SET(oracle_HEADERS src/oracleimporter.h src/window_main.h ../cockatrice/src/carddatabase.h ../cockatrice/src/settingscache.h)
+ 
+@@ -21,5 +24,5 @@
+ 
+ INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/oracle DESTINATION bin)
+ IF (NOT WIN32 AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION share/applications)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR})
+ ENDIF (NOT WIN32 AND NOT APPLE)
diff --git a/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch b/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch
new file mode 100644
index 000000000..2117751c1
--- /dev/null
+++ b/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch
@@ -0,0 +1,29 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Aug  2 22:12:00 UTC 2012
+Subject: underlinking
+
+add -lpthread to cockatrice amd servatrice LIBS to support linkers that
+don't permit underlinking
+
+--- cockatrice/CMakeLists.txt
++++ cockatrice/CMakeLists.txt
+@@ -219,7 +219,7 @@
+ INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})
+ 
+ ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_HEADERS_MOC})
+-TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY})
++TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} -lpthread)
+ 
+ INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin)
+ if (NOT WIN32 AND NOT APPLE)
+--- servatrice/CMakeLists.txt
++++ servatrice/CMakeLists.txt
+@@ -46,7 +46,7 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC})
+-TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY})
++TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY} -lpthread)
+ 
+ #add_custom_target(versionheader ALL DEPENDS version_header)
+ add_custom_command(
diff --git a/games-board/cockatrice/metadata.xml b/games-board/cockatrice/metadata.xml
index a7812767a..772061ee2 100644
--- a/games-board/cockatrice/metadata.xml
+++ b/games-board/cockatrice/metadata.xml
@@ -5,6 +5,7 @@
 		<email>maintainer-wanted@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='client'>Build with client</flag>
+		<flag name='dedicated'>Build dedicated server</flag>
+		<flag name='server'>Build with server</flag>
     </use>
 </pkgmetadata>