diff options
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/Manifest.gz | bin | 11088 -> 11090 bytes | |||
-rw-r--r-- | sci-geosciences/grass/Manifest | 4 | ||||
-rw-r--r-- | sci-geosciences/grass/grass-7.4.4-r3.ebuild (renamed from sci-geosciences/grass/grass-7.4.4-r2.ebuild) | 32 | ||||
-rw-r--r-- | sci-geosciences/grass/grass-7.4.4.ebuild | 32 | ||||
-rw-r--r-- | sci-geosciences/opencpn-plugins-meta/Manifest | 2 | ||||
-rw-r--r-- | sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild | 2 | ||||
-rw-r--r-- | sci-geosciences/qgis/Manifest | 8 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch | 11 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch | 22 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.10.2-r1.ebuild (renamed from sci-geosciences/qgis/qgis-3.10.2.ebuild) | 34 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.4.12.ebuild | 216 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-9999.ebuild | 34 | ||||
-rw-r--r-- | sci-geosciences/qmapshack/Manifest | 4 | ||||
-rw-r--r-- | sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild | 41 | ||||
-rw-r--r-- | sci-geosciences/qmapshack/qmapshack-1.13.2.ebuild | 37 |
15 files changed, 76 insertions, 403 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex e04e3fd32831..c6a616187358 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index e0cbe2282c7a..0b6d52c3fc46 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,5 +1,5 @@ AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4 DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83 -EBUILD grass-7.4.4-r2.ebuild 7377 BLAKE2B 9a57d8e09c6a00371569730cbf81d80005de31f053f9818d50b2dafe755ef6b047cba59d513c2cb7a568bba4bb49162842017ca3349bf8646fb2a8691b745e09 SHA512 f7ee0cb8a850bcb6318962197123f5ea0f2f4e8c347386a400e8905556ab5a9ecb152cb1f7ba16ba07252667af22258ce3ad0396933f13f4c5548fcc51390c2b -EBUILD grass-7.4.4.ebuild 7388 BLAKE2B aa8f400ff439b80be56b82c143d66839d28ce107183f6041e6d40af21205cd12d028598280567777f2a8842c41027a5da888226e94dbfc1077560a12723f5606 SHA512 811b4d33adec006ff2c9d40682d6e7e04953a0225101fadeb8292df4327c2c4b2b305cf131455dd6119c615c5b3b83d8afe6808e06bfb581f401ae324213db14 +EBUILD grass-7.4.4-r3.ebuild 7400 BLAKE2B 8dde00d639e28c3d53b9ca02ff7b4b1bcc2424b121dbad8b24645c5f26ef252dc62c695a7a1c87d58b8992ca859c2425b85fdcaa1204a04d5f7f4bdd3b61d256 SHA512 69a41763c2d3a60cdab2756fe5e4643e47b67f681fa548a6d055bb630c09e001d066196964a26d53407e580e57438e94b0052063ee1fe16c3796081ab45a74ab +EBUILD grass-7.4.4.ebuild 7411 BLAKE2B c4b0539103c65e5c5f3275a51a60ef48000f898e72395f779c0178de598eaee745aada62cb5f3c2c682cdef1b2d962b0490f82ada644a137c69b81b2fecac1fa SHA512 71dd5f7e0e3972d89e3e29fa6dfe593697606188dd6318b7267f6793a87499d253952faa3f951659d22d9c4ccb9438e8b752f0c1b18f57408edc71380b8bd8d0 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635 diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r3.ebuild index 4fc916183868..595f714b7b87 100644 --- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild +++ b/sci-geosciences/grass/grass-7.4.4-r3.ebuild @@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm RDEPEND="${PYTHON_DEPS} >=app-admin/eselect-1.2 - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + ') media-libs/libprojectm sci-libs/gdal sys-libs/gdbm @@ -150,23 +152,23 @@ src_configure() { setup-wxwidgets fi - addwrite "${EPREFIX%/}/dev/dri/renderD128" + addwrite "${EPREFIX}/dev/dri/renderD128" local myeconfargs=( --enable-shared --disable-w11 --without-opendwg --with-regex - --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" - --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" - --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" - --with-proj-share="${EPREFIX%/}/usr/share/proj/" + --with-gdal="${EPREFIX}/usr/bin/gdal-config" + --with-proj-includes="${EPREFIX}/usr/include/libprojectM" + --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" + --with-proj-share="${EPREFIX}/usr/share/proj/" $(use_with cxx) $(use_with tiff) $(use_with png) $(use_with postgres) $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") + $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") $(use_with sqlite) $(use_with opengl) $(use_with odbc) @@ -175,16 +177,16 @@ src_configure() { $(use_with lapack) $(use_with X cairo) $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") $(use_with nls) $(use_with readline) $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") + $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") - $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") + $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") $(use_with X x) ) econf "${myeconfargs[@]}" @@ -244,7 +246,7 @@ src_install() { # get proper fonts path for fontcap sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + -e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die # set proper python interpreter diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild index e875e74c7586..af8e8a283be9 100644 --- a/sci-geosciences/grass/grass-7.4.4.ebuild +++ b/sci-geosciences/grass/grass-7.4.4.ebuild @@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm RDEPEND="${PYTHON_DEPS} >=app-admin/eselect-1.2 - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + ') media-libs/libprojectm sci-libs/gdal sys-libs/gdbm @@ -150,23 +152,23 @@ src_configure() { setup-wxwidgets fi - addwrite "${EPREFIX%/}/dev/dri/renderD128" + addwrite "${EPREFIX}/dev/dri/renderD128" local myeconfargs=( --enable-shared --disable-w11 --without-opendwg --with-regex - --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" - --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" - --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" - --with-proj-share="${EPREFIX%/}/usr/share/proj/" + --with-gdal="${EPREFIX}/usr/bin/gdal-config" + --with-proj-includes="${EPREFIX}/usr/include/libprojectM" + --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" + --with-proj-share="${EPREFIX}/usr/share/proj/" $(use_with cxx) $(use_with tiff) $(use_with png) $(use_with postgres) $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") + $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") $(use_with sqlite) $(use_with opengl) $(use_with odbc) @@ -175,16 +177,16 @@ src_configure() { $(use_with lapack) $(use_with X cairo) $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") $(use_with nls) $(use_with readline) $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") + $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") - $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") + $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") $(use_with X x) ) econf "${myeconfargs[@]}" @@ -244,7 +246,7 @@ src_install() { # get proper fonts path for fontcap sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + -e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die # set proper python interpreter diff --git a/sci-geosciences/opencpn-plugins-meta/Manifest b/sci-geosciences/opencpn-plugins-meta/Manifest index f08f5de0d8ab..6ac8b7214245 100644 --- a/sci-geosciences/opencpn-plugins-meta/Manifest +++ b/sci-geosciences/opencpn-plugins-meta/Manifest @@ -1,2 +1,2 @@ -EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1354 BLAKE2B d46b48f16b553279ca65fc17848f2cb918cc5d079bfce47d30a347324f25c13a6d18887fe3f175ee15afa232ca245f5f5127b0c611c6e15f5f57d021e47556ad SHA512 06959e4ae448d57e5d8f28f1deffb73a1bd2597a001b8b71a30a3a92e7ec60e9ecd4de33c4ae446085e3841d7cd0702bae2b6efc9c5b0f9d574ea6b0819c5abe +EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1372 BLAKE2B 0a1cee39e987227373847e8689e957dffb0dbf80a176dafb5d119d8411d5b3cfc7487b98ba0d3eb74fdf99ae022e6b55523ccd44a73fc7a25cc3e3917cb304f2 SHA512 8b37b575709ead8bb0f2a3f79f37fe5025c3af6aa8c6e594060e3e061025586716955427b8867c6c0e76a90be8209cc39a9383258f0b702bbac990be1ab845ca MISC metadata.xml 380 BLAKE2B e36e71274105ca4ccc90d1956dbd050ef82af00c0342c17b6d98e7b1d2e7fb9096ab4a2aea3763d054ffb9165d6d8b20122908c6b4ab651f18b722aeec66672a SHA512 8e6413ba8a2f51d21bd883f097825a3e86a410d222496242fc2b6da34ee8d759c473e1c1c58ee93c90b0d88db2cfd6e1f8c00fa29bd8a1637a2026142b9b18ab diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild index 08856b3f00c9..1f85e8dec7a6 100644 --- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild +++ b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild @@ -4,7 +4,7 @@ EAPI=6 DESCRIPTION="Meta ebuild to pull in opencpn plugins" -HOMEPAGE="https://www.gentoo.org" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="metapackage" SLOT="0" diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 5e238fcb8ef5..cecd0cc83476 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,12 +1,8 @@ -AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d -AUX qgis-3.4.12-qt-5.13.patch 707 BLAKE2B 3a6e14a77403980df16008345c1f8a6edeba6d7bc027e6c2844501af2d902277360d0ef3955bdc9845da3c2b8a688f4d98fd3d4062c388476c20900e08827be7 SHA512 66af7639e1ab475ae1f6d89d44bef75b5904024b04209fddb6b855f3f08e823a1224233a39f595412de196f6739d026e2c0a9384694ca308d8a5bea0ab4942e5 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f -DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d -EBUILD qgis-3.10.2.ebuild 5462 BLAKE2B 1dda9fc92e04689fa73a0bda51d4d87cedcc0d50ab72c07b7512f1a740b1ff5247a53d9ed40a88d4c03174e97607488f2b1639eb857115f05654fd106b19526e SHA512 3483ad1c06e894e1546c426fda33bd27a4884df2c1a7b11580c72a3f3c59f44620438baa6e778f7c3257b4a62218b10a3ed9226371e10309093026ea69caefd9 -EBUILD qgis-3.4.12.ebuild 6069 BLAKE2B 56308d01f866770d39f9dc90998f7e0a1116f1701ce1a3485d098cad49f40f3aaedb73d498de1af1bd63f33062e4f4b73f15e8a0b5d0bb6d8b8f4ceb14f7824b SHA512 adbe42974b73c82bb3ad8f0fa3e26549b19e742c6a922d7bda9ee736bb4def0aee9837e4e22ad1439835db5f8f9c3a1aaec5d8dfdc073a30def851547e0cbf36 -EBUILD qgis-9999.ebuild 5464 BLAKE2B bc5374f93fec200d1a1c824bb9da5755d4871b4a041bce481ced386470bf66795c32d0266e07fa249dbc07399a328c9902edab5e2a03d035615811d8b46436a1 SHA512 2fbe115ef3ff9dad4af0174b6e11082d2a1468935fd5fae870bc5de33f664a16e15ed7667b8d66d23c0420d56e2037a2285f9f5e86a155f64051ec52178b366e +EBUILD qgis-3.10.2-r1.ebuild 5605 BLAKE2B 6a843e029a5428a3908d8029056b0dcf50b59417d3f0f3b0f0de269b049bae110d69d80c11d588c769b54539457bbdae425820d2c1438684db2a13e8875a2fd6 SHA512 a2ade40ebb1b8ed733af9b36c265cd9254a3b13d4f46a6ae0640f0786d760878d4bc6667c3c413f3f24b5880692c72b9254c564edbe01799a4864fa16bf757a8 +EBUILD qgis-9999.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99 diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch deleted file mode 100644 index 5a1e8fcd9551..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/PyQtMacros.cmake 2016-08-26 05:58:37.000000000 -0600 -+++ b/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600 -@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles ) - ELSE(WIN32) - # TODO osx - SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") -- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib") -+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") - ENDIF(WIN32) - - FOREACH(it ${ARGN}) diff --git a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch deleted file mode 100644 index 9edb44276098..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001 -From: Matthias Kuhn <matthias@opengis.ch> -Date: Sat, 22 Jun 2019 10:11:31 +0200 -Subject: [PATCH] Add missing include - -Fix https://github.com/qgis/QGIS/issues/30316 ---- - src/analysis/interpolation/qgsinterpolator.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h -index 35343ccdf7f..5d694418299 100644 ---- a/src/analysis/interpolation/qgsinterpolator.h -+++ b/src/analysis/interpolation/qgsinterpolator.h -@@ -19,6 +19,7 @@ - #define QGSINTERPOLATOR_H - - #include <QVector> -+#include <QList> - #include "qgis_sip.h" - #include "qgis_analysis.h" - diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild index 232d4a5b49c5..cc6d86b4b702 100644 --- a/sci-geosciences/qgis/qgis-3.10.2.ebuild +++ b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild @@ -73,22 +73,24 @@ COMMON_DEPEND=" 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}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/jinja[${PYTHON_MULTI_USEDEP}] + dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] + dev-python/owslib[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + dev-python/pytz[${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) + ') ) qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild deleted file mode 100644 index ae1b97d37ba2..000000000000 --- a/sci-geosciences/qgis/qgis-3.4.12.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" - -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" - inherit git-r3 -else - 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" -fi -inherit cmake-utils desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" - -LICENSE="GPL-2+ GPL-3+" -SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -BDEPEND=" - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex -" -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/qtserialport-${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] - 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*:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - 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}] - >=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} - >=dev-qt/qttest-${QT_MIN_VER}:5 - >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 - python? ( ${PYTHON_DEPS} ) -" -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" - "${FILESDIR}/${P}-qt-5.13.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" - "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \ - -i CMakeLists.txt || die # TODO fixed in master -} - -src_configure() { - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=share/man/ - -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 - -DUSE_CCACHE=OFF - -DWITH_APIDOC=OFF - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_3D=$(usex 3d) - -DWITH_GEOREFERENCER=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - $(cmake-utils_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake-utils_use_find_package netcdf NetCDF) - -DUSE_OPENCL=$(usex opencl) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -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 - - newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop - - local size type - for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png - for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} linux/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 - fi - - 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 - - xdg_pkg_postinst -} diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 14ca3c37210b..74129055f6bb 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -73,22 +73,24 @@ COMMON_DEPEND=" 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}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/jinja[${PYTHON_MULTI_USEDEP}] + dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] + dev-python/owslib[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + dev-python/pytz[${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) + ') ) qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 5b76d2385247..e57924fcc8ba 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,9 +1,5 @@ AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e07444cbed86ace926348c0b94a0061cde1edd1ab0dfd330b57dabd7cc9be5317c761c307f61fce3c9a SHA512 d110ae4081ba75cdcee0feac9967a8f59218f12cd497a48434e6289a2fa1b04116a84582191ff45b8eda4af2dd4b6611b5035422af392653e3548e1829f2acd6 AUX qmapshack-positioning.patch 482 BLAKE2B cb7d7b8f74a23828503c76e0cf3c7120af1aa412512461ae0e3e4a051ed7d8b89f9254a2397767b6ff56f1cbeefb1a6347f546222e991946dae3235da194d774 SHA512 245524903ec5db0da9d1874f0b5c0e2a318f6b955970da2645cff6dc1b21adb0565728021feca2cd236af9d2e60325e0bce1bb8084390d073200c5bad65d7175 -DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5 -DIST qmapshack-1.13.2.tar.gz 12725064 BLAKE2B fad8fdbb9fe1559823bcb835f64d88751c4f8593b8e1b213df17d5450c12eaf8c470241c1dde1299a555d698ddae1aee6cb66bee09baa6e3339513e65bacbb79 SHA512 0f2d260cb58e1cc995a05eda213d7c3ddd219cb5829164f406f928da5bbaf681d41743534f0354ba59786339ff193925d41ffddc5efa5dcf27fbbcbc070b98f3 DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99 -EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d -EBUILD qmapshack-1.13.2.ebuild 875 BLAKE2B 336d58ba60e3a0d30c68b3ba2579851c4aa19e13473fa9dd51686b0b4b2e084979347d2959feb6f78296a515349a991cdb290955b2332ff6c24d40337685b613 SHA512 6bbd42f14809b65b4a4c3ea902f8eba523ee450a32e533f1cf10a50c419cd10a348d1930271f524e21810a414564e9afdda05bfbeecfd58e3f7e0ac3740ad2c2 EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild deleted file mode 100644 index 29267c1a3828..000000000000 --- a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils gnome2-utils - -DESCRIPTION="GPS mapping utility" -HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" -SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="dev-qt/qtwebengine:5[widgets] - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtprintsupport:5 - dev-qt/qtdbus:5 - dev-qt/qttest:5 - dev-qt/designer:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-libs/quazip - >=sci-geosciences/routino-3.1.1 - sci-libs/gdal - sci-libs/proj - sci-libs/alglib" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -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/qmapshack/qmapshack-1.13.2.ebuild b/sci-geosciences/qmapshack/qmapshack-1.13.2.ebuild deleted file mode 100644 index 5d7932b589d2..000000000000 --- a/sci-geosciences/qmapshack/qmapshack-1.13.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg - -DESCRIPTION="GPS mapping utility" -HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" -SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwebengine:5[widgets] - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtprintsupport:5 - dev-qt/qtpositioning:5 - dev-qt/qtdbus:5 - dev-qt/qttest:5 - dev-qt/designer:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-libs/quazip - >=sci-geosciences/routino-3.1.1 - sci-libs/gdal - >=sci-libs/proj-5.0.0 - sci-libs/alglib" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -PATCHES=( "${FILESDIR}"/${PN}-positioning.patch ) - -src_prepare() { - cmake-utils_src_prepare - cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die -} |