gentoo resync : 14.07.2018

13 files changed, 113 insertions, 35 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 73c33afd3e3f..53bbeeebfef3 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
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__ )
diff --git a/games-board/peg-e/Manifest b/games-board/peg-e/Manifest
index 8ac80d21feac..98ea89d1a4a1 100644
--- a/games-board/peg-e/Manifest
+++ b/games-board/peg-e/Manifest
@@ -1,3 +1,4 @@
-DIST peg-e-1.2.3-src.tar.bz2 466872 BLAKE2B bcff7b31bc2281b24b6c54466aa14e6d200b14f9204437a66a84d180607e9e108be893e4da7dd722d17c1ea7490bac34fae08ddf2dcd89f696439d026e831e96 SHA512 775bab9512ec33ef31a1fb549af365ec3ae0e8d9533c2e05f438d3affa68e10786e043925bcdec67ebdb027559773582687dbdc625d3dca307c3aadde01686dd
-EBUILD peg-e-1.2.3.ebuild 749 BLAKE2B 60d9120862d8de5a6cc6412bde0fdbb1f41542d319c5139061f43398ef1606d809bdf8c927de4f5e2dba22d23d1dbc63761f9713f3264f137420fca279fae47e SHA512 5cb855dd92e9a0228ffe4dad7e4ccdd4258bca2e7fd121fd605d2a8ddd42cf898b700fd1ac4c7b47b4950a3fb6f207941aad00c7895e8502363f8eba25413eb0
+AUX peg-e-1.2.5-gentoo.patch 253 BLAKE2B e9bb860a02f87bc255b2161e3a98c860cde367fede9d5b9bc8bef52d4934cb959fbccb50fe4a79687670fb9a264ea038a37d67c14b2f60c51a59b4818c1ee602 SHA512 8c5952603a748ba7e156451c2d0338a6dd8b89d7f8485f4360b8d353993cfd7e6c03c7b9976c649059c788f80cc4a48441ff628b342e791ba833f2c700af505a
+DIST peg-e-1.2.5-src.tar.bz2 598322 BLAKE2B f717d3e378fe69e087631abd8f0cbe3cc3bf2479ab86a608c256100778bc94baa40752463a4cb511c4ffd431ce38333318803a1dc289be4bd7d3aad595cd76d1 SHA512 cfd15e2c8cba678d64c9289ab2aa3803af48aebb3e4e545439c247d622dd914dac0735a0fd786cdba1678b448c22a9e40f48a9a1db6391fa6532e3d918c0ca10
+EBUILD peg-e-1.2.5.ebuild 688 BLAKE2B ff8b8fc6a40e90aa69d2dc7513ca2e8b662f072d22bdff72a19591a16668912e186eed8239fae5e19d1271e034ffd63e8d4939adfc52b8819c7bcf2562b965d5 SHA512 c6c27f4aea964f185e2e49f1acbcf2533ea748ad0cde2800ec68c6cde83940d89a8488000e3313f6965c018af1c9d7db632926db0d11ad31e32226935a956402
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch b/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch
new file mode 100644
index 000000000000..e6430001cf35
--- /dev/null
+++ b/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/peg-e.pro	2018-05-29 13:01:32.000000000 +0200
++++ b/peg-e.pro	2018-07-11 20:15:46.151082792 +0200
+@@ -75,7 +75,7 @@
+ 	RESOURCES = icons/icon.qrc
+ 
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+ 		BINDIR = bin
diff --git a/games-board/peg-e/peg-e-1.2.3.ebuild b/games-board/peg-e/peg-e-1.2.5.ebuild
index adc3c90c22df..e53cb97a9303 100644
--- a/games-board/peg-e/peg-e-1.2.3.ebuild
+++ b/games-board/peg-e/peg-e-1.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils gnome2-utils qmake-utils
+inherit desktop gnome2-utils qmake-utils
 
 DESCRIPTION="A peg solitaire game"
 HOMEPAGE="https://gottcode.org/peg-e/"
@@ -23,19 +23,15 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure() {
 	eqmake5
 }
 
 src_install() {
-	dobin ${PN}
-	doicon -s 48 icons/hicolor/48x48/apps/${PN}.png
-	domenu icons/${PN}.desktop
-	dodoc CREDITS ChangeLog
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/games-board/simsu/Manifest b/games-board/simsu/Manifest
index 7a9b7f23911a..013b363497db 100644
--- a/games-board/simsu/Manifest
+++ b/games-board/simsu/Manifest
@@ -1,3 +1,3 @@
-DIST simsu-1.3.4-src.tar.bz2 465505 BLAKE2B ef958ab943acd0e012cd2b5e794662ca70e2e5a5f5f4dc3744960af6abe5ae429a39f6d76b8ffd28f71e996a589139dd490ffd03501be47d414784a022ce6940 SHA512 64a8337c522614c2a87f43daf5c0c95af42c623789df3d851c3d2aae06dc6ffccaa14361458de7410c939e4b60fa930af9883de5b7b25f2cea8092075fd80605
-EBUILD simsu-1.3.4.ebuild 764 BLAKE2B 4564efd4a6d6519ec1875b03ca96c55c59d47fc28319318fdbbf94e587821c70eabbf2ee5f147c3259ed9fff3c103671ed562ecfc0893da6d5a417827594426b SHA512 f6881a3c818fe9507a71d7c23c2329bd725bb75630eb8d8e8d02115f09b2758c28e2886e6cf1be809c8c0408260892f03664585753cea486d1092ba2d68c783c
+DIST simsu-1.3.6-src.tar.bz2 597982 BLAKE2B acf13fe4e3e228cecc76a16352a4df06f14cf58307008f5679b63f1209b4cf191b28544ed3b002375afdf0de8cd92ce179f3cb367f9a5201099da99a806d60c5 SHA512 04e60ccab8345002078b7dbd253bc2a9701f9b8edbbdd9a01ac3ddffd9a5f3ccd32399216b9e497b309b6718646db11a55717e5bd201bfd2aaa80ad9b171cb94
+EBUILD simsu-1.3.6.ebuild 764 BLAKE2B 4564efd4a6d6519ec1875b03ca96c55c59d47fc28319318fdbbf94e587821c70eabbf2ee5f147c3259ed9fff3c103671ed562ecfc0893da6d5a417827594426b SHA512 f6881a3c818fe9507a71d7c23c2329bd725bb75630eb8d8e8d02115f09b2758c28e2886e6cf1be809c8c0408260892f03664585753cea486d1092ba2d68c783c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/simsu/simsu-1.3.4.ebuild b/games-board/simsu/simsu-1.3.6.ebuild
index 75b793631b42..75b793631b42 100644
--- a/games-board/simsu/simsu-1.3.4.ebuild
+++ b/games-board/simsu/simsu-1.3.6.ebuild
diff --git a/games-board/tetzle/Manifest b/games-board/tetzle/Manifest
index 44c5c37ff821..e14f4d60b874 100644
--- a/games-board/tetzle/Manifest
+++ b/games-board/tetzle/Manifest
@@ -1,3 +1,4 @@
-DIST tetzle-2.1.1-src.tar.bz2 1246920 BLAKE2B dab8128b70fd6650da190b27f356b1db9d763b65b9192cb19140d81b5ae6aed8eadef19d5c5e36a9d223e5a9dee81c8c90b604a822df7dce725b4c98fbe139b0 SHA512 80022556ccadc19f0b4357b0f629b340cb040fdff927dccd540fba5383ae4638fcca020be020c78a3809d0ca70fae7d7f19342f3e2a162f53f5e5e3b83ddf11d
-EBUILD tetzle-2.1.1.ebuild 702 BLAKE2B 58b3a728c9f415b0260c0c1f45cea3b3dc84366fb1f4659ec7ab90461585397032fc409fa434ee3abecbb00b224497d68498a51b77a3f3f1953041ecdf73e090 SHA512 c8f3ef15c4c76482816aab9968670bede057b60da40a4dab662aa79b256f59bd875a5ec5f464bd11642b61fc845b06488c849af9de87654abc09807f436f4ff2
+AUX tetzle-2.1.3-gentoo.patch 267 BLAKE2B 7432663ff3ae333e4dcef46193da107436a30395f236e2aebe11c5b3c0efe2264303f50c6eabc92167b5ba36a2e8d64d9cd27e78dc1a3aa3ddebbb29d8d567f3 SHA512 92e4a48b88df690f75890cb969863006b6b7cb1476970d87c0fa7ae59bc5aaa591004e6e962bdf7d84bb1e9668eeed0bc7131269247d79e613b7cb252bbf194c
+DIST tetzle-2.1.3-src.tar.bz2 1022680 BLAKE2B 197e2a221a779734d3cd76d5600460df42014a31a032fca2f5c181d54c004f56e6beb9803c60fd53edf5b0d4a614b3d0709fd8913d561e49a938a2f6f1943001 SHA512 6f4541ad2f67ac8a98bd0e1683d4cb6131a85a4e9d31a9dae0a97177a721038750f4276fb3a592b97804daceb1b99f0117e14c6221a6a6ce74b852b00ed5c607
+EBUILD tetzle-2.1.3.ebuild 861 BLAKE2B 34d273e9f48fd29d2c97a91e05c23231f6e794e1e1d19be2451e0ccb9997a1cf1b87027eb75c2f708dc7ef5bde027450518e8a52325f24d3507d784d52b79950 SHA512 9d3de221ff94c0f8f85920734f70b288b622d11977f890be57700805a417d85911e7b36d63b0d56f07e433046d24b64261189f1e30ed332b170ac1d6f94e8e37
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch b/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch
new file mode 100644
index 000000000000..f7d76c1276bc
--- /dev/null
+++ b/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/tetzle.pro	2018-05-29 13:20:06.000000000 +0200
++++ b/tetzle.pro	2018-07-11 20:24:01.076668458 +0200
+@@ -104,7 +104,7 @@
+ 	RC_FILE = icons/icon.rc
+ } else:unix {
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+ 		BINDIR = bin
diff --git a/games-board/tetzle/tetzle-2.1.1.ebuild b/games-board/tetzle/tetzle-2.1.3.ebuild
index de1e76ffa68a..bc3518d35a8f 100644
--- a/games-board/tetzle/tetzle-2.1.1.ebuild
+++ b/games-board/tetzle/tetzle-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils qmake-utils
+inherit gnome2-utils qmake-utils xdg-utils
 
 DESCRIPTION="A jigsaw puzzle game that uses tetrominoes for the pieces"
 HOMEPAGE="https://gottcode.org/tetzle/"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-DOCS=( ChangeLog CREDITS )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
 	eqmake5
@@ -31,12 +31,17 @@ src_configure() {
 
 src_install(){
 	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+	einstalldocs
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }