gentoo Easter resync : 12.04.2020

4 files changed, 16 insertions, 164 deletions

diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index b3adb3eb95b9..9c9955e668cb 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,7 +1,5 @@
 AUX commandergenius-2.3.1-build.patch 451 BLAKE2B 5c82e9919262fd55ec89069c55de2ba0f18eea2af4587776c353345aef7fb1657763abfcf0956856dae3707a65f0e33210dc521f95d3a0c863461bdb851667d6 SHA512 7b567072137af294b876da4d3701deddc5bf80c52c7a9bf7f0e266885f2a5cc61b7f495725e9d3fdaf3527cf92da0437c8ed1b90f34f9925579c2fe5da8484fb
-AUX commandergenius-2.3.1-desktop.patch 1614 BLAKE2B f2b4a66d98af114a98a83a0ee7ff8ad8dd08d5c0ddba82859b2887adaa8f7893fa6b0cedce5327c7be8f2c0ac8085981b893126e1a39ac4c1effa8212e91b890 SHA512 b03232cda867870b9d8f787463cd423cf805c0bb911c3d371fbb7664ec27e0a0f47706b86889025eb5158e99cc24ac04dbf785d2ff8ed5a292beaeb995e0d75e
-AUX commandergenius-2.3.1-minizip.patch 2277 BLAKE2B d41e86021769db7189620b3ac6941d2a0c1d60efb97ddee30b449045a7d561011638cb56cfab4285b0c7a35a385a6c66d7159f4b01b42fae0c6f363d7d2d6054 SHA512 ff8a1a8fd6c1c87b52b05fcd248b3ba92e2b9559b8b68522ef83a49878d7ccd3d4c8d9ac2eebb8211e4213b4106f563eb59819117b962a28ecdfd9c60d29621d
 AUX commandergenius-2.3.1-paths.patch 528 BLAKE2B 0d3362d1f5099206a352c47c8625fc8bf7c5bcc371576340209eb4ef978c9cd7dfe0d13206fa2fe3f25dac094fd93e33a957d942a432080c77d50bab21b0a42e SHA512 f447166227566fe914c3d50f6f8c7b1dab6161b9ff633824c8feea0cc441872cd6245572e8cb2929a9f8345c0b8592cd3b3a7d77224ed9f5bc0076d82415f66a
-DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe SHA512 f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
-EBUILD commandergenius-2.3.3.ebuild 2277 BLAKE2B 1ac640057e311d1c6c7f7ccc9ccadd2abd0dd0dfeefa8807a5343fb5f0a7378743343035d5d66848d542d494a72e2b34d61530cc38dc6a528c05662c93d041c9 SHA512 099908a6ad457fa72c102c841879862253265a19617a74022a76f990fb5b9351cbcfc9bf389ef1d7790667eb6cd1bc1c511eac2f289f5b52878b124d8b392284
+DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd SHA512 76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b
+EBUILD commandergenius-2.4.0.ebuild 2192 BLAKE2B 6f56b9049b899ddc3c253e6d33ab901f3c993aabe1b2b093e54aee81b162a340e43fa43a34243a87d4ff7f598c67be3ba7f8530fad8a25a2941f6bb696b07781 SHA512 8413ea6c69c56162c4d4d630fcd1911cc01ff88eb712bd94033955eb5dd08bc691f8572afae543de4a6b612ec10c336768791ee017b3d68249bcfcb0a56a9084
 MISC metadata.xml 506 BLAKE2B 2e4a746b047d9e50d4403cdd52984cc2f0e8ba58e81ac73b6d3e3363f60c8370221713248fcf56505ad5768f7f66dd30778d025b8342088fa9c329deb7afac20 SHA512 f7e6dd9ad5ba4e57218226ec1693e482228133d3e19332a9aa7995bf60e184a77520a59d7d2b3195429c3b56ecb857da675d467b05b1b9aeb52826500db2061a
diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
index 9a139cff2fa3..9baded9ec4a0 100644
--- a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8} )
 
-inherit cmake desktop python-single-r1 xdg-utils
+inherit desktop python-single-r1 xdg cmake
 
 MY_PN="Commander-Genius"
 MY_P="${MY_PN}-v${PV}"
@@ -20,22 +20,25 @@ IUSE="+downloader opengl +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="mirror" # contains keen files, but we do not install them
 
-RDEPEND="media-libs/libsdl2[opengl?,video]
+RDEPEND="
+	media-libs/libsdl2[opengl?,video]
 	media-libs/sdl2-image
 	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
 	sys-libs/zlib[minizip]
 	downloader? ( net-misc/curl )
 	opengl? ( virtual/opengl )
-	python? ( ${PYTHON_DEPS} )"
+	python? ( ${PYTHON_DEPS} )
+"
 
-DEPEND="${RDEPEND}
-	dev-libs/boost"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
 
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.1-minizip.patch
-	"${FILESDIR}"/${PN}-2.3.1-desktop.patch
 	"${FILESDIR}"/${PN}-2.3.1-build.patch
 	"${FILESDIR}"/${PN}-2.3.1-paths.patch
 )
@@ -52,10 +55,10 @@ src_configure() {
 		-DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
 		-DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DDOWNLOADER=$(usex downloader)
-		-DOPENGL=$(usex opengl)
+		-DUSE_OPENGL=$(usex opengl)
 		-DUSE_PYTHON3=$(usex python)
 		-DUSE_SDL2=ON
-		-DBUILD_SHARED_LIBS=OFF
+		-DUSE_SDL_TTF=ON # Crashes when disabled.
 	)
 
 	cmake_src_configure
@@ -72,7 +75,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	elog "Run ${PN} to start the game. It will search for game data"
 	elog "in ~/.CommanderGenius/games and ${EPREFIX}${GAMESDIR}."
@@ -86,7 +89,3 @@ pkg_postinst() {
 	elog
 	use opengl && elog "You may also want to set \"OpenGL = true\"."
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
deleted file mode 100644
index 4d2c246e5b76..000000000000
--- a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 84243052d0b9409b4d5b28e751e598287b00bab9 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 24 Feb 2019 21:26:38 +0000
-Subject: [PATCH 1/2] Remove deprecated "Application" entry from desktop
- categories
-
-The desktop-file-validate tool says it is deprecated.
----
- share/cgenius.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/cgenius.desktop b/share/cgenius.desktop
-index 8d0771522..b7b39ffef 100644
---- a/share/cgenius.desktop
-+++ b/share/cgenius.desktop
-@@ -6,4 +6,4 @@ Icon=/usr/share/icons/hicolor/512x512/apps/CGLogo.png
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=Application;Game;ArcadeGame;
-+Categories=Game;ArcadeGame;
--- 
-2.20.1
-
-From e9d6157210015b4aa5efcb9ba0c57842ae4ef266 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 24 Feb 2019 21:31:28 +0000
-Subject: [PATCH 2/2] Remove unnecessary absolute icon path from desktop entry
-
-We should not assume that the game has been installed to /usr and
-there is no need to specify an absolute path for the icon anyway as
-the standard says that bare icon names should be looked up.
----
- share/cgenius.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/cgenius.desktop b/share/cgenius.desktop
-index b7b39ffef..9b09ec9fc 100644
---- a/share/cgenius.desktop
-+++ b/share/cgenius.desktop
-@@ -2,7 +2,7 @@
- Name=Commander Genius
- Comment=Play natively Commander Keen Games
- Exec=CGeniusExe
--Icon=/usr/share/icons/hicolor/512x512/apps/CGLogo.png
-+Icon=CGLogo
- Terminal=false
- Type=Application
- StartupNotify=true
--- 
-2.20.1
-
diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch
deleted file mode 100644
index ca2553b5f7d3..000000000000
--- a/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 04f776e73248d19d9beaf4ea8d407b7c85ecc9c9 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 24 Feb 2019 20:25:34 +0000
-Subject: [PATCH] Allow use of external minizip library instead of linking just
- zlib
-
-Some distributions package the minizip part of zlib, as well as zlib
-itself, so allow that to be used with help from pkg-config.
----
- src/engine/unzip/CMakeLists.txt | 42 +++++++++++++++++++++------------
- src/engine/unzip/miniunz.c      |  4 ++--
- 2 files changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/src/engine/unzip/CMakeLists.txt b/src/engine/unzip/CMakeLists.txt
-index 5f2b8a959..24833abb7 100644
---- a/src/engine/unzip/CMakeLists.txt
-+++ b/src/engine/unzip/CMakeLists.txt
-@@ -1,23 +1,35 @@
--find_package( ZLIB REQUIRED )
--if ( ZLIB_FOUND )
--    include_directories( ${ZLIB_INCLUDE_DIRS} )
--else ( ZLIB_FOUND )
--    Message(FATAL_ERROR "Zlib development packages not found!")
--endif( ZLIB_FOUND )
-+find_package(PkgConfig)
- 
-+if ( PKGCONFIG_FOUND )
-+    pkg_check_modules(ZLIB minizip)
-+else ( PKGCONFIG_FOUND )
-+    unset(ZLIB_FOUND)
-+endif ( PKGCONFIG_FOUND )
- 
-+if ( ZLIB_FOUND )
-+    set(CXXSRC miniunz.c)
-+    unset(HSRC)
-+else ( ZLIB_FOUND )
-+    find_package(ZLIB REQUIRED)
-+    include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
-+    set(CXXSRC
-+        miniunz.c
-+        ioapi.c
-+        iowin32.c
-+        unzip.c)
- 
--set(CXXSRC
--    miniunz.c
--    ioapi.c
--    iowin32.c
--    unzip.c)
-+    set(HSRC
-+        ioapi.h
-+        iowin32.h
-+        unzip.h)
-+endif ( ZLIB_FOUND )
- 
--set(HSRC
--    ioapi.h
--    iowin32.h
--    unzip.h)
-+if ( ZLIB_FOUND )
-+    include_directories( ${ZLIB_INCLUDE_DIRS} )
-+else ( ZLIB_FOUND )
-+    Message(FATAL_ERROR "Zlib development packages not found!")
-+endif( ZLIB_FOUND )
- 
- add_library(unzip ${CXXSRC} ${HSRC})
- 
-diff --git a/src/engine/unzip/miniunz.c b/src/engine/unzip/miniunz.c
-index 694aa8e60..0f289c96c 100644
---- a/src/engine/unzip/miniunz.c
-+++ b/src/engine/unzip/miniunz.c
-@@ -56,7 +56,7 @@
- #endif
- 
- 
--#include "unzip.h"
-+#include <unzip.h>
- 
- #define CASESENSITIVITY (0)
- #define WRITEBUFFERSIZE (8192)
-@@ -64,7 +64,7 @@
- 
- #ifdef _WIN32
- #define USEWIN32IOAPI
--#include "iowin32.h"
-+#include <iowin32.h>
- #endif
- /*
-   mini unzip, demo of unzip package
--- 
-2.20.1
-