diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-14 01:05:40 +0100 |
commit | 76cba73c47c8694e74377004634daca18f2d9c08 (patch) | |
tree | 468603ebdc189bcfae77696162761b3be936baea /sci-geosciences | |
parent | 6957f5c65b02bba533954eabc0b62f5de36be206 (diff) |
gentoo resync : 14.04.2018
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/Manifest.gz | bin | 11085 -> 11077 bytes | |||
-rw-r--r-- | sci-geosciences/qgis/Manifest | 9 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-2.18.12-sip.patch | 185 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch | 31 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-2.18.12.ebuild | 209 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-2.18.16.ebuild | 207 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.0.1.ebuild | 2 |
7 files changed, 2 insertions, 641 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex f635db4695bf..233922e61475 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index b88c9769c648..724a855a58f0 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,16 +1,9 @@ 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 AUX qgis-3.0.1-check-constraints.patch 9535 BLAKE2B d2296d9f99578c53cdca2a0287163cc17748ad79910b19e6a888e7e341adb8436ce2463fa1cec1cbe9bc9b07ef83c3390407dd2baf05c25c33300a292022b2af SHA512 a806442cc3c85b032bf5b018ebf06eb7c99cd4c212b60c7d7aa0c1cfb028f236f6f3c5b224597cfceb118bbb7a552f48f7fd64e6bb772ec63f4d3a48d1ec5006 AUX qgis-3.0.1-qt-5.11.patch 7015 BLAKE2B 77b59b3e8381ae84b138fae9bf39029207985c212489c2a3f4a522c1bdb84f82d0ef2a283869819e63a39d89584d7f1f4967d0d4947e96dd1ad1c4af6654aba7 SHA512 4d935e6686dad9e8bf17de944706f6815da25387278a2ebf822d31c580972809226d77ee0e5e9e9137d028e8e980742bfb73926f97738242dd56220fd53d6e9d -DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea -DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75 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 db6c6fa1262605f1595cf0f7ee63c8126e80b0f5fbee6676a52729a1f09ca6b40e00502ee67490807302549ecff490b1c0ed6b5c8d7381695875cb2fa5dfdb5b SHA512 2c4bb08747a740f7fb9e3405245163e2b628c40fd1d95123afd2f364dd35e77dbf7bcec52fa77069d89d4a37f0d62fd36000d3e1d77c635171ae8d8c5336b901 -EBUILD qgis-2.18.16.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6 -EBUILD qgis-3.0.1.ebuild 6260 BLAKE2B 09181406e5d666311c874088228d5403224aa370341e2992063a4e0152b100ac8336ebd5e6c69c010d8788c1b8a177d6d1edcc597a662c2268ac1552be6824ea SHA512 f3bfe67d90b1649a35133933b1561157924e291bfeb4d76eb80684e8e3b42c5f8ad01f6d5146325db4d9dbe278c115f50ae11ddeee6daf83245cc95a02af3e2a +EBUILD qgis-3.0.1.ebuild 6259 BLAKE2B 452fb81c2eaa394b5d8b74ec954bb4845530b45a6e2dd54dbda9af6c220afd66f4d09dbfb2313644ebdd1357b5eb03518afc3a75b2484ad1988feeb92f780ba8 SHA512 de833d3679e3aa943e1b5361d069e08c5bb75475fa31fbcce2106ac0abaa9c8260a180c03ce6aa0ba3cdfa5f8f2a09df6e3ebd27b416038462603319a31af6f7 EBUILD qgis-9999.ebuild 6161 BLAKE2B 1e55aece92a60ce8cfd7b4d5265f7824c8a8a54b1d996fd83852a78cf34e9cce4458a7e7d4f2f8c096c49df75d3daf4ef54fac4ffd992c84621a4ed5f5f08abf SHA512 fab722837d024b644096643096c7549453bf95b71fa17bc5f8afdedc85db425a47967e32591aaded01c22108652dfc5464cd6a28d76153f0bfc5675345469de7 MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700 diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch b/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch deleted file mode 100644 index 07db9b029bf6..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff --git a/python/core/conversions.sip b/python/core/conversions.sip -index f07d3ab1db..948821e91e 100644 ---- a/python/core/conversions.sip -+++ b/python/core/conversions.sip -@@ -2041,3 +2041,178 @@ register_from_qvariant_convertor = (void (*)(FromQVariantConvertorFn))sipImportS - register_from_qvariant_convertor(null_from_qvariant_convertor); - %End - %End -+ -+// QList<QVariant> is implemented as a Python list. -+%MappedType QList<QVariant> /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/ -+{ -+%TypeHeaderCode -+#include <qlist.h> -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ QVariant *t = new QVariant(sipCpp->at(i)); -+ PyObject *tobj; -+ -+ if ((tobj = sipConvertFromNewType(t, sipType_QVariant, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ delete t; -+ -+ return NULL; -+ } -+ -+ PyList_SET_ITEM(l, i, tobj); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ SIP_SSIZE_T len; -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) -+ return 0; -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ bool ok = (itm && sipCanConvertToType(itm, sipType_QVariant, SIP_NOT_NONE)); -+ -+ Py_XDECREF(itm); -+ -+ if (!ok) -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ QList<QVariant> *ql = new QList<QVariant>; -+ len = PySequence_Size(sipPy); -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ int state; -+ QVariant *t = reinterpret_cast<QVariant *>(sipConvertToType(itm, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ -+ Py_DECREF(itm); -+ -+ if (*sipIsErr) -+ { -+ sipReleaseType(t, sipType_QVariant, state); -+ -+ delete ql; -+ return 0; -+ } -+ -+ ql->append(*t); -+ -+ sipReleaseType(t, sipType_QVariant, state); -+ } -+ -+ *sipCppPtr = ql; -+ -+ return sipGetState(sipTransferObj); -+%End -+}; -+ -+ -+// QList<QPolygonF> is implemented as a Python list. -+%MappedType QList<QPolygonF> /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/ -+{ -+%TypeHeaderCode -+#include <qlist.h> -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ QPolygonF *t = new QPolygonF(sipCpp->at(i)); -+ PyObject *tobj; -+ -+ if ((tobj = sipConvertFromNewType(t, sipType_QPolygonF, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ delete t; -+ -+ return NULL; -+ } -+ -+ PyList_SET_ITEM(l, i, tobj); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ SIP_SSIZE_T len; -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0) -+ return 0; -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ bool ok = (itm && sipCanConvertToType(itm, sipType_QPolygonF, SIP_NOT_NONE)); -+ -+ Py_XDECREF(itm); -+ -+ if (!ok) -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ QList<QPolygonF> *ql = new QList<QPolygonF>; -+ len = PySequence_Size(sipPy); -+ -+ for (SIP_SSIZE_T i = 0; i < len; ++i) -+ { -+ PyObject *itm = PySequence_ITEM(sipPy, i); -+ int state; -+ QPolygonF *t = reinterpret_cast<QPolygonF *>(sipConvertToType(itm, sipType_QPolygonF, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ -+ Py_DECREF(itm); -+ -+ if (*sipIsErr) -+ { -+ sipReleaseType(t, sipType_QPolygonF, state); -+ -+ delete ql; -+ return 0; -+ } -+ -+ ql->append(*t); -+ -+ sipReleaseType(t, sipType_QPolygonF, state); -+ } -+ -+ *sipCppPtr = ql; -+ -+ return sipGetState(sipTransferObj); -+%End -+}; --- -2.12.0 diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch b/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch deleted file mode 100644 index 0d4c99de9de0..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -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_EXECUTABLES "qgis" "QGIS") - SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") - INCLUDE(CPack) -+ -+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.12.2 - diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild deleted file mode 100644 index 94f4a69b124c..000000000000 --- a/sci-geosciences/qgis/qgis-2.18.12.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit cmake-utils eutils gnome2-utils python-single-r1 qmake-utils xdg-utils - -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=" - mapserver? ( python ) - python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND=" - 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 - sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}] - sci-libs/geos - sci-libs/libspatialindex:= - sci-libs/proj - x11-libs/qscintilla:=[qt4(-)] - >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] - >=x11-libs/qwtpolar-1[qt4(-)] - 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/PyQt4[X,sql,svg,${PYTHON_USEDEP}] - 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/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - 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" - # 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 -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \ - CMakeLists.txt || die "Failed to fix lrelease path" - - 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-qt4.so - -DWITH_INTERNAL_QWTPOLAR=OFF - -DPEDANTIC=OFF - -DWITH_APIDOC=OFF - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_GRASS=$(usex grass) - -DWITH_SERVER=$(usex mapserver) - -DWITH_ORACLE=$(usex oracle) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_QTWEBKIT=OFF - ) - - if has_version '<x11-libs/qscintilla-2.10'; then - mycmakeargs+=( - -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so - ) - fi - - if use grass; then - mycmakeargs+=( - -DWITH_GRASS7=ON - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 - ) - fi - - if use python; then - mycmakeargs+=( - -DBINDINGS_GLOBAL_INSTALL=ON - -DWITH_PYSPATIALITE=ON - -DWITH_INTERNAL_DATEUTIL=OFF - -DWITH_INTERNAL_FUTURE=OFF - -DWITH_INTERNAL_MARKUPSAFE=OFF - -DWITH_INTERNAL_PYTZ=OFF - -DWITH_INTERNAL_SIX=OFF - -DWITH_INTERNAL_YAML=OFF - ) - fi - - # bug 612956 - addpredict /dev/dri/renderD128 - - 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_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 - 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-2.18.16.ebuild b/sci-geosciences/qgis/qgis-2.18.16.ebuild deleted file mode 100644 index 2f935622f68c..000000000000 --- a/sci-geosciences/qgis/qgis-2.18.16.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit cmake-utils eutils gnome2-utils python-single-r1 qmake-utils xdg-utils - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" -SRC_URI=" - https://qgis.org/downloads/qgis-${PV}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - -LICENSE="GPL-2+ GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples georeferencer grass mapserver oracle postgres python" - -REQUIRED_USE=" - mapserver? ( python ) - python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND=" - 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 - sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}] - sci-libs/geos - sci-libs/libspatialindex:= - sci-libs/proj - x11-libs/qscintilla:=[qt4(-)] - >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] - >=x11-libs/qwtpolar-1[qt4(-)] - 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/PyQt4[X,sql,svg,${PYTHON_USEDEP}] - 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/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - 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" - # git master - "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \ - CMakeLists.txt || die "Failed to fix lrelease path" - - 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-qt4.so - -DWITH_INTERNAL_QWTPOLAR=OFF - -DPEDANTIC=OFF - -DWITH_APIDOC=OFF - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_GRASS=$(usex grass) - -DWITH_SERVER=$(usex mapserver) - -DWITH_ORACLE=$(usex oracle) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_QTWEBKIT=OFF - ) - - if has_version '<x11-libs/qscintilla-2.10'; then - mycmakeargs+=( - -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so - ) - fi - - if use grass; then - mycmakeargs+=( - -DWITH_GRASS7=ON - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 - ) - fi - - if use python; then - mycmakeargs+=( - -DBINDINGS_GLOBAL_INSTALL=ON - -DWITH_PYSPATIALITE=ON - -DWITH_INTERNAL_DATEUTIL=OFF - -DWITH_INTERNAL_FUTURE=OFF - -DWITH_INTERNAL_MARKUPSAFE=OFF - -DWITH_INTERNAL_PYTZ=OFF - -DWITH_INTERNAL_SIX=OFF - -DWITH_INTERNAL_YAML=OFF - ) - fi - - # bug 612956 - addpredict /dev/dri/renderD128 - - 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_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 - 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-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild index 882d915e20ea..79614147766f 100644 --- a/sci-geosciences/qgis/qgis-3.0.1.ebuild +++ b/sci-geosciences/qgis/qgis-3.0.1.ebuild @@ -10,7 +10,7 @@ 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" + KEYWORDS="amd64 x86" else GIT_ECLASS="git-r3" EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |