Add back in necessary Prefix changes from 1.6.3 that seemingly got lost with the 1.7.1 bump

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

3 files changed, 18 insertions, 11 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 69339256c2de..b861977164e3 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.78 2010/04/17 18:10:47 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.79 2010/04/18 12:31:02 grobian Exp $
+
+  18 Apr 2010; Fabian Groffen <grobian@gentoo.org> gdal-1.7.1-r1.ebuild:
+  Add back in necessary Prefix changes from 1.6.3 that seemingly got lost
+  with the 1.7.1 bump
 
   17 Apr 2010; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.3-r1.ebuild:
   Corrected eprefix configure path for ogdi (must be /usr).
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a57856d37b02..1c8cb703258d 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -22,6 +22,6 @@ EBUILD gdal-1.6.1.ebuild 6261 RMD160 6b4d7360e237785bfcefa449ea9d25d14c2787cf SH
 EBUILD gdal-1.6.2.ebuild 6258 RMD160 5a856ad8e38455c0a7acca0806f402b29720f5d1 SHA1 a749df11026604e81d3061f3be0e19e39895d4a0 SHA256 2e51a26f67ae3e1ace3911b3461586e5a95fd0b7f442b514d89ffa6619cd5aab
 EBUILD gdal-1.6.3-r1.ebuild 6634 RMD160 38c0b0bae945da9e94e31623465e0ef8ae31f1ab SHA1 110acc5f90605b040a999218ed05cb5f8485ba8d SHA256 e43b7a42c8e640c098033bd09411a01327c9649bebd4ab570aa296cb9255ab6d
 EBUILD gdal-1.6.3.ebuild 6422 RMD160 cf47cde7626034a9b12f5edda669bb49b2640ca0 SHA1 e311209140f40a9ab70df9783c44fcd998045c55 SHA256 1a02068a8c9ba47f2bed2c17a2db4e846a599ae176ee34d8dc14535a9e1b519c
-EBUILD gdal-1.7.1-r1.ebuild 7284 RMD160 fca460db663d62096314f1e5f52c1ef2ef9351df SHA1 63659d28ca1f99f5af6954efbadd8028f93729f8 SHA256 94a32e18630f08caff9ef998d92a4a69368057b64d5266eb789924ff0e5d3cd9
-MISC ChangeLog 15401 RMD160 f67a6467420ed9ab53ec0870af75ff41566713fe SHA1 4d391584d350085d17bbfa6f1b055c75582a590e SHA256 c42478d159124b5f72fd5f0637484c38f4ee9f050866bf91f54670ce724c0336
+EBUILD gdal-1.7.1-r1.ebuild 7469 RMD160 9910a57e84f46161ac3e956afa08b76f8c68d202 SHA1 afabb428b3015077f4db6267fa2ea21523b0fbef SHA256 dbb54313765321d04ce38e456490e07579932aa7faa47578aa0c29ac4e7a55e5
+MISC ChangeLog 15571 RMD160 1557fc6dc9b197f5e1dcd6f14a89a4249c11d7c3 SHA1 8f7426e4b54fa754be6561d3d1812ad396456ded SHA256 f1765197e77e1ef94c6046a977e4cb572c5aea60bf22433e7659f21fab060936
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.7.1-r1.ebuild b/sci-libs/gdal/gdal-1.7.1-r1.ebuild
index 1d2c23b1dc81..997c93efa368 100644
--- a/sci-libs/gdal/gdal-1.7.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.7.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.1-r1.ebuild,v 1.1 2010/04/12 07:11:44 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.1-r1.ebuild,v 1.2 2010/04/18 12:31:02 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 
 WANT_AUTOCONF="2.5"
 RUBY_OPTIONAL="yes"
@@ -80,12 +80,15 @@ src_prepare() {
 		swig/ruby/RubyMakefile.mk || die "sed failed"
 
 	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
 	    "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
 	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch \
 	    "${FILESDIR}"/${P}-warp_fix.patch
 
+	[[ ${CHOST} == *-darwin* ]] \
+		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
 	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."
@@ -98,23 +101,23 @@ src_configure() {
 	local use_conf=""
 
 	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool"
+		--with-libgrass=no --without-libtool --with-expat=${EPREFIX}/usr"
 
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
+	use_conf="$(use_with jpeg) $(use_with jpeg pcidsk) $(use_with png) $(use_with mysql) \
 	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
 	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
 	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
-	    $(use_with sqlite sqlite3) $(use_with jpeg2k jasper) $(use_with odbc) \
+	    $(use_with sqlite sqlite3 "${EPREFIX}"/usr) $(use_with jpeg2k jasper) $(use_with odbc) \
 	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
 	    $(use_enable debug)"
 
 	# It can't find this
 	if useq ogdi ; then
-	    use_conf="--with-ogdi=/usr ${use_conf}"
+	    use_conf="--with-ogdi=${EPREFIX}/usr ${use_conf}"
 	fi
 
 	if useq mysql ; then
-	    use_conf="--with-mysql=/usr/bin/mysql_config ${use_conf}"
+	    use_conf="--with-mysql=${EPREFIX}/usr/bin/mysql_config ${use_conf}"
 	fi
 
 	if useq gif ; then