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

[Marc Schiffbauer]

commit:     d33f1acb7f5761c23a372094bffccc6633f97df0
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 23:48:30 2017 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 23:48:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33f1acb

app-misc/zygrib: fix #606510

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-misc/zygrib/files/zygrib-8.0.1-libs.patch | 2 +-
 app-misc/zygrib/zygrib-8.0.1.ebuild           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 3aa7446..b1a8937 100644
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
@@ -15,6 +15,6 @@
  
 -LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
 +LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5
- LIBS +=  -Lg2clib -lg2c -lpng -ljasper  # respect order!
+ LIBS +=  -Lg2clib -lg2c -lpng   # respect order!
  
  # ----------------------------------------------------

diff --git a/app-misc/zygrib/zygrib-8.0.1.ebuild 
b/app-misc/zygrib/zygrib-8.0.1.ebuild
index c954f4c..42da5f9 100644
--- a/app-misc/zygrib/zygrib-8.0.1.ebuild
+++ b/app-misc/zygrib/zygrib-8.0.1.ebuild
@@ -46,6 +46,7 @@ src_prepare() {
        sed -i "/QWTDIR/d" Makefile
        #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"
        default
 }