[gentoo-commits] gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.6.3-r1.ebuild

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     10/03/09 13:24:23

  Modified:             ChangeLog gdal-1.6.3-r1.ebuild
  Log:
  Unbreak compilation on Darwin
  (Portage version: 2.2.00.15800-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.75                 sci-libs/gdal/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.74&r2=1.75

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	7 Mar 2010 19:32:30 -0000	1.74
+++ ChangeLog	9 Mar 2010 13:24:22 -0000	1.75
@@ -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.74 2010/03/07 19:32:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.75 2010/03/09 13:24:22 grobian Exp $
+
+  09 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+  +files/gdal-1.5.0-install_name.patch, gdal-1.6.3-r1.ebuild:
+  Unbreak compilation on Darwin
 
 *gdal-1.6.3-r1 (07 Mar 2010)
 



1.3                  sci-libs/gdal/gdal-1.6.3-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?r1=1.2&r2=1.3

Index: gdal-1.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdal-1.6.3-r1.ebuild	7 Mar 2010 22:56:28 -0000	1.2
+++ gdal-1.6.3-r1.ebuild	9 Mar 2010 13:24:22 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.6.3-r1.ebuild,v 1.2 2010/03/07 22:56:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.3 2010/03/09 13:24:22 grobian Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.5"
@@ -76,11 +76,14 @@
 	eautoconf
 
 	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
 
+	[[ ${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."