Fixed automagic and jpeg2k support, bug #391797

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/sci-libs/grib_api/ChangeLog b/sci-libs/grib_api/ChangeLog
index 765060e23aa10f7e0de2c53584d2b897c631c3fb..613622a1859c8e976da82e9aaf3bba0050b7fe3a 100644 (file)
--- a/sci-libs/grib_api/ChangeLog
+++ b/sci-libs/grib_api/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/grib_api
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.6 2011/11/20 20:34:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.7 2011/12/20 23:16:07 bicatali Exp $
+
+  20 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> grib_api-1.9.9.ebuild:
+  Fixed automagic and jpeg2k support, bug #391797
 
 *grib_api-1.9.9 (20 Nov 2011)
 

diff --git a/sci-libs/grib_api/Manifest b/sci-libs/grib_api/Manifest
index 202a2d41b43f77a79ae6b27c483ccdf77198eda3..65c29a079fb8a975f761fd52c7b5caa6afc043ca 100644 (file)
--- a/sci-libs/grib_api/Manifest
+++ b/sci-libs/grib_api/Manifest
@@ -8,13 +8,13 @@ AUX grib_api-1.9.9-ieeefloat.patch 489 RMD160 3bb3c94e46dc94f95553cbb51a8e6f14e6
 DIST grib_api-1.9.5.tar.gz 6031267 RMD160 b0067f8b99a341d44ed1e2b1569cd7b8dba09c69 SHA1 278ca8213ea358b58a295774d66efcb65046b104 SHA256 1fbaa92e9f026548b7260e77dbd0e8201bd5629240ec4d157d6322cf7444137f
 DIST grib_api-1.9.9.tar.gz 6269463 RMD160 fb2fa217edf7c07b432af91337da3cf04039fd9c SHA1 f16333363f35cbcab496118afe1fe21ae743b756 SHA256 9fef7ce41301e94ef7151d786d7000d6db94c578e32b04497f7ee1f124985ce0
 EBUILD grib_api-1.9.5-r1.ebuild 1454 RMD160 980c8562bc75bd253d438bf2732b2bce5b4ec0b0 SHA1 107c361c2b2d24dd991493d28362c0e9aa350caf SHA256 9b4870de04f82750b966a1339cc944a924d0b2d607d0cc846c67e31f78be084f
-EBUILD grib_api-1.9.9.ebuild 1595 RMD160 24a29400f030e37ce6eae761de6d728cc37fda53 SHA1 5dccfafe033197166da7ae4d0bcff508a9675939 SHA256 56ddb5ff6ee2dead341225cd2c48f4516f7230d9128edf49afd345edb16cf07e
-MISC ChangeLog 1361 RMD160 8bda29423eaedce401135e10f31b748d60212889 SHA1 430f1ff1b9e72b7921b62a21e3d023ef26d7810f SHA256 4da8ed58be6afbcb4160796d17653e9c560cbeba5e6b7b7eb393961d00fc78c2
+EBUILD grib_api-1.9.9.ebuild 1914 RMD160 bc6178cf9370aca48f34900d6dffc55caf061e15 SHA1 d67e600f0b6bdd5a8ec0b67ca920de986f938eeb SHA256 881650090a62e5c1dfaf091f66cb99ed9137643af835aac4cf242208d9a06bc3
+MISC ChangeLog 1490 RMD160 a302d8cd42e766a3df1e7c7491fe466c9ffac894 SHA1 20acade9e2e93ba727c5d5821ad732208603c974 SHA256 06d09350f50875edb130dd38ea037fc2f56642f7987a3f2daa85e591ee250add
 MISC metadata.xml 547 RMD160 027cff497339b515ee70e6a88002b6a13ae0636b SHA1 2178680f3965b593491d88e874777af50e2451ac SHA256 d8075d9dc0ecd812d815ff4a8ceb01209b7576160a1a8bc6bd5ac0aae88ba609
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7JZG4ACgkQ1ycZbhPLE2DUrQCgsadTHNnnhHqOjDZrSZW8+nAw
-uAoAmgM24POF0szJ4WJsp+FA+zaQF7Gi
-=4pDk
+iEYEARECAAYFAk7xF1YACgkQ1ycZbhPLE2DhMwCgj2wUcKqRzgxptYoQRHlkwwXy
+DNUAnjbbAB4uCpbo1r9WSRUQQGCk+3OJ
+=a76/
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/grib_api/grib_api-1.9.9.ebuild b/sci-libs/grib_api/grib_api-1.9.9.ebuild
index beccc2016d9895331d146ceeb5a5b93b472087fe..c39ad59c10ddf26d67614ba3adee2da87b16a176 100644 (file)
--- a/sci-libs/grib_api/grib_api-1.9.9.ebuild
+++ b/sci-libs/grib_api/grib_api-1.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild,v 1.1 2011/11/20 20:34:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild,v 1.2 2011/12/20 23:16:07 bicatali Exp $
 
 EAPI=3
 inherit eutils autotools
@@ -33,19 +33,29 @@ src_prepare() {
 }
 
 src_configure() {
+       local myconf
+       if use jpeg2k; then
+               myconf="--enable-jpeg"
+               if hasv media-libs/jasper; then
+                       myconf="${myconf} --with-jasper=system --without-openjpeg"
+               elif hasv media-libs/openjpeg; then
+                       myconf="${myconf} --without-jasper --with-openjpeg=system"
+               fi
+       else
+               myconf="--disable-jpeg --without-jasper --without-openjpeg"
+       fi
        econf \
                --enable-install-system-perl \
-               --with-perl-options=INSTALLDIRS=vendor \
+               --with-perl-options="INSTALLDIRS=vendor" \
                $(use_enable fortran) \
-               $(use_enable jpeg2k jpeg) \
                $(use_enable openmp omp-packing) \
                $(use_enable python) \
                $(use_enable python numpy) \
                $(use_enable static-libs static) \
-               $(use_with netcdf netcdf "${EPRFIX}"/usr) \
+               $(use_with netcdf netcdf "${EPREFIX}"/usr) \
                $(use_with perl) \
-               $(use_with png png-support)
-
+               $(use_with png png-support) \
+               ${myconf}
 }
 
 src_install() {