Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 24 insertions, 17 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/Manifest b/sci-geosciences/qgis/Manifest
index 9ecc47c101c4..90a26dd45b5c 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,7 +1,8 @@
 AUX qgis-1.4.0-gcc45.patch 536 RMD160 78966492091d7b9a249fce13d892881d82d25d5a SHA1 6ea4ea20d346a4f4df7bb043f779afebd831a606 SHA256 909d0699d8c203ff3198261d46de770ed3b6da3b9d77be7315c895539564b922
 DIST qgis_1.4.0.tar.gz 17285943 RMD160 47486732c8fe37aa6864d09c7420be22de5ea802 SHA1 105f353f36e9625d1eb15f1a315882f214dbe026 SHA256 bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da
+DIST qgis_1.5.0.tar.gz 17360308 RMD160 bd371640740c4f6d589d5bb9f2677a0de46d4895 SHA1 f17b1a1175bdfad6f8a005470bfbb70eaeaf806a SHA256 f99748e3948b97894703dc81c2a3eba1f2796651e581957cc2c61c9b9dbab470
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
-EBUILD qgis-1.4.0-r1.ebuild 2320 RMD160 8b70d10ac1672719eb919351c7ca59dcf903cdf2 SHA1 bb911418b3fb79ffa8e4e45c6c0c6d8e356cec26 SHA256 cb153f1853c925dbb9460154b81e49f452012fbf906aea7dee2fc04689e195d0
 EBUILD qgis-1.4.0.ebuild 2576 RMD160 50e73148c4888d745d395c7b048c42d31cfcc48d SHA1 e8b40ed3c76c1d7544dff465af8c301e5f02a156 SHA256 35ed320ec0ca0cccbd5841dee6f4cac66d0790bc819b41f75c43e3db0e110065
-MISC ChangeLog 2332 RMD160 26e80bcaf7a96848fc6ba3c51e9fc64953337511 SHA1 d8496e93439931ec29f07ae567a178277ce0c7a6 SHA256 dbab4f4e61b2944a93d73fa47ad8ba952c10cd8c9273f2e2e11c25d8c0b21f69
+EBUILD qgis-1.5.0.ebuild 2431 RMD160 54ef756115a7f833dff9d18aad522e0ac5749ba0 SHA1 1ca92b13e8322365b834f0ab5ac2fd79baa1beb7 SHA256 3a3eb9e15a3bb154529fede5057e83f2675f1593989e8092ecaaf5d5c2cb4eb0
+MISC ChangeLog 2478 RMD160 58a9e66212f11aedad8ab213a7f9a7a25d95c089 SHA1 d883a6c68642d5db148878114890c39924c04a22 SHA256 5475fd1047530852c47e3d7bf758fe8d5a05a267c8c4f4ab63d23d5687f4d1b1
 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
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)