commit: 0f2133ecf5177fd1489f8cf93946266cf70c6a4b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 5 00:57:31 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Mar 5 06:06:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f2133ec
sci-geosciences/qgis: Fix DEPENDs Closes: https://bugs.gentoo.org/649526 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../qgis/files/qgis-3.0.0-featuresummary.patch | 31 ++++++++++++++++++++++ sci-geosciences/qgis/metadata.xml | 1 + .../{qgis-9999.ebuild => qgis-3.0.0-r1.ebuild} | 12 ++++++--- sci-geosciences/qgis/qgis-9999.ebuild | 12 ++++++--- 4 files changed, 48 insertions(+), 8 deletions(-) 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 00000000000..8787dc09196 --- /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 <[email protected]> +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 511bb239d69..da9f159f45d 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -14,6 +14,7 @@ tracks from your GPS. </longdescription> <use> + <flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag> <flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag> <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag> <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag> diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild similarity index 94% copy from sci-geosciences/qgis/qgis-9999.ebuild copy to sci-geosciences/qgis/qgis-3.0.0-r1.ebuild index d773dd57187..4f627756c81 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="https://www.qgis.org/"; LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit" +IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" REQUIRED_USE=" mapserver? ( python ) @@ -36,6 +36,7 @@ COMMON_DEPEND=" 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 @@ -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}/${P}-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) ) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index d773dd57187..3c190c67ffb 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="https://www.qgis.org/"; LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit" +IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" REQUIRED_USE=" mapserver? ( python ) @@ -36,6 +36,7 @@ COMMON_DEPEND=" 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 @@ -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) )
