diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
commit | b2be182d49eea46686b5cf2680d457df61e89dc4 (patch) | |
tree | c66442ced2011c5ca81c3114cc51041e314c6d33 /sci-geosciences | |
parent | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff) |
gentoo resync : 30.06.2018
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/Manifest.gz | bin | 11092 -> 11086 bytes | |||
-rw-r--r-- | sci-geosciences/gpxsee/Manifest | 6 | ||||
-rw-r--r-- | sci-geosciences/gpxsee/gpxsee-5.10.ebuild | 72 | ||||
-rw-r--r-- | sci-geosciences/gpxsee/gpxsee-5.14.ebuild (renamed from sci-geosciences/gpxsee/gpxsee-5.1.ebuild) | 11 | ||||
-rw-r--r-- | sci-geosciences/qgis/Manifest | 9 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch | 38 | ||||
-rw-r--r-- | sci-geosciences/qgis/metadata.xml | 1 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.0.3-r1.ebuild (renamed from sci-geosciences/qgis/qgis-3.0.2.ebuild) | 23 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.0.3.ebuild | 221 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-9999.ebuild | 27 |
10 files changed, 80 insertions, 328 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex 0966c96227b9..75c511a38c43 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index e26852735eaa..3ded80caea44 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,7 +1,5 @@ -DIST GPXSee-5.1.tar.gz 926296 BLAKE2B 77685685229869bf8bb6c7c71e49c2b2a0a93e7b1d2c16912f2ddc2fa5b779e92a650760c726b4f17b0dcc5154783d3f1c6ab69b44b20257549dc0cd13669d8b SHA512 e963228d168822f9796ec1e5244a5eefcf0ca24f424dd579531fe4749f5d946724b4e76f2c2ab028776d87df6e593e06d04963c2e1e338ec0d12d729be646723 -DIST GPXSee-5.10.tar.gz 3009762 BLAKE2B 6152b5268c1715ccd6c2d080a5a720a9369b09834a0d192eb37ca95c10948613c49cd078ff4ffeb4684d7305f557592cee34c1ab2fab1cad49cc01d956844eec SHA512 74f99d18c692e7411ec7350c5a2f3618884b5e84e799b4999b5988a8c5a8af000ebe325b0523dbb7daff1fc0e05687a3d8f53d136934c9ca8cd791b1eee445db DIST GPXSee-5.13.tar.gz 3058493 BLAKE2B 3c262d1e78380f8cc0a4a989dd721cfb6eef72f2285f9f5d88f8d521c6d0b24b3c5e8a3b3b7a3a87b7a0e11ca350540a78d826e62afe3c82ad614899c5663f79 SHA512 7cffbf5d3e928cfc14074c62c046be9b2e7546c1cc59716c52c5f43b8a1ffabe04585cff5b4eccbfd6a756c6d635443af610bb3e8c82834f21bb768a93f7bbb6 -EBUILD gpxsee-5.1.ebuild 1428 BLAKE2B da53af9fb8095bf78c3a709fbbb1cbbf7f7701bd7e7a263b57e220b99123b85bc710acddbe589c303ac8f735843005dbce7fecbe26ab0d33e59deb1c5e314261 SHA512 174fdbd8ca262e8f457bb2618caef2c9b8c26303cd6bfe9fbdf5e58ba52a187bc353a643d7e763b9e27d406b042846597535980c0abf6cf8e65c6982d46aaebf -EBUILD gpxsee-5.10.ebuild 1428 BLAKE2B da53af9fb8095bf78c3a709fbbb1cbbf7f7701bd7e7a263b57e220b99123b85bc710acddbe589c303ac8f735843005dbce7fecbe26ab0d33e59deb1c5e314261 SHA512 174fdbd8ca262e8f457bb2618caef2c9b8c26303cd6bfe9fbdf5e58ba52a187bc353a643d7e763b9e27d406b042846597535980c0abf6cf8e65c6982d46aaebf +DIST gpxsee-5.14.tar.gz 3155455 BLAKE2B 6180efa345532c99a655b80b6052e6646d4b8bcf5b7feda1eec6f0c73ca63a21cf6ab7efd29e297d35e2cd5ab8cd73204864f1db0e9417107b59bc29f8982d3e SHA512 0fa666b999bb6990a3e78087053f9647c023a21b2bbec870fffc4fe1df3982e06beb294231340c4a0a006d06a1c136f94a09724ffa76758c1246d79f3077b075 EBUILD gpxsee-5.13.ebuild 1438 BLAKE2B 02586710a52aeb9e7d438d280513c7471e6c92c62a9bba4c0826e0d07f59158ca20a19ffa59bfd7db3dd8d0e137b2d4492f27ddaf008d8b102d2a6989df8d487 SHA512 c5d3104e71d67ea5de0ecd7125a3fba1c34f3eb09f0ec234c246cc596ae404c17329f60f29ab3c346a72be687b8ac366a52e1ddb6fcd92a7d7260f70ea686c1d +EBUILD gpxsee-5.14.ebuild 1528 BLAKE2B 3a497c29783eddebffec8cf3d9a6220680ba6763462f9b508b26c4cd6750af21982768eeac0086e03befd819fcdd159981457cc75c4d946ac2ab8b43c23e78a2 SHA512 e7eb13dd2c1577283f9e7fd75594436dff2cd35c0f5d9a2d987e2f02638d0fbd3346ab6808e85b50a202e630fa3de2852cdbeb3546ab73a07ce389392de576fe MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd diff --git a/sci-geosciences/gpxsee/gpxsee-5.10.ebuild b/sci-geosciences/gpxsee/gpxsee-5.10.ebuild deleted file mode 100644 index adb87d2d7736..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-5.10.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs de fi fr ru sv" -inherit qmake-utils l10n xdg-utils gnome2-utils - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="http://www.gpxsee.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - newbin ${MY_PN} ${PN} - dodoc README.md - insinto /usr/share/${PN} - doins -r pkg/maps pkg/csv - insinto /usr/share/${PN}/translations - doins lang/*.qm - insinto /usr/share/applications - doins pkg/${PN}.desktop - insinto /usr/share/mime/packages - doins pkg/${PN}.xml - insinto /usr/share/pixmaps - doins icons/${PN}.png -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/gpxsee/gpxsee-5.1.ebuild b/sci-geosciences/gpxsee/gpxsee-5.14.ebuild index adb87d2d7736..50bccd2c2d46 100644 --- a/sci-geosciences/gpxsee/gpxsee-5.1.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-5.14.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PLOCALES="cs de fi fr ru sv" +PLOCALES="cs de fi fr pl ru sv" inherit qmake-utils l10n xdg-utils gnome2-utils MY_PN="GPXSee" @@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" HOMEPAGE="http://www.gpxsee.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -45,12 +45,17 @@ src_compile() { } src_install() { + local lang newbin ${MY_PN} ${PN} dodoc README.md insinto /usr/share/${PN} doins -r pkg/maps pkg/csv + insinto /usr/share/${PN}/translations - doins lang/*.qm + for lang in lang/*.qm; do + [ -f "${lang}" ] && doins "${lang}" + done + insinto /usr/share/applications doins pkg/${PN}.desktop insinto /usr/share/mime/packages diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 16eaf4016d64..238ecd2db410 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,9 +1,8 @@ AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 AUX qgis-3.0.0-featuresummary.patch 986 BLAKE2B 088e7aa420ae6da6b7bcbd7ffff53ec4364861fc554ae490ed5b9606eea700369158a83e5bf90f183fdc7f59bbfc9a43d4a59efd261813f022b20de3a0ac3a49 SHA512 d8ad2e2c8a1f83172f37434657762d7796adf75db06201a1cc52f412327e22aeb3d5df7b24232bfb8da66593db85e772aac3fe33672fc01f81c2fabf9b8d1835 -DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1 +AUX qgis-3.0.3-qt-5.11.0.patch 1210 BLAKE2B fb55302592c6c8168d8863e8794b424df350fb0231bef5772be9c43743d813bcf2f6c4d4ad1a45cf52baae371a418267e8dbeead88fb2141ac077394077d67f9 SHA512 30518f7534e452a105a428953e1fb1119acce593393fb677e7571a01a692feb6764cbb05b56aed6f866cd4c79f4fdda02da8fda4bf9fb95b1765ba0bde4a0814 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d -EBUILD qgis-3.0.2.ebuild 6190 BLAKE2B a717118b11d56a585e3b547d3fa9064e7eb923c82a31ed169c19322837ff015eec4d48c96d5eb3cc4f562a28ccd47280e3d5ad46dce0dea662e791202bb9ad0a SHA512 2aacbe848fcd6dc2db925772746c42911d88328ffd54cc5f2883e574c536d6840bd30ca1c461ea1ee196d5d69dccf1137de3656ca913ecdce5116508766d408e -EBUILD qgis-3.0.3.ebuild 6192 BLAKE2B 304565331b8ebaed4afa777ddd454da15acd8094c63459dfb197eff024a63f5ac7cd0c1cc6bab57bb36b357107cef8a3fc1a1d7a42eceb4e5351b2eb5348ca14 SHA512 74450d5caa73086807da8651f5da1cfc86af522561356710421b06e0dae7f4cfefb13fb5456f6ac5e98703483635244d8f5584f02e71a59022601e37c6e39877 -EBUILD qgis-9999.ebuild 6192 BLAKE2B 304565331b8ebaed4afa777ddd454da15acd8094c63459dfb197eff024a63f5ac7cd0c1cc6bab57bb36b357107cef8a3fc1a1d7a42eceb4e5351b2eb5348ca14 SHA512 74450d5caa73086807da8651f5da1cfc86af522561356710421b06e0dae7f4cfefb13fb5456f6ac5e98703483635244d8f5584f02e71a59022601e37c6e39877 -MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700 +EBUILD qgis-3.0.3-r1.ebuild 6233 BLAKE2B df8a8d83be8b563027abc3d7e6f759357449bd9852a205e7583e5055e564da68645df7be5f8aab8107bfa115d5eb48889acdee6c8c98b1eed4f14379e5b9cf07 SHA512 18da6eb489ca5095099c11d20582c1ea140f4c843f3fc6f02c01b8a338a522420a7be44479cd61f9101ecc90621ba5da6581e28dbe7fe90cdb5377fd4f91f096 +EBUILD qgis-9999.ebuild 6298 BLAKE2B 73f926b0c0f0205b22382ed0c2621cf0c77aacdf623d7a94e1c47399e2129fa2bf6893f974dd427092af90d0b0f30e1046e7b892d19f22f9c171a939c22bd631 SHA512 14c9c816890f9948ade5e0000d2b154aec820ab5a47d309c2f3db1fd0bd42a96f659cc3e9aab127ac850b6e2104f273951e8656d1e3e6778cee207e0be6e9e7b +MISC metadata.xml 1211 BLAKE2B 761852f48581c7cca9f9474d1e2e99c751ca2597726cbbb973c82c6292806e4908fcaa091ad4ad5b60f73cea831db2f94be9c7ae3627ad9bfbe0a7572638c929 SHA512 22aa2127957668f8017e20d08297ef222bb1f9fd0a420398ee191426de0b681fb90138bfa8117f67612001d64020455871db4b8a772653d9ee02d7777555e48b diff --git a/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch b/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch new file mode 100644 index 000000000000..abda33b2dd28 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch @@ -0,0 +1,38 @@ +From 83346e5ec77dc3474c01acd27d4a3e03690170b5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 24 Jun 2018 14:38:44 +0200 +Subject: [PATCH] Fix WITH_GRASS7 build with Qt-5.11.0 (missing headers) + +--- + src/plugins/grass/qgsgrassmoduleinput.cpp | 1 + + src/plugins/grass/qgsgrassregion.cpp | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp +index ebb8efd493..6968a34d8c 100644 +--- a/src/plugins/grass/qgsgrassmoduleinput.cpp ++++ b/src/plugins/grass/qgsgrassmoduleinput.cpp +@@ -17,6 +17,7 @@ + #include <QCompleter> + #include <QFileDialog> + #include <QFileInfo> ++#include <QHeaderView> + #include <QHBoxLayout> + #include <QIcon> + #include <QLatin1String> +diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp +index 00928da4a7..b31f1b9ae9 100644 +--- a/src/plugins/grass/qgsgrassregion.cpp ++++ b/src/plugins/grass/qgsgrassregion.cpp +@@ -27,6 +27,8 @@ + + #include <QButtonGroup> + #include <QColorDialog> ++#include <QDoubleValidator> ++#include <QIntValidator> + #include <QMessageBox> + #include <QMouseEvent> + #include <QRubberBand> +-- +2.18.0 + diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index f25562d2fc93..162cbbaa3dec 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -19,5 +19,6 @@ <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag> <flag name="mapserver">Determines whether mapserver should be built</flag> <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag> + <flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag> </use> </pkgmetadata> diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild index cd2fb0afe941..df0980c51a19 100644 --- a/sci-geosciences/qgis/qgis-3.0.2.ebuild +++ b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_5 ) +PYTHON_COMPAT=( python3_{5,6} ) PYTHON_REQ_USE="sqlite" QT_MIN_VER="5.9.4" @@ -25,10 +25,7 @@ LICENSE="GPL-2+ GPL-3+" SLOT="0" IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" -REQUIRED_USE=" - grass? ( python ) - mapserver? ( python ) - python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" COMMON_DEPEND=" app-crypt/qca:2[qt5(+),ssl] @@ -48,7 +45,7 @@ COMMON_DEPEND=" >=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/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj @@ -64,7 +61,8 @@ COMMON_DEPEND=" ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) - python? ( ${PYTHON_DEPS} + python? ( + ${PYTHON_DEPS} dev-python/future[${PYTHON_USEDEP}] dev-python/httplib2[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] @@ -79,6 +77,7 @@ COMMON_DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) @@ -89,6 +88,7 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 sys-devel/bison sys-devel/flex + python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel @@ -102,10 +102,11 @@ PATCHES=( "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" # TODO upstream "${FILESDIR}/${PN}-3.0.0-featuresummary.patch" + "${FILESDIR}/${P}-qt-5.11.0.patch" ) pkg_setup() { - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup } src_prepare() { @@ -187,10 +188,10 @@ src_install() { if use python; then python_optimize "${ED%/}"/usr/share/qgis/python + fi - if use grass; then - python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts - fi + if use grass; then + python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts fi } diff --git a/sci-geosciences/qgis/qgis-3.0.3.ebuild b/sci-geosciences/qgis/qgis-3.0.3.ebuild deleted file mode 100644 index 0b888637f800..000000000000 --- a/sci-geosciences/qgis/qgis-3.0.3.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# 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.4" - -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=" - grass? ( python ) - 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[ssl] - >=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*:= ) - 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,network,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-5.9.1: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}/${PN}-3.0.0-featuresummary.patch" -) - -pkg_setup() { - use python && 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_GRASS7=$(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+=( - -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 - - if use python; then - python_optimize "${ED%/}"/usr/share/qgis/python - - if use grass; then - python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts - fi - 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 "<sci-geosciences/qgis-3"; then - elog "QGIS is now based on PyQt5. Old scripts may not work anymore." - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 0b888637f800..7ea4905841a8 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_5 ) +PYTHON_COMPAT=( python3_{5,6} ) PYTHON_REQ_USE="sqlite" QT_MIN_VER="5.9.4" @@ -23,12 +23,9 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" +IUSE="3d examples georeferencer grass mapserver oracle polar postgres python qml webkit" -REQUIRED_USE=" - grass? ( python ) - mapserver? ( python ) - python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" COMMON_DEPEND=" app-crypt/qca:2[qt5(+),ssl] @@ -48,7 +45,7 @@ COMMON_DEPEND=" >=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/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj @@ -64,7 +61,8 @@ COMMON_DEPEND=" ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) - python? ( ${PYTHON_DEPS} + python? ( + ${PYTHON_DEPS} dev-python/future[${PYTHON_USEDEP}] dev-python/httplib2[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] @@ -79,8 +77,10 @@ COMMON_DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ) + qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) " DEPEND="${COMMON_DEPEND} @@ -89,6 +89,7 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 sys-devel/bison sys-devel/flex + python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel @@ -105,7 +106,7 @@ PATCHES=( ) pkg_setup() { - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup } src_prepare() { @@ -131,6 +132,7 @@ src_configure() { -DQWT_INCLUDE_DIR=/usr/include/qwt6 -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so -DPEDANTIC=OFF + -DUSE_CCACHE=OFF -DWITH_APIDOC=OFF -DWITH_QSPATIALITE=ON -DENABLE_TESTS=OFF @@ -143,6 +145,7 @@ src_configure() { -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) + -DWITH_QUICK=$(usex qml) -DWITH_QTWEBKIT=$(usex webkit) ) @@ -187,10 +190,10 @@ src_install() { if use python; then python_optimize "${ED%/}"/usr/share/qgis/python + fi - if use grass; then - python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts - fi + if use grass; then + python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts fi } |