From 80208fb578cf92cc308906660ca6d7860c6b2a1f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Mar 2018 16:53:27 +0000 Subject: gentoo resync : 09.03.2018 --- sci-geosciences/qgis/Manifest | 13 +- .../qgis/files/qgis-3.0.0-featuresummary.patch | 31 +++ sci-geosciences/qgis/metadata.xml | 2 +- sci-geosciences/qgis/qgis-2.18.12.ebuild | 2 +- sci-geosciences/qgis/qgis-2.18.14.ebuild | 2 +- sci-geosciences/qgis/qgis-2.18.16.ebuild | 2 +- sci-geosciences/qgis/qgis-3.0.0-r1.ebuild | 219 +++++++++++++++++++++ sci-geosciences/qgis/qgis-3.0.0.ebuild | 214 -------------------- sci-geosciences/qgis/qgis-9999.ebuild | 15 +- 9 files changed, 271 insertions(+), 229 deletions(-) create mode 100644 sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch create mode 100644 sci-geosciences/qgis/qgis-3.0.0-r1.ebuild delete mode 100644 sci-geosciences/qgis/qgis-3.0.0.ebuild (limited to 'sci-geosciences/qgis') diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 4ff976547fb0..61e839acb87d 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,15 +1,16 @@ 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-3.0.0-featuresummary.patch 986 BLAKE2B 088e7aa420ae6da6b7bcbd7ffff53ec4364861fc554ae490ed5b9606eea700369158a83e5bf90f183fdc7f59bbfc9a43d4a59efd261813f022b20de3a0ac3a49 SHA512 d8ad2e2c8a1f83172f37434657762d7796adf75db06201a1cc52f412327e22aeb3d5df7b24232bfb8da66593db85e772aac3fe33672fc01f81c2fabf9b8d1835 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-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d DIST qgis-3.0.0.tar.bz2 94186303 BLAKE2B 2b2623c218a86af22ee13e1271e66244fc6191732db6bc694860015824525188308609c8758062910ba7065ca6790d4091beb15ff324d1a8410e65525cf785b0 SHA512 91201c5d48f9450734a6268f70cba830e363db15a979266af1a7f2ef73857ca11e89145d027f394d052d0536e54b4f62523b1ad49bbe698743fec882ceecfabe 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.ebuild 5238 BLAKE2B 71ce0aa312a0dabb8ef91b0f256dd65253617e3e5b37da7c8b2ece291a977c824247860c315ec2e113a1b77468120728b16aef0b876abdd3bdd6f4c60477f920 SHA512 6ed6eea3577c8b33773cf2d998458ee4c6a9ed5fa47c4912e8b8f15657a4c8cfa8ff8b054614c65cf664924d4a0070b2025e5b897c51fd66b1fcbbcddd6db2e3 -EBUILD qgis-2.18.14.ebuild 5230 BLAKE2B 0ab87ecfaa25d53ad9253d51e776d1b12e2e0bdfdb14d20d86ea8177e77fbc9b5d607523a6cd66345c66383965f06459df3569b8cb00e774919492e43de85024 SHA512 4bcbf4eeb9c73d99646d0ddc2ca78ebb15fcb8d5e29895990c316b2495d6aaad413cfaf390641128562fbe46fafe07c4070f304f7d3a24ace3551e19b0f1971e -EBUILD qgis-2.18.16.ebuild 5227 BLAKE2B cdc3794d934707153185ff5bb25c99d55bcd277995862bdd32714e0d51c488fa205aca16317421b495242ebde4e4a7017a6009b5b27d06e66d59d402dc1026b4 SHA512 c32036b5fce7c205bf4ae40b9e2cb7e55d7a98b5287e13316a68cc3cab8bf0e770c4a4f3085749b1a8cf44f865605c2e808c7d4b5bc29ed9e1eab197776ca105 -EBUILD qgis-3.0.0.ebuild 5993 BLAKE2B c0c346c0c99540b2372c539e16e80be8459c92c1633ae45daffa5fe3104693d02d9a37e325d85603b03e7784426d0244e63ea78d32c9b316cbdeef13f0e53ade SHA512 4d6aaa0d039c94d0bb6484f9179e2a5f7e5e3e1a8fd04226dc8f585b2a1a0071f0310496c1e783e213ec3bc54c200461d7da95dcb1c0ec4342f813ea195db81d -EBUILD qgis-9999.ebuild 5993 BLAKE2B c0c346c0c99540b2372c539e16e80be8459c92c1633ae45daffa5fe3104693d02d9a37e325d85603b03e7784426d0244e63ea78d32c9b316cbdeef13f0e53ade SHA512 4d6aaa0d039c94d0bb6484f9179e2a5f7e5e3e1a8fd04226dc8f585b2a1a0071f0310496c1e783e213ec3bc54c200461d7da95dcb1c0ec4342f813ea195db81d -MISC metadata.xml 1121 BLAKE2B c81c6538e2b0a0094f7566fc72e2c4249d5ff21d999355502b0eaf89cb77b0be305d0df0aa366144bf4ced98e5b07969b33a4f6ee2efb3438cdf098788850571 SHA512 bdd356ee78300f01de7169ab2c8915c369e8e2d5a7cce85df21ba4c4835b65164cc28d7258e7ac0efba4b826cce2d90d179c9247b3f53c06ba73d6b2ac175d06 +EBUILD qgis-2.18.12.ebuild 5238 BLAKE2B db6c6fa1262605f1595cf0f7ee63c8126e80b0f5fbee6676a52729a1f09ca6b40e00502ee67490807302549ecff490b1c0ed6b5c8d7381695875cb2fa5dfdb5b SHA512 2c4bb08747a740f7fb9e3405245163e2b628c40fd1d95123afd2f364dd35e77dbf7bcec52fa77069d89d4a37f0d62fd36000d3e1d77c635171ae8d8c5336b901 +EBUILD qgis-2.18.14.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6 +EBUILD qgis-2.18.16.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6 +EBUILD qgis-3.0.0-r1.ebuild 6141 BLAKE2B 3b6fe020bf25cc345e9d345e819d76961ad5db2b0bd164c05938ffba9d10a05afdd9a58a1abc2191a0a7b2a0aa7c15703277617b0b1d57406e7197e57d4d60bd SHA512 1a1ba0ac0d1d502aff097e5ef1db9b96e5f6b3078977a1a56162e6d94886638a579e1f042b8ad2d0649baec3656862bd721d78498fe3ed2730b4cecede615a07 +EBUILD qgis-9999.ebuild 6148 BLAKE2B faa4704920b164b825c81356d905a88dd5b092931e6eaa8ab98bd703393df763b5b496d1da033661d1bb1fd2cb8804971501cf589c55b102a1abf0c1ab771c2f SHA512 fc934044fc00c46878be2cfb62fdcc24fbe412e5a8b12da6b211a2e24766fc2e0569929990cfe639b26803df23ff3e1963783724a5b78859eb633993ef3e984f +MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700 diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch new file mode 100644 index 000000000000..8787dc09196d --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch @@ -0,0 +1,31 @@ +From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 9 Apr 2017 20:21:28 +0200 +Subject: [PATCH 1/2] Use FeatureSummary + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed0a84013a..26f4659f61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON) + # set path to additional CMake modules + SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) + ++include(FeatureSummary) ++ + # in generated makefiles use relative paths so the project dir is moveable + # Note commented out since it cause problems but it would be nice to resolve these and enable + # +@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX) + SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") + INCLUDE(CPack) + ENDIF (WITH_CORE) ++ ++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +2.12.2 + diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index 511bb239d69d..f25562d2fc93 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -14,7 +14,7 @@ tracks from your GPS. - Build custom widgets for dev-qt/designer + Build QGIS 3D library using dev-qt/qt3d Determines whether georeferencer plugin should be built Add support for sci-geosciences/grass Determines whether mapserver should be built diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild index 3dcd7a697d1f..94f4a69b124c 100644 --- a/sci-geosciences/qgis/qgis-2.18.12.ebuild +++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild @@ -60,7 +60,7 @@ COMMON_DEPEND=" dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}] + dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild index 6a6e8c383ad8..2f935622f68c 100644 --- a/sci-geosciences/qgis/qgis-2.18.14.ebuild +++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild @@ -60,7 +60,7 @@ COMMON_DEPEND=" dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}] + dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] diff --git a/sci-geosciences/qgis/qgis-2.18.16.ebuild b/sci-geosciences/qgis/qgis-2.18.16.ebuild index 1471c7e45cf7..2f935622f68c 100644 --- a/sci-geosciences/qgis/qgis-2.18.16.ebuild +++ b/sci-geosciences/qgis/qgis-2.18.16.ebuild @@ -60,7 +60,7 @@ COMMON_DEPEND=" dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/qscintilla-python[qt4,${PYTHON_USEDEP}] + dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] diff --git a/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild new file mode 100644 index 000000000000..84a8a75f10bc --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_5 ) +PYTHON_REQ_USE="sqlite" +QT_MIN_VER="5.9.1" + +if [[ ${PV} != *9999 ]]; then + SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 + examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.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="https://www.qgis.org/" + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" + +REQUIRED_USE=" + mapserver? ( python ) + python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND=" + app-crypt/qca:2[qt5(+),ssl] + >=dev-db/spatialite-4.2.0 + dev-db/sqlite:3 + dev-libs/expat + dev-libs/libzip:= + dev-libs/qtkeychain[qt5(+)] + >=dev-qt/designer-${QT_MIN_VER}:5 + >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 + >=dev-qt/qtcore-${QT_MIN_VER}:5 + >=dev-qt/qtgui-${QT_MIN_VER}:5 + >=dev-qt/qtnetwork-${QT_MIN_VER}:5 + >=dev-qt/qtpositioning-${QT_MIN_VER}:5 + >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 + >=dev-qt/qtsvg-${QT_MIN_VER}:5 + >=dev-qt/qtsql-${QT_MIN_VER}:5 + >=dev-qt/qtwidgets-${QT_MIN_VER}:5 + >=dev-qt/qtxml-${QT_MIN_VER}:5 + >=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}] + sci-libs/geos + sci-libs/libspatialindex:= + sci-libs/proj + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] + 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}: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] + ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + 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/owslib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/PyQt5[designer,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-2.10.1[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}] ) + ) + webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/linguist-tools-${QT_MIN_VER}:5 + >=dev-qt/qttest-${QT_MIN_VER}:5 + >=dev-qt/qtxmlpatterns-${QT_MIN_VER}: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=( + # git master + "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" + # TODO upstream + "${FILESDIR}/${P}-featuresummary.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 +} + +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 + -DPEDANTIC=OFF + -DWITH_APIDOC=OFF + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=OFF + -DWITH_3D=$(usex 3d) + -DWITH_GEOREFERENCER=$(usex georeferencer) + -DWITH_GRASS=$(usex grass) + -DWITH_SERVER=$(usex mapserver) + -DWITH_ORACLE=$(usex oracle) + -DWITH_QWTPOLAR=$(usex polar) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_BINDINGS=$(usex python) + -DWITH_CUSTOM_WIDGETS=$(usex python) + -DWITH_QTWEBKIT=$(usex webkit) + ) + + if use grass; then + mycmakeargs+=( + -DWITH_GRASS7=ON + -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 + ) + fi + + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + + # bugs 612956, 648726 + addpredict /dev/dri/renderD128 + addpredict /dev/dri/renderD129 + + 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/icons/${PN}-icon${size}x${size}.png ${PN}.png + newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png + for type in qgs qml qlr qpt; do + newicon -c mimetypes -s ${size} debian/icons/${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_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 + if has_version "=dev-qt/designer-${QT_MIN_VER}:5 >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 >=dev-qt/qtcore-${QT_MIN_VER}:5 >=dev-qt/qtgui-${QT_MIN_VER}:5 @@ -52,7 +53,7 @@ COMMON_DEPEND=" sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 ) + 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) @@ -69,7 +70,7 @@ COMMON_DEPEND=" dev-python/markupsafe[${PYTHON_USEDEP}] dev-python/owslib[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}] + dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] @@ -98,6 +99,8 @@ RESTRICT="test" PATCHES=( # git master "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" + # TODO upstream + "${FILESDIR}/${PN}-3.0.0-featuresummary.patch" ) pkg_setup() { @@ -130,7 +133,7 @@ src_configure() { -DWITH_APIDOC=OFF -DWITH_QSPATIALITE=ON -DENABLE_TESTS=OFF - -DWITH_CUSTOM_WIDGETS=$(usex designer) + -DWITH_3D=$(usex 3d) -DWITH_GEOREFERENCER=$(usex georeferencer) -DWITH_GRASS=$(usex grass) -DWITH_SERVER=$(usex mapserver) @@ -138,6 +141,7 @@ src_configure() { -DWITH_QWTPOLAR=$(usex polar) -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) + -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QTWEBKIT=$(usex webkit) ) @@ -150,8 +154,9 @@ src_configure() { use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - # bug 612956 + # bugs 612956, 648726 addpredict /dev/dri/renderD128 + addpredict /dev/dri/renderD129 cmake-utils_src_configure } -- cgit v1.2.3