Update deps to reflect reality bit more. Move to new cmake-utils syntax.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 26 insertions, 22 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index 0f6e284a8aa9..b0966cc27f67 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-geosciences/qgis
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.2 2009/11/23 02:01:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.3 2009/12/15 10:59:40 scarabeus Exp $
+
+  15 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> qgis-1.3.0.ebuild:
+  Update deps to reflect reality bit more. Move to new cmake-utils syntax.
 
   23 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> qgis-1.3.0.ebuild:
   Fixed the plugins directory, thanks Chris Mayo, bug #294113
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f13683e8604b..3205a70b8a53 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qgis-1.3.0-sip.patch 2929 RMD160 54e82871460ae566bda62218b73dd51d5b3fcac0 SHA1 56d055dc3089216b4037165a2819424fb751f458 SHA256 af7c60951bc51dd4e2e0afe3bf81d6427138907fc02b21e421fdd532dfa84779
 DIST qgis_1.3.0.tar.gz 22091843 RMD160 c2ffd90468b7f9cd49d2ba878a6572e8f19e137a SHA1 6c2f4cf5db8d5b513306465bfd160bdfa9a727af SHA256 4d94913fa44648980609762c7a72d9e3b9736a2157321acb0402afb03ea8186c
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
-EBUILD qgis-1.3.0.ebuild 2314 RMD160 597b00feb9031b56a6b089c228a9a87f725ac6e4 SHA1 826e2c80c477214d7ca58bef29436508a8c474ef SHA256 3b47f7484cd842b7b7a11c891bee857a567f6b6bb523baf1f6b3578bfa50d4c5
-MISC ChangeLog 549 RMD160 a103e1f2a7ec32e60cd96c9870fd042e838f4a1c SHA1 fa30bdd3ed8ddc722bd708e30ce9083e98b003e7 SHA256 41d9afb576256ddd684aac183676dc03995026df1bb753750b7f8a5750164719
+EBUILD qgis-1.3.0.ebuild 2451 RMD160 28308302a7e7abd1061ba1151ae1f4d76aaff247 SHA1 6fe9d991a973333db3ac4c9546ace9e52f37028e SHA256 2ac0e379b7df1ce96092f361bfc35680701476348b9a81704e9d83a3263fde03
+MISC ChangeLog 700 RMD160 7dfb701de5bf7eba4b6c969810bf8078ed771562 SHA1 ee77cf230ee2fd9faf93a6b66ff432006c619d49 SHA256 6117403f920742cce9b3e82f84af797f157ddc0d5ee542cb5c4299ec570cea4f
 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksJ9o8ACgkQ1ycZbhPLE2CffQCcCtq/qyp4j59WGzvib4TMNANI
-N3gAnRi/zNTsKGLXdDi5r69k0dbsO+e7
-=bo73
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/qgis/qgis-1.3.0.ebuild b/sci-geosciences/qgis/qgis-1.3.0.ebuild
index b84a1c44f90c..67ca4b202608 100644
--- a/sci-geosciences/qgis/qgis-1.3.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.3.0.ebuild,v 1.2 2009/11/23 02:01:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.3.0.ebuild,v 1.3 2009/12/15 10:59:40 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ RDEPEND=">=sci-libs/gdal-1.6.1
 	gps? ( dev-libs/expat sci-geosciences/gpsbabel )
 	grass? ( >=sci-geosciences/grass-6 sci-geosciences/gdal-grass )
 	gsl? ( sci-libs/gsl )
-	postgres? ( >=virtual/postgresql-base-8 dev-db/postgis )
+	postgres? ( >=virtual/postgresql-base-8 )
 	python? ( dev-python/PyQt4[sql,svg] )
 	sqlite? ( dev-db/sqlite:3 )"
 
@@ -41,17 +41,18 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs
-	mycmakeargs="${mycmakeargs}
-		-D BUILD_SHARED_LIBS:BOOL=ON
-		-D BINDINGS_GLOBAL_INSTALL:BOOL=ON
-		-D QGIS_LIB_SUBDIR=$(get_libdir)
-		-D QGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+	mycmakeargs+=(
+		"-DBUILD_SHARED_LIBS:BOOL=ON"
+		"-DBINDINGS_GLOBAL_INSTALL:BOOL=ON"
+		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
+		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
 		$(cmake-utils_use_with postgres POSTGRESQL)
 		$(cmake-utils_use_with grass GRASS)
 		$(cmake-utils_use_with gps EXPAT)
 		$(cmake-utils_use_with gsl GSL)
 		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use_with sqlite SPATIALITE)"
+		$(cmake-utils_use_with sqlite SPATIALITE)
+	)
 
 	if use grass; then
 		GRASS_ENVD="/etc/env.d/99grass /etc/env.d/99grass-6 /etc/env.d/99grass-cvs";
@@ -60,7 +61,9 @@ src_configure() {
 				GRASSPATH=$(sed -n 's/LDPATH="\(.*\)\/lib"$/\1/p' ${file});
 			fi
 		done
-		mycmakeargs="${mycmakeargs} -DGRASS_PREFIX=${GRASSPATH}"
+		mycmakeargs+=(
+			"-DGRASS_PREFIX=${GRASSPATH}"
+		)
 	fi
 	cmake-utils_src_configure
 }
@@ -77,3 +80,11 @@ src_install() {
 		doins "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
 	fi
 }
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	fi
+}