gentoo (leap year) resync : 29.02.2020

22 files changed, 218 insertions, 206 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index de761942ab59..e7db37a99582 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 33e01f8b4906..f7de24b1a208 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,19 +1,8 @@
-AUX gmt-4.5.0-no-strip.patch 1963 BLAKE2B b261058d5e6eefa2b6b4286158d971991f351c0a66da36b45a53b9f4c6298cb3d378cd79155c8791aea848ddb455cf2c539358cab02df821b0e8c962c508d2a4 SHA512 8ef2ca6acf17b092989ce7b8c91a3f42b82b074d606d2635c7b5a03355fcd3f83b3d08ef83747e51f5eb6e6ed9cb9a683208797d49da7b8f0714ed0c8f2e6155
 AUX gmt-4.5.6-respect-ldflags.patch 2396 BLAKE2B 66d15afd6a6cbc7f4fbd16d34bfc8b3e02df56c1c3a72b55732bf2694b9699cb6059522d3648f8651af331a92a87d158ecdb43ff758cf3208d04531b0dd0e89d SHA512 c2cc4986a1211a75856391cd0c731f37d9cf8e2ad28fdf29f532ed03308f2ef7f309a0bc525bb08c976c4535e8cbe77789546eb8585ddcedf016af32769e5420
 AUX gmt-4.5.9-no-strip.patch 1246 BLAKE2B f834f1b514a2ce59a56f52290b54ef80ec1580d88facfb77f2af6aa4472609638d627ff5a10a2b692a8b3357adb12cfde0f9587f0529e5c257c9c56037be946d SHA512 271be4c32607bd4776cace933ed0a81a76fb5ea8ccc0c92f0f11cdf17f6b4f8740e2345323236af94dd4eb52323625cc82e5c661e22a008dcdc85f4d1d452b23
-AUX gmt-4.5.9-unistd.h.patch 358 BLAKE2B 48a577c87e521fe89ff815a88e0f40a6031ce4dfb388116081125f2847115786f8ae20f6797aa477edb36a602907b20fe9ca1725f89aae0b9b9e9ea00bd0a449 SHA512 877e73b161d9fbb1fe17d5f575852be67cfd9eec31ff8b74ffeb7b00569e3061d5a85c55e6633c06f12147bf7e3ab2838ab2738c5fe4adf93065ce55e7884df6
 DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e
 DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945
-DIST gmt-4.5.6-doc.tar.bz2 25230761 BLAKE2B 5e4ed5400accb3da2af6d6403ffb1b86b05a8fe6724b7fcf1728c31f56cfd0a4ce80fe47b9b3f5fcab1bc42ef8cc06ec0cc971cdd7397ab059035dfe9bc2e109 SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302
-DIST gmt-4.5.6-share.tar.bz2 43704 BLAKE2B 56c4c2e29a97824245c8b8cc9afbf5e865886d3047392c4ab72311bb278f4a041516a16858f06103b8edfe6ec251db09e0a3e028bb944c289ba833f99c0af79f SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0
-DIST gmt-4.5.6-src.tar.bz2 1134118 BLAKE2B 6519002bfcafd91c420d56fb356d70cb6a814a62c8b7d9d30d77015f8401ea71ffb87b9ea4ea5b2af7917b0bce3794d66566150ce2ae82c7a5d9bb52bf5414ef SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e
-DIST gmt-4.5.6-suppl.tar.bz2 4137369 BLAKE2B 9150e54385c4ee3df6dee6f8598cb2e91b4b23a3e4531fad7fee7e4eef80cbe6f06efd4a5a06882aff90782a5f07824cb6ed744da5c10e73402bdb1930984b9d SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027
-DIST gmt-4.5.6-triangle.tar.bz2 103426 BLAKE2B cb6372a0980a660a7e70725d43681c0a251698ff89329f92c37965c70d180cfb63ee2741702c8f9cbfef0f41c95cf6676dabcef3aefb18801367efc32e833f44 SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e
 DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
-DIST gshhs-2.1.1-coast.tar.bz2 4322743 BLAKE2B e171b6a41ceee6c15a9a7679c6a9145c1ffcede7be61bc26b351371a7bde7f4ddd68bbd5104638da56a66af3e930fc11d9dc6c215d3c3b528f0d56b855e3b496 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332
-DIST gshhs-2.1.1-full.tar.bz2 29916230 BLAKE2B 80ae867a46fc5f9cab60c3e4cedb0db7d683cb58294865a228b8853b458647179382d8fc7fefcbfff7f33ee0e12b527e402376b78f1be0ff8388a81ba682d52d SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375
-DIST gshhs-2.1.1-high.tar.bz2 9712697 BLAKE2B fa81ee855916566e135eb0522b414da9cf28f1cc29847fbccf80a485f337e6b8a1e051df95d38454679e0405cfa6777cc7f0139772425c082d46b6bd65c17c98 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e
-EBUILD gmt-4.5.18-r1.ebuild 1969 BLAKE2B add5f0c069904260201ba9fd77efef09b42f27c81843401410931284516a39dc7356c516e8086d5e44d31fbfdc7aad815d41deaf911886138afaa2da9c452f6e SHA512 d6cb51bf827a5fa4f4655928fdf4f4c43120542ed134f789fb0e01b62666dbbeea750aaed1c0ba84382e7e1c043ddaeda9d546f5e7e68a89191ed61fc745264c
-EBUILD gmt-4.5.6.ebuild 2311 BLAKE2B 019492348e921aec08fd1d25d84b653c43e4c69837c1114cecc739137ad1ecfa1f157a3e5937816caa32da6a2c4656c159f010c91e850e35b9660aaed0673f07 SHA512 c3ce34dbd2e000416eae85e98b582e4729de4ee4b1e09107e8930c9802970207b35a56c76e918bf89bbff4f582f8310b6dc8bc3d89a346b25cd4ac20e021cf8c
+EBUILD gmt-4.5.18-r1.ebuild 1967 BLAKE2B 7a19509a881a2e0dd91170846e1cb7b30ade83cfacf73e6afc0f02dfd361eaf0bf1348fd9c04a0020f7627fb8a3faa65064450b25e80ad14b2e264c3f25f87a9 SHA512 365ecb57d47a055b2a823483399bfeb52071cf60895f08dcd960fda354a4e225557a22f9f6acae882c8326f0625f166468c6e3d55e6398a4849e9ef3547a64b9
 EBUILD gmt-5.4.4.ebuild 2942 BLAKE2B b36f87c108b351561f768d0ba927c3e9966f7c4f19002f0ccbc84ba822d037211e8ed543ecbd723582975720b957ecc51e91c82c0f74b11cbb789a9e10db0acc SHA512 eae39ad69124ce00d7400b24555e249fc5397e1bf3c4f849c4bd7e92c9e9f2cf9499fdbcf1507e202410653c713cafbff76240d1fba41f4d77da61d1ed77ad79
-MISC metadata.xml 1058 BLAKE2B 2ec919d568907a8abd029b0a5f05a1ab39b0b50bfa288a29029294052f0005bb224f086274e5230970549727995bbf10c8e98c7e5855e694201b736578eef7f0 SHA512 bfdbbd4ec022edb67091957d8215d88ab25b5cf545b3912eec118aae0fd3783f4a352b3195c5a7dc916827593702d677fae9e1a2a80dd8d678f4c5556442d55e
+MISC metadata.xml 918 BLAKE2B d3c35d50145d54df689dba5e34f4feaf6a45a202b99f271b467b9d6faecf630e1136ceb0c46076fe4023b6b8913567c8463ff7fb1d0227d4314ab5b784c62c65 SHA512 47680e3a33b2460205a41ad12da27770803d81d42e85ade54250d75eceb9ec797334ebfd5af6b620bbd99a1ee63b3106ce75c5c101b6abf29e1dfa05c8ded048
diff --git a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
deleted file mode 100644
index f0fe4c3e833e..000000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Drop manipulation of several flags:
-
-* stripping of -g from CFLAGS, as it interferes with deliberate
-  generation of debug symbols and breaks on flags like -ggdb.
-* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is
-  done as a separate step on Gentoo (and many other distros) in order
-  to faciliate retention or splitting of debug symbols.
-* Setting of optimization flags, as the user should be free to choose
-  them.
-
-2009-07-27 Martin von Gagern
-
-Reference: http://bugs.gentoo.org/279268
-
-Index: GMT4.5.0/configure
-===================================================================
---- GMT4.5.0.orig/configure
-+++ GMT4.5.0/configure
-@@ -10665,19 +10665,6 @@ if test "X$enable_debug" = "Xyes" ; then
- echo "${ECHO_T}yes" >&6; }
- 	CFLAGS="$CFLAGS -g"
- else
--	CFLAGS=`echo $CFLAGS | sed 's/-g//'`
--	if test "$os" = "Darwin" ; then
--		LDFLAGS="$LDFLAGS -Wl,-x"
--	else
--		LDFLAGS="$LDFLAGS -s"
--	fi
--	if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
--		CFLAGS="$CFLAGS -O2"
--	elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
--		CFLAGS="$CFLAGS"
--	else
--		CFLAGS="$CFLAGS -O"
--	fi
- 	{ echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-Index: GMT4.5.0/configure.ac
-===================================================================
---- GMT4.5.0.orig/configure.ac
-+++ GMT4.5.0/configure.ac
-@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then
- 	AC_MSG_RESULT(yes)
- 	CFLAGS="$CFLAGS -g"
- else
--	CFLAGS=`echo $CFLAGS | sed 's/-g//'`
--	if test "$os" = "Darwin" ; then
--		LDFLAGS="$LDFLAGS -Wl,-x"
--	else
--		LDFLAGS="$LDFLAGS -s"
--	fi
--	if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
--		CFLAGS="$CFLAGS -O2"
--	elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
--		CFLAGS="$CFLAGS"
--	else
--		CFLAGS="$CFLAGS -O"
--	fi
- 	AC_MSG_RESULT(no)
- fi
- dnl -----------------------------------------------------------------
diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch b/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
deleted file mode 100644
index e724b4ceab79..000000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix "gmtdigitize.c:77:2: error: unknown type name 'gid_t'"
-build failure; patch from upstream version 4.5.11
-
-https://bugs.gentoo.org/show_bug.cgi?id=543624
-
---- a/src/misc/gmtdigitize.c
-+++ b/src/misc/gmtdigitize.c
-@@ -37,6 +37,11 @@
-  *
-  */
-  
-+#define _XOPEN_SOURCE
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #include "gmt.h"
- 
- #ifndef WIN32
diff --git a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
index ac668505bc6b..a7e01472873c 100644
--- a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gmt/${P}-src.tar.bz2
 
 LICENSE="GPL-2+ gmttria? ( Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples debug +gdal gmttria +gshhg htmldoc +metric mex +netcdf octave postscript tutorial"
 
 # mex can use matlab too which i can't test
diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild
deleted file mode 100644
index 9e73c830b201..000000000000
--- a/sci-geosciences/gmt/gmt-4.5.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib autotools eutils
-
-GSHHS="gshhs-2.1.1"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="mirror://gmt/legacy/${P}-src.tar.bz2
-	mirror://gmt/legacy/${P}-share.tar.bz2
-	mirror://gmt/legacy/${GSHHS}-coast.tar.bz2
-	mirror://gmt/legacy/${P}-suppl.tar.bz2
-	doc? ( mirror://gmt/legacy/${P}-doc.tar.bz2 )
-	gmtfull? ( mirror://gmt/legacy/${GSHHS}-full.tar.bz2 )
-	gmthigh? ( mirror://gmt/legacy/${GSHHS}-high.tar.bz2 )
-	gmttria? ( mirror://gmt/legacy/${P}-triangle.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug gmtfull gmthigh gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
-	!sci-biology/probcons
-	netcdf? ( >=sci-libs/netcdf-4.1 )
-	octave? ( sci-mathematics/octave )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror" # for the gmttria
-
-S="${WORKDIR}/GMT${PV}"
-
-# mex can use matlab too which i can't test
-REQUIRED_USE="
-	mex? ( octave )
-	gmthigh? ( !gmtfull ) gmtfull? ( !gmthigh )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	mv -f "${WORKDIR}/share/"* "${S}/share/" || die
-
-	epatch \
-		"${FILESDIR}/${PN}-4.5.0-no-strip.patch" \
-		"${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch" \
-		"${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# triangle disabled due to non-comercial license
-	econf \
-		--libdir=/usr/$(get_libdir)/${P} \
-		--includedir=/usr/include/${P} \
-		--datadir=/usr/share/${P} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-update \
-		--disable-debug \
-		--disable-gdal \
-		--disable-matlab \
-		--disable-xgrid \
-		--enable-shared \
-		$(use_enable netcdf) \
-		$(use_enable octave) \
-		$(use_enable debug devdebug) \
-		$(use_enable !metric US) \
-		$(use_enable postscript eps) \
-		$(use_enable mex) \
-		$(use_enable gmttria triangle)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install-gmt install-data install-suppl install-man
-
-	# remove static libs
-	find "${D}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
-
-	dodoc README
-	use doc && dodoc -r "${S}"/share/doc/${PN}/*
-
-	cat << _EOF_ > "${T}/99gmt"
-GMTHOME=${EPREFIX}/usr/share/${P}
-GMT_SHAREDIR=${EPREFIX}/usr/share/${P}
-_EOF_
-	doenvd "${T}/99gmt"
-}
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index d0db455197ca..ce97db5b54d2 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -7,8 +7,6 @@
   </maintainer>
   <use>
     <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
-    <flag name="gmtfull">Full resolution bathymetry database</flag>
-    <flag name="gmthigh">Add high resolution bathymetry database</flag>
     <flag name="gmttria">Non GNU triangulation method, more efficient</flag>
     <flag name="gshhg">Install coastline database</flag>
     <flag name="htmldoc">Install html documentation</flag>
diff --git a/sci-geosciences/gpx-viewer/Manifest b/sci-geosciences/gpx-viewer/Manifest
index 6493727dd282..112fc8780500 100644
--- a/sci-geosciences/gpx-viewer/Manifest
+++ b/sci-geosciences/gpx-viewer/Manifest
@@ -1,4 +1,4 @@
 AUX gpx-viewer-0.4.0-crash-backport 1152 BLAKE2B dacd8a8f4cf1703257d37be6e230fe535faaad6d337b15fece132ee358b61b00329ef0e4c4e1cabfb233a37b46c22a212696d09cf2fa4cc806c80d83913b31bd SHA512 97152da46ed0699b95a8c1379b6b08997f8fb171b9e07755b5ce44da3ef09601b5a674b97d9fb449e985e8ffd329b49f961bfce0895822027124e1e67dfa6aab
 DIST gpx-viewer-0.4.0.tar.gz 534735 BLAKE2B 3b6e14961dd79d07ad99d68b7f926b2152413e5512044febdb30306d4045f0074a0a1fdb8c40bd92523e06f1f22853934c63876793f8594af197a17fd0d0a0c9 SHA512 ab65d872509df605c07110c0a5ffef5c9c385f39cde841fce2d593a58abd3e48f1124a48c11a8d599fad9430cd7b71969da0880b3d1fe4b952ade4b95929914a
-EBUILD gpx-viewer-0.4.0-r1.ebuild 1140 BLAKE2B 1ff1be6b64edf580f6ea6355769c429d1959d67c64f67eea45b74d548a91d6dc0add07f26201e8a660ebdbcf7e1abf6cabbeca12c2164deb4eefa9c2bc9cb021 SHA512 f7fcbfc5d423f050c2a72f3c26df39b2977cf1e3701f941ed3256d3df3e9de06b9bfc75c803f04de30d39adddaa601f9f3a5576188c1482c2ebc227ab3b2b0ed
+EBUILD gpx-viewer-0.4.0-r1.ebuild 1136 BLAKE2B 1708f0b34ecd3ea753ad4fea400091098bba89686ef488d705517bd324e536757de0c20f5e30c3125d093d6672a862745d9cc6deb63c6210d3db65e4c463104c SHA512 c3fa95cc6c57f350ba5349257216c1993618e6abc637dbee7b62b9489356b6f81176efa1456a0efab588c91d44795b2691e815f33cfcbda7ac484fc65bb733bf
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
index 18278d6ae130..58e714a400e9 100644
--- a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
+++ b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,7 +47,7 @@ src_compile() {
 	autotools-utils_src_compile
 }
 
-src_install () {
+src_install() {
 	autotools-utils_src_install
 	dosym ../icons/hicolor/scalable/apps/gpx-viewer.svg /usr/share/pixmaps/gpx-viewer.svg
 }
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 86421277e325..97509bb92fab 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,5 +1,7 @@
 DIST gpxsee-7.18.tar.gz 5006604 BLAKE2B b7568a677e3cff08903d862921ace01374a594e216b1bd9eda457a92f700ef232b5804dff24696ee0574bcbe1d4e8a103dac6b5db33482cb0139f73b21852883 SHA512 562944a14ac2af4ec6837e77a6610b8ad7d254ffada4202e589c05a4306c0410e815212d7a7847708c50de72fa21a02d41bf5152f5d5f313c96da5b2516138fd
 DIST gpxsee-7.20.tar.gz 5348758 BLAKE2B d7e8f0f29dfe666572a58a1a5072545cda345f51d305d6c0351ee5639ba09c185b9b3e7e883d2d02198e70a58ef69508cfd5ab561183c68a625fa4101dc17285 SHA512 37c975d9e64cf6fe5455a0e6cfb896275db6a0469ba772c97615c8b2f79af591bf4eb7f6dd414c6a3f0344fe1b9f443f402e0b8c173beee0a301ede783fa26db
+DIST gpxsee-7.23.tar.gz 5358562 BLAKE2B aaa1fd5815ba1f0e3592d034033f0335cf257f408a1344eb6adc1cba1b8f0bfb7e61374b83721efb75b99b9fed06fce8f1921b0af31b7375623c8dec1fd383ca SHA512 a6ffbb6d15efbf2491b447cfabbc3a50f6ef97e438fa788c98230f76d3c3acabc96f713839fe13b238d39ecac84554e80f1d3f8c282122dff92eb987ca3d3dba
 EBUILD gpxsee-7.18.ebuild 1330 BLAKE2B 55fbeb2d5ec0f423be33378c5a30b1aad457f8a39cc70d1466db18f8bdc0a9b530ecb54273721dabbe9423198dbcba67c5b6bebdd86e51ab36d8fec516398a28 SHA512 fedc7457011576ce608610be5f97507ddb7465508f001151ca30f8aef469b06832ccb62d687b7521f7dd88e5e82d0e830cf6e1d6bece6b887a47a1dadd902313
 EBUILD gpxsee-7.20.ebuild 1329 BLAKE2B 0519cac214de89aaf141f90bc9a47432e11c764462ecf42bb4728e335bac20eb5256d05622fc0f62e46b0a6dbe779491d7cf19874e0d05119c4671aa0286b4f6 SHA512 597e0ea32097a2908a8e1ae4ce822873c8e4511dc26deb5a6fdf0b723dc20c2cf53a3295a30a35b77c903d40b858c7ab28a646546dc33d7ae7335d5396423350
+EBUILD gpxsee-7.23.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.23.ebuild b/sci-geosciences/gpxsee/gpxsee-7.23.ebuild
new file mode 100644
index 000000000000..c5b1bd5f1e11
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.23.ebuild
@@ -0,0 +1,66 @@
+# 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 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}"
+
+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() {
+	local lang
+	dobin ${PN}
+	dodoc README.md
+	insinto /usr/share/${PN}
+	doins -r pkg/maps pkg/csv
+
+	insinto /usr/share/${PN}/translations
+	for lang in lang/*.qm; do
+		[ -f "${lang}" ] && doins "${lang}"
+	done
+
+	domenu pkg/${PN}.desktop
+	insinto /usr/share/mime/packages
+	doins pkg/${PN}.xml
+	doicon icons/${PN}.png
+}
diff --git a/sci-geosciences/gshhg-gmt/Manifest b/sci-geosciences/gshhg-gmt/Manifest
index cbf515f96748..b0e6b431e5fb 100644
--- a/sci-geosciences/gshhg-gmt/Manifest
+++ b/sci-geosciences/gshhg-gmt/Manifest
@@ -1,3 +1,3 @@
 DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727
-EBUILD gshhg-gmt-2.3.7.ebuild 446 BLAKE2B 7f3b4d3e96e4335f1f1f2f9b095289cb4fbaac60659c3fdb689a32c29715e4e975628278300d8d0040b2ccd61dede0ccbeba1af4c6a22d1059c939a6491ce7f9 SHA512 f53796f28088be4c4db5eec3e59f70033cfb7e4c2e239a25fa0e7433e85e8d839111819515c55d9b4e8a4f29862f0af110630ce2e10cbe8c3ae4389ed54574a4
+EBUILD gshhg-gmt-2.3.7.ebuild 444 BLAKE2B d886fbbdafa72f48940754457b522bdf857d2fc46001720b9830ee6d0ae93a81093fa44d904f84777cd31268d066550091b51a983e8ebf99a85f5ca383d1c163 SHA512 f792cf3013610dbb80bbc1ab3d67f703273c367d4e1cfbf1bce42d5ecf2f4b8b236f708c7559e731b09ab69f028616363ff01dee36809f279aa0bae848567530
 MISC metadata.xml 792 BLAKE2B 386af871abe7a142f708d291cce70826f1347bf84c3dcdcbcfd5e6778f13e63929ac64d54c9725c5ebf3d9c32d71240a850a50e4df3b010d2bd7f7f600db6a7a SHA512 d1fc22ba6fddd7ec3e586b6334ec106f64fac8c05901052a41b2474f1bcdae31f629533e2e9f5577b3f4084f1abf92be39c1fd8385b10ef93e5cd483ddcdb4c3
diff --git a/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
index ebc770e53ffb..5dbb1584670d 100644
--- a/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
+++ b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.soest.hawaii.edu/pwessel/gshhg/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_install() {
 	dodoc README.TXT
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index e3461d280127..c7b6ffc11618 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,6 +1,10 @@
 AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
+AUX liblas-1.8.1-CVE-2018-20540-fixup.patch 901 BLAKE2B 81f8a3e8ea076146ad8ec258e37d75c0e3a567b1304d1283dff0151cb0a7318a70816b1dbb1c3c46ed7798be47f8a3fca4add34940150f093549fe55553d1b0f SHA512 919e91732b91e2d9b3de2365291c7679e08dd2f3d5262a2fe026ef9360be2b367bd1f3822f7fc6cead04da58c3f454066bc4776282f66d268e06cddb3be65d4a
 AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316
+AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4ef7a2b3e5b5a6780455146896d03ed49dcb952cdcb68c85cb47411f3abdd1a84e31200e49a50f5bdcc888464f6d791 SHA512 6e0cbce9451c0496b04da852c7b113c5a3d0b060a15675290c92b85d8c03cd59216e7fbda5d1bfe6c2a157c7777fa9f0d380034df709b20a318432ee756a4f56
 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
+AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f
 DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
 EBUILD liblas-1.8.1-r2.ebuild 1105 BLAKE2B aff71a1dd3b4775796cce7ab64422313b2c98e78077c8c69ce3eb0dfe1d49fe4f7ecaed3af5972d285c40f05b8957b996295dcaa34e0dc2ac26270666e4246de SHA512 c0c539ca00cebe2aaa63ac2711d876479738de072b407d3bf749fb31e86480106bcaba1e39903fd4783bd5e14ed3acb20306624a5dcd876c16a1813189bbfbe6
+EBUILD liblas-1.8.1-r3.ebuild 1333 BLAKE2B 3923e2d4636137859678df1098150925311ed192a6ec32c7ddd79ef8b44cbd6513f46929d8a33a3961977f18f809628b5b0d1ca755aa45c75da485a64828c683 SHA512 4bcf473335cae6fde45c2733a5014400983213a25dd3063cb39aba3d2590b2ae5f23f7e63ab3e4299701b28270943ee9ee3ee0da3ee18b82d2c48f6b7a52dfe9
 MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch
new file mode 100644
index 000000000000..6f0c132b5c58
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch
@@ -0,0 +1,24 @@
+From 6a666b9101293b13fde4e4eb1d2c627f7613515e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felipe=20M=2E=20L=C3=B3pez?= <femulop@gmail.com>
+Date: Fri, 19 Jul 2019 08:26:44 +0200
+Subject: [PATCH] Always return NULL when Open() is used (#168)
+
+Attempt to open LAS file using standard stream, without
+Boost supports built in, always failed with
+"Cannot open sample.las for read.  Exiting..."
+---
+ include/liblas/liblas.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp
+index 325de3ff..5c950ce0 100644
+--- a/include/liblas/liblas.hpp
++++ b/include/liblas/liblas.hpp
+@@ -138,6 +138,7 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode)
+         ifs = new std::ifstream();
+         ifs->open(filename.c_str(), mode);
+         if (ifs->is_open() == false) return NULL;
++        return ifs;
+     }
+     catch (...)
+     {
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch b/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch
new file mode 100644
index 000000000000..0c3b8ceec269
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch
@@ -0,0 +1,18 @@
+Description: Fix compilation with -DDEBUG and GDAL >= 2
+Author: Even Rouault <even.rouault@spatialys.com>
+Origin: https://github.com/libLAS/libLAS/commit/72f7709bf1dfd3473b64cdba0259363d3beea3c3
+
+--- a/src/gt_wkt_srs.cpp
++++ b/src/gt_wkt_srs.cpp
+@@ -90,7 +90,11 @@ static const char *papszDatumEquiv[] =
+ /*                       LibgeotiffOneTimeInit()                        */
+ /************************************************************************/
+ 
++#if GDAL_VERSION_MAJOR >= 2
++static CPLMutex* hMutex = NULL;
++#else
+ static void* hMutex = NULL;
++#endif
+ 
+ void LibgeotiffOneTimeInit() 
+ {
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch
new file mode 100644
index 000000000000..0691c16c1b7e
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch
@@ -0,0 +1,34 @@
+From 3a572ff7e684668da62c794b37ccccbc169723de Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 26 Feb 2020 17:45:30 +0100
+Subject: [PATCH] Fix build against >=GDAL-2.5.0
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/gt_wkt_srs.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp
+index 9871aa0..099972d 100755
+--- a/src/gt_wkt_srs.cpp
++++ b/src/gt_wkt_srs.cpp
+@@ -493,7 +493,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+         {
+             char	*pszWKT;
+             oSRS.morphFromESRI();
+-            oSRS.FixupOrdering();
+             if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
+                 return pszWKT;
+         }
+@@ -1094,8 +1093,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+ /* ==================================================================== */
+     char	*pszWKT;
+ 
+-    oSRS.FixupOrdering();
+-
+     if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
+         return pszWKT;
+     else
+-- 
+2.25.1
+
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
new file mode 100644
index 000000000000..c8f1fb5c1aa8
--- /dev/null
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
+HOMEPAGE="https://github.com/libLAS/libLAS/"
+SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+IUSE="gdal"
+
+DEPEND="
+	dev-libs/boost:=
+	sci-geosciences/laszip
+	sci-libs/libgeotiff:=
+	gdal? ( sci-libs/gdal:= )
+"
+RDEPEND="${DEPEND}"
+
+# tests known to fail due to LD_LIBRARY_PATH issue
+RESTRICT="test"
+
+S="${WORKDIR}/libLAS-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
+	"${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654
+	"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
+	"${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846
+	"${FILESDIR}"/${P}-fix-debug.patch # bug 668778
+)
+
+src_prepare() {
+	use gdal && has_version ">=sci-libs/gdal-2.5.0" && PATCHES+=(
+		"${FILESDIR}"/${P}-gdal-2.5.0.patch # bug 707706
+	)
+	cmake_src_prepare
+
+	# add missing linkage
+	sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
+		-i "${S}/apps/CMakeLists.txt" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
+		-DWITH_GDAL=$(usex gdal)
+	)
+	cmake_src_configure
+}
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 1c45c4f3b078..0688cf110d5a 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 932 BLAKE2B 73ff707b8e5bd87b43a83d977670cf6cadea654daae6250325fcca1e012e5b2701927cd2a4f5c0847cdcf5a1c48925994bc89de5c4916bbd124dadb1d257c33c SHA512 3dba4655d7690b8a14950d97740d641e0fa761e3874cd66aa00034c43f65156624836213f13ea73e081c563c3f2a2d852b828180d0fbb0c808230dc002354883
+EBUILD osm-gps-map-1.1.0.ebuild 891 BLAKE2B 45323abdfd84c2c55e532a8a6382b01d79e8f9008378460afb52f87434342e6b45b243b62d69081991025c5623d770c31f50af9f9a2c44cbed543cc3f91c0fc4 SHA512 0acf12599916c36f6a5a1f5dc4765140700776e00e8e925297c7904e7fd85d086ab959a10a29d8f1c4ccc2234394b231c276d535a5235d67c8d36905dd1e6230
 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 fda2bd508a4f..63f13d8b8643 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,5 @@ src_prepare() {
 }
 
 src_configure() {
-	gnome2_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
+	gnome2_src_configure $(use_enable static-libs static)
 }
diff --git a/sci-geosciences/swmm/Manifest b/sci-geosciences/swmm/Manifest
index 2bc40c283a59..cf7d77874926 100644
--- a/sci-geosciences/swmm/Manifest
+++ b/sci-geosciences/swmm/Manifest
@@ -1,4 +1,4 @@
 AUX swmm-5.0.022-QA.patch 449 BLAKE2B ac7036240677b1c0a088400f205497e48124f799b3754351787e4748c59bbf5105f6b8290a06acd527ee523ffca4a416d7f9e693c1896c1bc5119964f12208c1 SHA512 b9d68d3273a1f43a34a568aa4a9b334834bfff4abf239d16350916326cad7d6d440f1778b9f75dbf8b2b8b8f6ff12f74cf103b03db6ed8868461c41845aec34d
 DIST swmm50022_engine.zip 338011 BLAKE2B a3fba4a480130903fe576ed1521cb94f54dbf350ec4200d96def10bca6842d55a1de2d17911d35b59acff70d13a31012554ca09b0cb7ac7e60f0f4ebc2e0ea98 SHA512 aa424d36c062656611bc6d6e4ced3108b6fd05806bf47ace30b44cc631860423073ad4fcafb523b2bf0ce7c73c5edc4386e5129009984d3d34f34e9260c69006
-EBUILD swmm-5.0.022.ebuild 1067 BLAKE2B 98d82e5e378262e170078ee323f554bf729fe8228ada1e24b84bbe781da55aff294ab539945e98dfa4cc04025790f84db081a250dc5e19d6a1206b2eb2e26d2c SHA512 12f2d8068939f943f09e3de5ecb4c27facc8fd6369467158251c4de28157512be6214530d818cf75f2bb627dd48276970331007e475f2a9d7f08920a5722664a
+EBUILD swmm-5.0.022.ebuild 1066 BLAKE2B 13172b6686658c6f77ea1ff08dd36a887dc3361984b38c78fdb88dc5acd526bb81a0d97d94b8e15e3c7a1e1e50e960f9f0c71fce10075098c485a8ea733d4304 SHA512 8095f3e7513267cd7049d22f755dfa2b5ed7ff39e9ca1b56885cbb61b445382ef453440b3818ef39c20b9473eb7bb2df94c7edf6d27c739fdab73da6911418e6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/swmm/swmm-5.0.022.ebuild b/sci-geosciences/swmm/swmm-5.0.022.ebuild
index defeb38e3854..2466bbe3fa13 100644
--- a/sci-geosciences/swmm/swmm-5.0.022.ebuild
+++ b/sci-geosciences/swmm/swmm-5.0.022.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,7 +37,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-QA.patch
 }
 
-src_compile(){
+src_compile() {
 	# 'sed' command has to accomodate DOS formatted file.
 	sed -i \
 		-e 's;^#define DLL;//#define DLL;' \
@@ -46,7 +46,7 @@ src_compile(){
 	emake
 }
 
-src_install(){
+src_install() {
 	newbin swmm5 swmm
 	dodoc Roadmap.txt
 }