Skip to content

Commit

Permalink
app-misc/zygrib: EAPI-7 bump, add several missing || die
Browse files Browse the repository at this point in the history
Pushing this plus 2 follow-up commits per maintainer timeout on existing bugs.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Jul 15, 2020
1 parent c329d0c commit 07f31ec
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
4 changes: 2 additions & 2 deletions app-misc/zygrib/files/zygrib-8.0.1-libs.patch
Original file line number Diff line number Diff line change
@@ -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

Expand Down
29 changes: 14 additions & 15 deletions app-misc/zygrib/zygrib-8.0.1-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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/"
Expand All @@ -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"
Expand All @@ -40,20 +38,21 @@ RDEPEND="${DEPEND}"

S="${WORKDIR}/${MY_PN}-${PV}"

PATCHES=( "${FILESDIR}/${P}-libs.patch" )

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"
Expand All @@ -62,7 +61,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
}

0 comments on commit 07f31ec

Please sign in to comment.