From 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Dec 2017 20:47:17 +0000 Subject: gentoo resync : 21.12.2017 --- sci-geosciences/qgis/Manifest | 5 +- .../qgis/files/qgis-2.18.6-python.patch | 25 --- sci-geosciences/qgis/metadata.xml | 38 ++-- sci-geosciences/qgis/qgis-2.18.12-r100.ebuild | 234 --------------------- sci-geosciences/qgis/qgis-9999.ebuild | 215 +++++++++++++++++++ 5 files changed, 236 insertions(+), 281 deletions(-) delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.6-python.patch delete mode 100644 sci-geosciences/qgis/qgis-2.18.12-r100.ebuild create mode 100644 sci-geosciences/qgis/qgis-9999.ebuild (limited to 'sci-geosciences/qgis') diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index b319c8e1c4f1..fe4359e2a6c6 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,12 +1,11 @@ AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 AUX qgis-2.18.12-sip.patch 4471 BLAKE2B c4bbdbfe43f6b9c2a4f8aec25109a40967fd93ca815d0fcb2007ee8072e620c0b3aca08890cff4e085a8a2f35962d3f8e3eec54f4256274f7edb5a977b74dc63 SHA512 df08773c915ee640b6ef81ffdb1553e144f5530934bed3a37230824662fa99de91bcc52475f7232e44df3ebd147abf54f537b6a23b02563a5155c14a7d2cb9a6 AUX qgis-2.18.6-featuresummary.patch 1009 BLAKE2B bca5de34bc4eccc10aee3b4320be0259c342d45ea538fd92d6229243fc6b0c6ab90dcc8f24fd9bc10119cac6ab87c1a64f47528269f07865e3e8bf1ca16e4f1f SHA512 4f271d7fb5b39b49bd06cb6308e82b44088978e2fcc17e453dcdc71655000b91be06e08ce05a373ed45d25472422a7b317c12b19a3a41620df07ea723766b44e -AUX qgis-2.18.6-python.patch 647 BLAKE2B 784d5a412d349dda3d60232e184446764cd10f78ff78adb5c26f84859d2e83391d51a88b199678dde90e2361d671093a8ac7a010559c4af240bce416d15a889c SHA512 71d3ab2c1669e76fbfdb5700906c4940f74111e698b19111f148c6e96dd900f9527fc92e6ddbd801318d788f7348ad8ac294fd26e5f7e5ed1bde5bdd6b23e49c DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 -EBUILD qgis-2.18.12-r100.ebuild 6075 BLAKE2B b4955a6cab9f5c6923166b1c7230f29715f6d9b5a022cce4918827a1345daf2734c766ede7be2435f2ff444aa805cffb7206c50e4131a06821c5dd92ed332d0c SHA512 721ed584321140c52890025c78e9faa32fb867fbe24572e3730c0ba3ef24864ab8c8338faf29ec93abc69dd581a00b319e533e42fb0a3c37435596212c8f2971 EBUILD qgis-2.18.12.ebuild 5279 BLAKE2B b4400f19270a6d724890e4c1e1c0c8273429ffc491cf46f5c7d6c0c27a621a9d198568f3d6f60665a7b13fcd9484ae551f73c148877fafca51c7852bb444e92b SHA512 8118478f8aa8bc7ca5221f48125b6fab899bb8bd4db12da89472fc853f1b0eb8094a51c715e1962970b67462b7ed7939f9a92142b52442fd9d735ab3ce9162a4 EBUILD qgis-2.18.14.ebuild 5331 BLAKE2B c3600735a749a82521dcb6adaf3cf8fa72d91ccda47d64cadb6da3f69789b4fb188303e7073792fb1906fcb5d49763cb4d13c0634fa08f2d67c6b99301fb097e SHA512 b62acaea5e1f8a1467593f194cde90ef2558f64cd915f517a042299865822656db8a743c47cd2f8bfd3710fdbb7ec4ed66ba8f5cab681392db6852927d91b341 -MISC metadata.xml 1105 BLAKE2B 6822fb7470bb8416a5cdaf7acc641099d310a3a0b7f86fe19bc5d77a97deb24418911b911bab42c68214c587380771367cd9657a7ea9dd1ae5abdb0272b06507 SHA512 d16c2396c35d915e1d284aaa7b59118b9a66284fcd5e8cfef8b5835b88bf75e3a3ede1b6e7d939e403aa212190afc49b51deebc4868bfa38b44d2e6c25150fa4 +EBUILD qgis-9999.ebuild 5910 BLAKE2B 77f6df6411886052e400725c9f54ae0a21ac42d98d5414591646d19815d269b2b697f71fff4889ddd2101fd32178289bbb745a7848b4cdac1efa7303cd52fb37 SHA512 42ab726a18914c7f9b24cb839e19e2a36d0b4d8a28da18da979bc5eecfae4b964ecb58595c7c0537d4c450f9a64fe14513beceecbe2b3b282a36c31c91549e64 +MISC metadata.xml 1121 BLAKE2B c81c6538e2b0a0094f7566fc72e2c4249d5ff21d999355502b0eaf89cb77b0be305d0df0aa366144bf4ced98e5b07969b33a4f6ee2efb3438cdf098788850571 SHA512 bdd356ee78300f01de7169ab2c8915c369e8e2d5a7cce85df21ba4c4835b65164cc28d7258e7ac0efba4b826cce2d90d179c9247b3f53c06ba73d6b2ac175d06 diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch deleted file mode 100644 index b8a812d3e4fa..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 13d8e30bbe0ee17fff32a3eba90cd217d277e5ac -Author: Marco Bernasocchi -Date: Wed Dec 7 19:08:24 2016 +1300 - - fix 2.18 build with Qt5 by executing pyuic - -diff --git a/scripts/pyuic-wrapper.sh b/scripts/pyuic-wrapper.sh -index d6fb497a84..aa146b31bb 100755 ---- a/scripts/pyuic-wrapper.sh -+++ b/scripts/pyuic-wrapper.sh -@@ -15,12 +15,12 @@ - ########################################################################### - - --PYUIC4=$1 -+PYUIC=$1 - LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH - PYTHONPATH=$3:$PYTHONPATH - PYTHON=$4 - shift 4 - - export LD_LIBRARY_PATH PYTHONPATH -- -+$PYUIC $@ - exec $PYTHON $(dirname $0)/pyuic-wrapper.py $@ diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index b08b019390ee..511bb239d69d 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -1,23 +1,23 @@ - - sci-geosciences@gentoo.org - Gentoo Geosciences Project - - - Quantum GIS (QGIS) is a user friendly Open Source Geographic - Information System (GIS). QGIS supports vector, raster, and database - formats. QGIS lets you browse and create map data on your - computer. It supports many common spatial data formats (e.g. ESRI - ShapeFile, geotiff). QGIS supports plugins to do things like display - tracks from your GPS. - - - Build custom widgets for dev-qt/designer - Determines whether georeferencer plugin should be built - Add support for sci-geosciences/grass - Determines whether mapserver should be built - Enable support for touch input devices - + + sci-geosciences@gentoo.org + Gentoo Geosciences Project + + + Quantum GIS (QGIS) is a user friendly Open Source Geographic + Information System (GIS). QGIS supports vector, raster, and database + formats. QGIS lets you browse and create map data on your + computer. It supports many common spatial data formats (e.g. ESRI + ShapeFile, geotiff). QGIS supports plugins to do things like display + tracks from your GPS. + + + Build custom widgets for dev-qt/designer + Determines whether georeferencer plugin should be built + Add support for sci-geosciences/grass + Determines whether mapserver should be built + Enable support for the polar coordinate system via x11-libs/qwtpolar + diff --git a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild b/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild deleted file mode 100644 index 2e8591032def..000000000000 --- a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5} ) -PYTHON_REQ_USE="sqlite" - -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://qgis.org/downloads/${P}.tar.bz2 - examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )" - KEYWORDS="~amd64 ~x86" -else - GIT_ECLASS="git-r3" - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" -fi -inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils -unset GIT_ECLASS - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="http://www.qgis.org/" - -LICENSE="GPL-2+ GPL-3+" -SLOT="0" -IUSE="designer examples georeferencer grass mapserver oracle postgres python touch" - -REQUIRED_USE=" - mapserver? ( python ) - python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND=" - app-crypt/qca:2[qt5,ssl] - >=dev-db/spatialite-4.1.0 - dev-db/sqlite:3 - dev-libs/expat - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtsvg:5 - dev-qt/qtsql:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}] - sci-libs/geos - sci-libs/libspatialindex:= - sci-libs/proj - x11-libs/qscintilla:=[qt5] - >=x11-libs/qwt-6.1.2:6=[qt5,svg] - >=x11-libs/qwtpolar-1.1.1-r1[qt5] - designer? ( dev-qt/designer:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( >=sci-geosciences/grass-7.0.0:= ) - mapserver? ( dev-libs/fcgi ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - postgres? ( dev-db/postgresql:= ) - python? ( ${PYTHON_DEPS} - 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/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - dev-qt/qtxmlpatterns:5 - sys-devel/bison - sys-devel/flex -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # TODO upstream - "${FILESDIR}/${PN}-2.18.6-featuresummary.patch" - "${FILESDIR}/${PN}-2.18.6-python.patch" - # Taken from redhat - "${FILESDIR}/${P}-sip.patch" - # git master - "${FILESDIR}/${P}-cmake-lib-suffix.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \ - -i CMakeLists.txt || die "Failed to fix lrelease path" - - sed -e "/QT_LRELEASE_EXECUTABLE/d" \ - -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \ - -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \ - -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake" - - 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 - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DWITH_INTERNAL_QWTPOLAR=OFF - -DPEDANTIC=OFF - -DWITH_APIDOC=OFF - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DENABLE_QT5=ON - -DWITH_CUSTOM_WIDGETS=$(usex designer) - -DWITH_GRASS=$(usex grass) - -DWITH_SERVER=$(usex mapserver) - -DWITH_ORACLE=$(usex oracle) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_TOUCH="$(usex touch)" - ) -# # FIXME: Re-add when segfaults were figured out upstream, bug #612070 -# -DWITH_QTWEBKIT=$(usex webkit) - - if has_version '