gentoo resync : 25.08.2020

5 files changed, 82 insertions, 19 deletions

diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest
index 5f3b18700088..4d88333b1e12 100644
--- a/app-misc/zygrib/Manifest
+++ b/app-misc/zygrib/Manifest
@@ -1,4 +1,6 @@
-AUX zygrib-8.0.1-libs.patch 628 BLAKE2B 44c0df4defbc2fd847e30a4fc3b8bee017a6b9419e25a43462a02bc8da6748f19692d305476443d2f8d6fcc65b8cb50f524792ea3033e19aecacbfc922937164 SHA512 c63d9c04ea2615179ebe6d7f627c4f5db39e757e6b8758da515f04cbd02263155729628d59625604cf2d6fef359d28446a40d4ebe2c7ae16752c9e1deaf8fb07
+AUX zygrib-8.0.1-libs.patch 627 BLAKE2B 0f94addb56e17028736dde079833b144f41a98612710415224d7f265d30de8affc299e609d60da168d8c9cf02a700d661d846f5a2562f7ff2b49eea0041b4b91 SHA512 99a92039a2aa4969871b212bd495ebb30eb0eadc07c9a28c3d633bd6444fb380cfba9cb9cf75804120da04f213530d8d35043031be167cb0f04da4f4240cf5a1
+AUX zygrib-8.0.1-proj-6.patch 578 BLAKE2B 739e753682fc28b050bbb4412ff7a2e244327a13cd82591bf1e2cb20c63b7f198bf6af7273bb8475ae434c6fded58ff1c92966b0ed23636be4098e90c6e521ba SHA512 4055d93aafbb9cf449c6bd9366e7927bb6ed88607abfb2ed2035eec60704cded6540d244046f4937b89b9b4e6bc650ead0dbfd633907e7658bceec4c1df95e74
+AUX zygrib-8.0.1-qt-5.15.patch 956 BLAKE2B f01b71bdbd5061c9214d69064ddc5ae847194a7f53fd4badc16a44376be61ff813a9e198dc45b9c1487d1fb4150933802be3692102120aa1e139b0f3898a862b SHA512 6c98ab47f9b5512d5dcd442d796f94fc06ebc5050fad43a0c5bac6ef33c4c05b3554fae2b9bceaa4685d4f66dfbd71db6bb4228a6392c9bf768ac12ae2ea119e
 AUX zygrib.desktop 210 BLAKE2B 0e340f8c9ae1da700e694ac2c0a973fc00264c4981376fd0aa67587a248f27f0940a80c9937cc71d52b42429d9ec891f3837344730706ca1adab4237d8df464d SHA512 fd88b992d248d0ad01374f291d792682e6ee2b5625fc792ba002f2d912bd2982c8d20aeb9bed5cf5e43a92344f1c580573e4bcf0f949cd6cebc09eff6e407b9d
 DIST zygrib-8.0.1.tgz 19759812 BLAKE2B f7f73cb54b18e510b0097fae27400efef081fb66f2bf361d5929d69c69087107ecb1d88fe83495571fe85edbd2464910776797e5c6700505acac9585951f0854 SHA512 bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
 DIST zygrib-cities_0-300.txt.gz 517620 BLAKE2B 74916674c84b171d34f882d15a244349940e2ccad5e408f7420484b400357945cc78339c2db70eb05b428f35f4b35695b9ec655a42a23779f66649e1b7432274 SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80
@@ -6,5 +8,5 @@ DIST zygrib-cities_1k-3k.txt.gz 495119 BLAKE2B 16bfe2d5ff4c67c8e9858fa352aea23ae
 DIST zygrib-cities_300-1k.txt.gz 512733 BLAKE2B 2e480411ab8278c57f1368e809166820d9e1f5bf931e6eaf053a2448ec808b2b60d20ad5d5517cc590fc0c3c074b41a5b388856ea6145d5f6f5938d0ed50967e SHA512 f22f10c5d4d011593cf658acc2b2bdb6678d9ad26be0dfab67e2e6546439adc2c5a26d04889ddfd3544dbd2ff4d52e1d17e7d4b7d929e589fe55ceb6c0dc4112
 DIST zygrib-icon.png 851 BLAKE2B 15a300726e4ee486aa49116fe7ca74b655fe316ef0c1fee116e83cd949d273744d7e76ed3f4d847a40d74e6bbaa0d3ace71fea2ad7cd86f041576b6ab986c698 SHA512 9f36e96be1efa5df558321b631b43a7496ec812e76eb1eb5392b1a0afdec782f427b9d0b697102a661258ac1edd00b4bb0a84788c73e1fcd5f16584ad566fe5b
 DIST zygrib-maps2.4.tgz 105735981 BLAKE2B b3d666481d374cadc50ec979ed8a2ed9920bd80e2bf8a01dd2aded8a39df12e335515e84e666aeb8b01f37bc37126016bf8dc63d90a0492903c6436cf5c56a87 SHA512 0f10786ef81141299fd9550e36d976ce126b0d3523b56c10b19a839d56e17697ac93915b46f31d6691950f1e6d13c368fa1d198a5e2d830768fcb9e63034b487
-EBUILD zygrib-8.0.1-r1.ebuild 2003 BLAKE2B 6290e309841d2ec67f3aa936b4a700598dccfdfd1c63309172324970321543c783f6f45504d3d336d8e51db1cb032c1b83320bbb23c54a27ab03e656d686cc8d SHA512 1d3da9eb270c271745e0f9cfcee5d6811952d91189680b7183e8427854600ced387a469e556c69db15135703bd03168327a70bf53fbe59a3eb01e0d554b757b0
+EBUILD zygrib-8.0.1-r1.ebuild 2152 BLAKE2B 3ed5941c1c6bb48a6d59f99fe812926e4a403ac2fcafa4de3af769e90022ab1f6c7529deee3749b36d4b3d5470edd5d8c5bc8f45d7d2da333cb918a3ddaed522 SHA512 9966dd69d099a0210f821ebcd1fb5948e609eae36741ad721b93b610b6f883838bda057f0c360c614fbf5e6b7e76181ed25d24ac05ff9a22ee389d53ae5edef2
 MISC metadata.xml 337 BLAKE2B a1b4c21642a4ff8aef04e1d25f90b11c1b0917fc53fe706cfc56b4c2d6516a235d76d034a68393c472ba79b571c06be45b199083f29da867dd35170e0c639be1 SHA512 6d74d0109440f945eb9e224b5a81773348490beaa1f01e394749966e74b4d59b25c39a5e51c4de33bbaaf1ea4c3a59ef8d839d47fd66ddaeb01b075008e3356d
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
index b1a8937cc3cf..41df41830d9d 100644
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
@@ -1,5 +1,5 @@
---- src/zyGrib.pro.orig	2017-01-16 21:55:32.459388028 +0100
-+++ src/zyGrib.pro	2017-01-16 22:17:18.509256966 +0100
+--- a/src/zyGrib.pro	2017-01-16 21:55:32.459388028 +0100
++++ b/src/zyGrib.pro	2017-01-16 22:17:18.509256966 +0100
 @@ -8,7 +8,7 @@
  TARGET   = zyGrib
  
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
new file mode 100644
index 000000000000..d76a89b5e517
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
@@ -0,0 +1,20 @@
+From 481e9d3f8f8086afa7deb4ac6db60a2575dc2203 Mon Sep 17 00:00:00 2001
+From: KIVACHUK Valentin <valentin.kivachuk@irt-saintexupery.com>
+Date: Tue, 10 Sep 2019 11:29:37 +0200
+Subject: [PATCH] Fix proj build error
+
+---
+ proj_deprecated_api.patch | 2 ++
+ 1 files changed, 2 insertions(+)
+
+--- a/src/map/Projection.h	2016-11-09 17:27:38.000000000 +0100
++++ b/src/map/Projection.h	2019-09-10 10:20:27.440134499 +0200
+@@ -21,6 +21,8 @@
+ #include <QObject>
+ #include <cstdio>
+ 
++#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
++
+ #include "proj_api.h"
+ 
+ class Projection : public QObject
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
new file mode 100644
index 000000000000..7f641bd0b9e9
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
@@ -0,0 +1,38 @@
+From 73b1e8a9b622a27a03425db03bdbaee0eb88b8b7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 15 Jul 2020 14:21:13 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing headers)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/IacPlot.h | 1 +
+ src/SkewT.h   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/IacPlot.h b/src/IacPlot.h
+index dab76b6..59f6deb 100644
+--- a/src/IacPlot.h
++++ b/src/IacPlot.h
+@@ -30,6 +30,7 @@ Lecture mise en mémoire d'un fichier IAC (fleetcodes)
+ 
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QString>
+ 
+ #include "DataMeteoAbstract.h"
+diff --git a/src/SkewT.h b/src/SkewT.h
+index eb70372..36d4df8 100644
+--- a/src/SkewT.h
++++ b/src/SkewT.h
+@@ -16,6 +16,7 @@
+ #include <QMainWindow>
+ #include <QFrame>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLayout>
+ #include <QKeyEvent>
+ #include <QPrintDialog>
+-- 
+2.27.0
+
diff --git a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
index 06c11e2312ca..5742b5dc7ae2 100644
--- a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
+++ b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils qmake-utils
+EAPI=7
 
 MY_PN="zyGrib"
+inherit desktop eutils qmake-utils
 
 DESCRIPTION="GRIB File Viewer - Weather data visualization"
 HOMEPAGE="http://www.zygrib.org/"
@@ -14,15 +13,14 @@ HOMEPAGE="http://www.zygrib.org/"
 #SRC_URI="http://www.zygrib.org/getfile.php?file=${MY_PN}-${PV}.tgz -> ${P}.tgz
 SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${MY_PN}-${PV}.tgz -> ${P}.tgz
 	https://dev.gentoo.org/~mschiff/distfiles/${PN}-icon.png
-	maps?   (
+	maps? (
 		http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz
 		http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz
 		http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz
 		http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz
 	 )"
 
-LICENSE="GPL-3
-	public-domain"
+LICENSE="GPL-3 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+maps"
@@ -40,20 +38,25 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libs.patch"
+	"${FILESDIR}/${P}-proj-6.patch" # bug 686078
+	"${FILESDIR}/${P}-qt-5.15.patch" # bug 732732
+)
+
 src_prepare() {
-	sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile
-	sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile
-	sed -i "/QWTDIR/d" Makefile
+	sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile || die
+	sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile || die
+	sed -i "/QWTDIR/d" Makefile || die
 	#use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
-	sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
-	sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro
-	epatch "${FILESDIR}/${P}-libs.patch"
+	sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile || die
+	sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro || die
 	default
 }
 
 src_install() {
 	default
-	rm zyGrib
+	rm zyGrib || die
 	doicon -s 32 "${DISTDIR}/zygrib-icon.png"
 	make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}"
 	domenu "${FILESDIR}/zygrib.desktop"
@@ -62,7 +65,7 @@ src_install() {
 		insinto "/opt/${MY_PN}"
 		doins -r "${WORKDIR}/data"
 		insinto "/opt/${MY_PN}/data/gis"
-		gzip "${WORKDIR}"/*.txt
+		gzip "${WORKDIR}"/*.txt || die
 		doins "${WORKDIR}"/*.txt.gz
 	fi
 }