[patch] hasty ebuild patch

grib_api-1.9.16.ebuild-413703.patch (text/plain), 2.61 KB, created by Jeroen Roovers (RETIRED) on 2012-04-27 17:04:06 UTC

Index: grib_api-1.9.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.16.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 grib_api-1.9.16.ebuild
--- grib_api-1.9.16.ebuild	18 Apr 2012 21:50:32 -0000	1.1
+++ grib_api-1.9.16.ebuild	27 Apr 2012 17:03:18 -0000
@@ -15,9 +15,13 @@
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fortran jpeg2k netcdf openmp png python static-libs"
+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 )"
@@ -28,32 +32,30 @@
 src_prepare() {
 	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}
 }
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/grib_api/metadata.xml,v
retrieving revision 1.1
diff -u -B -r1.1 metadata.xml
--- metadata.xml	30 Nov 2010 17:49:46 -0000	1.1
+++ metadata.xml	27 Apr 2012 17:03:18 -0000
@@ -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>