gentoo resync : 03.11.2019

3 files changed, 8 insertions, 70 deletions

diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index dae38d8bdbd2..274aa634ceae 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,11 +1,9 @@
 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.0.tar.gz 12323773 BLAKE2B ea9cc15376546af442c6874e9321dfda268f523edb9908418baa4b3286339b4274f3c4694bebe036fb24ea3af82da1195d323c5e7484ca49039b9a526c29fa12 SHA512 cdc876a73d855573854691e3ef1d685499c9da381eb028e4a6e80dcd243df68caa66c92057fc1b896fce2be20e6d2ca43499b0e6827f804f27a0e8cc3749a100
-DIST qmapshack-1.13.1.tar.gz 12615121 BLAKE2B d1de6ec299c539da451f800565ea9e1e44edfbe0c1c0fa6ea8d6b1922cffbc94082ae12557050608d21f1d84fb3c5ce37dea1d2b676cd2d15edfaa8da8cbe4c7 SHA512 998366a1aff3568e9d0484c54aa18ee7621e9ed676f1f011cfc0566a7bc32379bb525168987f1a6c7332e4791aad6590398dc82d5af14a044ec5eb341b4597b3
 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.0.ebuild 1086 BLAKE2B 83e222af391edb4bbfa51d04f8180ecaf76756653da973f5c13133b5e854e7041fd482bca52569ac0c17eabc9dcdaa88c00cec87f4140f20964cb4cd7fd347fa SHA512 802ba95584a69c7cc31919d4523d156f4406c3bc9a1537c0607be9dd0e93ebcd6c958030bae46a3f9b90d73dbd01e0700b3305bb9c5b2a5d17b62d303a315c1a
-EBUILD qmapshack-1.13.1.ebuild 1086 BLAKE2B 83e222af391edb4bbfa51d04f8180ecaf76756653da973f5c13133b5e854e7041fd482bca52569ac0c17eabc9dcdaa88c00cec87f4140f20964cb4cd7fd347fa SHA512 802ba95584a69c7cc31919d4523d156f4406c3bc9a1537c0607be9dd0e93ebcd6c958030bae46a3f9b90d73dbd01e0700b3305bb9c5b2a5d17b62d303a315c1a
 EBUILD qmapshack-1.13.2.ebuild 875 BLAKE2B 336d58ba60e3a0d30c68b3ba2579851c4aa19e13473fa9dd51686b0b4b2e084979347d2959feb6f78296a515349a991cdb290955b2332ff6c24d40337685b613 SHA512 6bbd42f14809b65b4a4c3ea902f8eba523ee450a32e533f1cf10a50c419cd10a348d1930271f524e21810a414564e9afdda05bfbeecfd58e3f7e0ac3740ad2c2
+EBUILD qmapshack-1.14.0.ebuild 910 BLAKE2B 7816ff6d1d6171d5ef25a1202bbd3ede2e090ed36b6d6b065c5f494904bd312e9ca798e833f7e6ce55aaacc1ce9dde6fb81d8ad01411051d8e0b307e97df34f6 SHA512 548d08ffe6811d87c92abe7f863fce09035ecf1e33ff71168346d26251d1195caa75cc356aba87a06c6e8410773ad91b63ba11225c9552e529d72e1fcc83237a
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.13.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.13.1.ebuild
deleted file mode 100644
index a1e08508c620..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.13.1.ebuild
+++ /dev/null
@@ -1,49 +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/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() {
-	default
-	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
-}
-
-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.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
index a1e08508c620..3897457cafed 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils gnome2-utils
+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"
+HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
+SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.14.0.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -30,20 +30,9 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 
 PATCHES=( "${FILESDIR}"/${PN}-positioning.patch )
+S="${WORKDIR}"/${PN}-V_${PV}
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
 }
-
-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
-}