summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin10922 -> 10921 bytes
-rw-r--r--sci-geosciences/osm-gps-map/Manifest2
-rw-r--r--sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild2
-rw-r--r--sci-geosciences/qgis/Manifest6
-rw-r--r--sci-geosciences/qgis/qgis-3.10.7.ebuild (renamed from sci-geosciences/qgis/qgis-3.10.3.ebuild)41
-rw-r--r--sci-geosciences/qgis/qgis-9999.ebuild41
-rw-r--r--sci-geosciences/qmapshack/Manifest3
-rw-r--r--sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch67
-rw-r--r--sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild45
9 files changed, 158 insertions, 49 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ec2a15a2b2e5..0e489edfa04e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index bfb8f71ddfc9..128dc0adf611 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,5 +1,5 @@
AUX osm-gps-map-1.1.0-gtk-doc-module.patch 392 BLAKE2B 73bdfd92240b7e96b05a3cf1c6b77075e1b2e45f47919b3123a036f71c43ef6530f939f40609531287594802f37d07d59cfc8de8fb558e99f33710954acd179c SHA512 e49ab51ed248a2e05130bb7c7774c486a71af46207e855ad95d6373d3a6859bd52d56cf7957a3b16f5d65114697f27aff1d3a18a398ea846b77d25c35752c404
AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9ffbc46a4003a4f00a19e156ba2a288aa0aff0a72fc2d5363004ef3e91aeb6d3c2caea43f710cf77dc76d61b26834be359558baae7af6 SHA512 e6cd05ca74d77851b4b40ec167bad20f1b06840378ef93f4f961fcf795212d5f0f5ae4198bd345143e0eb0418c4bfd9e59d62b69936ae68cccb24fb84d9f87fa
DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c9911f76e05a6f8e96cd741ca291b74e238a06b6d01fbd8bac9c43bdd73788e8ef0c035d75290ffb631a15ee0b9f749e5 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0
-EBUILD osm-gps-map-1.1.0.ebuild 892 BLAKE2B 31040324b37c0e3df7e4338a83d6d476fd47b5f2ff53bd02e5ccff711cd45cdb5088616297f7aa14ba643782916b714029f138e641ffae6d79490e9d7d2bce0f SHA512 356bc4dd01e5feebc5ebc610aa6eef2461b7a1b55d47a895ff43b496d93ac99140fd3f0e86c016717c7891bef461487ee7b0ba771632861f0b4d33826704c6a3
+EBUILD osm-gps-map-1.1.0.ebuild 899 BLAKE2B 52bc75f8caf261415dffc1d7bb4f5256dbc9ee5c1e17cf52020b91b15ec365f09e19dcff5cce697137c54b50751511a44a54f0d18d8685c8e24a5de9b4ee59c8 SHA512 c868f9a711c0ce574376954499a68ab05411e136eba282be7fb7668a89262e1fb2eae2e38ec30c513a150c76f0dd07fdfdf95e274c2d77daedb545077cb61363
MISC metadata.xml 327 BLAKE2B 33d0eccf4eaefa31ad6a2a5fa2aea8ac9a03e9c423c8c96400c4a6921429886bcba4c388f8ed739af67673bc00cc07a038b4664a23c6a808b1b9a699866860c1 SHA512 67dd8500028be31b9bbae47ea255981f82762bc6a1c2a98b1d76c04e09e3bd794bdcac589e09c9158425e9ed8500a2d8d02d5add82e5d269848ca19b4fd299ea
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
index 2fcde8616055..504900c0a3fa 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="static-libs"
RDEPEND="
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7a7911854826..df84b755cc4a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,9 +2,9 @@ AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81b
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.10.3.tar.bz2 102032791 BLAKE2B f64375438698f5477162644dc233e1014e6b541c5630398daa164582c3fb9130516144a9b0a5405948923416c1239cfa5260ee1e2f195b437044b0ae1bb29b9f SHA512 05501763e6ff38caa3b527e2f800da945bc08a9a194aae531c4466b76bc8bd18582e2ed5eceb82affaeec3db895ab9e36b3e09c9a4c7b3406bf98c88d54cc1a4
+DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
EBUILD qgis-3.10.2-r1.ebuild 5605 BLAKE2B 6a843e029a5428a3908d8029056b0dcf50b59417d3f0f3b0f0de269b049bae110d69d80c11d588c769b54539457bbdae425820d2c1438684db2a13e8875a2fd6 SHA512 a2ade40ebb1b8ed733af9b36c265cd9254a3b13d4f46a6ae0640f0786d760878d4bc6667c3c413f3f24b5880692c72b9254c564edbe01799a4864fa16bf757a8
-EBUILD qgis-3.10.3.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706
-EBUILD qgis-9999.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706
+EBUILD qgis-3.10.7.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
+EBUILD qgis-9999.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/qgis-3.10.3.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
index 74129055f6bb..5009332eb58e 100644
--- a/sci-geosciences/qgis/qgis-3.10.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
+QTMIN="5.9.4"
if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -26,9 +26,8 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5
+BDEPEND="${PYTHON_DEPS}
+ >=dev-qt/linguist-tools-${QTMIN}:5
sys-devel/bison
sys-devel/flex
"
@@ -39,26 +38,26 @@ 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
- >=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
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtpositioning-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtserialport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
- >=sci-libs/proj-4.9.3:=
+ >=sci-libs/proj-6.3.1:=
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+ 3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( =sci-geosciences/grass-7*:= )
hdf5? ( sci-libs/hdf5:= )
@@ -74,7 +73,6 @@ COMMON_DEPEND="
python? (
${PYTHON_DEPS}
$(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}]
@@ -92,12 +90,11 @@ COMMON_DEPEND="
postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
')
)
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QT_MIN_VER}:5
- python? ( ${PYTHON_DEPS} )
+ >=dev-qt/qttest-${QTMIN}:5
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 74129055f6bb..5009332eb58e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
+QTMIN="5.9.4"
if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -26,9 +26,8 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5
+BDEPEND="${PYTHON_DEPS}
+ >=dev-qt/linguist-tools-${QTMIN}:5
sys-devel/bison
sys-devel/flex
"
@@ -39,26 +38,26 @@ 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
- >=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
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtpositioning-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtserialport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
- >=sci-libs/proj-4.9.3:=
+ >=sci-libs/proj-6.3.1:=
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+ 3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( =sci-geosciences/grass-7*:= )
hdf5? ( sci-libs/hdf5:= )
@@ -74,7 +73,6 @@ COMMON_DEPEND="
python? (
${PYTHON_DEPS}
$(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}]
@@ -92,12 +90,11 @@ COMMON_DEPEND="
postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
')
)
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QT_MIN_VER}:5
- python? ( ${PYTHON_DEPS} )
+ >=dev-qt/qttest-${QTMIN}:5
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 2ed48279d405..e30f424bac9d 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,7 +1,10 @@
AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e07444cbed86ace926348c0b94a0061cde1edd1ab0dfd330b57dabd7cc9be5317c761c307f61fce3c9a SHA512 d110ae4081ba75cdcee0feac9967a8f59218f12cd497a48434e6289a2fa1b04116a84582191ff45b8eda4af2dd4b6611b5035422af392653e3548e1829f2acd6
AUX qmapshack-positioning.patch 482 BLAKE2B cb7d7b8f74a23828503c76e0cf3c7120af1aa412512461ae0e3e4a051ed7d8b89f9254a2397767b6ff56f1cbeefb1a6347f546222e991946dae3235da194d774 SHA512 245524903ec5db0da9d1874f0b5c0e2a318f6b955970da2645cff6dc1b21adb0565728021feca2cd236af9d2e60325e0bce1bb8084390d073200c5bad65d7175
+AUX qmapshack-qt-5.15.patch 3026 BLAKE2B f5f15429c198235658ba726b9122f72000c6f947d4dd4de1fd871e04148640152ca5caccd662d64da787cf4eef5841431b7e1d6d1e5e0dd310c099b14dac61d7 SHA512 7475aa269e2e502e8df2c2aa7d4f993f720284a8a190f09388581560755d9e18f1082b4e99106e934b5e02ef60fb7b8c620b02e650243b770dbe520367c2ebbb
DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
DIST qmapshack-1.14.1.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
+DIST qmapshack-1.15.0.tar.gz 46097781 BLAKE2B 16db9c59bd669e55dbb67af0411570963ff6a59f24c75d62421540fa1437cbc4dd837cf115b2649b3482e191ae11040b567f34babbf9ad46bb09114727ad4ae9 SHA512 92e2b40c37cccbb4848dab1afd872d3cb29b4a162d44d57a1042ea0d5139ffc976bc02407d327b6f5cd3e0d08dbd526661fcbc0e05602fda15f78fd9bbce52cb
EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a
EBUILD qmapshack-1.14.1.ebuild 913 BLAKE2B 8103fd017e942ea864c8cd33976530d343460ed5ea843d67e2f3545d1878ea0fb3457ba10f513006170b00b24a992a9040a345022485be9e5ce9ec45b78ed709 SHA512 672b28b280385eb3acae91a295271bd60bb6c14aebaa5eace74560b649b8862b5248b4cef9ee5044324537868aa525aa8778e4f7dfc32057a8bb1f424ee0d883
+EBUILD qmapshack-1.15.0.ebuild 1137 BLAKE2B f6a5baaef7fce7a5457ce0b7c76bdc93be982f9b646b64d8f00b1a644a87bb322cbbb22d2a8889734f25a6fe75bd9219075466a6c3a056f5c177bd9ac92bd823 SHA512 9465f489cbf1398796d1e846bfc070fe83046630fb1fff4686a616c66810c5513b1e2531fc6b82372a4cca55aff2c5bd99ac4c7472f6dc7a8c55dceb9504b56a
MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
new file mode 100644
index 000000000000..08d8946f69d4
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
@@ -0,0 +1,67 @@
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp 2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp 2020-06-22 17:41:58.776553045 +0700
+@@ -38,6 +38,7 @@
+
+ #include <QtWidgets>
+ #include <QtXml>
++#include <QPainterPath>
+
+ IGisItem::key_t CGisItemWpt::keyUserFocus;
+ QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap;
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp 2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp 2020-06-22 17:45:43.431558615 +0700
+@@ -24,6 +24,7 @@
+ #include <QImage>
+ #include <QPointF>
+ #include <QtMath>
++#include <QPainterPath>
+
+ QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
+ QPen CDraw::penBorderGray(Qt::lightGray, 2);
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp 2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp 2020-06-22 17:47:21.413561045 +0700
+@@ -33,6 +33,7 @@
+ #include "units/IUnit.h"
+
+ #include <QtWidgets>
++#include <QPainterPath>
+
+ #undef DEBUG_SHOW_SECT_DESC
+ #undef DEBUG_SHOW_TRE_DATA
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp 2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp 2020-06-22 17:43:31.338555340 +0700
+@@ -23,6 +23,7 @@
+ #include "mouse/IScrOpt.h"
+
+ #include <QtWidgets>
++#include <QPainterPath>
+
+ IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
+ : IMouse(gis, canvas, mouse)
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp
+--- qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp 2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp 2020-06-22 17:49:14.789563856 +0700
+@@ -24,6 +24,7 @@
+ #include <QImage>
+ #include <QPointF>
+ #include <QtMath>
++#include <QPainterPath>
+
+ QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
+ QPen CDraw::penBorderGray(Qt::lightGray,2);
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp
+--- qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp 2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp 2020-06-22 17:50:08.109565178 +0700
+@@ -24,6 +24,8 @@
+
+ #include <functional>
+ #include <QtWidgets>
++#include <QPainterPath>
++
+ using std::bind;
+
+ static inline qreal sqr(qreal a)
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
new file mode 100644
index 000000000000..1d7bf8e6abf5
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 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://github.com/Maproom/qmapshack/wiki"
+SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.15.0.tar.gz -> ${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-qt/qthelp:5
+ dev-libs/quazip
+ >=sci-geosciences/routino-3.1.1
+ sci-libs/gdal
+ >=sci-libs/proj-6.0.0:=
+ sci-libs/alglib"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
+
+PATCHES=( "${FILESDIR}"/${PN}-positioning.patch "${FILESDIR}"/${PN}-qt-5.15.patch )
+S="${WORKDIR}"/${PN}-V_${PV}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
+}
+
+src_install() {
+ docompress -x /usr/share/doc/${PF}/html
+ cmake-utils_src_install
+ mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
+}