aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Schmitt <chris@ilovelinux.de>2010-07-08 14:16:31 +0200
committerChristian Schmitt <chris@ilovelinux.de>2010-07-08 14:23:05 +0200
commit554006853879d5e5f58758be7d983684d9e009d8 (patch)
tree6fa49c77e0f1c3c0a957f510859ea70d5b590ec2 /sci-geosciences/qgis
parentBump sci-libs/libfac-3.1.1 (diff)
downloadsci-554006853879d5e5f58758be7d983684d9e009d8.tar.gz
sci-554006853879d5e5f58758be7d983684d9e009d8.tar.bz2
sci-554006853879d5e5f58758be7d983684d9e009d8.zip
[sci-geosciences/qgis-9999] add live ebuild to test version 1.5 (to be released soon)
Diffstat (limited to 'sci-geosciences/qgis')
-rw-r--r--sci-geosciences/qgis/Manifest12
-rw-r--r--sci-geosciences/qgis/qgis-9999.ebuild17
2 files changed, 5 insertions, 24 deletions
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5284c211a..b0c471abc 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
-EBUILD qgis-9999.ebuild 2436 RMD160 cd8b4f20263d58e031e63a2e430769889468aac6 SHA1 9fcc8851345eb1afd5e8d6321b03e0f12535594c SHA256 7dc22aea99faee569598330f42dafe07c63d3d44bcfefd4e6a4e5c2cb3100d3a
+EBUILD qgis-9999.ebuild 2217 RMD160 7205ec9a13b1fbc9d48255693b9640e31abb73ea SHA1 e83e3e7e5c7cb94aae29c726115acda65a9e6f0f SHA256 fef499e5c5fb200f36fb9be703845993fedcd0c52d160baf5123afd748b958fb
MISC ChangeLog 422 RMD160 ee66e01f9ff08026b752b0eb9e79d47cf48636ee SHA1 bbec1b99c475c90f77ba4631b538ac257a4c72c8 SHA256 0f4022f1564ce14fc98c276425c44060c3b764c2d87f969d42866e60a08a27a6
MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwqKh0ACgkQgAnW8HDreRaQWACdGZBSkK2V8TUGWcYyCsJXm+u4
-IxgAoNNMt4eWRb/jESARPt2QBrhmClGh
-=neEq
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e2c459255..d58172e53 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND=">=sci-libs/gdal-1.6.1
gps? (
dev-libs/expat
sci-geosciences/gpsbabel
+ x11-libs/qwt
)
grass? (
>=sci-geosciences/grass-6.4.0_rc6
@@ -53,28 +54,18 @@ src_configure() {
"-DQGIS_MANUAL_SUBDIR=/share/man/"
"-DBUILD_SHARED_LIBS:BOOL=ON"
"-DBINDINGS_GLOBAL_INSTALL:BOOL=ON"
- "-DQWT_INCLUDE_DIR=/usr/include/qwt5"
"-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 QWT)
+ $(cmake-utils_use_with gps EXPAT QWT)
$(cmake-utils_use_with gsl)
$(cmake-utils_use_with python BINDINGS)
$(cmake-utils_use_with sqlite SPATIALITE)
)
+ use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" )
- if use grass; then
- GRASS_ENVD="/etc/env.d/99grass /etc/env.d/99grass-6 /etc/env.d/99grass-cvs";
- for file in ${GRASS_ENVD}; do
- if test -r ${file}; then
- GRASSPATH=$(sed -n 's/LDPATH="\(.*\)\/lib"$/\1/p' ${file});
- fi
- done
- mycmakeargs+=(
- "-DGRASS_PREFIX=${GRASSPATH}"
- )
- fi
cmake-utils_src_configure
}