[sci-geosciences/qgis-9999] adapt ebuild to portage changes plus some extras

2 files changed, 25 insertions, 15 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d6c817e74..7c38a93e9 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,4 @@
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
-EBUILD qgis-9999.ebuild 2108 SHA1 cb32ea416f3b5a0234619fcf522acac65f472245 SHA256 0a54e35088232a52145e6fd6b2b56eacabe5c2d1133efd50854bda97a201eab9
-MISC ChangeLog 337 SHA1 93e114c7df3e9fda67b8b9a7ed0dd9f6266c35cc SHA256 bd9fb10bc5a6b3a64bb9282cfd0d3e85d155d2794d029e7c41fc6aef4bb66b8d
-MISC metadata.xml 664 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
+EBUILD qgis-9999.ebuild 2236 RMD160 0de02de86b4da09131d64f0bf65fab7dc060ffc6 SHA1 6e68d3110170664761cd323e3f3c1eb8ad33e252 SHA256 e7dfe29e63d36380083ff14e4014f46fd690e960e52e359f90ff0e7ee55a6da3
+MISC ChangeLog 337 RMD160 7e2aeb20e3b35920ed21e651857cb2686620eaf5 SHA1 93e114c7df3e9fda67b8b9a7ed0dd9f6266c35cc SHA256 bd9fb10bc5a6b3a64bb9282cfd0d3e85d155d2794d029e7c41fc6aef4bb66b8d
+MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 7117ed11e..5e42ae36b 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -8,9 +8,8 @@ inherit cmake-utils eutils subversion
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
-SRC_URI="examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
 ESVN_REPO_URI="http://svn.osgeo.org/qgis/trunk/qgis"
+SRC_URI="examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,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-lang/python[sqlite] dev-python/PyQt4[sql,svg] )
 	sqlite? ( dev-db/sqlite:3 )"
 
@@ -37,17 +36,18 @@ DEPEND="${RDEPEND}
 
 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 grass)
 		$(cmake-utils_use_with gps EXPAT)
-		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with 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";
@@ -56,7 +56,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
 }
@@ -73,3 +75,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 an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	fi
+}