summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/gdal')
-rw-r--r--sci-libs/gdal/ChangeLog5
-rw-r--r--sci-libs/gdal/Manifest14
-rw-r--r--sci-libs/gdal/gdal-1.7.2.ebuild6
3 files changed, 10 insertions, 15 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index f88713d4de20..c65319931fbb 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -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.
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 77415d85c7c9..2b19bfe5f232 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
@@ -19,13 +16,6 @@ DIST gdal-1.7.2.tar.gz 7755378 RMD160 a3f7950798448d8179f899dc095a83e23dcc269b S
EBUILD gdal-1.6.1.ebuild 6207 RMD160 bc770f30e3fc7a2730593301493e5131887f96cf SHA1 fa00e68b0db2889ff4f41485577c73aea4c1902d SHA256 f42f23039752836249fbd420e7be8d1261b31dd8f62189a38e0e6cb030deff93
EBUILD gdal-1.6.3-r1.ebuild 6953 RMD160 ebddd7e18664123f25311ab30c3a81ffbc8fbed0 SHA1 3e9f9ea851f0e1a818339249c1c7cc03f2f6ce41 SHA256 e0203d2a2e49adcb982c4cdc05520816af0e5ebd7a15edfb55275f4ec86e189f
EBUILD gdal-1.7.1-r1.ebuild 7451 RMD160 52f641bb8f071b89cc735f10b88ec238ad3d3376 SHA1 3cdbf9facf1f1cb7aec01663741c8cb261fc5b2b SHA256 9fbda91f15606d33a0fcd2e421925b965800e78bcde3f15816965b2edb6202cd
-EBUILD gdal-1.7.2.ebuild 6039 RMD160 9289c29a4fe9c38eba102d02aa31a082b58b2b02 SHA1 0901a7a0627f05df0fd657d9c5e620a7741018bc SHA256 19388968609683933170ef506c10b58881e6586b4757bc674c1ab96761c5ab4b
-MISC ChangeLog 17773 RMD160 a9a4f862d80774394301532f80ede362e627d524 SHA1 f0367be0d81ddea3ee422371125cb7cd82b32387 SHA256 ae7407c9f6701f9a4b640a7760191ec6072155fe2c75aa64f15607b8d0d90a37
+EBUILD gdal-1.7.2.ebuild 6053 RMD160 ab08ba33540ce4f9ccaec0967b35dcff2a19ca8d SHA1 6f21acb5369bcd0361b68442dcf686a02e3ecd1d SHA256 023271f33e7d1c081fb4f2a627ed24a90b258d02c97de9dbab56cd5e3b9f6e26
+MISC ChangeLog 17884 RMD160 464e9ca961da5d47cf568dce6d55fd77c826d973 SHA1 2bcd725233a11cd2df1e928933d7f43a487aefd6 SHA256 6a3c1d2077bd9e749ffff2aaf893ca03d49d42645f802791fe26332239b91a5a
MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxUeQ4ACgkQHB6c3gNBRYcGQgCgyknhO4fNjRLKii4x5uj+SKQb
-KEkAnjQMmFiEAjCzjps8IT/DlRPIdoW9
-=J46V
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.7.2.ebuild b/sci-libs/gdal/gdal-1.7.2.ebuild
index ec09c0f4a19f..a427d860c4ab 100644
--- a/sci-libs/gdal/gdal-1.7.2.ebuild
+++ b/sci-libs/gdal/gdal-1.7.2.ebuild
@@ -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 @@ DEPEND="${RDEPEND}
AT_M4DIR="${S}/m4"
+MAKEOPTS+=" -j1"
+
pkg_setup() {
# only py2 is supported
python_set_active_version 2
@@ -177,7 +179,7 @@ src_compile() {
done
# parallel makes fail
- emake -j1 || die "emake failed"
+ emake || die "emake failed"
if use perl ; then
cd "${S}"/swig/perl