gentoo resync : 28.11.2020

5 files changed, 65 insertions, 9 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 2d6dc3fcab18..99f11df1977e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 85fd10273c21..82da04440a6d 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -2,7 +2,9 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434a
 DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f
 DIST gpxsee-7.35.tar.gz 5403169 BLAKE2B 901c77aa0fd0a54976a8d88daa98acc0125dacae7b9e45455ed79f2c633f33a6311dd3c9a388eae1350dac82ac1e02b811680b15f161cb8a523878698d993aae SHA512 d3346e2ed8593d5b57c2484a2153c9900289380a79799dbbe587879c9fc0b3e95d21f14d178e7e2a4b586062cc22c4ba1d90b3e66e73f0c334360f3b04625f8e
 DIST gpxsee-7.36.tar.gz 5404628 BLAKE2B 252acab21aed260eb6f01b9ee38f3c7a88067953b9e481cf2c6e77fcfd52c14fb995c69330dd381fbb3d2b9f7ea5bd345f6d2d3ae8b5be0f6b020680ef9e5f21 SHA512 8a0c718e80544506a6e393fd9b95a2d29092332d8c9fe141351cc1e3553759c909aaac12953a0206dca47f855b8516ecdaacaee577b1ce3dd0e75be2595e4062
+DIST gpxsee-7.37.tar.gz 5406206 BLAKE2B eecc311a89ee94aa1e52cb742802ee78634199d13173106938b559f787029df2496a60642c08109928051cd0d478b794f8ca0db050fe4406b2aca51c290d317e SHA512 891689e78a7cb3ece63d28cc892cadd483770ab88add241021bcee70a6acb744410a9b412e0f2286e63552eadf6398671c25a594ef02b0a09d8ecf89fa9ca278
 EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b
 EBUILD gpxsee-7.35.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 EBUILD gpxsee-7.36.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
+EBUILD gpxsee-7.37.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-7.37.ebuild b/sci-geosciences/gpxsee/gpxsee-7.37.ebuild
new file mode 100644
index 000000000000..d9d146091a25
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.37.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr hu it nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+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() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 9b0e4b35ed65..c6cc953b7f6d 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -2,7 +2,7 @@ AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e0
 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.15.0.tar.gz 46097781 BLAKE2B 16db9c59bd669e55dbb67af0411570963ff6a59f24c75d62421540fa1437cbc4dd837cf115b2649b3482e191ae11040b567f34babbf9ad46bb09114727ad4ae9 SHA512 92e2b40c37cccbb4848dab1afd872d3cb29b4a162d44d57a1042ea0d5139ffc976bc02407d327b6f5cd3e0d08dbd526661fcbc0e05602fda15f78fd9bbce52cb
+DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988 SHA512 c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a
 EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a
-EBUILD qmapshack-1.15.0.ebuild 1137 BLAKE2B f6a5baaef7fce7a5457ce0b7c76bdc93be982f9b646b64d8f00b1a644a87bb322cbbb22d2a8889734f25a6fe75bd9219075466a6c3a056f5c177bd9ac92bd823 SHA512 9465f489cbf1398796d1e846bfc070fe83046630fb1fff4686a616c66810c5513b1e2531fc6b82372a4cca55aff2c5bd99ac4c7472f6dc7a8c55dceb9504b56a
+EBUILD qmapshack-1.15.1.ebuild 1008 BLAKE2B a323d85a6f25f40c7fff1edd752ec70fd4c0befd8b8f209d4558867a9cd54308a7a19e0abc47c4b8fe40748bcb2bca13819d47a5930d2430550711429e391ae1 SHA512 abeddc1526a64a1a683f6acbcd4c891e96f6cfcf452fc1566027b8f0d690e70261e882066234e7fc1e77af009f2d279227accb479aa796d656ebcc510cc7f09a
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
index 1d7bf8e6abf5..2f083ca83c76 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake 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"
+SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -15,7 +15,6 @@ 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
@@ -30,16 +29,16 @@ RDEPEND="dev-qt/qtwebengine:5[widgets]
 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
+	eapply "${S}"/FindPROJ4.patch
+	cmake_src_prepare
+	xdg_environment_reset
 }
 
 src_install() {
 	docompress -x /usr/share/doc/${PF}/html
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
 }