| 1 |
markusle 10/02/27 04:33:54 |
| 2 |
|
| 3 |
Modified: ChangeLog gdl-0.9_rc4.ebuild |
| 4 |
Log: |
| 5 |
Significant ebuild cleanup. Removed libproj option for now since this requires libproj4 which is currently missing from portage. |
| 6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.17 dev-lang/gdl/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/ChangeLog?rev=1.17&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/ChangeLog?rev=1.17&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/ChangeLog?r1=1.16&r2=1.17 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v |
| 18 |
retrieving revision 1.16 |
| 19 |
retrieving revision 1.17 |
| 20 |
diff -u -r1.16 -r1.17 |
| 21 |
--- ChangeLog 18 Feb 2010 21:20:56 -0000 1.16 |
| 22 |
+++ ChangeLog 27 Feb 2010 04:33:54 -0000 1.17 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-lang/gdl |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.16 2010/02/18 21:20:56 bicatali Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.17 2010/02/27 04:33:54 markusle Exp $ |
| 28 |
+ |
| 29 |
+ 27 Feb 2010; Markus Dittrich <markusle@g.o> gdl-0.9_rc4.ebuild: |
| 30 |
+ Significant ebuild cleanup. Removed libproj option for now since |
| 31 |
+ this requires libproj4 which is currently missing from portage. |
| 32 |
+ Thanks much to Sylwester Arabas for his help and support. |
| 33 |
|
| 34 |
18 Feb 2010; Sébastien Fabbro <bicatali@g.o> gdl-0.9_rc4.ebuild: |
| 35 |
Adding an mpi hack when hdf5 has mpi support, see bug #302621 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 dev-lang/gdl/gdl-0.9_rc4.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: gdl-0.9_rc4.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- gdl-0.9_rc4.ebuild 18 Feb 2010 21:20:56 -0000 1.2 |
| 52 |
+++ gdl-0.9_rc4.ebuild 27 Feb 2010 04:33:54 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.2 2010/02/18 21:20:56 bicatali Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.3 2010/02/27 04:33:54 markusle Exp $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
|
| 61 |
@@ -14,7 +14,7 @@ |
| 62 |
|
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~amd64 ~x86" |
| 65 |
-IUSE="python fftw hdf hdf5 netcdf imagemagick proj" |
| 66 |
+IUSE="python fftw hdf hdf5 netcdf imagemagick" |
| 67 |
|
| 68 |
RDEPEND=">=sys-libs/readline-4.3 |
| 69 |
sci-libs/gsl |
| 70 |
@@ -25,8 +25,7 @@ |
| 71 |
hdf5? ( sci-libs/hdf5 ) |
| 72 |
netcdf? ( sci-libs/netcdf ) |
| 73 |
python? ( dev-python/numarray dev-python/matplotlib ) |
| 74 |
- fftw? ( >=sci-libs/fftw-3 ) |
| 75 |
- proj? ( sci-libs/proj )" |
| 76 |
+ fftw? ( >=sci-libs/fftw-3 )" |
| 77 |
|
| 78 |
DEPEND="${RDEPEND} |
| 79 |
sys-devel/libtool" |
| 80 |
@@ -35,7 +34,6 @@ |
| 81 |
|
| 82 |
src_prepare() { |
| 83 |
use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx |
| 84 |
- epatch "${FILESDIR}"/${PN}-0.9_rc3-proj4.patch |
| 85 |
epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch |
| 86 |
epatch "${FILESDIR}"/${P}-antlr.patch |
| 87 |
|
| 88 |
@@ -44,6 +42,9 @@ |
| 89 |
# header files |
| 90 |
rm -fr "${S}"/src/antlr || die "failed to remove antlr directory" |
| 91 |
|
| 92 |
+ # adjust the *.pro file install path |
| 93 |
+ sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \ |
| 94 |
+ || die "Failed to fix *.pro install patch." |
| 95 |
eautoreconf |
| 96 |
} |
| 97 |
|
| 98 |
@@ -65,7 +66,6 @@ |
| 99 |
$(use_with hdf5) \ |
| 100 |
$(use_with netcdf) \ |
| 101 |
$(use_with imagemagick Magick) \ |
| 102 |
- $(use_with proj libproj4) \ |
| 103 |
${myconf} \ |
| 104 |
|| die "econf failed" |
| 105 |
|
| 106 |
@@ -81,13 +81,6 @@ |
| 107 |
src_install() { |
| 108 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 109 |
|
| 110 |
- insinto /usr/share/${PN} |
| 111 |
- doins -r src/pro src/py || die "install pro and py files failed" |
| 112 |
dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING \ |
| 113 |
|| die "Failed to install docs" |
| 114 |
- |
| 115 |
- # add GDL provided routines to IDL_PATH |
| 116 |
- echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl |
| 117 |
- echo "GDL_PATH=/usr/share/${PN}" >> 99gdl |
| 118 |
- doenvd 99gdl || die "doenvd failed" |
| 119 |
} |
Archives