diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-06 19:06:20 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-06 19:06:20 +0000 |
| commit | 3b2e3c607a84e033a0144b468123227b66288a6d (patch) | |
| tree | d28f060ae268b723da7d44859371e419bbed2c54 /sci-geosciences | |
| parent | Enable Rakefile tracing (diff) | |
| download | gentoo-2-3b2e3c607a84e033a0144b468123227b66288a6d.tar.gz gentoo-2-3b2e3c607a84e033a0144b468123227b66288a6d.tar.bz2 gentoo-2-3b2e3c607a84e033a0144b468123227b66288a6d.zip | |
Version bump.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/qgis/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-geosciences/qgis/qgis-1.5.0.ebuild (renamed from sci-geosciences/qgis/qgis-1.4.0-r1.ebuild) | 28 |
2 files changed, 21 insertions, 15 deletions
diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog index f5d4f9469518..bc521387b2b3 100644 --- a/sci-geosciences/qgis/ChangeLog +++ b/sci-geosciences/qgis/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-geosciences/qgis # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.14 2010/06/17 21:07:26 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.15 2010/08/06 19:06:20 scarabeus Exp $ + +*qgis-1.5.0 (06 Aug 2010) + + 06 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -qgis-1.4.0-r1.ebuild, +qgis-1.5.0.ebuild: + Version bump. 17 Jun 2010; Patrick Lauer <patrick@gentoo.org> qgis-1.4.0.ebuild, qgis-1.4.0-r1.ebuild: diff --git a/sci-geosciences/qgis/qgis-1.4.0-r1.ebuild b/sci-geosciences/qgis/qgis-1.5.0.ebuild index 2dc7d727036d..95181fb79865 100644 --- a/sci-geosciences/qgis/qgis-1.4.0-r1.ebuild +++ b/sci-geosciences/qgis/qgis-1.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0-r1.ebuild,v 1.2 2010/06/17 21:07:26 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.1 2010/08/06 19:06:20 scarabeus Exp $ EAPI="2" @@ -10,7 +10,6 @@ inherit python cmake-utils eutils DESCRIPTION="User friendly Geographic Information System" HOMEPAGE="http://www.qgis.org/" - SRC_URI="http://download.osgeo.org/${PN}/src/${PN}_${PV}.tar.gz examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )" @@ -19,23 +18,26 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="examples gps grass gsl postgres python sqlite" -RDEPEND=">=sci-libs/gdal-1.6.1 +RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?] x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4 x11-libs/qt-svg:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 sci-libs/geos - sci-libs/proj gps? ( dev-libs/expat sci-geosciences/gpsbabel + x11-libs/qwt ) - grass? ( - >=sci-geosciences/grass-6.4.0_rc6 - ) + grass? ( >=sci-geosciences/grass-6.4.0_rc6[postgres?,python?,sqlite?] ) gsl? ( sci-libs/gsl ) - postgres? ( >=dev-db/postgresql-base-8 ) + postgres? ( + || ( + >=dev-db/postgresql-base-8.4 + >=dev-db/postgresql-server-8.4 + ) + ) python? ( dev-python/PyQt4[sql,svg] ) sqlite? ( dev-db/sqlite:3 )" @@ -48,21 +50,19 @@ pkg_setup() { python_pkg_setup } -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc45.patch -} - src_configure() { local mycmakeargs mycmakeargs+=( "-DQGIS_MANUAL_SUBDIR=/share/man/" - "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DBINDINGS_GLOBAL_INSTALL:BOOL=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBINDINGS_GLOBAL_INSTALL=ON" "-DQGIS_LIB_SUBDIR=$(get_libdir)" "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis" + "-DWITH_INTERNAL_SPATIALITE:BOOL=OFF" $(cmake-utils_use_with postgres POSTGRESQL) $(cmake-utils_use_with grass) $(cmake-utils_use_with gps EXPAT) + $(cmake-utils_use_with gps QWT) $(cmake-utils_use_with gsl) $(cmake-utils_use_with python BINDINGS) $(cmake-utils_use_with sqlite SPATIALITE) |