diff options
author | Steve Arnold <nerdboy@gentoo.org> | 2006-05-26 00:11:02 +0000 |
---|---|---|
committer | Steve Arnold <nerdboy@gentoo.org> | 2006-05-26 00:11:02 +0000 |
commit | 96879595ca91074bda2b8187fcbb31bc9fa9088f (patch) | |
tree | 4738f716abbb250ad8874b9d178a19dbce70534a /sci-libs | |
parent | requires ~ppc64 for gdal gml support (diff) | |
download | historical-96879595ca91074bda2b8187fcbb31bc9fa9088f.tar.gz historical-96879595ca91074bda2b8187fcbb31bc9fa9088f.tar.bz2 historical-96879595ca91074bda2b8187fcbb31bc9fa9088f.zip |
updated geos dependency for gcc 4; added ~ppc64 to testing versions
Package-Manager: portage-2.1_rc1-r3
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/gdal/ChangeLog | 7 | ||||
-rw-r--r-- | sci-libs/gdal/Manifest | 32 | ||||
-rw-r--r-- | sci-libs/gdal/gdal-1.3.0-r1.ebuild | 9 | ||||
-rw-r--r-- | sci-libs/gdal/gdal-1.3.1.ebuild | 6 | ||||
-rw-r--r-- | sci-libs/gdal/gdal-1.3.2.ebuild | 25 |
5 files changed, 40 insertions, 39 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index b3b41ae7bbe2..0564755ba607 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.24 2006/05/23 02:09:11 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.25 2006/05/26 00:11:02 nerdboy Exp $ + + 25 May 2006; Steve Arnold <nerdboy@gentoo.org> gdal-1.3.0-r1.ebuild, + gdal-1.3.1.ebuild, gdal-1.3.2.ebuild: + Updated geos dependency for gcc 4; added ~ppc64 to testing versions. + See hdf5 ChangeLog for Todo list. 23 May 2006; Steve Arnold <nerdboy@gentoo.org> +files/gdal-1.3.2-destdir.patch, +files/gdal-1.3.2-ruby-install.patch: diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index d277d7aaecc8..b01d9f73c8ae 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -30,22 +30,22 @@ EBUILD gdal-1.2.6-r4.ebuild 4170 RMD160 902ad6ca0e006bcceee71bedd050d15d45273460 MD5 ee3c01cc28212fc087c4675fc7e80613 gdal-1.2.6-r4.ebuild 4170 RMD160 902ad6ca0e006bcceee71bedd050d15d45273460 gdal-1.2.6-r4.ebuild 4170 SHA256 c1d1f6c71f4193bf6a43c2e88471a342de3aa394957b42b54884e14a96c509af gdal-1.2.6-r4.ebuild 4170 -EBUILD gdal-1.3.0-r1.ebuild 4167 RMD160 e7d09b29ca71906abd6e5ac9a5110ad043a7b53d SHA1 1742ca49c20de9726d012f0bd97c3571ce8520ac SHA256 a9bb99073316a5d51dc976f2cb6804b80ef069c114ab1d04a6c06147bd5adf4d size 4167 -MD5 1d71f64c724dcc43f23854731d1a339d gdal-1.3.0-r1.ebuild 4167 -RMD160 e7d09b29ca71906abd6e5ac9a5110ad043a7b53d gdal-1.3.0-r1.ebuild 4167 -SHA256 a9bb99073316a5d51dc976f2cb6804b80ef069c114ab1d04a6c06147bd5adf4d gdal-1.3.0-r1.ebuild 4167 -EBUILD gdal-1.3.1.ebuild 4433 RMD160 bee8a1c351f1669dc4823758a928884a5597cce3 SHA1 a85e9255ba435c5b975cc4d20be1b8d94cb21443 SHA256 0d5ec06d30bd7a686dfb7eef9f1c3bf2e17eae4bb2d6d8caca21170cc203ea9d size 4433 -MD5 6a622b9b760392b89b0722b34cfcfc7d gdal-1.3.1.ebuild 4433 -RMD160 bee8a1c351f1669dc4823758a928884a5597cce3 gdal-1.3.1.ebuild 4433 -SHA256 0d5ec06d30bd7a686dfb7eef9f1c3bf2e17eae4bb2d6d8caca21170cc203ea9d gdal-1.3.1.ebuild 4433 -EBUILD gdal-1.3.2.ebuild 4759 RMD160 909631ad222798dd465aa7d1a533e60c1701d3f9 SHA1 b9f4f513a132f954188cadd5f319c29b187023d8 SHA256 beed1e3a92a11f0034d54c7d612a47ad66efbb33421ccca9e380453c38765a19 size 4759 -MD5 cc55bc12f0f2544f9a5c1b77f2ffcb2d gdal-1.3.2.ebuild 4759 -RMD160 909631ad222798dd465aa7d1a533e60c1701d3f9 gdal-1.3.2.ebuild 4759 -SHA256 beed1e3a92a11f0034d54c7d612a47ad66efbb33421ccca9e380453c38765a19 gdal-1.3.2.ebuild 4759 -MISC ChangeLog 4971 RMD160 8ea0d5184b127f0e425c39453805f34332aa1198 SHA1 0b2b72188f17b46cf4cfa5bc1fd005f4fbdeacf4 SHA256 e56e7e545b2ca1cf38c5253e158c77afcdc044417b2e3ecb1e528e3a8a6a2585 size 4971 -MD5 af1b96e5e82cf58f0a5bed44664df337 ChangeLog 4971 -RMD160 8ea0d5184b127f0e425c39453805f34332aa1198 ChangeLog 4971 -SHA256 e56e7e545b2ca1cf38c5253e158c77afcdc044417b2e3ecb1e528e3a8a6a2585 ChangeLog 4971 +EBUILD gdal-1.3.0-r1.ebuild 4230 RMD160 375fd7d369029a23cddd9088a4f30664fdbec7b5 SHA1 28b7fc1293f5efc458001036a45a02f949171eb6 SHA256 c67325d48f15df1bf2a41321210435bec364a033769a11305573f3b24b05c2bf size 4230 +MD5 8117815f3565bbfc130ae44aac4e4e6a gdal-1.3.0-r1.ebuild 4230 +RMD160 375fd7d369029a23cddd9088a4f30664fdbec7b5 gdal-1.3.0-r1.ebuild 4230 +SHA256 c67325d48f15df1bf2a41321210435bec364a033769a11305573f3b24b05c2bf gdal-1.3.0-r1.ebuild 4230 +EBUILD gdal-1.3.1.ebuild 4448 RMD160 57babbb57045140fa472777894c24155711133cf SHA1 fbd4e26452217ec50281751b461f91ccd42e14d9 SHA256 16681ac05b2b98aa6d7ea71ac21ea226d239c6618b9b61d88d9e58af853dc566 size 4448 +MD5 c966ad494c3637f0e882dc5ccd6bd2fd gdal-1.3.1.ebuild 4448 +RMD160 57babbb57045140fa472777894c24155711133cf gdal-1.3.1.ebuild 4448 +SHA256 16681ac05b2b98aa6d7ea71ac21ea226d239c6618b9b61d88d9e58af853dc566 gdal-1.3.1.ebuild 4448 +EBUILD gdal-1.3.2.ebuild 4605 RMD160 66c93f85dc81a514fb1bc027c51a215767defc23 SHA1 4e00723a71190ffd6457c72953c8d5098906ecf4 SHA256 a09bee6f956b2a327ab724468135fafcca1c6a1182ac2f8a4fc1e33b1a2aac82 size 4605 +MD5 0ac23fb5030cda66a7f197ccf4848dc6 gdal-1.3.2.ebuild 4605 +RMD160 66c93f85dc81a514fb1bc027c51a215767defc23 gdal-1.3.2.ebuild 4605 +SHA256 a09bee6f956b2a327ab724468135fafcca1c6a1182ac2f8a4fc1e33b1a2aac82 gdal-1.3.2.ebuild 4605 +MISC ChangeLog 5190 RMD160 65566370470f2feaa3f94a3a393b2a7977dd8619 SHA1 ccd0c46907753e5263748813b5f51c8169b1ffef SHA256 763be44d61635c1ee143fa38c915d4538da65b39522a63cb7db7fcebc30309b6 size 5190 +MD5 e54b0abe4abcd7479a5fd1767b162c37 ChangeLog 5190 +RMD160 65566370470f2feaa3f94a3a393b2a7977dd8619 ChangeLog 5190 +SHA256 763be44d61635c1ee143fa38c915d4538da65b39522a63cb7db7fcebc30309b6 ChangeLog 5190 MISC metadata.xml 481 RMD160 bf21d73428ffeb72d05c41556b846820666e6192 SHA1 84bd0e3bd2b57b0e3985a2fe1afbdec9178bce17 SHA256 6e64541abb8c79774ac99aeedeadfabb8771c9ad3da281e967629fbc83300fa4 size 481 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481 RMD160 bf21d73428ffeb72d05c41556b846820666e6192 metadata.xml 481 diff --git a/sci-libs/gdal/gdal-1.3.0-r1.ebuild b/sci-libs/gdal/gdal-1.3.0-r1.ebuild index f9ecfc9259e4..13e2eb88c34f 100644 --- a/sci-libs/gdal/gdal-1.3.0-r1.ebuild +++ b/sci-libs/gdal/gdal-1.3.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 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-r1.ebuild,v 1.10 2006/05/22 06:52:51 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.11 2006/05/26 00:11:02 nerdboy Exp $ inherit eutils libtool gnuconfig distutils toolchain-funcs -IUSE="jpeg png geos gif jpeg2k netcdf hdf python postgres mysql \ +IUSE="jpeg png geos gif jpeg2k netcdf hdf hdf5 python postgres mysql \ odbc sqlite ogdi fits gml doc debug" DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)" @@ -27,6 +27,7 @@ DEPEND=">=sys-libs/zlib-1.1.4 fits? ( sci-libs/cfitsio ) ogdi? ( sci-libs/ogdi ) gml? ( dev-libs/xerces-c ) + hdf5? ( >=sci-libs/hdf5-1.6.4 ) || ( postgres? ( dev-db/postgresql ) mysql? ( dev-db/mysql ) @@ -37,7 +38,7 @@ DEPEND=">=sys-libs/zlib-1.1.4 ) jpeg2k? ( media-libs/jasper ) odbc? ( dev-db/unixODBC ) - geos? ( sci-libs/geos ) + geos? ( >=sci-libs/geos-2.2.1 ) sqlite? ( >=dev-db/sqlite-3 ) doc? ( app-doc/doxygen )" @@ -71,7 +72,7 @@ src_compile() { $(use_with postgres pg) $(use_with fits cfitsio) \ $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \ $(use_with sqlite) $(use_with jpeg2k jasper) $(use_with odbc) \ - $(use_with gml xerces)" + $(use_with gml xerces) $(use_with hdf5)" # It can't find this if useq ogdi ; then diff --git a/sci-libs/gdal/gdal-1.3.1.ebuild b/sci-libs/gdal/gdal-1.3.1.ebuild index c532ccd44fda..78819a198fbc 100644 --- a/sci-libs/gdal/gdal-1.3.1.ebuild +++ b/sci-libs/gdal/gdal-1.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.9 2006/05/22 06:52:51 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.10 2006/05/26 00:11:02 nerdboy Exp $ inherit eutils libtool gnuconfig distutils toolchain-funcs @@ -13,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 ~ppc64 ~sparc x86" # need to get these arches updated on several libs first #KEYWORDS="~alpha ~hppa ~ppc64" @@ -35,7 +35,7 @@ DEPEND=">=sys-libs/zlib-1.1.4 ) jpeg2k? ( media-libs/jasper ) odbc? ( dev-db/unixODBC ) - geos? ( sci-libs/geos ) + geos? ( >=sci-libs/geos-2.2.1 ) sqlite? ( >=dev-db/sqlite-3 ) doc? ( app-doc/doxygen )" diff --git a/sci-libs/gdal/gdal-1.3.2.ebuild b/sci-libs/gdal/gdal-1.3.2.ebuild index 637d844254f7..bb6df83f5b23 100644 --- a/sci-libs/gdal/gdal-1.3.2.ebuild +++ b/sci-libs/gdal/gdal-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.1 2006/05/22 06:52:51 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.2 2006/05/26 00:11:02 nerdboy Exp $ inherit eutils libtool gnuconfig distutils toolchain-funcs @@ -13,12 +13,9 @@ SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" # need to get these arches updated on several libs first -#KEYWORDS="~alpha ~hppa ~ppc64" - -#USE_RUBY="1.7" -#RUBY_ECONF="--with-rubydir=/usr/$(get_libdir)/ruby/site_ruby" +#KEYWORDS="~alpha ~hppa" DEPEND=">=sys-libs/zlib-1.1.4 >=media-libs/tiff-3.7.0 @@ -40,7 +37,7 @@ DEPEND=">=sys-libs/zlib-1.1.4 ) jpeg2k? ( media-libs/jasper ) odbc? ( dev-db/unixODBC ) - geos? ( sci-libs/geos ) + geos? ( >=sci-libs/geos-2.2.1 ) sqlite? ( >=dev-db/sqlite-3 ) doc? ( app-doc/doxygen )" @@ -49,9 +46,6 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-destdir.patch || die "epatch failed" epatch ${FILESDIR}/${P}-ruby-install.patch || die "epatch failed" - if [ $(gcc-major-version) -eq 4 ] ; then - epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed" - fi elibtoolize --patch-only gnuconfig_update if useq netcdf && useq hdf; then @@ -84,9 +78,9 @@ src_compile() { use_conf="--with-ogdi=/usr/$(get_libdir) ${use_conf}" fi -# if useq mysql ; then -# use_conf="--with-mysql=/usr/bin/mysql_config ${use_conf}" -# fi + #if useq mysql ; then + # use_conf="--with-mysql=/usr/bin/mysql_config ${use_conf}" + #fi if useq gif ; then use_conf="--with-gif=internal ${use_conf}" @@ -110,14 +104,15 @@ src_compile() { econf ${pkg_conf} ${use_conf} || die "econf failed" # parallel makes fail on the ogr stuff (C++, what can I say?) - emake || die "emake failed" + # also failing with gcc4 in libcsf + make || die "make failed" if useq ruby ; then cd ${S}/swig make build || die "make ruby failed" cd ${S} fi if useq doc ; then - emake docs || die "emake docs failed" + make docs || die "make docs failed" fi } |