[gentoo-commits] repo/gentoo:master commit in: games-board/cockatrice/files/, games-board/cockatrice/

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     0f7add0d551daf7d75718cc67b929f404ddede4e
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Fri Jun 24 13:43:17 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 17:03:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7add0d

games-board/cockatrice: Clean old ebuild

* Remove old patches in files.
* Clean old ebuild in Manifest.

Closes: https://github.com/gentoo/gentoo/pull/1735

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 games-board/cockatrice/Manifest                    |   1 -
 games-board/cockatrice/cockatrice-20120702.ebuild  |  73 ---------------
 .../files/cockatrice-20120702-build.patch          | 103 ---------------------
 .../files/cockatrice-20120702-underlinking.patch   |  29 ------
 4 files changed, 206 deletions(-)

diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index a0b0cc2..beec551 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,2 +1 @@
 DIST 2016-05-06-Release.tar.gz 6910937 SHA256 379835006f38b603af01cf46d508fd40e862b451045807b444042914e8736fee SHA512 5f90804270907b3a915e763e6a20c39432f76591a11df7198526fde5635314ffbb27026860053c302be1ef1dfce1efa445c5849c72d1220575314d6c3d67e94f WHIRLPOOL a13c531980da2cf172e933c5bcb179f8dc9368514fe7d2ec12a203f54c04aa5258218c6d2fc1bee30826598e1e8c057c437af6810709c26b0863cd2b665bc159
-DIST cockatrice_source_20120702.tar.gz 3790304 SHA256 a418124d3df255f2af70a20ff6b13f85361467abe4ea4216602bd3647cfc490e SHA512 119acd394dfe97de72b0be8d1ea8c6178f9d0150dcb50d1aba074c28c8d0f52f2be5758ac3943c49d11f655f02a70fc5f5a7e207b8a2631f73f7178ff17b5c35 WHIRLPOOL 1e5112519ddd0f4107778c97d4cf415959117d7e5854ad9760d50621a77a53d992678470772358c880e89ba35376cbf6abab4687969810c117d2851eae4ec70a

diff --git a/games-board/cockatrice/cockatrice-20120702.ebuild b/games-board/cockatrice/cockatrice-20120702.ebuild
deleted file mode 100644
index 931419a..0000000
--- a/games-board/cockatrice/cockatrice-20120702.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils eutils gnome2-utils games
-
-DESCRIPTION="An open-source multiplatform software for playing card games over a network"
-HOMEPAGE="http://cockatrice.de/"
-SRC_URI="http://cockatrice.de/files/${PN}_source_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated server"
-
-DEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/protobuf
-	dev-qt/qtcore:4
-	dev-qt/qtsql:4
-	!dedicated? (
-		dev-qt/qtmultimedia:4
-		dev-qt/qtsvg:4
-		dev-qt/qtgui:4
-	)"
-RDEPEND=${DEPEND}
-
-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}"
-		-DDATADIR="${GAMES_DATADIR}/${PN}"
-		-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
-	elog "zonebg pictures are in ${GAMES_DATADIR}/${PN}/zonebg"
-	elog "sounds are in ${GAMES_DATADIR}/${PN}/sounds"
-	elog "you can use those directories in cockatrice settings"
-	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 6876fcd..0000000
--- a/games-board/cockatrice/files/cockatrice-20120702-build.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-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
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -8,7 +8,9 @@
- 	add_subdirectory(oracle)
- endif(NOT WITHOUT_CLIENT)
- 
-+set(DATADIR "share/cockatrice" CACHE PATH "Data dir")
-+
- FILE(GLOB sounds "${CMAKE_CURRENT_SOURCE_DIR}/sounds/*.raw")
--INSTALL(FILES ${sounds} DESTINATION share/cockatrice/sounds)
-+INSTALL(FILES ${sounds} DESTINATION ${DATADIR}/sounds)
- FILE(GLOB zonebg "${CMAKE_CURRENT_SOURCE_DIR}/zonebg/*.*")
--INSTALL(FILES ${zonebg} DESTINATION share/cockatrice/zonebg)
-\ No newline at end of file
-+INSTALL(FILES ${zonebg} DESTINATION ${DATADIR}/zonebg)
---- 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
-@@ -158,7 +158,13 @@
- )
- 
- if (UNIX AND NOT APPLE)
--	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/cockatrice/translations\\")
-+	if(IS_ABSOLUTE ${DATADIR})
-+		set(_DATADIR ${DATADIR})
-+	else()
-+		set(_DATADIR ${CMAKE_INSTALL_PREFIX}/${DATADIR})
-+	endif()
-+
-+	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${_DATADIR}/translations\\")
- endif (UNIX AND NOT APPLE)
- 
- set(cockatrice_RESOURCES cockatrice.qrc)
-@@ -201,6 +207,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,10 +229,10 @@
- 
- 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 ${cockatrice_QM} DESTINATION share/cockatrice/translations)
-+	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 ${DATADIR}/translations)
- ENDIF(NOT WIN32 AND NOT APPLE)
- 
- add_custom_command(
---- 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 2117751..0000000
--- a/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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(