1 |
commit: 871c9b356e0c940d25c204726fca91b300c94604 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 29 08:06:11 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 29 08:07:21 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871c9b35 |
7 |
|
8 |
app-misc/zygrib: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/637150 |
11 |
Closes: https://bugs.gentoo.org/828986 |
12 |
Closes: https://bugs.gentoo.org/854744 |
13 |
Closes: https://bugs.gentoo.org/686078 |
14 |
Closes: https://bugs.gentoo.org/733066 |
15 |
Closes: https://bugs.gentoo.org/733068 |
16 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
17 |
|
18 |
app-misc/zygrib/Manifest | 6 -- |
19 |
app-misc/zygrib/files/zygrib-8.0.1-libs.patch | 20 ------- |
20 |
app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch | 20 ------- |
21 |
app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch | 38 ------------- |
22 |
app-misc/zygrib/files/zygrib.desktop | 11 ---- |
23 |
app-misc/zygrib/metadata.xml | 10 ---- |
24 |
app-misc/zygrib/zygrib-8.0.1-r2.ebuild | 71 ------------------------ |
25 |
profiles/package.mask | 7 --- |
26 |
8 files changed, 183 deletions(-) |
27 |
|
28 |
diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest |
29 |
deleted file mode 100644 |
30 |
index 8800b51a083d..000000000000 |
31 |
--- a/app-misc/zygrib/Manifest |
32 |
+++ /dev/null |
33 |
@@ -1,6 +0,0 @@ |
34 |
-DIST zygrib-8.0.1.tgz 19759812 BLAKE2B f7f73cb54b18e510b0097fae27400efef081fb66f2bf361d5929d69c69087107ecb1d88fe83495571fe85edbd2464910776797e5c6700505acac9585951f0854 SHA512 bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d |
35 |
-DIST zygrib-cities_0-300.txt.gz 517620 BLAKE2B 74916674c84b171d34f882d15a244349940e2ccad5e408f7420484b400357945cc78339c2db70eb05b428f35f4b35695b9ec655a42a23779f66649e1b7432274 SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80 |
36 |
-DIST zygrib-cities_1k-3k.txt.gz 495119 BLAKE2B 16bfe2d5ff4c67c8e9858fa352aea23ae13ffa7668183d0cb3fe5e98cc6683e8a969c802c9297a29e9773dd471f233a900f2fca2e5e58f4090e0999107e9a72c SHA512 010d6688b9c381f0ace549c53a45f8bd43f1d6846dc01241ab7bfdf30b0629f39ef2a9a715c55a534634ad8480bc2edc2796a09f0c369406027f35f6b4ba8c08 |
37 |
-DIST zygrib-cities_300-1k.txt.gz 512733 BLAKE2B 2e480411ab8278c57f1368e809166820d9e1f5bf931e6eaf053a2448ec808b2b60d20ad5d5517cc590fc0c3c074b41a5b388856ea6145d5f6f5938d0ed50967e SHA512 f22f10c5d4d011593cf658acc2b2bdb6678d9ad26be0dfab67e2e6546439adc2c5a26d04889ddfd3544dbd2ff4d52e1d17e7d4b7d929e589fe55ceb6c0dc4112 |
38 |
-DIST zygrib-icon.png 851 BLAKE2B 15a300726e4ee486aa49116fe7ca74b655fe316ef0c1fee116e83cd949d273744d7e76ed3f4d847a40d74e6bbaa0d3ace71fea2ad7cd86f041576b6ab986c698 SHA512 9f36e96be1efa5df558321b631b43a7496ec812e76eb1eb5392b1a0afdec782f427b9d0b697102a661258ac1edd00b4bb0a84788c73e1fcd5f16584ad566fe5b |
39 |
-DIST zygrib-maps2.4.tgz 105735981 BLAKE2B b3d666481d374cadc50ec979ed8a2ed9920bd80e2bf8a01dd2aded8a39df12e335515e84e666aeb8b01f37bc37126016bf8dc63d90a0492903c6436cf5c56a87 SHA512 0f10786ef81141299fd9550e36d976ce126b0d3523b56c10b19a839d56e17697ac93915b46f31d6691950f1e6d13c368fa1d198a5e2d830768fcb9e63034b487 |
40 |
|
41 |
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch |
42 |
deleted file mode 100644 |
43 |
index 41df41830d9d..000000000000 |
44 |
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch |
45 |
+++ /dev/null |
46 |
@@ -1,20 +0,0 @@ |
47 |
---- a/src/zyGrib.pro 2017-01-16 21:55:32.459388028 +0100 |
48 |
-+++ b/src/zyGrib.pro 2017-01-16 22:17:18.509256966 +0100 |
49 |
-@@ -8,7 +8,7 @@ |
50 |
- TARGET = zyGrib |
51 |
- |
52 |
- DEPENDPATH += . util map GUI |
53 |
--INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib |
54 |
-+INCLUDEPATH += . util map GUI curvedrawer /usr/include/qwt6 g2clib |
55 |
- |
56 |
- # ---------------------------------------------------- |
57 |
- # platform specific |
58 |
-@@ -35,7 +35,7 @@ |
59 |
- } |
60 |
- } |
61 |
- |
62 |
--LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt |
63 |
-+LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5 |
64 |
- LIBS += -Lg2clib -lg2c -lpng # respect order! |
65 |
- |
66 |
- # ---------------------------------------------------- |
67 |
|
68 |
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 |
69 |
deleted file mode 100644 |
70 |
index d76a89b5e517..000000000000 |
71 |
--- a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch |
72 |
+++ /dev/null |
73 |
@@ -1,20 +0,0 @@ |
74 |
-From 481e9d3f8f8086afa7deb4ac6db60a2575dc2203 Mon Sep 17 00:00:00 2001 |
75 |
-From: KIVACHUK Valentin <valentin.kivachuk@××××××××××××××××.com> |
76 |
-Date: Tue, 10 Sep 2019 11:29:37 +0200 |
77 |
-Subject: [PATCH] Fix proj build error |
78 |
- |
79 |
---- |
80 |
- proj_deprecated_api.patch | 2 ++ |
81 |
- 1 files changed, 2 insertions(+) |
82 |
- |
83 |
---- a/src/map/Projection.h 2016-11-09 17:27:38.000000000 +0100 |
84 |
-+++ b/src/map/Projection.h 2019-09-10 10:20:27.440134499 +0200 |
85 |
-@@ -21,6 +21,8 @@ |
86 |
- #include <QObject> |
87 |
- #include <cstdio> |
88 |
- |
89 |
-+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H |
90 |
-+ |
91 |
- #include "proj_api.h" |
92 |
- |
93 |
- class Projection : public QObject |
94 |
|
95 |
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 |
96 |
deleted file mode 100644 |
97 |
index 7f641bd0b9e9..000000000000 |
98 |
--- a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch |
99 |
+++ /dev/null |
100 |
@@ -1,38 +0,0 @@ |
101 |
-From 73b1e8a9b622a27a03425db03bdbaee0eb88b8b7 Mon Sep 17 00:00:00 2001 |
102 |
-From: Andreas Sturmlechner <asturm@g.o> |
103 |
-Date: Wed, 15 Jul 2020 14:21:13 +0200 |
104 |
-Subject: [PATCH] Fix build with Qt 5.15 (missing headers) |
105 |
- |
106 |
-Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
107 |
---- |
108 |
- src/IacPlot.h | 1 + |
109 |
- src/SkewT.h | 1 + |
110 |
- 2 files changed, 2 insertions(+) |
111 |
- |
112 |
-diff --git a/src/IacPlot.h b/src/IacPlot.h |
113 |
-index dab76b6..59f6deb 100644 |
114 |
---- a/src/IacPlot.h |
115 |
-+++ b/src/IacPlot.h |
116 |
-@@ -30,6 +30,7 @@ Lecture mise en mémoire d'un fichier IAC (fleetcodes) |
117 |
- |
118 |
- #include <QApplication> |
119 |
- #include <QPainter> |
120 |
-+#include <QPainterPath> |
121 |
- #include <QString> |
122 |
- |
123 |
- #include "DataMeteoAbstract.h" |
124 |
-diff --git a/src/SkewT.h b/src/SkewT.h |
125 |
-index eb70372..36d4df8 100644 |
126 |
---- a/src/SkewT.h |
127 |
-+++ b/src/SkewT.h |
128 |
-@@ -16,6 +16,7 @@ |
129 |
- #include <QMainWindow> |
130 |
- #include <QFrame> |
131 |
- #include <QPainter> |
132 |
-+#include <QPainterPath> |
133 |
- #include <QLayout> |
134 |
- #include <QKeyEvent> |
135 |
- #include <QPrintDialog> |
136 |
--- |
137 |
-2.27.0 |
138 |
- |
139 |
|
140 |
diff --git a/app-misc/zygrib/files/zygrib.desktop b/app-misc/zygrib/files/zygrib.desktop |
141 |
deleted file mode 100644 |
142 |
index 92873a1b87a5..000000000000 |
143 |
--- a/app-misc/zygrib/files/zygrib.desktop |
144 |
+++ /dev/null |
145 |
@@ -1,11 +0,0 @@ |
146 |
-[Desktop Entry] |
147 |
-Version=1.0 |
148 |
-Name=zyGrib |
149 |
-GenericName=GRIB File Viewer |
150 |
-Comment=Weather data visualization |
151 |
-Exec=/usr/bin/zygrib |
152 |
-Terminal=false |
153 |
-X-MultipleArgs=false |
154 |
-Icon=zygrib |
155 |
-Type=Application |
156 |
-Categories=Network; |
157 |
|
158 |
diff --git a/app-misc/zygrib/metadata.xml b/app-misc/zygrib/metadata.xml |
159 |
deleted file mode 100644 |
160 |
index bdf79679ac79..000000000000 |
161 |
--- a/app-misc/zygrib/metadata.xml |
162 |
+++ /dev/null |
163 |
@@ -1,10 +0,0 @@ |
164 |
-<?xml version="1.0" encoding="UTF-8"?> |
165 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
166 |
-<pkgmetadata> |
167 |
- <maintainer type="person"> |
168 |
- <email>mschiff@g.o</email> |
169 |
- </maintainer> |
170 |
- <use> |
171 |
- <flag name="maps">Installs additional GSHHS maps for high resolution coastline data and cities</flag> |
172 |
- </use> |
173 |
-</pkgmetadata> |
174 |
|
175 |
diff --git a/app-misc/zygrib/zygrib-8.0.1-r2.ebuild b/app-misc/zygrib/zygrib-8.0.1-r2.ebuild |
176 |
deleted file mode 100644 |
177 |
index ec457d480dc5..000000000000 |
178 |
--- a/app-misc/zygrib/zygrib-8.0.1-r2.ebuild |
179 |
+++ /dev/null |
180 |
@@ -1,71 +0,0 @@ |
181 |
-# Copyright 1999-2021 Gentoo Authors |
182 |
-# Distributed under the terms of the GNU General Public License v2 |
183 |
- |
184 |
-EAPI=7 |
185 |
- |
186 |
-MY_PN="zyGrib" |
187 |
-inherit desktop eutils qmake-utils |
188 |
- |
189 |
-DESCRIPTION="GRIB File Viewer - Weather data visualization" |
190 |
-HOMEPAGE="http://www.zygrib.org/" |
191 |
-# zygrib.org has a DDoS protection and only allowd interactive downloads, |
192 |
-# so we mirror the tarball... |
193 |
-#SRC_URI="http://www.zygrib.org/getfile.php?file=${MY_PN}-${PV}.tgz -> ${P}.tgz |
194 |
-SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${MY_PN}-${PV}.tgz -> ${P}.tgz |
195 |
- https://dev.gentoo.org/~mschiff/distfiles/${PN}-icon.png |
196 |
- maps? ( |
197 |
- http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz |
198 |
- http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz |
199 |
- http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz |
200 |
- http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz |
201 |
- )" |
202 |
- |
203 |
-LICENSE="GPL-3 public-domain" |
204 |
-SLOT="0" |
205 |
-KEYWORDS="~amd64 ~x86" |
206 |
-IUSE="+maps" |
207 |
- |
208 |
-DEPEND="app-arch/bzip2 |
209 |
- dev-qt/qtnetwork:5 |
210 |
- dev-qt/qtsvg:5 |
211 |
- media-libs/libpng:* |
212 |
- sci-libs/libnova |
213 |
- <sci-libs/proj-8:= |
214 |
- sys-libs/zlib |
215 |
- x11-libs/qwt:6[qt5(+)]" |
216 |
- |
217 |
-RDEPEND="${DEPEND}" |
218 |
- |
219 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
220 |
- |
221 |
-PATCHES=( |
222 |
- "${FILESDIR}/${P}-libs.patch" |
223 |
- "${FILESDIR}/${P}-proj-6.patch" # bug 686078 |
224 |
- "${FILESDIR}/${P}-qt-5.15.patch" # bug 732732 |
225 |
-) |
226 |
- |
227 |
-src_prepare() { |
228 |
- sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile || die |
229 |
- sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile || die |
230 |
- sed -i "/QWTDIR/d" Makefile || die |
231 |
- #use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile |
232 |
- sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile || die |
233 |
- sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro || die |
234 |
- default |
235 |
-} |
236 |
- |
237 |
-src_install() { |
238 |
- default |
239 |
- rm zyGrib || die |
240 |
- doicon -s 32 "${DISTDIR}/zygrib-icon.png" |
241 |
- make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}" |
242 |
- domenu "${FILESDIR}/zygrib.desktop" |
243 |
- |
244 |
- if use maps; then |
245 |
- insinto "/opt/${MY_PN}" |
246 |
- doins -r "${WORKDIR}/data" |
247 |
- insinto "/opt/${MY_PN}/data/gis" |
248 |
- gzip "${WORKDIR}"/*.txt || die |
249 |
- doins "${WORKDIR}"/*.txt.gz |
250 |
- fi |
251 |
-} |
252 |
|
253 |
diff --git a/profiles/package.mask b/profiles/package.mask |
254 |
index 2f7af388d673..802fbdab5660 100644 |
255 |
--- a/profiles/package.mask |
256 |
+++ b/profiles/package.mask |
257 |
@@ -296,13 +296,6 @@ dev-qt/qtwebsockets:6 |
258 |
# sci-libs/gsl. Bug #862486. Removal on 2022-08-31. |
259 |
sci-chemistry/numbat |
260 |
|
261 |
-# Marc Schiffbauer <mschiff@g.o> (2022-07-30) |
262 |
-# No update since 2016, compilation and build system |
263 |
-# errors |
264 |
-# Bugs #637150, #686078, #733066, #733068, #828986, #854744 |
265 |
-# removal in 30 days (2022-08-29) |
266 |
-app-misc/zygrib |
267 |
- |
268 |
# Marek Szuba <marecki@g.o> (2022-07-13) |
269 |
# Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them), |
270 |
# which have seriously messed up dependency handling and trigger several |