commit: 7dfbb552448ee0fe07d1e40fe0eddb390c169200 Author: Chris Mayo <aklhfex <AT> gmail <DOT> com> AuthorDate: Sun Jan 15 11:56:49 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 13:24:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dfbb552
sci-geosciences/qgis: Version bump 2.18.3 - Use system dev-python/pyyaml and dev-python/future - Fix GRASS plugin error on first load, finding installed GRASS Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3483 sci-geosciences/qgis/Manifest | 1 + .../qgis/files/qgis-2.18.3-app-icon.patch | 13 ++ sci-geosciences/qgis/qgis-2.18.3.ebuild | 192 +++++++++++++++++++++ 3 files changed, 206 insertions(+) diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index b7bd640..87ad6ae 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,4 +1,5 @@ DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927 DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb +DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5 diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch b/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch new file mode 100644 index 00000000..88db963 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp +index 4cdb07e..76ffc09 100644 +--- a/src/core/qgsapplication.cpp ++++ b/src/core/qgsapplication.cpp +@@ -396,7 +396,7 @@ QString QgsApplication::activeThemePath() + + QString QgsApplication::appIconPath() + { +- return QString( "qgis-icon-60x60.png" ); ++ return iconsPath() + QStringLiteral( "qgis-icon-60x60.png" ); + } + + QString QgsApplication::iconPath( const QString& iconFile ) diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild new file mode 100644 index 00000000..67371af --- /dev/null +++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit cmake-utils eutils fdo-mime gnome2-utils python-single-r1 + +DESCRIPTION="User friendly Geographic Information System" +HOMEPAGE="http://www.qgis.org/"; +SRC_URI=" + http://qgis.org/downloads/qgis-${PV}.tar.bz2 + examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )" + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples georeferencer grass mapserver oracle postgres python" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + mapserver? ( python )" + +RDEPEND=" + app-crypt/qca:2[qt4,ssl] + >=dev-db/spatialite-4.1.0 + dev-db/sqlite:3 + dev-libs/expat + dev-libs/qjson + dev-qt/designer:4 + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtscript:4 + dev-qt/qtsvg:4 + dev-qt/qtsql:4 + dev-qt/qtwebkit:4 + sci-geosciences/gpsbabel + >=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}] + sci-libs/geos + sci-libs/libspatialindex:= + sci-libs/proj + x11-libs/qscintilla:=[qt4(-)] + || ( + ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) + ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) + ) + georeferencer? ( sci-libs/gsl:= ) + grass? ( >=sci-geosciences/grass-7.0.0:= ) + mapserver? ( dev-libs/fcgi ) + oracle? ( dev-db/oracle-instantclient:= ) + postgres? ( dev-db/postgresql:= ) + python? ( + dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}] + <dev-python/sip-4.19:=[${PYTHON_USEDEP}] + dev-python/qscintilla-python[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + ${PYTHON_DEPS} + ) +" + +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${P}-app-icon.patch ) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + cd src/plugins || die + use georeferencer || cmake_comment_add_subdirectory "georeferencer" +} + +src_configure() { + local mycmakeargs=( + -DQGIS_MANUAL_SUBDIR=/share/man/ + -DBUILD_SHARED_LIBS=ON + -DQGIS_LIB_SUBDIR=$(get_libdir) + -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis + -DWITH_INTERNAL_DATEUTIL=OFF + -DWITH_INTERNAL_FUTURE=OFF + -DWITH_INTERNAL_HTTPLIB2=OFF + -DWITH_INTERNAL_JINJA2=OFF + -DWITH_INTERNAL_MARKUPSAFE=OFF + -DWITH_INTERNAL_PYGMENTS=OFF + -DWITH_INTERNAL_PYTZ=OFF + -DWITH_INTERNAL_QWTPOLAR=OFF + -DWITH_INTERNAL_SIX=OFF + -DWITH_INTERNAL_YAML=OFF + -DPEDANTIC=OFF + -DWITH_APIDOC=OFF + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=OFF + -DWITH_BINDINGS="$(usex python)" + -DWITH_GRASS7="$(usex grass)" + -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 + -DWITH_ORACLE="$(usex oracle)" + -DWITH_POSTGRESQL="$(usex postgres)" + -DWITH_PYSPATIALITE="$(usex python)" + -DWITH_SERVER="$(usex mapserver)" + ) + + if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then + elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6" + mycmakeargs+=( "-DQWT_INCLUDE_DIR=/usr/include/qwt6" ) + if has_version '>=x11-libs/qwt-6.1.2' ; then + mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so" ) + else + mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so" ) + fi + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + domenu debian/qgis.desktop + + local size type + for size in 16 22 24 32 48 64 96 128 256; do + newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png + newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png + for type in qgs qml qlr qpt; do + newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png + done + done + newicon -s scalable images/icons/qgis_icon.svg qgis.svg + + insinto /usr/share/mime/packages + doins debian/qgis.xml + + if use examples; then + docinto examples + dodoc -r "${WORKDIR}"/qgis_sample_data/. + docompress -x /usr/share/doc/${PF}/examples + fi + + python_optimize "${ED%/}"/usr/share/qgis/python + + if use grass; then + python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +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" + elif use python; then + elog "Support of PostgreSQL is disabled." + elog "But some installed python-plugins import the psycopg2 module." + elog "If you do not need these plugins just disable them" + elog "in the Plugins menu, else you need to set USE=\"postgres\"" + fi + + gnome2_icon_cache_update + fdo-mime_mime_database_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_mime_database_update + fdo-mime_desktop_database_update +}
