public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.7.2.ebuild
@ 2010-07-31 13:35 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-07-31 13:35 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/07/31 13:35:37

  Modified:             ChangeLog gdal-1.7.2.ebuild
  Log:
  Upate to fix linking failitures. Tiff is harddep so dont useflag it.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.93                 sci-libs/gdal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.92&r2=1.93

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog	30 Jul 2010 12:27:51 -0000	1.92
+++ ChangeLog	31 Jul 2010 13:35:36 -0000	1.93
@@ -1,6 +1,9 @@
 # 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.92 2010/07/30 12:27:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.93 2010/07/31 13:35:36 scarabeus Exp $
+
+  31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
+  Upate to fix linking failitures. Tiff is harddep so dont useflag it.
 
 *gdal-1.7.2 (30 Jul 2010)
 



1.2                  sci-libs/gdal/gdal-1.7.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?r1=1.1&r2=1.2

Index: gdal-1.7.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdal-1.7.2.ebuild	30 Jul 2010 12:27:51 -0000	1.1
+++ gdal-1.7.2.ebuild	31 Jul 2010 13:35:36 -0000	1.2
@@ -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.7.2.ebuild,v 1.1 2010/07/30 12:27:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.2 2010/07/31 13:35:36 scarabeus Exp $
 
 EAPI="3"
 
@@ -18,10 +18,12 @@
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~x86-macos"
 
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pam perl png postgres python ruby sqlite tiff threads"
+IUSE="curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pam perl png postgres python ruby sqlite threads"
 
 RDEPEND="
 	dev-libs/expat
+	>=media-libs/tiff-4.0.0_beta6
+	sci-libs/libgeotiff
 	sys-libs/zlib
 	curl? ( net-misc/curl )
 	ecwj2k? ( sci-libs/libecwj2 )
@@ -48,10 +50,6 @@
 	python? ( dev-python/numpy )
 	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
 	sqlite? ( >=dev-db/sqlite-3 )
-	tiff? (
-		>=media-libs/tiff-4.0.0_beta6
-		sci-libs/libgeotiff
-	)
 "
 
 DEPEND="${RDEPEND}
@@ -96,6 +94,7 @@
 	# bsb - legal issues
 	# oracle - disabled, i dont have and can't test
 	# ingres - same story as oracle oci
+	# tiff is a hard dep
 	econf \
 		--enable-shared \
 		--disable-static \
@@ -117,10 +116,13 @@
 		--without-epsilon \
 		--without-idb \
 		--without-sde \
+		--without-libtool \
 		--with-libz="${EPREFIX}/usr/" \
 		--with-ogr \
 		--with-grib \
 		--with-vfk \
+		--with-libtiff \
+		--with-geotiff \
 		$(use_enable debug) \
 		$(use_with postgres pg) \
 		$(use_with fits cfitsio) \
@@ -128,8 +130,6 @@
 		$(use_with png) \
 		$(use_with jpeg) \
 		$(use_with jpeg pcidsk) \
-		$(use_with tiff libtiff) \
-		$(use_with tiff geotiff) \
 		$(use_with gif) \
 		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
 		$(use_with hdf5) \






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.7.2.ebuild
@ 2010-07-31 19:28 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-07-31 19:28 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/07/31 19:28:40

  Modified:             ChangeLog gdal-1.7.2.ebuild
  Log:
  Fix one too many : at sed line. Per bug #330515.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.94                 sci-libs/gdal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.93&r2=1.94

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog	31 Jul 2010 13:35:36 -0000	1.93
+++ ChangeLog	31 Jul 2010 19:28:40 -0000	1.94
@@ -1,6 +1,9 @@
 # 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.93 2010/07/31 13:35:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.94 2010/07/31 19:28:40 scarabeus Exp $
+
+  31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
+  Fix one too many : at sed line. Per bug #330515.
 
   31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
   Upate to fix linking failitures. Tiff is harddep so dont useflag it.



1.3                  sci-libs/gdal/gdal-1.7.2.ebuild

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

Index: gdal-1.7.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdal-1.7.2.ebuild	31 Jul 2010 13:35:36 -0000	1.2
+++ gdal-1.7.2.ebuild	31 Jul 2010 19:28:40 -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.7.2.ebuild,v 1.2 2010/07/31 13:35:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.3 2010/07/31 19:28:40 scarabeus Exp $
 
 EAPI="3"
 
@@ -161,7 +161,7 @@
 	        -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
 	        swig/python/GNUmakefile || die "sed python makefile failed"
 	    sed -i \
-			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir)::g" \
+			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
 	        swig/python/setup.cfg || die "sed python setup.cfg failed"
 	fi
 }






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.7.2.ebuild
@ 2010-08-08 17:12 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-08-08 17:12 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/08/08 17:12:43

  Modified:             ChangeLog gdal-1.7.2.ebuild
  Log:
  Disable paralel emake everywhere.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.95                 sci-libs/gdal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.94&r2=1.95

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog	31 Jul 2010 19:28:40 -0000	1.94
+++ ChangeLog	8 Aug 2010 17:12:42 -0000	1.95
@@ -1,6 +1,9 @@
 # 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.94 2010/07/31 19:28:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.95 2010/08/08 17:12:42 scarabeus Exp $
+
+  08 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
+  Disable paralel emake everywhere.
 
   31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
   Fix one too many : at sed line. Per bug #330515.



1.4                  sci-libs/gdal/gdal-1.7.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?r1=1.3&r2=1.4

Index: gdal-1.7.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdal-1.7.2.ebuild	31 Jul 2010 19:28:40 -0000	1.3
+++ gdal-1.7.2.ebuild	8 Aug 2010 17:12:42 -0000	1.4
@@ -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.7.2.ebuild,v 1.3 2010/07/31 19:28:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.4 2010/08/08 17:12:42 scarabeus Exp $
 
 EAPI="3"
 
@@ -61,6 +61,8 @@
 
 AT_M4DIR="${S}/m4"
 
+MAKEOPTS+=" -j1"
+
 pkg_setup() {
 	# only py2 is supported
 	python_set_active_version 2
@@ -177,7 +179,7 @@
 	done
 
 	# parallel makes fail
-	emake -j1 || die "emake failed"
+	emake || die "emake failed"
 
 	if use perl ; then
 	    cd "${S}"/swig/perl






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.7.2.ebuild
@ 2010-08-11  6:23 Fabian Groffen (grobian)
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen (grobian) @ 2010-08-11  6:23 UTC (permalink / raw
  To: gentoo-commits

grobian     10/08/11 06:23:04

  Modified:             ChangeLog gdal-1.7.2.ebuild
  Log:
  Add back soname/install_name conditional patching for Darwin
  
  (Portage version: 2.2.01.15553-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.96                 sci-libs/gdal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	8 Aug 2010 17:12:42 -0000	1.95
+++ ChangeLog	11 Aug 2010 06:23:03 -0000	1.96
@@ -1,10 +1,13 @@
 # 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.95 2010/08/08 17:12:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.96 2010/08/11 06:23:03 grobian Exp $
 
   08 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
   Disable paralel emake everywhere.
 
+  08 Aug 2010; Fabian Groffen <grobian@gentoo.org> gdal-1.7.2.ebuild:
+  Add back soname/install_name conditional patching for Darwin
+
   31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
   Fix one too many : at sed line. Per bug #330515.
 



1.5                  sci-libs/gdal/gdal-1.7.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild?r1=1.4&r2=1.5

Index: gdal-1.7.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdal-1.7.2.ebuild	8 Aug 2010 17:12:42 -0000	1.4
+++ gdal-1.7.2.ebuild	11 Aug 2010 06:23:03 -0000	1.5
@@ -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.7.2.ebuild,v 1.4 2010/08/08 17:12:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.5 2010/08/11 06:23:03 grobian Exp $
 
 EAPI="3"
 
@@ -79,8 +79,12 @@
 		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
 		swig/python/GNUmakefile || die
 
-	epatch "${FILESDIR}"/${PV}-ruby_cflags.patch \
-		"${FILESDIR}"/${PN}-1.5.0-soname.patch
+	epatch "${FILESDIR}"/${PV}-ruby_cflags.patch
+
+	# -soname is only accepted by GNU ld/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
 
 	eautoreconf
 }






^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-08-11  6:23 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-31 13:35 [gentoo-commits] gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.7.2.ebuild Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2010-07-31 19:28 Tomas Chvatal (scarabeus)
2010-08-08 17:12 Tomas Chvatal (scarabeus)
2010-08-11  6:23 Fabian Groffen (grobian)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox