| 1 |
nerdboy 10/02/23 05:29:55 |
| 2 |
|
| 3 |
Modified: gdal-1.6.2.ebuild ChangeLog gdal-1.6.1.ebuild |
| 4 |
gdal-1.6.3.ebuild |
| 5 |
Log: |
| 6 |
Updated swig depends and added work-around for new perl with swig cruft. |
| 7 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 sci-libs/gdal/gdal-1.6.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: gdal-1.6.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- gdal-1.6.2.ebuild 23 Jan 2010 20:21:34 -0000 1.3 |
| 23 |
+++ gdal-1.6.2.ebuild 23 Feb 2010 05:29:53 -0000 1.4 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.3 2010/01/23 20:21:34 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.4 2010/02/23 05:29:53 nerdboy Exp $ |
| 29 |
|
| 30 |
EAPI="2" |
| 31 |
WANT_AUTOCONF="2.5" |
| 32 |
@@ -54,7 +54,9 @@ |
| 33 |
sqlite? ( >=dev-db/sqlite-3 )" |
| 34 |
|
| 35 |
DEPEND="${RDEPEND} |
| 36 |
- perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) ) |
| 37 |
+ perl? ( >=dev-lang/swig-1.3.28 ) |
| 38 |
+ python? ( >=dev-lang/swig-1.3.28 ) |
| 39 |
+ ruby? ( >=dev-lang/swig-1.3.28 ) |
| 40 |
doc? ( app-doc/doxygen )" |
| 41 |
|
| 42 |
AT_M4DIR="${S}/m4" |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.73 sci-libs/gdal/ChangeLog |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.73&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.73&content-type=text/plain |
| 50 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.72&r2=1.73 |
| 51 |
|
| 52 |
Index: ChangeLog |
| 53 |
=================================================================== |
| 54 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v |
| 55 |
retrieving revision 1.72 |
| 56 |
retrieving revision 1.73 |
| 57 |
diff -u -r1.72 -r1.73 |
| 58 |
--- ChangeLog 15 Feb 2010 08:24:18 -0000 1.72 |
| 59 |
+++ ChangeLog 23 Feb 2010 05:29:53 -0000 1.73 |
| 60 |
@@ -1,6 +1,12 @@ |
| 61 |
# ChangeLog for sci-libs/gdal |
| 62 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 63 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.72 2010/02/15 08:24:18 nerdboy Exp $ |
| 64 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.73 2010/02/23 05:29:53 nerdboy Exp $ |
| 65 |
+ |
| 66 |
+ 23 Feb 2010; Steve Arnold <nerdboy@g.o> gdal-1.6.1.ebuild, |
| 67 |
+ gdal-1.6.2.ebuild, gdal-1.6.3.ebuild: |
| 68 |
+ Updated swig depends and added work-around for new perl with swig cruft |
| 69 |
+ (fixes bug #305395). Seems like there ought to be an EAPI2 way to do |
| 70 |
+ the swig deps in a nicer way, but I couldn't find one... |
| 71 |
|
| 72 |
*gdal-1.6.3 (15 Feb 2010) |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.9 sci-libs/gdal/gdal-1.6.1.ebuild |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild?rev=1.9&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild?rev=1.9&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild?r1=1.8&r2=1.9 |
| 82 |
|
| 83 |
Index: gdal-1.6.1.ebuild |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v |
| 86 |
retrieving revision 1.8 |
| 87 |
retrieving revision 1.9 |
| 88 |
diff -u -r1.8 -r1.9 |
| 89 |
--- gdal-1.6.1.ebuild 6 Jan 2010 19:24:12 -0000 1.8 |
| 90 |
+++ gdal-1.6.1.ebuild 23 Feb 2010 05:29:53 -0000 1.9 |
| 91 |
@@ -1,6 +1,6 @@ |
| 92 |
# Copyright 1999-2010 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.8 2010/01/06 19:24:12 ranger Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.9 2010/02/23 05:29:53 nerdboy Exp $ |
| 96 |
|
| 97 |
EAPI="2" |
| 98 |
WANT_AUTOCONF="2.5" |
| 99 |
@@ -54,7 +54,9 @@ |
| 100 |
sqlite? ( >=dev-db/sqlite-3 )" |
| 101 |
|
| 102 |
DEPEND="${RDEPEND} |
| 103 |
- perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) ) |
| 104 |
+ perl? ( >=dev-lang/swig-1.3.28 ) |
| 105 |
+ python? ( >=dev-lang/swig-1.3.28 ) |
| 106 |
+ ruby? ( >=dev-lang/swig-1.3.28 ) |
| 107 |
doc? ( app-doc/doxygen )" |
| 108 |
|
| 109 |
AT_M4DIR="${S}/m4" |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
1.2 sci-libs/gdal/gdal-1.6.3.ebuild |
| 114 |
|
| 115 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild?rev=1.2&view=markup |
| 116 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild?rev=1.2&content-type=text/plain |
| 117 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild?r1=1.1&r2=1.2 |
| 118 |
|
| 119 |
Index: gdal-1.6.3.ebuild |
| 120 |
=================================================================== |
| 121 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild,v |
| 122 |
retrieving revision 1.1 |
| 123 |
retrieving revision 1.2 |
| 124 |
diff -u -r1.1 -r1.2 |
| 125 |
--- gdal-1.6.3.ebuild 15 Feb 2010 08:24:18 -0000 1.1 |
| 126 |
+++ gdal-1.6.3.ebuild 23 Feb 2010 05:29:53 -0000 1.2 |
| 127 |
@@ -1,6 +1,6 @@ |
| 128 |
# Copyright 1999-2010 Gentoo Foundation |
| 129 |
# Distributed under the terms of the GNU General Public License v2 |
| 130 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild,v 1.1 2010/02/15 08:24:18 nerdboy Exp $ |
| 131 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild,v 1.2 2010/02/23 05:29:53 nerdboy Exp $ |
| 132 |
|
| 133 |
EAPI="2" |
| 134 |
WANT_AUTOCONF="2.5" |
| 135 |
@@ -53,7 +53,9 @@ |
| 136 |
sqlite? ( >=dev-db/sqlite-3 )" |
| 137 |
|
| 138 |
DEPEND="${RDEPEND} |
| 139 |
- perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) ) |
| 140 |
+ perl? ( >=dev-lang/swig-1.3.32 ) |
| 141 |
+ python? ( >=dev-lang/swig-1.3.32 ) |
| 142 |
+ ruby? ( >=dev-lang/swig-1.3.32 ) |
| 143 |
doc? ( app-doc/doxygen )" |
| 144 |
|
| 145 |
AT_M4DIR="${S}/m4" |
| 146 |
@@ -130,6 +132,15 @@ |
| 147 |
} |
| 148 |
|
| 149 |
src_compile() { |
| 150 |
+ local i |
| 151 |
+ for i in perl ruby python; do |
| 152 |
+ if useq $i; then |
| 153 |
+ rm "${S}"/swig/$i/*_wrap.cpp |
| 154 |
+ emake -C "${S}"/swig/$i generate || \ |
| 155 |
+ die "make generate failed for swig/$i" |
| 156 |
+ fi |
| 157 |
+ done |
| 158 |
+ |
| 159 |
# parallel makes fail on the ogr stuff (C++, what can I say?) |
| 160 |
# also failing with gcc4 in libcsf |
| 161 |
emake -j1 || die "emake failed" |
Archives