Migrate to EAPI 2 in order to remove built_with_use usage.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 19 insertions, 27 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 0b1d88da1be5..7d0fcc33a64b 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.63 2009/08/08 17:25:02 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.64 2009/09/18 18:48:22 betelgeuse Exp $
+
+  18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> gdal-1.6.1.ebuild:
+  Migrate to EAPI 2 in order to remove built_with_use usage.
 
   08 Aug 2009; Hanno Boeck <hanno@gentoo.org> gdal-1.6.1.ebuild:
   Don't apply mysql_ogr_header patch, already upstream-applied, fixes
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 9f69857dd009..60fbd88c3428 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -16,13 +16,13 @@ DIST gdal-1.6.1.tar.gz 6999411 RMD160 64955b4940675475bfaf0cc8fd5f0b264b56b0bb S
 EBUILD gdal-1.5.2.ebuild 6420 RMD160 0619a3660937eda53d501235d3b95de7f492e13f SHA1 3d0a948f9959ad3b0e232476fe77345db6d727b8 SHA256 c09aabaa7019c25adf18763d16bfde2d5b4e801dc2a4747cc22155e1f5767fce
 EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
 EBUILD gdal-1.6.0-r1.ebuild 6652 RMD160 18ff508ff3e30f9ca59ae1b0d14b7bfd328f4742 SHA1 b03d0cadc2ecf18e637f91536c5d01a3a1491401 SHA256 9601fc023623040470983dca89fae17770034158db3daed485d6c4d3e5554907
-EBUILD gdal-1.6.1.ebuild 6570 RMD160 8e2c2eb6536f53e640f346a8d4924fc7ba24adc4 SHA1 64f8d6227411cbafb57221cc6ee0737c693cb0cf SHA256 43c69bfce66c018636cf0245f862401cd3633e87b18b70a688ffa6c8fdf4c599
-MISC ChangeLog 12945 RMD160 333570e7b4cadd667f497fb367dc5998db06310f SHA1 e42b459408b9058e438094daa3d22c8a22b404e9 SHA256 9539b8d0ec3b9c01ee77f57d918a34ea5ecd9024e9fbc2bba931780d0640a3d3
+EBUILD gdal-1.6.1.ebuild 6220 RMD160 f372b368d6c73a63c630df3acf76a2bb60275c48 SHA1 512559db9799930f2684e3b68a280aa4f26a6833 SHA256 3cda80cf22134f25b7e6487dc3dd69fa42fe7d8f664a609ff034c5bb53f0923e
+MISC ChangeLog 13084 RMD160 52d9d209ec7c2e0631e591923d3cdc707fa758a6 SHA1 ba9399d7bf5033ad81b186e8c9f75d56ce057d51 SHA256 52894b3a7b9fde0554e6ce9791bfb80137f34c77b43139ee4b2197a0cd43cc4c
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp9tO0ACgkQr2QksT29OyC1hACfa2dlDRKAZcmeGdmDN22KZcb7
-l+oAn28Wf5UxOdTMlhBG4LO4CNDiXnlF
-=hcGf
+iEYEARECAAYFAkqz1fwACgkQcxLzpIGCsLQGawCfV27M3rHmP+tbiQeVMkydeeyz
+Q2wAmQESXdNRcfxP1mpp9S5JJsIFg7Rl
+=Xxs2
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.6.1.ebuild b/sci-libs/gdal/gdal-1.6.1.ebuild
index 0743550df7e7..5343815b2c22 100644
--- a/sci-libs/gdal/gdal-1.6.1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.2 2009/08/08 17:25:02 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.3 2009/09/18 18:48:22 betelgeuse Exp $
 
+EAPI="2"
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module ruby toolchain-funcs
 
@@ -37,7 +38,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	postgres? ( virtual/postgresql-server )
 	|| (
 	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
+	    hdf? ( sci-libs/hdf[szip] )
 	)
 	|| (
 	    jpeg2k? ( media-libs/jasper )
@@ -66,10 +67,7 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	eaclocal
 	eautoconf
 
@@ -79,25 +77,14 @@ src_unpack() {
 	    "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
 	    "${FILESDIR}"/${P}-ruby-make.patch
 
-	if useq hdf; then
-	    einfo	"Checking if HDF4 is compiled with szip..."
-	    if built_with_use sci-libs/hdf szip ; then
-		einfo	"Found HDF4 compiled with szip. Nice."
-	    else
-		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
-		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
-	    fi
-
-	    if useq netcdf; then
+	if useq hdf && useq netcdf; then
 		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
 		ewarn "common; HDF5 is now the preferred choice for HDF data."
 		die "Please disable either the hdf or netcdf use flag."
-	    fi
 	fi
 }
 
-src_compile() {
+src_configure() {
 
 	distutils_python_version
 
@@ -140,7 +127,9 @@ src_compile() {
 	    GDALmake.opt.in || die "sed gdalmake.opt failed"
 
 	econf ${pkg_conf} ${use_conf} || die "econf failed"
+}
 
+src_compile() {
 	# parallel makes fail on the ogr stuff (C++, what can I say?)
 	# also failing with gcc4 in libcsf
 	emake -j1 || die "emake failed"
@@ -175,10 +164,10 @@ src_install() {
 	fi
 
 	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	make DESTDIR="${D}" install \
+	emake DESTDIR="${D}" install \
 	    || die "make install failed"
 
-	dodoc Doxyfile HOWTO-RELEASE NEWS
+	dodoc Doxyfile HOWTO-RELEASE NEWS || die
 
 	if useq doc ; then
 	    dohtml html/* || die "install html failed"