Fixed a shell script, jpeg2k (bug #413703, thanks jer), and keyword amd64-linux x86-linux

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

6 files changed, 41 insertions, 145 deletions

diff --git a/sci-libs/grib_api/ChangeLog b/sci-libs/grib_api/ChangeLog
index b09f74ed9e2b..daad3f4dc643 100644
--- a/sci-libs/grib_api/ChangeLog
+++ b/sci-libs/grib_api/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/grib_api
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.10 2012/04/18 21:50:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.11 2012/08/03 19:09:42 bicatali Exp $
+
+  03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/grib_api-1.9.16-jpeg2k.patch, -grib_api-1.9.5-r1.ebuild,
+  -grib_api-1.9.9-r1.ebuild, grib_api-1.9.16.ebuild, metadata.xml:
+  Fixed a shell script, jpeg2k (bug #413703, thanks jer), and keyword
+  amd64-linux x86-linux
 
 *grib_api-1.9.16 (18 Apr 2012)
 
@@ -50,4 +56,3 @@
   30 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> +grib_api-1.9.5.ebuild,
   +files/grib_api-1.9.5-autotools.patch, +metadata.xml:
   Initial import
-
diff --git a/sci-libs/grib_api/files/grib_api-1.9.16-jpeg2k.patch b/sci-libs/grib_api/files/grib_api-1.9.16-jpeg2k.patch
new file mode 100644
index 000000000000..5fb65edcbfb2
--- /dev/null
+++ b/sci-libs/grib_api/files/grib_api-1.9.16-jpeg2k.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -337,7 +337,7 @@
+     jpeg_ok=0
+ 
+     # prefer openjpeg over jasper
+-	if test $openjpeg_ok -eq 1
++	if test $openjpeg_ok -eq 1 && test $with_openjpeg = "yes"
+ 	then
+ 	  jpeg_ok=1
+       LIB_OPENJPEG='-lopenjpeg -lm'
diff --git a/sci-libs/grib_api/grib_api-1.9.16.ebuild b/sci-libs/grib_api/grib_api-1.9.16.ebuild
index 77361bb034ca..d5a2d6a19bb2 100644
--- a/sci-libs/grib_api/grib_api-1.9.16.ebuild
+++ b/sci-libs/grib_api/grib_api-1.9.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.16.ebuild,v 1.1 2012/04/18 21:50:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.16.ebuild,v 1.2 2012/08/03 19:09:41 bicatali Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -14,10 +14,14 @@ SRC_URI="http://www.ecmwf.int/products/data/software/download/software_files/${M
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fortran jpeg2k netcdf openmp png python static-libs"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran jasper jpeg2k netcdf openmp png python static-libs"
 
-DEPEND="jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) )
+DEPEND="
+	jpeg2k? (
+		jasper? ( media-libs/jasper )
+		!jasper? ( media-libs/openjpeg )
+	)
 	netcdf? ( sci-libs/netcdf )
 	png? ( media-libs/libpng )
 	python? ( dev-python/numpy )"
@@ -26,34 +30,33 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
+	sed -i -e 's:/usr/bin/ksh:/bin/sh:' tools/grib1to2.txt || die
 	epatch \
 		"${FILESDIR}"/${PN}-1.9.9-ieeefloat.patch \
-		"${FILESDIR}"/${PN}-1.9.16-autotools.patch
+		"${FILESDIR}"/${PN}-1.9.16-autotools.patch \
+		"${FILESDIR}"/${PN}-1.9.16-jpeg2k.patch
 	eautoreconf
 }
 
 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
-
 	# perl sources disappear from tar ball
 	econf \
 		--without-perl \
+		$(use_enable jpeg2k jpeg) \
+		$(
+			use jasper && \
+				echo --with-jasper=system --without-openjpeg || \
+				echo --with-openjpeg=system --without-jasper
+		) \
 		$(use_enable fortran) \
 		$(use_enable openmp omp-packing) \
 		$(use_enable python) \
 		$(use_enable python numpy) \
 		$(use_enable static-libs static) \
-		$(use_with netcdf netcdf "${EPREFIX}"/usr) \
+		$(
+			use netcdf && echo --with-netcdf="${EPREFIX}"/usr || \
+				echo --with-netcdf=none
+		) \
 		$(use_with png png-support) \
 		${myconf}
 }
diff --git a/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild b/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild
deleted file mode 100644
index 5b210beae76d..000000000000
--- a/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.5-r1.ebuild,v 1.4 2011/06/21 15:18:12 jlec Exp $
-
-EAPI=2
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="Library for decoding WMO FM-92 GRIB messages"
-HOMEPAGE="http://www.ecmwf.int/products/data/software/grib_api.html"
-SRC_URI="http://www.ecmwf.int/products/data/software/download/software_files/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fortran jpeg2k openmp png perl python static-libs"
-
-DEPEND="
-	fortran? ( virtual/fortran )
-	jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) )
-	png? ( media-libs/libpng )
-	python? ( dev-python/numpy )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-32bit.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-install-system-perl \
-		$(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 perl) \
-		$(use_with png png-support)
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install  || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-	if use doc; then
-		dohtml html/* || die
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		emake clean
-		doins -r * || die
-	fi
-}
diff --git a/sci-libs/grib_api/grib_api-1.9.9-r1.ebuild b/sci-libs/grib_api/grib_api-1.9.9-r1.ebuild
deleted file mode 100644
index c821d963d15d..000000000000
--- a/sci-libs/grib_api/grib_api-1.9.9-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/02/27 18:18:19 bicatali Exp $
-
-EAPI=4
-inherit eutils autotools
-
-#MYP=${P}_libtool
-MYP=${P}
-
-DESCRIPTION="Library for decoding WMO FM-92 GRIB messages"
-HOMEPAGE="http://www.ecmwf.int/products/data/software/grib_api.html"
-SRC_URI="http://www.ecmwf.int/products/data/software/download/software_files/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fortran jpeg2k netcdf openmp png perl python static-libs"
-
-DEPEND="jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) )
-	netcdf? ( sci-libs/netcdf )
-	png? ( media-libs/libpng )
-	python? ( dev-python/numpy )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ieeefloat.patch \
-		"${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
-
-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" \
-		$(use_enable fortran) \
-		$(use_enable openmp omp-packing) \
-		$(use_enable python) \
-		$(use_enable python numpy) \
-		$(use_enable static-libs static) \
-		$(use_with netcdf netcdf "${EPREFIX}"/usr) \
-		$(use_with perl) \
-		$(use_with png png-support) \
-		${myconf}
-}
-
-src_install() {
-	default
-	use doc && dohtml html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		emake clean
-		doins -r *
-	fi
-}
diff --git a/sci-libs/grib_api/metadata.xml b/sci-libs/grib_api/metadata.xml
index e2c65891d24c..bcf58c960489 100644
--- a/sci-libs/grib_api/metadata.xml
+++ b/sci-libs/grib_api/metadata.xml
@@ -9,4 +9,6 @@
   FM-92 GRIB edition 1 and edition 2 messages. A useful set of command
   line tools is also provided to give quick access to grib messages.
 </longdescription>
+<use><flag name="jasper">Use <pkg>media-libs/jasper</pkg> instead of
+<pkg>media-libs/openjpeg</pkg> for JPEG 2000 support</flag></use>
 </pkgmetadata>