[gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/, profiles/

[gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/, profiles/

[Jakov Smolić]

commit:     871c9b356e0c940d25c204726fca91b300c94604
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 08:06:11 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 08:07:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871c9b35

app-misc/zygrib: treeclean

Closes: https://bugs.gentoo.org/637150
Closes: https://bugs.gentoo.org/828986
Closes: https://bugs.gentoo.org/854744
Closes: https://bugs.gentoo.org/686078
Closes: https://bugs.gentoo.org/733066
Closes: https://bugs.gentoo.org/733068
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-misc/zygrib/Manifest                         |  6 --
 app-misc/zygrib/files/zygrib-8.0.1-libs.patch    | 20 -------
 app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch  | 20 -------
 app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch | 38 -------------
 app-misc/zygrib/files/zygrib.desktop             | 11 ----
 app-misc/zygrib/metadata.xml                     | 10 ----
 app-misc/zygrib/zygrib-8.0.1-r2.ebuild           | 71 ------------------------
 profiles/package.mask                            |  7 ---
 8 files changed, 183 deletions(-)

diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest
deleted file mode 100644
index 8800b51a083d..000000000000
--- a/app-misc/zygrib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST zygrib-8.0.1.tgz 19759812 BLAKE2B f7f73cb54b18e510b0097fae27400efef081fb66f2bf361d5929d69c69087107ecb1d88fe83495571fe85edbd2464910776797e5c6700505acac9585951f0854 SHA512 bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
-DIST zygrib-cities_0-300.txt.gz 517620 BLAKE2B 74916674c84b171d34f882d15a244349940e2ccad5e408f7420484b400357945cc78339c2db70eb05b428f35f4b35695b9ec655a42a23779f66649e1b7432274 SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80
-DIST zygrib-cities_1k-3k.txt.gz 495119 BLAKE2B 16bfe2d5ff4c67c8e9858fa352aea23ae13ffa7668183d0cb3fe5e98cc6683e8a969c802c9297a29e9773dd471f233a900f2fca2e5e58f4090e0999107e9a72c SHA512 010d6688b9c381f0ace549c53a45f8bd43f1d6846dc01241ab7bfdf30b0629f39ef2a9a715c55a534634ad8480bc2edc2796a09f0c369406027f35f6b4ba8c08
-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

diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
deleted file mode 100644
index 41df41830d9d..000000000000
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
- 
- DEPENDPATH  += . util map GUI
--INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
-+INCLUDEPATH += . util map GUI curvedrawer /usr/include/qwt6 g2clib
- 
- # ----------------------------------------------------
- # platform specific
-@@ -35,7 +35,7 @@
- }
- }
- 
--LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
-+LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5
- LIBS +=  -Lg2clib -lg2c -lpng   # respect order!
- 
- # ----------------------------------------------------

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
deleted file mode 100644
index d76a89b5e517..000000000000
--- a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 7f641bd0b9e9..000000000000
--- a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/files/zygrib.desktop b/app-misc/zygrib/files/zygrib.desktop
deleted file mode 100644
index 92873a1b87a5..000000000000
--- a/app-misc/zygrib/files/zygrib.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=zyGrib
-GenericName=GRIB File Viewer
-Comment=Weather data visualization
-Exec=/usr/bin/zygrib
-Terminal=false
-X-MultipleArgs=false
-Icon=zygrib
-Type=Application
-Categories=Network;

diff --git a/app-misc/zygrib/metadata.xml b/app-misc/zygrib/metadata.xml
deleted file mode 100644
index bdf79679ac79..000000000000
--- a/app-misc/zygrib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="maps">Installs additional GSHHS maps for high resolution coastline data and cities</flag>
-	</use>
-</pkgmetadata>

diff --git a/app-misc/zygrib/zygrib-8.0.1-r2.ebuild b/app-misc/zygrib/zygrib-8.0.1-r2.ebuild
deleted file mode 100644
index ec457d480dc5..000000000000
--- a/app-misc/zygrib/zygrib-8.0.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="zyGrib"
-inherit desktop eutils qmake-utils
-
-DESCRIPTION="GRIB File Viewer - Weather data visualization"
-HOMEPAGE="http://www.zygrib.org/"
-# zygrib.org has a DDoS protection and only allowd interactive downloads,
-# so we mirror the tarball...
-#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? (
-		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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maps"
-
-DEPEND="app-arch/bzip2
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	media-libs/libpng:*
-	sci-libs/libnova
-	<sci-libs/proj-8:=
-	sys-libs/zlib
-	x11-libs/qwt:6[qt5(+)]"
-
-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 || 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 || die
-	sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro || die
-	default
-}
-
-src_install() {
-	default
-	rm zyGrib || die
-	doicon -s 32 "${DISTDIR}/zygrib-icon.png"
-	make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}"
-	domenu "${FILESDIR}/zygrib.desktop"
-
-	if use maps; then
-		insinto "/opt/${MY_PN}"
-		doins -r "${WORKDIR}/data"
-		insinto "/opt/${MY_PN}/data/gis"
-		gzip "${WORKDIR}"/*.txt || die
-		doins "${WORKDIR}"/*.txt.gz
-	fi
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 2f7af388d673..802fbdab5660 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -296,13 +296,6 @@ dev-qt/qtwebsockets:6
 # sci-libs/gsl. Bug #862486. Removal on 2022-08-31.
 sci-chemistry/numbat
 
-# Marc Schiffbauer <mschiff@gentoo.org> (2022-07-30)
-# No update since 2016, compilation and build system
-# errors
-# Bugs #637150, #686078, #733066, #733068, #828986, #854744
-# removal in 30 days (2022-08-29)
-app-misc/zygrib
-
 # Marek Szuba <marecki@gentoo.org> (2022-07-13)
 # Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them),
 # which have seriously messed up dependency handling and trigger several