From de57d2fc2c316a2ec99c3193c4ad4a79a8cb9409 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 22 Jul 2011 22:55:24 +0000 Subject: Version bump to the latest. Drop older. Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64 --- sci-libs/gdal/ChangeLog | 8 +- sci-libs/gdal/Manifest | 12 +- sci-libs/gdal/gdal-1.8.0-r1.ebuild | 260 ------------------------------------- sci-libs/gdal/gdal-1.8.1.ebuild | 259 ++++++++++++++++++++++++++++++++++++ 4 files changed, 272 insertions(+), 267 deletions(-) delete mode 100644 sci-libs/gdal/gdal-1.8.0-r1.ebuild create mode 100644 sci-libs/gdal/gdal-1.8.1.ebuild (limited to 'sci-libs/gdal') diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index f12d81fdba99..93492512eeda 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.115 2011/07/18 14:33:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.116 2011/07/22 22:55:24 scarabeus Exp $ + +*gdal-1.8.1 (22 Jul 2011) + + 22 Jul 2011; Tomáš Chvátal -gdal-1.8.0-r1.ebuild, + +gdal-1.8.1.ebuild: + Version bump to the latest. Drop older. 18 Jul 2011; Tomáš Chvátal gdal-1.8.0-r1.ebuild: Silence the pkgcore warning. diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 01650df86bb6..7466c6a88697 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -10,15 +10,15 @@ AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301b AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea AUX gdal-png-1.5.patch 1422 RMD160 5177f60d44189289fefc98ec8f59645b880b7362 SHA1 63c3290883f6f9f70fe6ec9cd2c3e37becaeee7b SHA256 c7a5c4584b60c653b0f2116d9898e5110fe0e29d175a2fc00d34d36487856418 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67 -DIST gdal-1.8.0.tar.gz 8837824 RMD160 0e116f41b23ff5b44c692f56459facab332c6201 SHA1 e5a2802933054050c6fb0b0a0e1f46b5dd195b0a SHA256 515f0316cd17281a09a147914b47b28bbc4855cdb86d41d12cb8716d1721e435 +DIST gdal-1.8.1.tar.gz 8852355 RMD160 4ac1cd59979464bd37b4d2aa588092ee0c34d45c SHA1 b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c SHA256 d5d76b85b4a7a0e28ead6c92be0eba9e2b2361a06db0a60ef0fb85db63e7a5df EBUILD gdal-1.6.3-r1.ebuild 6735 RMD160 5e29a11f00004e879c12b774597b19d0b5b7947e SHA1 9b389f851c4c577ecd638a0ba18b2488ccb9c86f SHA256 82eed125dcc005990b7f1e9d223308c1d00cdf47a1b33ca966488c56b3ace9e3 -EBUILD gdal-1.8.0-r1.ebuild 6642 RMD160 33f5501c84e31df2f0cd565932288d676277fe75 SHA1 4e9abd0a5264c49d631bfeba89b8a9b8b9bf5c90 SHA256 49366a4670afd124b61da1ac70e203bd3d45b7689d3c13b6aba687e89acf73ba -MISC ChangeLog 21546 RMD160 94bcbc0bd489988498c65b7da5858de63a1e9d9a SHA1 6dc9fa01b6124d7ac73ff5c151bb4df77b11c42a SHA256 b435840485ef3e6191017d9c2f51d5d0aa48b3fa996a1acd5a58d0e998b75318 +EBUILD gdal-1.8.1.ebuild 6598 RMD160 134fe2f8de29b2dcc579bb531114107b2fcf6993 SHA1 f882f7a8658788566e9315cfc5147a1972419e44 SHA256 00918b44dcb4f65119dd2aad4e7d5d4607a57bed447c0c5947ffd8dd76fe560d +MISC ChangeLog 21716 RMD160 2ca37ea00de85dbc314a782c4fd78dc6f59b37a7 SHA1 cf5259275e16dce507b9b731f74241c718b69071 SHA256 804bf9c1f2a9f6470032bd033722117a7b75b80555a5527aae46cd7b91e8ddc3 MISC metadata.xml 1183 RMD160 a095695d479404c183e066274335dacc408bd406 SHA1 0c07b2188a4e5e2cff50ba6355a1543e7f70ed57 SHA256 789b3c4b281326a6c763ac9a62f3e1ef82ddf679e71bc7d1a1849d3772a4323e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4kRAYACgkQHB6c3gNBRYdv3QCbBVAmX0IY37DCzbQRnd8UgoFH -PmcAoIcJk6dtLvoL8yREJjlcKIEhfpDu -=smet +iEYEARECAAYFAk4p/64ACgkQHB6c3gNBRYdd6QCgpA+NmsClDgkwLtRQj1ifGqiY +TfAAn1KCU51eq1j3Zg/iI2spQMEQqBM6 +=AAjo -----END PGP SIGNATURE----- diff --git a/sci-libs/gdal/gdal-1.8.0-r1.ebuild b/sci-libs/gdal/gdal-1.8.0-r1.ebuild deleted file mode 100644 index f7a6caca399f..000000000000 --- a/sci-libs/gdal/gdal-1.8.0-r1.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.6 2011/07/18 14:33:43 scarabeus Exp $ - -EAPI=2 - -WANT_AUTOCONF="2.5" - -RUBY_OPTIONAL="yes" -USE_RUBY="ruby18" - -PYTHON_DEPEND="python? 2:2.6" - -inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs - -DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" -HOMEPAGE="http://www.gdal.org/" -SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads" - -RDEPEND=" - dev-libs/expat - media-libs/tiff - sci-libs/libgeotiff - sys-libs/zlib - curl? ( net-misc/curl ) - ecwj2k? ( sci-libs/libecwj2 ) - fits? ( sci-libs/cfitsio ) - geos? ( >=sci-libs/geos-2.2.1 ) - gif? ( media-libs/giflib ) - gml? ( >=dev-libs/xerces-c-3 ) - hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - ogdi? ( sci-libs/ogdi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng ) - postgres? ( >=dev-db/postgresql-base-8.4 ) - python? ( dev-python/numpy ) - ruby? ( $(ruby_implementation_depend ruby18) ) - sqlite? ( >=dev-db/sqlite-3 )" - -SWIG_DEP=">=dev-lang/swig-2.0.2" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - perl? ( ${SWIG_DEP} ) - python? ( ${SWIG_DEP} ) - ruby? ( ${SWIG_DEP} )" - -AT_M4DIR="${S}/m4" -MAKEOPTS+=" -j1" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_unpack() { - # prevent ruby-ng.eclass from messing with the src path - default -} - -src_prepare() { - # fix datadir and docdir placement - sed -i \ - -e "s:@datadir@:@datadir@/gdal:" \ - -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \ - GDALmake.opt.in || die - - # the second sed expression should fix bug 371075 - sed -i \ - -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \ - -e "s:--prefix=\$(DESTDIR):--prefix=:" \ - swig/python/GNUmakefile || die - - epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch - epatch "${FILESDIR}"/gdal-png-1.5.patch - - # -soname is only accepted by GNU ld/ELF - [[ ${CHOST} == *-darwin* ]] \ - && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ - || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch - - # autoheader fail - eaclocal - eautoconf - eautomake - elibtoolize -} - -src_configure() { - if use ruby; then - RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')" - echo "Ruby module dir is: $RUBY_MOD_DIR" - fi - - # pcidsk is internal, because there is no such library yet released - # also that thing is developed by the gdal people - # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore - # bsb - legal issues - # oracle - disabled, i dont have and can't test - # ingres - same story as oracle oci - # tiff is a hard dep - econf \ - --enable-shared \ - --disable-static \ - --with-expat \ - --without-grass \ - --without-hdf4 \ - --without-fme \ - --without-pcraster \ - --without-kakadu \ - --without-mrsid \ - --without-jp2mrsid \ - --without-msg \ - --without-bsb \ - --without-dods-root \ - --without-oci \ - --without-ingres \ - --without-spatialite \ - --without-dwgdirect \ - --without-epsilon \ - --without-idb \ - --without-sde \ - --without-libtool \ - --with-libz="${EPREFIX}/usr/" \ - --with-ogr \ - --with-grib \ - --with-vfk \ - --with-libtiff=external \ - --with-geotiff=external \ - $(use_enable debug) \ - $(use_with postgres pg) \ - $(use_with fits cfitsio) \ - $(use_with netcdf) \ - $(use_with png) \ - $(use_with jpeg) \ - $(use_with jpeg pcidsk) \ - $(use_with gif) \ - $(use_with ogdi ogdi "${EPREFIX}"/usr) \ - $(use_with hdf5) \ - $(use_with jpeg2k jasper) \ - $(use_with ecwj2k ecw) \ - $(use_with gml xerces) \ - $(use_with odbc) \ - $(use_with curl) \ - $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \ - $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \ - $(use_with geos) \ - $(use_with aux_xml pam) \ - $(use_with pdf poppler) \ - $(use_with perl) \ - $(use_with ruby) \ - $(use_with python) \ - $(use_with threads) \ - --with-pymoddir="${EPREFIX}"/$(python_get_sitedir) - - # mysql-config puts this in (and boy is it a PITA to get it out) - if use mysql; then - sed -i \ - -e "s: -rdynamic : :" \ - GDALmake.opt || die "sed LIBS failed" - fi - - # updated for newer swig (must specify the path to input files) - if use python; then - sed -i \ - -e "s: gdal_array.i: ../include/gdal_array.i:" \ - -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \ - swig/python/GNUmakefile || die "sed python makefile failed" - sed -i \ - -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \ - swig/python/setup.cfg || die "sed python setup.cfg failed" - fi -} - -src_compile() { - local i - for i in perl ruby python; do - if use $i; then - rm "${S}"/swig/$i/*_wrap.cpp - emake -C "${S}"/swig/$i generate || \ - die "make generate failed for swig/$i" - fi - done - - # parallel makes fail - emake || die "emake failed" - - if use perl ; then - pushd "${S}"/swig/perl > /dev/null - perl-module_src_prep - perl-module_src_compile - popd > /dev/null - fi - - if use doc ; then - emake docs || die "make docs failed" - fi -} - -src_install() { - if use perl ; then - pushd "${S}"/swig/perl > /dev/null - perl-module_src_install - popd > /dev/null - sed -i \ - -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \ - GDALmake.opt || die - fi - - emake DESTDIR="${D}" install || die "make install failed" - - if use ruby ; then - # weird reinstall collision; needs manual intervention... - pushd "${S}"/swig/ruby > /dev/null - rm -rf "${D}"${RUBY_MOD_DIR}/gdal - exeinto ${RUBY_MOD_DIR}/gdal - doexe *.so || die "doins ruby modules failed" - popd > /dev/null - fi - - use perl && fixlocalpod - - dodoc Doxyfile HOWTO-RELEASE NEWS || die - - if use doc ; then - dohtml html/* || die "install html failed" - docinto ogr - dohtml ogr/html/* || die "install ogr html failed" - fi - - if use python; then - newdoc swig/python/README.txt README-python.txt || die - insinto /usr/share/${PN}/samples - doins swig/python/samples/* || die - fi -} - -pkg_postinst() { - if use python; then - python_need_rebuild - python_mod_optimize $(python_get_sitedir)/${PN}.py \ - $(python_get_sitedir)/ogr.py - fi - echo - elog "Check available image and data formats after building with" - elog "gdalinfo and ogrinfo (using the --formats switch)." -} diff --git a/sci-libs/gdal/gdal-1.8.1.ebuild b/sci-libs/gdal/gdal-1.8.1.ebuild new file mode 100644 index 000000000000..54e273ac470b --- /dev/null +++ b/sci-libs/gdal/gdal-1.8.1.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1.ebuild,v 1.1 2011/07/22 22:55:24 scarabeus Exp $ + +EAPI=2 + +WANT_AUTOCONF="2.5" + +RUBY_OPTIONAL="yes" +USE_RUBY="ruby18" + +PYTHON_DEPEND="python? 2:2.6" + +inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs + +DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" +HOMEPAGE="http://www.gdal.org/" +SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads" + +RDEPEND=" + dev-libs/expat + media-libs/tiff + sci-libs/libgeotiff + sys-libs/zlib + curl? ( net-misc/curl ) + ecwj2k? ( sci-libs/libecwj2 ) + fits? ( sci-libs/cfitsio ) + geos? ( >=sci-libs/geos-2.2.1 ) + gif? ( media-libs/giflib ) + gml? ( >=dev-libs/xerces-c-3 ) + hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) + jpeg? ( virtual/jpeg ) + jpeg2k? ( media-libs/jasper ) + mysql? ( virtual/mysql ) + netcdf? ( sci-libs/netcdf ) + odbc? ( dev-db/unixODBC ) + ogdi? ( sci-libs/ogdi ) + pdf? ( app-text/poppler ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + postgres? ( >=dev-db/postgresql-base-8.4 ) + python? ( dev-python/numpy ) + ruby? ( $(ruby_implementation_depend ruby18) ) + sqlite? ( >=dev-db/sqlite-3 )" + +SWIG_DEP=">=dev-lang/swig-2.0.2" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + perl? ( ${SWIG_DEP} ) + python? ( ${SWIG_DEP} ) + ruby? ( ${SWIG_DEP} )" + +AT_M4DIR="${S}/m4" +MAKEOPTS+=" -j1" + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + +src_unpack() { + # prevent ruby-ng.eclass from messing with the src path + default +} + +src_prepare() { + # fix datadir and docdir placement + sed -i \ + -e "s:@datadir@:@datadir@/gdal:" \ + -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \ + GDALmake.opt.in || die + + # the second sed expression should fix bug 371075 + sed -i \ + -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \ + -e "s:--prefix=\$(DESTDIR):--prefix=:" \ + swig/python/GNUmakefile || die + + epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch + + # -soname is only accepted by GNU ld/ELF + [[ ${CHOST} == *-darwin* ]] \ + && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ + || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch + + # autoheader fail + eaclocal + eautoconf + eautomake + elibtoolize +} + +src_configure() { + if use ruby; then + RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')" + echo "Ruby module dir is: $RUBY_MOD_DIR" + fi + + # pcidsk is internal, because there is no such library yet released + # also that thing is developed by the gdal people + # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore + # bsb - legal issues + # oracle - disabled, i dont have and can't test + # ingres - same story as oracle oci + # tiff is a hard dep + econf \ + --enable-shared \ + --disable-static \ + --with-expat \ + --without-grass \ + --without-hdf4 \ + --without-fme \ + --without-pcraster \ + --without-kakadu \ + --without-mrsid \ + --without-jp2mrsid \ + --without-msg \ + --without-bsb \ + --without-dods-root \ + --without-oci \ + --without-ingres \ + --without-spatialite \ + --without-dwgdirect \ + --without-epsilon \ + --without-idb \ + --without-sde \ + --without-libtool \ + --with-libz="${EPREFIX}/usr/" \ + --with-ogr \ + --with-grib \ + --with-vfk \ + --with-libtiff=external \ + --with-geotiff=external \ + $(use_enable debug) \ + $(use_with postgres pg) \ + $(use_with fits cfitsio) \ + $(use_with netcdf) \ + $(use_with png) \ + $(use_with jpeg) \ + $(use_with jpeg pcidsk) \ + $(use_with gif) \ + $(use_with ogdi ogdi "${EPREFIX}"/usr) \ + $(use_with hdf5) \ + $(use_with jpeg2k jasper) \ + $(use_with ecwj2k ecw) \ + $(use_with gml xerces) \ + $(use_with odbc) \ + $(use_with curl) \ + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \ + $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \ + $(use_with geos) \ + $(use_with aux_xml pam) \ + $(use_with pdf poppler) \ + $(use_with perl) \ + $(use_with ruby) \ + $(use_with python) \ + $(use_with threads) \ + --with-pymoddir="${EPREFIX}"/$(python_get_sitedir) + + # mysql-config puts this in (and boy is it a PITA to get it out) + if use mysql; then + sed -i \ + -e "s: -rdynamic : :" \ + GDALmake.opt || die "sed LIBS failed" + fi + + # updated for newer swig (must specify the path to input files) + if use python; then + sed -i \ + -e "s: gdal_array.i: ../include/gdal_array.i:" \ + -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \ + swig/python/GNUmakefile || die "sed python makefile failed" + sed -i \ + -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \ + swig/python/setup.cfg || die "sed python setup.cfg failed" + fi +} + +src_compile() { + local i + for i in perl ruby python; do + if use $i; then + rm "${S}"/swig/$i/*_wrap.cpp + emake -C "${S}"/swig/$i generate || \ + die "make generate failed for swig/$i" + fi + done + + # parallel makes fail + emake || die "emake failed" + + if use perl ; then + pushd "${S}"/swig/perl > /dev/null + perl-module_src_prep + perl-module_src_compile + popd > /dev/null + fi + + if use doc ; then + emake docs || die "make docs failed" + fi +} + +src_install() { + if use perl ; then + pushd "${S}"/swig/perl > /dev/null + perl-module_src_install + popd > /dev/null + sed -i \ + -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \ + GDALmake.opt || die + fi + + emake DESTDIR="${D}" install || die "make install failed" + + if use ruby ; then + # weird reinstall collision; needs manual intervention... + pushd "${S}"/swig/ruby > /dev/null + rm -rf "${D}"${RUBY_MOD_DIR}/gdal + exeinto ${RUBY_MOD_DIR}/gdal + doexe *.so || die "doins ruby modules failed" + popd > /dev/null + fi + + use perl && fixlocalpod + + dodoc Doxyfile HOWTO-RELEASE NEWS || die + + if use doc ; then + dohtml html/* || die "install html failed" + docinto ogr + dohtml ogr/html/* || die "install ogr html failed" + fi + + if use python; then + newdoc swig/python/README.txt README-python.txt || die + insinto /usr/share/${PN}/samples + doins swig/python/samples/* || die + fi +} + +pkg_postinst() { + if use python; then + python_need_rebuild + python_mod_optimize $(python_get_sitedir)/${PN}.py \ + $(python_get_sitedir)/ogr.py + fi + echo + elog "Check available image and data formats after building with" + elog "gdalinfo and ogrinfo (using the --formats switch)." +} -- cgit v1.2.3-65-gdbad