gentoo resync : 24.06.2021

4 files changed, 13 insertions, 87 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 42a7dfd76e88..786ce5dce99f 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index 8a7654f318c1..1278411f73b3 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,5 +1,3 @@
-DIST cockatrice-20200823.tar.gz 8503044 BLAKE2B a987418b25db53e5fc42627e3efa93ee7348ff341d7cf844647c6655b00bb76f2929cff91c6a1d199525fba2785f4d5da533c934ad483636af1979d52f8eea94 SHA512 0fa919009536238cd540db6ef01271a41f96aa40a3d40b468fbc400905dbdfe914cfb785f62f8135355c64cc8fef19a83604aee1ad4420bb73c8f31b9d48e48b
 DIST cockatrice-20210126.tar.gz 8589061 BLAKE2B f90840f2b6044ea364101410adc9481660a7247460f7191d6b022e447cc1685f28384a39596a3fbeaeb67f1af0cc184cf017f8e666e67e673672bc3968ac807a SHA512 e07cdee72c8bf4755d49cac69bd6a2ddb4c168d370ed4a1cbd341537184869ee8680fbf5e9d6b636c7c68888a8d00f474bae9cf245303d638b3aac8762f9fa8e
-EBUILD cockatrice-20200823.ebuild 1523 BLAKE2B f33ae793f11c6e009b244a8f5b6dda2fce4a9d6186de0eb8d876d91cb30eb066c8f55a11dfc5943888b36fa1cf08278683897b686e2d03023d0cb235df028dde SHA512 abb3107c2129fb064f4b93b06705aebbff02ed8d5da5e431425705b80492ce8f85111c82188fef31f8ae1353eef798262681a8c9550ced5d3deb6ade4f0e16a4
-EBUILD cockatrice-20210126.ebuild 1603 BLAKE2B 0cafe94386ced61e0865aa8247d1ba5fcab04750c6b2f9aed04f763d26d50c0e9e37167326540cf2afe8fddef7c96cea76417b235c5c284654d00bcfb5b182ab SHA512 72b40ba1df1da5b452e68d3051b1c924aa0c0b921844daf58c9f7b8af45ce67a7166e82b289b33cac8617305d6a991963c5911a63967b833e76bfdca6bd6377d
+EBUILD cockatrice-20210126.ebuild 1522 BLAKE2B aaebbe0ce90cdadc3b8f693d5c54992c196f71498209aa6c80ca7ebb11abfd5b76f4227d783c448018068324378fa3da7226ce0986ecf1f0575fb7f64069ae3c SHA512 69fa1fadc4b36c9ce2dea4c78aa5ca19c85ef07a9251709e47aae1e12143ad071e065a53fdb86af11eb2be4366eae72efdf6c83eb01159886c26b075cc327356
 MISC metadata.xml 1450 BLAKE2B c4a364258aa2fdc7c82aedd69abed77a7c6715ea5e3124b4980c4067731b044fc5377b8aac137e168f5aff1b728bded8560b660d0690e5dfb3cc1561e8f07a54 SHA512 2ce5c04a36ab4af86f9dcf76f8ca031eb22dd9f6277f47c227bc8658298a40f8f72a6aa655224956073992bd787a865350ed0152c1663c6234075cb652c357bf
diff --git a/games-board/cockatrice/cockatrice-20200823.ebuild b/games-board/cockatrice/cockatrice-20200823.ebuild
deleted file mode 100644
index fa3bd9ba82ed..000000000000
--- a/games-board/cockatrice/cockatrice-20200823.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-MY_PV="2020-08-23-Release-2.7.5"
-DESCRIPTION="An open-source multiplatform software for playing card games over a network"
-HOMEPAGE="https://github.com/Cockatrice/Cockatrice"
-SRC_URI="https://github.com/Cockatrice/Cockatrice/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +oracle test server"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	client? (
-		dev-libs/protobuf:=
-		dev-qt/qtmultimedia:5
-		dev-qt/qtsvg:5
-	)
-	oracle? ( sys-libs/zlib )
-	server? (
-		dev-libs/protobuf:=
-		dev-qt/qtsql:5
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	client? ( dev-libs/protobuf )
-	server? ( dev-libs/protobuf )
-	test? ( dev-cpp/gtest )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/Cockatrice-${MY_PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_SERVER=$(usex server)
-		-DTEST=$(usex test)
-		-DICONDIR="${EPREFIX}/usr/share/icons"
-		-DDESKTOPDIR="${EPREFIX}/usr/share/applications" )
-
-	# Add date in the help about, come from git originally
-	sed -e 's/^set(PROJECT_VERSION_FRIENDLY.*/set(PROJECT_VERSION_FRIENDLY \"'${MY_PV}'\")/' \
-		-i cmake/getversion.cmake || die "sed failed!"
-
-	cmake_src_configure
-}
diff --git a/games-board/cockatrice/cockatrice-20210126.ebuild b/games-board/cockatrice/cockatrice-20210126.ebuild
index f3f5bd2606f3..caa652ceef6e 100644
--- a/games-board/cockatrice/cockatrice-20210126.ebuild
+++ b/games-board/cockatrice/cockatrice-20210126.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
-inherit cmake
+inherit xdg cmake
 
 MY_PV="2021-01-26-Release-2.8.0"
-DESCRIPTION="An open-source multiplatform software for playing card games over a network"
+
+DESCRIPTION="Open-source multiplatform software for playing card games over a network"
 HOMEPAGE="https://github.com/Cockatrice/Cockatrice"
 SRC_URI="https://github.com/Cockatrice/Cockatrice/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Cockatrice-${MY_PV}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+client +oracle test server"
@@ -33,17 +35,14 @@ RDEPEND="
 	server? (
 		dev-libs/protobuf:=
 		dev-qt/qtsql:5
-	)
-"
+	)"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )"
 BDEPEND="
 	dev-qt/linguist-tools:5
 	client? ( dev-libs/protobuf )
-	server? ( dev-libs/protobuf )
-	test? ( dev-cpp/gtest )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/Cockatrice-${MY_PV}"
+	server? ( dev-libs/protobuf )"
 
 src_configure() {
 	local mycmakeargs=(
@@ -54,7 +53,8 @@ src_configure() {
 		-DWITH_SERVER=$(usex server)
 		-DTEST=$(usex test)
 		-DICONDIR="${EPREFIX}/usr/share/icons"
-		-DDESKTOPDIR="${EPREFIX}/usr/share/applications" )
+		-DDESKTOPDIR="${EPREFIX}/usr/share/applications"
+	)
 
 	# Add date in the help about, come from git originally
 	sed -e 's/^set(PROJECT_VERSION_FRIENDLY.*/set(PROJECT_VERSION_FRIENDLY \"'${MY_PV}'\")/' \
@@ -62,11 +62,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}