summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2008-01-04 05:24:28 +0000
committerSteve Arnold <nerdboy@gentoo.org>2008-01-04 05:24:28 +0000
commit8293d1306162ff9a49350568265a77ee6b811d80 (patch)
tree3793ab910aba36d552b7ba8384cf54612c589bc8 /sci-libs/gdal
parentprune unused versions (diff)
downloadhistorical-8293d1306162ff9a49350568265a77ee6b811d80.tar.gz
historical-8293d1306162ff9a49350568265a77ee6b811d80.tar.bz2
historical-8293d1306162ff9a49350568265a77ee6b811d80.zip
fixed mysql borkage
Package-Manager: portage-2.1.4_rc12
Diffstat (limited to 'sci-libs/gdal')
-rw-r--r--sci-libs/gdal/ChangeLog5
-rw-r--r--sci-libs/gdal/Manifest16
-rw-r--r--sci-libs/gdal/gdal-1.4.2.ebuild9
3 files changed, 17 insertions, 13 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index d5d3ef0accd0..45d9af163471 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/gdal
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.33 2008/01/04 04:08:15 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.34 2008/01/04 05:24:28 nerdboy Exp $
+
+ 04 Jan 2008; Steve Arnold <nerdboy@gentoo.org> gdal-1.4.2.ebuild:
+ fixed mysql borkage; no idea what happened...
04 Jan 2008; Steve Arnold <nerdboy@gentoo.org>
-files/gdal-1.2.6-installpathfix.patch,
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 54d031bf00b7..970a72aa20d4 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -37,14 +37,14 @@ EBUILD gdal-1.3.2.ebuild 4710 RMD160 6c5f327b0c69a19078b5d87931826abef174c364 SH
MD5 ada46cc0dfc33f6964aed690000fbfb5 gdal-1.3.2.ebuild 4710
RMD160 6c5f327b0c69a19078b5d87931826abef174c364 gdal-1.3.2.ebuild 4710
SHA256 2db23bb124b9a6fb019da6e6c3494f406c6bea8ec72871af1e0a32b8018e834f gdal-1.3.2.ebuild 4710
-EBUILD gdal-1.4.2.ebuild 4544 RMD160 58188a76c432070714a57fab09c7f9cdaec9ff62 SHA1 14e55e59ae3c7e60536088b9e99690bdfb346092 SHA256 675973dbbb84ab09f187e8b2f9d32f691f1cf732b051018f7898e8127d2ae370
-MD5 a53eb25565c8a186c96fbd474f4c1c3c gdal-1.4.2.ebuild 4544
-RMD160 58188a76c432070714a57fab09c7f9cdaec9ff62 gdal-1.4.2.ebuild 4544
-SHA256 675973dbbb84ab09f187e8b2f9d32f691f1cf732b051018f7898e8127d2ae370 gdal-1.4.2.ebuild 4544
-MISC ChangeLog 6784 RMD160 fdec208eab24c7cdbb79f6f669853e94e234a523 SHA1 d49de83727da3be4d2e1875f659f5ada4a2630ff SHA256 35d60e749c78bc1c01960b10c6886f47ba04b3146939c9c509fb4897affe12dd
-MD5 dbe218d6db323a9334cb14c58a968184 ChangeLog 6784
-RMD160 fdec208eab24c7cdbb79f6f669853e94e234a523 ChangeLog 6784
-SHA256 35d60e749c78bc1c01960b10c6886f47ba04b3146939c9c509fb4897affe12dd ChangeLog 6784
+EBUILD gdal-1.4.2.ebuild 4581 RMD160 c47c1fba5b94bc3a4c57c8abfa2b19444962a4f7 SHA1 f6b426fd97c71e486cd4017d8f2139318079a3f4 SHA256 90946f8420887ecf15a6d054906a7937359fc809324f20df9b3913be5cda162f
+MD5 8ccb7b96d1719e5f57386d0a075dc26c gdal-1.4.2.ebuild 4581
+RMD160 c47c1fba5b94bc3a4c57c8abfa2b19444962a4f7 gdal-1.4.2.ebuild 4581
+SHA256 90946f8420887ecf15a6d054906a7937359fc809324f20df9b3913be5cda162f gdal-1.4.2.ebuild 4581
+MISC ChangeLog 6901 RMD160 ab7ff4e36f9680944d9835a2eab8b06ffd9fe792 SHA1 0eddc33293e875460911c599e2a4d7117c284b30 SHA256 f690842e7367879280e082ac4006ad9cb879b2bfa84ee9419db72183a3c5485f
+MD5 ed3cf57a8e1bbd106e886ae8773e4f4a ChangeLog 6901
+RMD160 ab7ff4e36f9680944d9835a2eab8b06ffd9fe792 ChangeLog 6901
+SHA256 f690842e7367879280e082ac4006ad9cb879b2bfa84ee9419db72183a3c5485f ChangeLog 6901
MISC metadata.xml 493 RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d SHA1 d97adc27fa58d040e92e93d17fce2f666090ad36 SHA256 1f6fdd4665a2c5e8f6f53e3d7d1b05ab2696eb23af60d7f430e20b2b3022b958
MD5 bf6b9c6083b3ccc9c3924343d20636e7 metadata.xml 493
RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d metadata.xml 493
diff --git a/sci-libs/gdal/gdal-1.4.2.ebuild b/sci-libs/gdal/gdal-1.4.2.ebuild
index fd93ad3ebc4e..5cfb8f110e7a 100644
--- a/sci-libs/gdal/gdal-1.4.2.ebuild
+++ b/sci-libs/gdal/gdal-1.4.2.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v 1.2 2008/01/04 04:08:15 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v 1.3 2008/01/04 05:24:28 nerdboy Exp $
inherit eutils libtool distutils toolchain-funcs
-IUSE="jpeg png geos gif jpeg2k netcdf hdf hdf5 python ruby postgres \
- odbc sqlite ogdi fits gml doc debug"
+IUSE="debug doc fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
+ odbc png ogdi postgres python ruby sqlite"
DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
HOMEPAGE="http://www.gdal.org/"
@@ -36,6 +36,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
hdf? ( sci-libs/hdf )
)
jpeg2k? ( media-libs/jasper )
+ mysql? ( virtual/mysql )
odbc? ( dev-db/unixODBC )
geos? ( >=sci-libs/geos-2.2.1 )
sqlite? ( >=dev-db/sqlite-3 )
@@ -106,7 +107,7 @@ src_compile() {
econf ${pkg_conf} ${use_conf} || die "econf failed"
# parallel makes fail on the ogr stuff (C++, what can I say?)
# also failing with gcc4 in libcsf
- make || die "make failed"
+ emake -j1 || die "make failed"
if useq ruby ; then
cd "${S}"/swig
make build || die "make ruby failed"