app-misc/zygrib: fix #606510

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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 3aa7446f209baa9d0bb9c9cdd9ca30f07385c5c7..b1a8937cc3cf836c1bf7f878d8733e226b667def 100644 (file)
--- 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 c954f4cb57fd4286074acff7c98bdb001838813e..42da5f9662c0cd15af191890c084288d96e800c8 100644 (file)
--- 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
 }