diff options
author | Steve Arnold <nerdboy@gentoo.org> | 2005-09-11 04:21:43 +0000 |
---|---|---|
committer | Steve Arnold <nerdboy@gentoo.org> | 2005-09-11 04:21:43 +0000 |
commit | 83567b23e6188a25a3df6d9ce866eaf67bb609b3 (patch) | |
tree | 31418553cae49df8667effc5609279ce6da42f8e /sci-libs/gdal | |
parent | Added ~sparc keyword. (diff) | |
download | historical-83567b23e6188a25a3df6d9ce866eaf67bb609b3.tar.gz historical-83567b23e6188a25a3df6d9ce866eaf67bb609b3.tar.bz2 historical-83567b23e6188a25a3df6d9ce866eaf67bb609b3.zip |
killing bugs #102859 and #104937
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'sci-libs/gdal')
-rw-r--r-- | sci-libs/gdal/ChangeLog | 9 | ||||
-rw-r--r-- | sci-libs/gdal/Manifest | 10 | ||||
-rw-r--r-- | sci-libs/gdal/files/digest-gdal-1.3.0 | 1 | ||||
-rw-r--r-- | sci-libs/gdal/gdal-1.2.5-r1.ebuild | 8 | ||||
-rw-r--r-- | sci-libs/gdal/gdal-1.2.6-r3.ebuild | 11 | ||||
-rw-r--r-- | sci-libs/gdal/gdal-1.3.0.ebuild | 151 |
6 files changed, 178 insertions, 12 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index 95282df0a86a..a47a8c597299 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.9 2005/08/04 00:05:50 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.10 2005/09/11 04:21:43 nerdboy Exp $ + +*gdal-1.3.0 (11 Sep 2005) + + 11 Sep 2005; Steve Arnold <nerdboy@gentoo.org> gdal-1.2.5-r1.ebuild, + gdal-1.2.6-r3.ebuild, +gdal-1.3.0.ebuild: + added new version and local use flag for xerces (bugs #102859 and #104937) + plus stable bump for sparc and x86. *gdal-1.2.6-r3 (04 Aug 2005) diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index a8328a5baa3d..5113f244c8b2 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,6 +1,8 @@ -MD5 e63b03bdb2be6bd2004eed250b2dcbb0 ChangeLog 1774 +MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481 +MD5 6f907376b02d239ca63c9160f29e9f7d gdal-1.3.0.ebuild 4893 +MD5 743d259967fdce09a5ec1565822eb4be ChangeLog 2033 +MD5 396210d71ba7322d8abd1afc4395dcf0 gdal-1.2.5-r1.ebuild 3252 +MD5 41930d4465b1b9f36dc428bc21efceac gdal-1.2.6-r3.ebuild 4894 MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5-r1 63 MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r3 63 -MD5 dbde47da00f85ec5ab00fe894a9bbb8b gdal-1.2.5-r1.ebuild 3244 -MD5 17df0f6ec87ec57a0f63c3fff674c003 gdal-1.2.6-r3.ebuild 4837 -MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481 +MD5 d4bd0e3f81da140c24f49c6e6513b9f6 files/digest-gdal-1.3.0 63 diff --git a/sci-libs/gdal/files/digest-gdal-1.3.0 b/sci-libs/gdal/files/digest-gdal-1.3.0 new file mode 100644 index 000000000000..952482fd1a38 --- /dev/null +++ b/sci-libs/gdal/files/digest-gdal-1.3.0 @@ -0,0 +1 @@ +MD5 fbf4e137c9d0f64f5a70273e555bf777 gdal-1.3.0.tar.gz 6644839 diff --git a/sci-libs/gdal/gdal-1.2.5-r1.ebuild b/sci-libs/gdal/gdal-1.2.5-r1.ebuild index 283662d00b25..8b257447cb1f 100644 --- a/sci-libs/gdal/gdal-1.2.5-r1.ebuild +++ b/sci-libs/gdal/gdal-1.2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.5-r1.ebuild,v 1.4 2005/08/02 23:51:30 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.5-r1.ebuild,v 1.5 2005/09/11 04:21:43 nerdboy Exp $ inherit eutils libtool gnuconfig distutils multilib @@ -46,9 +46,11 @@ src_compile() { distutils_python_version # This package uses old borked automake/autoconf and libtool, so # it doesn't work without ${D} (or with econf and einstall). - pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal --libdir=${D}usr/$(get_libdir) --enable-shared --with-gnu-ld --with-pic" + pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \ + --libdir=${D}usr/$(get_libdir) --enable-shared --with-gnu-ld --with-pic" [ "${ARCH}" = "x86" ] && pkg_conf="${pkg_conf} --without-libtool" - use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) $(use_with postgres pg) $(use_with fits cfitsio) $(use_with ogdi)" + use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \ + $(use_with postgres pg) $(use_with fits cfitsio) $(use_with ogdi)" myconf="${pkg_conf} ${use_conf}" diff --git a/sci-libs/gdal/gdal-1.2.6-r3.ebuild b/sci-libs/gdal/gdal-1.2.6-r3.ebuild index 269256fc75cc..3e8b50b53976 100644 --- a/sci-libs/gdal/gdal-1.2.6-r3.ebuild +++ b/sci-libs/gdal/gdal-1.2.6-r3.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r3.ebuild,v 1.2 2005/08/22 16:32:27 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r3.ebuild,v 1.3 2005/09/11 04:21:43 nerdboy Exp $ inherit eutils libtool gnuconfig distutils -IUSE="jpeg png geos gif grass jasper netcdf hdf python postgres mysql odbc sqlite ogdi fits doc debug" +IUSE="jpeg png geos gif grass jasper netcdf hdf python postgres mysql \ + odbc sqlite ogdi fits gml doc debug" DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)" HOMEPAGE="http://www.remotesensing.org/gdal/index.html" @@ -12,7 +13,7 @@ SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc sparc x86" # need to get these arches updated on several libs first #KEYWORDS="~alpha ~hppa ~ppc64" @@ -25,6 +26,7 @@ DEPEND=">=sys-libs/zlib-1.1.4 python? ( dev-lang/python ) fits? ( sci-libs/cfitsio ) ogdi? ( sci-libs/ogdi ) + gml? ( dev-libs/xerces-c ) || ( postgres? ( dev-db/postgresql ) mysql? ( dev-db/mysql ) @@ -73,7 +75,8 @@ src_compile() { use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \ $(use_with postgres pg) $(use_with fits cfitsio) \ $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \ - $(use_with sqlite) $(use_with jasper) $(use_with odbc)" + $(use_with sqlite) $(use_with jasper) $(use_with odbc) + $(use_with gml xerces)" # It can't find this if useq ogdi ; then diff --git a/sci-libs/gdal/gdal-1.3.0.ebuild b/sci-libs/gdal/gdal-1.3.0.ebuild new file mode 100644 index 000000000000..3ffd912cd746 --- /dev/null +++ b/sci-libs/gdal/gdal-1.3.0.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0.ebuild,v 1.1 2005/09/11 04:21:43 nerdboy Exp $ + +inherit eutils libtool gnuconfig distutils + +IUSE="jpeg png geos gif grass jasper netcdf hdf python postgres mysql \ + odbc sqlite ogdi fits gml doc debug" + +DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)" +HOMEPAGE="http://www.remotesensing.org/gdal/index.html" +SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +# need to get these arches updated on several libs first +#KEYWORDS="~alpha ~hppa ~ppc64" + +DEPEND=">=sys-libs/zlib-1.1.4 + >=media-libs/tiff-3.7.0 + sci-libs/libgeotiff + jpeg? ( media-libs/jpeg ) + gif? ( media-libs/giflib ) + png? ( media-libs/libpng ) + python? ( dev-lang/python ) + fits? ( sci-libs/cfitsio ) + ogdi? ( sci-libs/ogdi ) + gml? ( dev-libs/xerces-c ) + || ( + postgres? ( dev-db/postgresql ) + mysql? ( dev-db/mysql ) + ) + || ( + netcdf? ( sci-libs/netcdf ) + hdf? ( sci-libs/hdf ) + ) + jasper? ( media-libs/jasper ) + odbc? ( dev-db/unixODBC ) + geos? ( sci-libs/geos ) + grass? ( ~sci-geosciences/grass-6.0.0 ) + sqlite? ( dev-db/sqlite ) + doc? ( app-doc/doxygen )" + +src_unpack() { + unpack ${A} + cd ${S} + elibtoolize --patch-only + gnuconfig_update + if useq netcdf && useq hdf; then + einfo "Checking is HDF4 compiled with szip..." + if built_with_use sci-libs/hdf szip ; then + einfo "Found HDF4 compiled with szip. Nice." + else + ewarn "HDF4 must be compiled with szip USE flag!" + einfo "Emerge HDF with szip USE flag and then emerge GDAL." + die "HDF4 not merged with szip use flag" + fi + fi +} + +src_compile() { + distutils_python_version + # This package uses old borked automake/autoconf and libtool, so + # it doesn't work without ${D} (or with econf and einstall). + + pkg_conf="--prefix=${D}usr --exec-prefix=${D}usr --bindir=${D}usr/bin \ + --datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \ + --libdir=${D}usr/$(get_libdir) --mandir=${D}usr/share/man + --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ + --enable-static=no --enable-shared=yes --with-gnu-ld" + + # the above should make libtool behave for the most part + + use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \ + $(use_with postgres pg) $(use_with fits cfitsio) \ + $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \ + $(use_with sqlite) $(use_with jasper) $(use_with odbc) + $(use_with gml xerces)" + + # It can't find this + if useq ogdi ; then + use_conf="--with-ogdi=/usr/lib ${use_conf}" + fi + + if useq gif ; then + use_conf="--with-gif=internal ${use_conf}" + else + use_conf="--with-gif=no ${use_conf}" + fi + + if useq debug ; then + export CFG=debug + fi + + # Enable newer Grass support only + if useq grass ; then + use_conf="--with-grass=/usr/grass60 ${use_conf}" + use_conf="--with-libgrass=no ${use_conf}" + fi + + if useq python ; then + use_conf="--with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ + ${use_conf}" + else + use_conf="--with-python=no ${use_conf}" + fi + + # Fix doc path just in case + sed -i -e "s:@exec_prefix@/doc:${D}usr/share/doc/${PF}/html:g" GDALmake.opt.in + + ./configure --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ + ${pkg_conf} ${use_conf} + + # Patch libtool here since it's not created until after configure runs + sed -i -e "s:hardcode_into_libs=yes:hardcode_into_libs=no:g" libtool + echo '#undef GDAL_PREFIX' >> port/cpl_config.h + echo '#define GDAL_PREFIX "/usr"' >> port/cpl_config.h + emake || die "emake failed" + if useq doc ; then + emake docs || die "emake docs failed" + fi +} + +src_install() { + # einstall causes sandbox violations on /usr/lib/libgdal.so + make DESTDIR=${D} install || die "make install failed" + dosed "s:${D}usr:/usr:g" /usr/bin/gdal-config + dosed "s:/usr/local/bin/perl:/usr/bin/perl:g" ${S}/Doxyfile.man + dosed "s:$(INST_DOCS)/gdal:$(INST_DOCS)/html:g" GNUmakefile + dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS + if useq doc ; then + dohtml html/*.* || die "install html failed" + fi +} + +pkg_postinst() { + einfo "GDAL is most useful with full graphics support enabled via various" + einfo "USE flags: png, jpeg, gif, jasper, etc. Also python, fits, ogdi," + einfo "geos, and support for either netcdf or HDF4 is available, as well as" + einfo "grass, and mysql, sqlite, or postgres (grass support requires grass 6)." + ewarn + einfo "Note: tiff and geotiff are now hard depends, so no USE flags." + einfo "Also, this package will check for netcdf before hdf, so if you" + einfo "prefer hdf, please emerge hdf with USE=szip prior to emerging" + einfo "gdal. Detailed API docs require doxygen (man pages are free)." + einfo "" + einfo "Check available image and data formats after building with" + einfo "gdalinfo and ogrinfo (using the --formats switch)." +} + |