From e62a3b88afbc38ff0a63a10d690acae665fb980c Mon Sep 17 00:00:00 2001 From: hasufell Date: Sun, 5 Aug 2012 01:36:08 +0200 Subject: games-board/cockatrice imported into main tree --- games-board/cockatrice/ChangeLog | 20 ------ games-board/cockatrice/Manifest | 6 -- games-board/cockatrice/cockatrice-20120702.ebuild | 70 -------------------- .../files/cockatrice-20120702-build.patch | 75 ---------------------- .../files/cockatrice-20120702-underlinking.patch | 29 --------- games-board/cockatrice/metadata.xml | 11 ---- 6 files changed, 211 deletions(-) delete mode 100644 games-board/cockatrice/ChangeLog delete mode 100644 games-board/cockatrice/Manifest delete mode 100644 games-board/cockatrice/cockatrice-20120702.ebuild delete mode 100644 games-board/cockatrice/files/cockatrice-20120702-build.patch delete mode 100644 games-board/cockatrice/files/cockatrice-20120702-underlinking.patch delete mode 100644 games-board/cockatrice/metadata.xml (limited to 'games-board') diff --git a/games-board/cockatrice/ChangeLog b/games-board/cockatrice/ChangeLog deleted file mode 100644 index 6a7052dcc..000000000 --- a/games-board/cockatrice/ChangeLog +++ /dev/null @@ -1,20 +0,0 @@ -# ChangeLog for games-board/cockatrice -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*cockatrice-20120702 (04 Aug 2012) - - 04 Aug 2012; Alexander Berntsen (alexander__b) - -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) - +cockatrice-20120624.ebuild, - +files/cockatrice-20120630-servatrice-cmakelists.patch, +metadata.xml: - New ebuild games-board/cockatrice for bug #424273 - diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest deleted file mode 100644 index 39c94e3eb..000000000 --- a/games-board/cockatrice/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -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-20120702.ebuild b/games-board/cockatrice/cockatrice-20120702.ebuild deleted file mode 100644 index a8ad59ba3..000000000 --- a/games-board/cockatrice/cockatrice-20120702.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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-20120702-build.patch b/games-board/cockatrice/files/cockatrice-20120702-build.patch deleted file mode 100644 index f374bac5a..000000000 --- a/games-board/cockatrice/files/cockatrice-20120702-build.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Julian Ospald -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 -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 deleted file mode 100644 index 2117751c1..000000000 --- a/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Julian Ospald -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 deleted file mode 100644 index 772061ee2..000000000 --- a/games-board/cockatrice/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - maintainer-wanted@gentoo.org - - - Build dedicated server - Build with server - - -- cgit v1.2.3-65-gdbad