gentoo resync : 25.08.2020

7 files changed, 146 insertions, 98 deletions

diff --git a/games-board/chessx/Manifest b/games-board/chessx/Manifest
index 0bf9dd4cd84d..cc5be1585ee5 100644
--- a/games-board/chessx/Manifest
+++ b/games-board/chessx/Manifest
@@ -1,5 +1,6 @@
-AUX chessx-1.4.0-zlib.patch 883 BLAKE2B c03baa883587aac6f8abd6453f011387c772217aad235717b64d31eb97e828c9b7d868c72046c9148850c59b4d1d540b106ceb9f826b451e464c61bb44bba6d9 SHA512 326efb6ab3cca94849a1a89b2c51a18f2a6cb51d38cc11fd59e8d443034350851ffaf28412ba57a53a961900eaee4661b0035d8e7cbab2a1e99ea67eb4e2f2cf
-AUX chessx-1.4.6-qt-5.11.patch 1466 BLAKE2B b8b6fbe49be0f361fd0b19f53b55d75354813e65e286d0b031680f769c284d15d930b3fd5aeffefdae3e406ad4971742d378e04c38f7f249200fbe947a29520e SHA512 eeddea13a179b51f618f68a0505cdae6e3c0614f2c24ab01942df7b7f260e146cdbb1c7dae1efc8dbc9a70aebf11d664a9a9d5c3a0562267c8b9633a05702a1a
-DIST chessx-1.4.6.tgz 4223076 BLAKE2B 783ffe0a7396239066870dedcaa4b2b0c491db4f16871afe66bae7a82339916a8a574401499916fc63cf62478efb9b89c30ec85a7aa7c6d002d1119f1a6b23ef SHA512 cfa74e6423e1a2f9bca319e20645ddf8c8df6b46b64493777ca1cc93037e3f7cfc200f99a29236f7c5925448676c312abf34d395e795e7db6ef8a0832c3a523e
-EBUILD chessx-1.4.6.ebuild 927 BLAKE2B 3d1c8b359efe44451de7200c7b3ef77ec73a334839b3e412681598c6ca082a71cdea3af70c436aad92e84b54bb7d59c435594961486006f104ab79137e5fdcd2 SHA512 c5fbe061d17e9ea7956931262d68560f376c8a1df887b4d9f4e0022815510c9a2cbb14b297d63382aed9de58f840cbfeaca7121de873e454eece139d91594b42
+AUX chessx-1.5.4-install.patch 707 BLAKE2B 00199be5811a78ad2e610dd919a063d84d94156bdaed9aef6134c6a09227d3072b75b443e403b5c82d1ac36059709c1e2f7e4988dd68f813bdc56608a7a8dec0 SHA512 28adbaf8288b4688c1ccb6d8fc5cac019bc752d5d555ae8b2e3017e3085bbd7a28b896bd1c583933f4dda44964bc7d0f21842841666b8e454be946c20eabc0cd
+AUX chessx-1.5.4-missing-translations.patch 1502 BLAKE2B f0b745ceaf0f3b97e59b156515ec286f830b1163164ffd6d63a76d1118b648f9af221e89aa0c22d71a2a1fabc56074b436bd9fad433db1733b8742504559962e SHA512 a922dd05b98ea8ed54f203fa7d7d56c1fb87ef7fe97edde9e05ada37a6e4175f02465bbef2f7d8df3f672d74134722d1706fd6ecf559167ae0f1cd717d0f28cd
+AUX chessx-1.5.4-system-quazip.patch 2232 BLAKE2B b4cdc1e62be10293135d7c244b0c6765e833b2e12d738bb3bb6b2ca4b5e6d7444014420a43975cbaff94805b73b13e4f81de1d878aa817e376ec93807f002a8f SHA512 7d74d68998406d41f6142d1ccf092c7ee0a80fa1a1e6e18acc20a39ebe697b01412bddc50eaae3163f46575d2ec651455f0a0803bd5ec6fe12fa9880ee7f4e45
+DIST chessx-1.5.4.tgz 3663299 BLAKE2B 3a0f222d2c122e70f66600f15a2b9a9606e56407db364a616515ebc1b7f333e260c131e61e22f59fb3cbd340555bb8c238bfd560fbc23f4c173288cd4b7e7369 SHA512 9f112b185ed8af3690cb50eafead7dfbd7896d3baebc9b10c3d32103a51cc49834703c232c159dffe24fd09601f2b41db02598c435ca56fc1031195fb9762a42
+EBUILD chessx-1.5.4-r1.ebuild 951 BLAKE2B a89b61636be70d966e8270f0fab2d52494c1827b354a7976dc09fd7d54eff5d80b39bb5eeab90ec2adcbb0bc254ece35bbeca2963ddfddec721a38c48b62b803 SHA512 f395dfaf79a8dde88148310170d194d05b54540e81812934a2c9b2c97695fe5e909aa33a7c50ab79da40744743ebb5599543d4e99420a864d68be834dc55686f
 MISC metadata.xml 329 BLAKE2B 199a6f1de51ae4a4a1104bbd4419200e7440abafe3fc5dfe40eafc08c00449461c71131cfdf1d60a0b8375f575290bbdd0af6355ae10a9259c38728e3065e6cf SHA512 41215eff9af3f31175db0f20dd13574378e4124dda8a1670440897391a5b66423c953471d6e22984dbfb3e0abef8ea3d56fa3690b45c189fae2a3c26560ec1a8
diff --git a/games-board/chessx/chessx-1.4.6.ebuild b/games-board/chessx/chessx-1.5.4-r1.ebuild
index 87b4a82b974f..9293cbb1be7b 100644
--- a/games-board/chessx/chessx-1.4.6.ebuild
+++ b/games-board/chessx/chessx-1.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop qmake-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Qt5-based Chess Database Utility"
 HOMEPAGE="http://chessx.sourceforge.net/"
@@ -15,35 +15,37 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
+	>=dev-libs/quazip-0.9.1
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtspeech:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sys-libs/zlib:="
+	sys-libs/zlib
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-zlib.patch
-	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-system-quazip.patch
+	"${FILESDIR}"/${P}-missing-translations.patch
+	"${FILESDIR}"/${P}-install.patch
 )
 
-src_prepare() {
-	default
-	"$(qt5_get_bindir)/lrelease" i18n/* || die
-}
-
 src_configure() {
 	eqmake5
 }
 
 src_install() {
-	dobin release/${PN}
-	dodoc ChangeLog TODO
-	doicon data/images/${PN}.png
-	domenu unix/chessx.desktop
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
 }
diff --git a/games-board/chessx/files/chessx-1.4.0-zlib.patch b/games-board/chessx/files/chessx-1.4.0-zlib.patch
deleted file mode 100644
index fe6bfb39d508..000000000000
--- a/games-board/chessx/files/chessx-1.4.0-zlib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/quazip/ioapi.h
-+++ b/src/quazip/ioapi.h
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* ioapi.h -- IO base function header for compress/uncompress .zip
-    files using zlib + zip or unzip API
- 
---- a/src/quazip/unzip.c
-+++ b/src/quazip/unzip.c
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* unzip.c -- IO for uncompress .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
---- a/src/quazip/unzip.h
-+++ b/src/quazip/unzip.h
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* unzip.h -- IO for uncompress .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
---- a/src/quazip/zip.c
-+++ b/src/quazip/zip.c
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* zip.c -- IO on .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
---- a/src/quazip/zip.h
-+++ b/src/quazip/zip.h
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* zip.h -- IO for compress .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
diff --git a/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch b/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch
deleted file mode 100644
index 379de8836b94..000000000000
--- a/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Luigi Baldoni <aloisio@gmx.com>
-Date: 2018-06-18 13:16:31 +0200
-Subject: Add missing include statements
-References: https://sourceforge.net/p/chessx/bugs/254
-Upstream: submitted
-
-A few explicit include statements are required with Qt 5.11
----
-Index: chessx-1.4.6/src/gui/gamewindow.cpp
-===================================================================
---- chessx-1.4.6.orig/src/gui/gamewindow.cpp
-+++ chessx-1.4.6/src/gui/gamewindow.cpp
-@@ -9,6 +9,7 @@
- #include "settings.h"
- 
- #include <QToolButton>
-+#include <QAction>
- 
- #if defined(_MSC_VER) && defined(_DEBUG)
- #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
-Index: chessx-1.4.6/src/dialogs/savedialog.cpp
-===================================================================
---- chessx-1.4.6.orig/src/dialogs/savedialog.cpp
-+++ chessx-1.4.6/src/dialogs/savedialog.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QLineEdit>
- #include <QCompleter>
-+#include <QButtonGroup>
- 
- #if defined(_MSC_VER) && defined(_DEBUG)
- #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
-Index: chessx-1.4.6/src/dialogs/preferences.cpp
-===================================================================
---- chessx-1.4.6.orig/src/dialogs/preferences.cpp
-+++ chessx-1.4.6/src/dialogs/preferences.cpp
-@@ -33,6 +33,7 @@
- #include <QFileDialog>
- #include <QDesktopServices>
- #include <QTextStream>
-+#include <QAction>
- 
- #if defined(_MSC_VER) && defined(_DEBUG)
- #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
diff --git a/games-board/chessx/files/chessx-1.5.4-install.patch b/games-board/chessx/files/chessx-1.5.4-install.patch
new file mode 100644
index 000000000000..c017b3ea1535
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.5.4-install.patch
@@ -0,0 +1,27 @@
+Index: chessx-1.5.4/chessx.pro
+===================================================================
+--- chessx-1.5.4.orig/chessx.pro
++++ chessx-1.5.4/chessx.pro
+@@ -546,6 +546,22 @@ macx {
+     data/timeseal/mac/timeseal
+ }
+ 
++unix:!macx {
++  isEmpty(PREFIX) {
++    PREFIX = /usr
++  }
++  target.path = $$PREFIX/bin
++  desktop.path = $$PREFIX/share/applications
++  desktop.files = unix/chessx.desktop
++  icon.path = $$PREFIX/share/pixmaps
++  icon.files = data/images/chessx.png
++  data.path = $$PREFIX/share/chessx
++  data.files = data
++  lang.path = $$PREFIX/share/chessx/data/lang
++  lang.files = i18n/*.qm
++  INSTALLS += target desktop icon data lang
++}
++
+ win32 {
+   OTHER_FILES += \
+     src/chessx.rc \
diff --git a/games-board/chessx/files/chessx-1.5.4-missing-translations.patch b/games-board/chessx/files/chessx-1.5.4-missing-translations.patch
new file mode 100644
index 000000000000..7c874e16508b
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.5.4-missing-translations.patch
@@ -0,0 +1,24 @@
+Index: resources.qrc
+===================================================================
+--- a/resources.qrc
++++ b/resources.qrc
+@@ -12,11 +12,7 @@
+         <file alias="help/about4.html">data/help/about4.html</file>
+         <file alias="help/about5.html">data/help/about5.html</file>
+         <file alias="help/about6.html">data/help/about6.html</file>
+-        <file alias="i18n/chessx_da.qm">i18n/chessx_da.qm</file>
+         <file alias="i18n/chessx_de.qm">i18n/chessx_de.qm</file>
+-        <file alias="i18n/chessx_fr.qm">i18n/chessx_fr.qm</file>
+-        <file alias="i18n/chessx_it.qm">i18n/chessx_it.qm</file>
+-        <file alias="i18n/chessx_cz.qm">i18n/chessx_cz.qm</file>
+         <file alias="images/accept.png">data/images/accept.png</file>
+         <file alias="images/annotate.png">data/images/annotate.png</file>
+         <file alias="images/arrow_green.png">data/images/arrow_green.png</file>
+@@ -180,7 +176,6 @@
+         <file alias="themes/shadow/leipzig.png">data/themes/shadow/leipzig.png</file>
+         <file alias="themes/shadow/merida.png">data/themes/shadow/merida.png</file>
+         <file alias="themes/shadow/spatial.png">data/themes/shadow/spatial.png</file>
+-        <file alias="i18n/chessx_ru.qm">i18n/chessx_ru.qm</file>
+         <file alias="images/threat_black.png">data/images/threat_black.png</file>
+         <file alias="images/threat_white.png">data/images/threat_white.png</file>
+         <file alias="images/black_wall.png">data/images/black_wall.png</file>
diff --git a/games-board/chessx/files/chessx-1.5.4-system-quazip.patch b/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
new file mode 100644
index 000000000000..b5e4cf8f4351
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
@@ -0,0 +1,73 @@
+Index: chessx.pro
+===================================================================
+--- a/chessx.pro
++++ b/chessx.pro
+@@ -39,7 +39,6 @@ static { # Everything below takes effect
+     message("Static build.")
+ }
+ 
+-DEFINES += QUAZIP_STATIC
+ DEFINES += QT_NO_CAST_TO_ASCII
+ DEFINES *= QT_USE_QSTRINGBUILDER
+ 
+@@ -156,22 +155,6 @@ HEADERS += src/database/board.h \
+     src/gui/engineoptionlist.h \
+     src/gui/helpbrowser.h \
+     src/database/downloadmanager.h \
+-    src/quazip/zip.h \
+-    src/quazip/unzip.h \
+-    src/quazip/quazipnewinfo.h \
+-    src/quazip/quazipfileinfo.h \
+-    src/quazip/quazipfile.h \
+-    src/quazip/quazipdir.h \
+-    src/quazip/quazip.h \
+-    src/quazip/quazip_global.h \
+-    src/quazip/quaziodevice.h \
+-    src/quazip/quagzipfile.h \
+-    src/quazip/quacrc32.h \
+-    src/quazip/quachecksum32.h \
+-    src/quazip/quaadler32.h \
+-    src/quazip/JlCompress.h \
+-    src/quazip/ioapi.h \
+-    src/quazip/crypt.h \
+     src/gui/toolmainwindow.h \
+     src/gui/playerlistwidget.h \
+     src/gui/qled.h \
+@@ -321,16 +304,6 @@ SOURCES += src/database/board.cpp \
+     src/gui/engineoptionlist.cpp \
+     src/gui/helpbrowser.cpp \
+     src/database/downloadmanager.cpp \
+-    src/quazip/quazipnewinfo.cpp \
+-    src/quazip/quazipfile.cpp \
+-    src/quazip/quazipdir.cpp \
+-    src/quazip/quazip.cpp \
+-    src/quazip/quaziodevice.cpp \
+-    src/quazip/quagzipfile.cpp \
+-    src/quazip/quacrc32.cpp \
+-    src/quazip/quaadler32.cpp \
+-    src/quazip/qioapi.cpp \
+-    src/quazip/JlCompress.cpp \
+     src/gui/toolmainwindow.cpp \
+     src/gui/playerlistwidget.cpp \
+     src/gui/qled.cpp \
+@@ -401,8 +374,6 @@ SOURCES += src/database/board.cpp \
+     src/gui/historylabel.cpp \
+     src/database/streamdatabase.cpp \
+     src/database/refcount.cpp \
+-    src/quazip/unzip.cpp \
+-    src/quazip/zip.cpp \
+     src/database/arenabook.cpp \
+     src/gui/gamelistsortmodel.cpp \
+     src/gui/listwidgetex.cpp
+@@ -412,8 +383,9 @@ INCLUDEPATH += src/database
+ INCLUDEPATH += src/guess
+ INCLUDEPATH += src/gui
+ INCLUDEPATH += src/dialogs
+-INCLUDEPATH += src/quazip
+-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
++
++CONFIG += link_pkgconfig
++PKGCONFIG += quazip
+ 
+ win32 {
+     # DEFINES += ZLIB_WINAPI