gentoo resync : 14.07.2018

4 files changed, 71 insertions, 18 deletions

diff --git a/games-board/chessx/Manifest b/games-board/chessx/Manifest
index b27bc4be6ef3..0bf9dd4cd84d 100644
--- a/games-board/chessx/Manifest
+++ b/games-board/chessx/Manifest
@@ -1,4 +1,5 @@
-AUX chessx-1.4.0-zlib.patch 1033 BLAKE2B 8869c2097f94f02ed6b821edbbaff055e76c9c9e9fb535cbdeaf0e22dddf6103e596ec3df96143d240d9364face53f116ecead564de74c9a3e5e3430fb61fdd0 SHA512 f1b0e4f388665740cb714286e8bbd885308f37629eaaf36f3572bcdd912b3d28417eb6859d9ed44687b87d6589396c9e72069e7c22b95adaa5e9410e8e821d68
-DIST chessx-1.4.0.tgz 4128967 BLAKE2B 651a83a280ac2766da8f265c59d7f9014d0a7e6988d0ab981e2d9b962ce8ed8e878322d4bca536c156bf4b145e19c661fb68bb8bd7bda7872bc6ac95dc2736e4 SHA512 24e3fc60cdddb8a0136f96d6aa07d92e443264ade513be88a8c2eeb2717e04739a9b5963a3536a77aa499a1288c6cd9b8dddb312aae3087979d740f8528ec855
-EBUILD chessx-1.4.0-r1.ebuild 793 BLAKE2B 78562a5e3414bd1e792bdb8a9cbe0ec054fa09589562770c070f28cfecd14033ca20e22bacedda239bcda1eae19375d8baa1cf1660dc17b508fb196ce656a84f SHA512 4bffcd408a244c5336384a11699f88a72be7f05edd933ddc02046fd6f88c17f551443b8341406313ccea94be2b52337432dac2d3a92fb3feef05940fbf1f5314
+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
 MISC metadata.xml 329 BLAKE2B 199a6f1de51ae4a4a1104bbd4419200e7440abafe3fc5dfe40eafc08c00449461c71131cfdf1d60a0b8375f575290bbdd0af6355ae10a9259c38728e3065e6cf SHA512 41215eff9af3f31175db0f20dd13574378e4124dda8a1670440897391a5b66423c953471d6e22984dbfb3e0abef8ea3d56fa3690b45c189fae2a3c26560ec1a8
diff --git a/games-board/chessx/chessx-1.4.0-r1.ebuild b/games-board/chessx/chessx-1.4.6.ebuild
index aef4137aa945..87b4a82b974f 100644
--- a/games-board/chessx/chessx-1.4.0-r1.ebuild
+++ b/games-board/chessx/chessx-1.4.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils qmake-utils
+EAPI=7
+
+inherit desktop qmake-utils
 
 DESCRIPTION="Qt5-based Chess Database Utility"
 HOMEPAGE="http://chessx.sourceforge.net/"
@@ -14,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
@@ -21,14 +23,20 @@ RDEPEND="
 	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"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${PN}-1.4.0-zlib.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
 )
 
+src_prepare() {
+	default
+	"$(qt5_get_bindir)/lrelease" i18n/* || die
+}
+
 src_configure() {
 	eqmake5
 }
diff --git a/games-board/chessx/files/chessx-1.4.0-zlib.patch b/games-board/chessx/files/chessx-1.4.0-zlib.patch
index 36d685d9cba9..fe6bfb39d508 100644
--- a/games-board/chessx/files/chessx-1.4.0-zlib.patch
+++ b/games-board/chessx/files/chessx-1.4.0-zlib.patch
@@ -1,33 +1,33 @@
---- chessx-1.2.2/src/quazip/ioapi.h
-+++ chessx-1.2.2-patched/src/quazip/ioapi.h
+--- 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
  
---- chessx-1.2.2/src/quazip/unzip.c
-+++ chessx-1.2.2-patched/src/quazip/unzip.c
+--- 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
  
---- chessx-1.2.2/src/quazip/unzip.h
-+++ chessx-1.2.2-patched/src/quazip/unzip.h
+--- 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
  
---- chessx-1.2.2/src/quazip/zip.c
-+++ chessx-1.2.2-patched/src/quazip/zip.c
+--- 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
  
---- chessx-1.2.2/src/quazip/zip.h
-+++ chessx-1.2.2-patched/src/quazip/zip.h
+--- 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
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
new file mode 100644
index 000000000000..379de8836b94
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch
@@ -0,0 +1,44 @@
+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__ )