gentoo resync : 03.03.2019

20 files changed, 363 insertions, 93 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index da60dfec6af4..e70ce8f1c804 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest
index c6156252d2cc..a3ce225a847e 100644
--- a/sci-geosciences/congen/Manifest
+++ b/sci-geosciences/congen/Manifest
@@ -1,4 +1,3 @@
 DIST congen-1.6.2.tar.bz2 293130 BLAKE2B 3879e5e04fe260fc65b1852a6ece347b7ea0dc7c846ca788f448c4b0af4ce7af1efe8e398727da243a76b1bd5a52632f308ec626ac708141a163159fb2065164 SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6
-EBUILD congen-1.6.2-r1.ebuild 644 BLAKE2B d1fa1a77f0c8a23ea76a4444987ffb59cf3a1026c12ed3b91603ba93f0ee967940e5698818acc787e8802ec9dde70b8192987fb5b1d92f7107f000df383ddc9c SHA512 85839525cc1339f34ed018770e57303d471258b93bca99b88cd86de4f90c64b4e1fc38462b3624d65ce60056f79705eb8585dd44d3bb6efc00cb146e14aa6d24
-EBUILD congen-1.6.2.ebuild 646 BLAKE2B ad5196e4b8f96fb813b45629efd7f5bead976fb66be975787cec2b5f15cdab178eed38c455ae5305c811027989fcbe31565b0d7500837ed4fcab156f7b3b8829 SHA512 7c17606190ec8fcd4a83a39b51688be79a5fabbd503c6ed53e621554613a5e7363a2c534680df2343c7d4386a9484d570b67165f6a2f23bb169bca7343d249d0
+EBUILD congen-1.6.2-r1.ebuild 643 BLAKE2B f6df1548142b540c00318d6e53a959270536cc5594da7c0fbaa1fc3f5e30dc4edfd81277ef7db3063519902d35cc15bb0051bee5a78b2a140f5c6616d4d73896 SHA512 7b074183490cd2dc5a94a048278cc7ce371d744d70918fe277f4f4c664478ffd56fecffec7a2c90b7da6215747321a2315f08d4dd98d2fab8401541453a301f3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/congen/congen-1.6.2-r1.ebuild b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
index 4e2774d80d71..c01e3e7d2a47 100644
--- a/sci-geosciences/congen/congen-1.6.2-r1.ebuild
+++ b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 DEPEND=">=sci-geosciences/libtcd-2.2.3"
diff --git a/sci-geosciences/congen/congen-1.6.2.ebuild b/sci-geosciences/congen/congen-1.6.2.ebuild
deleted file mode 100644
index 758756a967d3..000000000000
--- a/sci-geosciences/congen/congen-1.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_P=${P/_p/-r}
-DESCRIPTION="Calculate speeds, equilibrium arguments, node factors of tidal constituents"
-HOMEPAGE="http://www.flaterco.com/xtide/files.html"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-DEPEND=">=sci-geosciences/libtcd-2.2.3"
-RDEPEND="${DEPEND}"
-
-MAKEOPTS+=" -j1"
-
-S=${WORKDIR}/${P%_p*}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-}
diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
index 28c5dce6e806..f498e16d81a6 100644
--- a/sci-geosciences/gdal-grass/Manifest
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -1,5 +1,7 @@
 DIST gdal-grass-2.0.0.tar.gz 56286 BLAKE2B 191402442bc3c16f3d07f538b9eae266e75c74efbecb235dc11cb3529e4758fc8354ab5e65ec4a8805595c6f1209d70e5f76a7006d546eb3d2e8f9e4966842ff SHA512 cefa60773c2acd5c1627b896e3298d02f51979c12f70ce67b88c0b886a13de2f62821a3d3e50984f5c676ef37819c685795949b06db57004a0edf8039e898d7e
 DIST gdal-grass-2.1.0.tar.gz 54299 BLAKE2B 09b9a408584618cefcc989feebc75431ae3efed2c9f6504e65ccf28bbc02a6e5125cb049accece7fd598aeef0bb1d5cb572067fc5a764a49c99627132d650f65 SHA512 fb06b71839849de413f68beb8f2cd1c2273cc48b5205fe1b255ffc4976f8f913b4b226eba186a24f5b40fe5fbb1ceeab760d06915222e4a4b269a6fbc7bc9417
-EBUILD gdal-grass-2.0.0-r1.ebuild 1245 BLAKE2B 6102d47e8ed2fa8f58a61f19a019cc6e2189b2c5626ea9f63b982687053bcbb509c201df317955c20449bf75df63a9fa21213da1b9333ec24ef22de48aa95621 SHA512 fd33279df18a30bcbecf42ca44dca2ff31f9bb526a83c4f61072b5cb9de0c0277a99fe01d5d5754efcf88d474736d09502ca7d0e848073fb84fa2548c4c2e775
-EBUILD gdal-grass-2.1.0.ebuild 1245 BLAKE2B 6102d47e8ed2fa8f58a61f19a019cc6e2189b2c5626ea9f63b982687053bcbb509c201df317955c20449bf75df63a9fa21213da1b9333ec24ef22de48aa95621 SHA512 fd33279df18a30bcbecf42ca44dca2ff31f9bb526a83c4f61072b5cb9de0c0277a99fe01d5d5754efcf88d474736d09502ca7d0e848073fb84fa2548c4c2e775
+DIST gdal-grass-2.1.3.tar.gz 54478 BLAKE2B 172200d8362b12583f0f73316b8c6d34875682c9d76c095745152c8d4fd1da1d9d1e94df5928225f6fda5712e987379c7c3192fa81d02b9cee9145fb577faee1 SHA512 c11776f92e591f1c0136e439ab6c672015171c5b750cb9332c73b49b3173c1d57efb4854b152a1d8e1b438c68a1130b4a46a189e1be0b99af9a8fb931f246e39
+EBUILD gdal-grass-2.0.0-r1.ebuild 1244 BLAKE2B ce04fdefce1170072cb2346ad4d0e812102956ffdebb857c8e7375c8cd8fd8395fc075bdebb69017fb043ade2473b48dafba09589bee1749ba0b5add8b7ef13c SHA512 60c1cdb7628beccbdd78aa120a0a7d03188457a1976e4a25e49af2cf0b3f5336d4720d3a5bf8950f595a2e6278a3989018dedbff322fb7fa1f35ad8d57f62083
+EBUILD gdal-grass-2.1.0.ebuild 1228 BLAKE2B 0eda99e944f3b363813c24103de49cb2e53487c1a31cde230150a694d3550a30bcc1ab15ff53dc9ce2a9b232ab9aaf6cb8cea2fb2353f725ebf0c68612f54533 SHA512 f0cd6fccb7b2a0a4781ed3b59a872ee6f83bfbaaf35c2ca7cfe070bf7ecea140e561460ad2fc422c971209b576e7040bfcc9d84d90e0b67a1eb84699bd13e119
+EBUILD gdal-grass-2.1.3.ebuild 1338 BLAKE2B 8446c1ca6087b98fd7bf66f7f9533d2325503fce01935ad7245c8073abe9b583b4026bfe7cec66f07620acbffc77beef136fe527cbbab9f60aeb047a91b6a663 SHA512 0f31ea8d593720ea177a47c7aa96f04381aee17115ee0023ddebe5600ed60b0952a306478e5b46f4f48d53b83ef257158567c456739c7b21e3a15a307967d0e2
 MISC metadata.xml 374 BLAKE2B e5c65df3d92edf2be292e76594e43f701f3a3dc25af1ed82daedfa550a65f698c867d840eb926e8d114ceb86c659c8d4db16fc90f8b6936f5670d1465cc88afb SHA512 be40eaf2149affadb4a8bbdc2817f44ea5d7117ad09797fb1ffe1db4a146129cde3955ad8b8c7e9283f9c2b8b86a6dc3bcf3d889d14c00481936ed388d632898
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
index 0b8f94b06435..b480a2b497b9 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils
 
 DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
+HOMEPAGE="https://www.gdal.org/"
+SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
index 0b8f94b06435..1d121dde9203 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
+HOMEPAGE="https://www.gdal.org/"
+SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
@@ -21,11 +19,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/expat
 	dev-libs/json-c:=
-	virtual/jpeg
 	media-libs/tiff
 	sci-libs/libgeotiff
 	sci-libs/proj
 	sys-libs/zlib
+	virtual/jpeg
 	postgres? ( dev-db/postgresql )"
 
 # these drivers are copied at install from the already installed GRASS
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild
new file mode 100644
index 000000000000..745a05ffcfa8
--- /dev/null
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GDAL plugin to access GRASS data"
+HOMEPAGE="https://www.gdal.org/"
+SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="postgres"
+RDEPEND="
+	>=sci-libs/gdal-2.0.0:=
+	sci-geosciences/grass:=
+"
+DEPEND="${RDEPEND}
+	postgres? ( dev-db/postgresql )"
+
+# these drivers are copied at install from the already installed GRASS
+QA_PREBUILT="/usr/share/gdal/grass/driver/db/*"
+
+src_prepare() {
+	sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \
+		-i Makefile.in || die
+	default
+}
+
+src_configure() {
+	local grassp=$(best_version sci-geosciences/grass)
+	local grasspv=$(echo ${grassp/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
+	local grasspm=$(ver_cut 1-2 ${grasspv})
+	local myeconfargs=(
+		--with-grass="/usr/$(get_libdir)/grass$(ver_rs 1 '' ${grasspm})"
+		--with-gdal="/usr/bin/gdal-config"
+		$(use_with postgres postgres-includes "/usr/include/postgresql")
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	#pass the right variables to 'make install' to prevent a sandbox access violation
+	emake DESTDIR="${D}" \
+		GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
+		AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
+		install
+}
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 8d913aceb3db..51dc59e03306 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -3,5 +3,5 @@ DIST gnome-maps-3.26.2.tar.xz 1175944 BLAKE2B abd8a592c10e31f4a05a6f3ef1167d111a
 DIST gnome-maps-3.30.3.tar.xz 2176712 BLAKE2B 8595643ddf3f6c419fdc053561e49e62d6bd6e3713d3d809d3fe73cd1aecf3361e3f6592fb53d6963cbdd5fc3edaf1dcb616059da9e5e506a3399d00a9a65de7 SHA512 f3481266c6cf792da71ef40ce489c13fdd807dab91238e02b815b25e29119ffb56212fb03078e14004cca27e24906af1b94f7f3c4325bbf4f332c782c79d8203
 EBUILD gnome-maps-3.24.3.ebuild 1270 BLAKE2B e2d7d77baed5a2aa7aa59e0a127b46a8a2e776260e4201780919fe42b122d066a089c5caac66b5103d7c52acf4a4ea33e52814e18502e80d8d08802f290d7050 SHA512 1cbd89a0b5621bebf8fd679adbb587a210bc45a77ad0cf162dac73f5440d765f510e0b066eeddda931053a5fc9cb574e5fffae8e6340c2f74b9aff97b1ffc827
 EBUILD gnome-maps-3.26.2.ebuild 1293 BLAKE2B 45fc678100dc7db48e1f96345c29b475171c8e77710ca329db19c9a102c3a4cf0bd5ad0e68d94366a64c25b626ae93c68d3a72306c8a875fa468137b1256a86c SHA512 26ab223d1a698659aed44090e2eb7c8c838ab7c6a8633bbbfc3adeb3c72cd00ed4c99f4006e2976c9ee8eca45524958c2312739e77df59ae6344dd0defc1fb97
-EBUILD gnome-maps-3.30.3.ebuild 1413 BLAKE2B a90a6bedf59c5da397dd732d003a62aa32e84dddbcf8026a0a6eb0621a1a575b0beb6f11a6fc804710ff48574fc2e2bc74c9ba08d523501df457de2d0caf4e38 SHA512 4b06e7453e820f817ad81ee758d967bde6a55f36fd94215bd7f7525879b06a1c3ca7ea43f02ed6a618a8a2942c8785f82795ec5225af1c298cff02c4ae138ae0
+EBUILD gnome-maps-3.30.3.ebuild 1361 BLAKE2B 0c1265e5a231615b36c58744e5434f0cc93fd14ea0bfb7958c1723acca5507e500d1b998984e8b5f5ea6efb8c02f399de7c0ea86451d7264a126991e0f52bd74 SHA512 f913d9029855ddf68f57c93cae3368cac6848d65d9cc30d390a8bf138f476a91d425dafd4d986d0e0e5ab8189795bd594497545830c952ee6cdd66cfd14f3a2b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild
index 9d2b7e48e515..14cec826099e 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,18 +37,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
-	gnome2_icon_cache_update
 }
 
 pkg_postinst() {
 	xdg_pkg_postrm
 	gnome2_schemas_update
-	gnome2_icon_cache_update
 }
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 5a6b97e6b6d9..cc7fa6759869 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -5,7 +5,9 @@ AUX grass-7.2.0-glibc-2.26-2.patch 1238 BLAKE2B 93dca4f61321f7d721171a0eb079d805
 DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
 DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
 DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90
-EBUILD grass-7.2.0-r1.ebuild 6838 BLAKE2B 30bdb9299483718e9fe2872496dd3a8b6e62f22cd452c229fe358da8d3920bd9634fd74ddf53abde208f5ee9b1fd399c28640e1a4b8f1b76a88c072a6240e83a SHA512 cc6b010ee705b3e09b90e0bbabffa4ed94b3d2da4012d8f87381cf44b645a542809035549f87b0b2afc7a5b35a698bfbcac9e9392006d625d02003c1b1319702
-EBUILD grass-7.4.0.ebuild 7316 BLAKE2B 0ccddb16ffb1d3e6e8cb566fd2f3cb435419bd70a69cb62550f65c9647f32251fbbaae281e3cb1eb2ed5807eafa067345deace268acd49f90a412e6522d0aaca SHA512 22cfbca1d55a73c1429bdc14d880f92c08b06f8875751497262b197d1f8f3f250777edeabeb23962312d8beffd856d7a45f83cc975c46807c5057adff4d1fa1e
-EBUILD grass-7.4.1.ebuild 7526 BLAKE2B e9ee810c6078942b4ee923aa47f1ded25fc18f4c66b131ea6f208affa3b42384384749ded1ac41d4648504ca41834c5f0095fdfd3c72b952022f91b98ed7a604 SHA512 cff8267419a71d3c7b241c0c1f0499984876d6e70a130f1533c5e3376cb0e95cb162854d2206f6b7cd9c9e3d6f4f8f83d598222f99e16b4b4f002d047f88e165
+DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
+EBUILD grass-7.2.0-r1.ebuild 6837 BLAKE2B acf0edfd8446fdcec8472da00e43a586d232b7b79491a74411fb78b756f7ef1548033af0865445e252f9a6296f96540d64a822ff4b4a1eeebc7dcee5232ed474 SHA512 18a871959cbc426a5c7e443e0aed1f77f2396784682260ed5bc195cc73073eea1a939e63a594915cf6d02840da6b848d171bd5bd2a8282c18ac564adb12b3456
+EBUILD grass-7.4.0.ebuild 7315 BLAKE2B b7722198a4b64815d0649fbd146d877d65de5ec7ed423fd92a165dd5cc9e61ddbc7bc4cb4804523ad16f7e1c1becbc65d3749557e6253de68b6692efc902b4a9 SHA512 e11e91e434b55005b99bfc9accfb057beb89a0a9818f4cc9b409ce695ab6b8080bfe4e3be6bc0c204eb921002c16507876213d2cd04bfcd766f658b801285857
+EBUILD grass-7.4.1.ebuild 7525 BLAKE2B 3652695a03ed74ba6d4b3032caefaad116087d81cc80db9de0c7016fb3dec092a9620d5530e4b9b66af634c34ff10550e0895dce58046ac417b5bb0b9f88020e SHA512 9c89d98cd121e05222f9305867113c111f82959409f35c7c281e53a0174b875179a75b6112bba0cbb219300aaa7fae6b727409e0cdf28c6f3476a524bcf1bce5
+EBUILD grass-7.4.4.ebuild 7333 BLAKE2B b42f1776211b07f341982bad5f2153e30d67a8e7f7d30171795cda9fc3880212f7762e621359df049d550cd0f64c659f8a8cbcc085f4848eaf8c360a36f716a9 SHA512 0343ff9a4e7451c9c074b10cb4f10e559ab613172d4c4eca41e48e17ad55ef085a925b04e84746c5c4d39bc62ddb032be55a4f2d62b04811e79d20f8dc5ef83b
 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index 4c924ed16592..6b99aa466e7b 100644
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,8 @@ MY_PM=${MY_PM/.}
 MY_P=${P/_rc/RC}
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+HOMEPAGE="https://grass.osgeo.org/"
+SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.2.0"
diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild
index a5e3ddaf60ef..4b0679f5b2c9 100644
--- a/sci-geosciences/grass/grass-7.4.0.ebuild
+++ b/sci-geosciences/grass/grass-7.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,8 @@ MY_PM=${MY_PM/.}
 MY_P=${P/_rc/RC}
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+HOMEPAGE="https://grass.osgeo.org/"
+SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.4.0"
diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild
index 5c45e10e1744..7c4d6e63529f 100644
--- a/sci-geosciences/grass/grass-7.4.1.ebuild
+++ b/sci-geosciences/grass/grass-7.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,8 @@ MY_PM=${MY_PM/.}
 MY_P=${P/_rc/RC}
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+HOMEPAGE="https://grass.osgeo.org/"
+SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.4.0"
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
new file mode 100644
index 000000000000..e067fbf0aaa6
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER=3.0
+
+inherit autotools desktop eapi7-ver python-single-r1 wxwidgets xdg
+
+MY_PM=${PN}$(ver_cut 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="https://grass.osgeo.org/"
+SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libprojectm
+	sci-libs/gdal
+	sys-libs/gdbm
+	sys-libs/ncurses:0=
+	sci-libs/proj
+	sci-libs/xdrfile
+	sys-libs/zlib
+	blas? (
+		sci-libs/cblas-reference
+		virtual/blas
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	geos? ( sci-libs/geos )
+	lapack? ( virtual/lapack )
+	liblas? ( sci-geosciences/liblas )
+	mysql? ( dev-db/mysql-connector-c:= )
+	netcdf? ( sci-libs/netcdf )
+	odbc? ( dev-db/unixODBC )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	readline? ( sys-libs/readline:0= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		dev-python/wxpython:3.0[cairo,opengl?]
+		x11-libs/cairo[X,opengl?]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? (
+		dev-lang/swig
+		x11-base/xorg-proto
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch )
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack
+		mylapack=$(eselect lapack show) || die
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas
+		myblas=$(eselect blas show) || die
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	local pyver=${EPYTHON/python/}
+	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	# fix header being unconditionally included
+	# see upstream https://trac.osgeo.org/grass/ticket/2779
+	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
+		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
+
+	default
+	eautoconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+
+}
+
+src_configure() {
+	if use X; then
+		WX_BUILD=yes
+		setup-wxwidgets
+	fi
+
+	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/"
+		$(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 sqlite)
+		$(use_with opengl)
+		$(use_with odbc)
+		$(use_with fftw)
+		$(use_with blas)
+		$(use_with lapack)
+		$(use_with X cairo)
+		$(use_with truetype freetype)
+		$(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 X wxwidgets "${WX_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[@]}"
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \
+		prefix="${D}/usr/" BINDIR="${D}/usr/bin" \
+		PREFIX="${D}/usr/" \
+		install
+
+	pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die
+
+	local HTML_DOCS=( docs/html/. )
+	einstalldocs
+
+	# manuals
+	dodir /usr/share/man/man1
+	rm -rf man/ || die
+
+	# translations
+	if use nls; then
+		dodir /usr/share/locale/
+		mv locale/* "${D}/usr/share/locale/" || die
+	fi
+
+	popd &> /dev/null || die
+
+	# link libraries in the ~standard~ place
+	for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do
+		dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}"
+	done
+
+	# link headers in the ~standard~ place
+	dodir "/usr/include/"
+	dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass"
+
+	# fix paths in addons makefile includes
+	local scriptMakeDir
+	scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/"
+	for mkFile in $(ls "${scriptMakeDir}"); do
+		echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
+		sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
+	done
+
+	# get proper folder for grass path in script
+	local gisbase
+	gisbase="${ROOT}/usr/$(get_libdir)/${MY_PM}"
+	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
+		-i "${D}/usr/bin/${MY_PM}" || die
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-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
+	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}/usr/bin/${MY_PM}" || die
+
+	if use X; then
+		local GUI="-gui"
+		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+
+	ewarn "GRASS addons may fail due to Python 3 incompatibility."
+	ewarn "If that is tha case you can change the shebang a the beginning of"
+	ewarn "the script to enforce Python 2 usage."
+	ewarn "#!/usr/bin/env python"
+	ewarn "Should be changed into"
+	ewarn "#!/usr/bin/env python2"
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/sci-geosciences/harmonics-dwf-free/Manifest b/sci-geosciences/harmonics-dwf-free/Manifest
index 38a5a6651b21..86dd06654263 100644
--- a/sci-geosciences/harmonics-dwf-free/Manifest
+++ b/sci-geosciences/harmonics-dwf-free/Manifest
@@ -1,5 +1,3 @@
-DIST harmonics-dwf-20121224-free.tar.bz2 508967 BLAKE2B 113c925dfb9381c4926701d0061204f9060da0bf272e1c6ba1612d2b8f56c0b96e6437d482b938d4dbddcb3a295324795e4d2ac207858b98041ff69c6b763f54 SHA512 25791923dad463a25210b4688c2868a502e690431fa22815d3daa693e42be3e2563367474c4771f88cd3e7eae3b3f290f312f05f5f554895de983eabc24e5657
 DIST harmonics-dwf-20131228-free.tar.bz2 511292 BLAKE2B fe1e36da2155bc3b94bf0df2e6f17eb718dd4cd94d6b2aa719564c672fb1b7f25b6c1eca1900f4e28c37e7764098be806f33b3d72f9a07e615523d21ddca85c7 SHA512 b36ca3f432a455fee051418b7eb427bfafc7cdad929765ed6d44f6f2583e6b8c1d4992b21225d07636c418cc4dea2e353f3276511ba7b331bb8709bf543fceed
-EBUILD harmonics-dwf-free-20121224.ebuild 449 BLAKE2B 19ae7f373f74257bf8f65144743015719149ea9647aabcc59513863c32a8cb2e01197a932e27a436980fe9a60f2951516de4582c26dcc2718fe9312cbd4875f9 SHA512 846248877ad8000b7fef8f5de2504358f4b81d7d3c37749b47b8362303b4b312976e052ac420add963978d6ae0d7172fff7518bf3875bcd569f04e49651987a4
-EBUILD harmonics-dwf-free-20131228.ebuild 464 BLAKE2B 245f9a835ce3a784cf9ab2f2896ba383733cecc4c6d722f785391213c81216e86ac7ca1eff2642bc9ad0c4d3070fc486bd1d94a520fde9e3ddc34488b92def0b SHA512 0a836229bb694ef1ba7bc37b08ee137e39aab3c8210221c253a204b00a697b17df09360958ef5f7e4037ad8da67cc7fb8655ec27200c3035908c4f7ee8087481
+EBUILD harmonics-dwf-free-20131228.ebuild 463 BLAKE2B 50001bc68f4bd128a8102906f752d7665ee448ba5f7b26f4e69d14c720899b4f379040ae9f7893bc8e40d02beb27193e8ad58bf1ef83464ee6c91f5f4e596e86 SHA512 d018d6c78186af6a78744709f4500037e5ed76aab53838d2bd74f75df5a7fb7f171909aa8d0ddd1825c9044436348c89ea7cbc372a77c50bf680b158effb916b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20121224.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20121224.ebuild
deleted file mode 100644
index 7c2689d0c496..000000000000
--- a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20121224.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/-free-/-}"
-DESCRIPTION="Tidal harmonics database for libtcd"
-HOMEPAGE="http://www.flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-free.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/harmonics
-	doins "${MY_P}"-free.tcd
-}
diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
index a52953d29d25..7d140e843b2d 100644
--- a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
+++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-free.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 2d72eff3b75e..7d3278abbe66 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -2,5 +2,5 @@ AUX mapserver-7.0.0-no-applicable-code.patch 812 BLAKE2B b3946628fc518dd37111e6f
 AUX mapserver-7.0.0-sec-format.patch 470 BLAKE2B 2156f485b0b1917fb6c6f4d34938cb083533b8658c4d29d5299475dfdfc14113ef87ca46a126e94fe69fc89463c493761e0d3cc1f981c154e96dfde1224972eb SHA512 7cddc978bce3691bfa19ea7f7782ce1e0a59c12b2142ebdb2c2dcdcb1076a79992e1a477f7b99e638d457136d167066b867de85b07574c766babd16c1f238a8f
 AUX mapserver-7.0.5-missing-macro.patch 439 BLAKE2B 4ef13371034994ed7a6e61a61463831dfb8a8d7a49812fe85d20cdd548159646d3c518f239d66112bfdfe019d74793a5f3a1ca6133a63adfbac3c8d5047757e7 SHA512 351f19b670b4352934150e8ab49af9bc5c47cad3b9bc5c5a25d92ddef19f66f91ab923590f764f5bb2cc9f12a313ab0f85d6c9eaa1c55f8b630362ce597552a2
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
-EBUILD mapserver-7.0.5.ebuild 4510 BLAKE2B 6ebcc5ecc23196c283845943ab6eba9033acd1e8113709a1efb96c5d5c4985a289835961bb208f17d4c83d5edb3ff834a4882ded8859633cc771a33f5d330491 SHA512 63f7156c6127b5bf3124a56698c30e2f4e14de229df39fa201d196d3f3f8d89e82a2b32b6c1f0b6b48e51fbd0ab40f9ab5069011a3fa98ce8d1c4d41a134374c
+EBUILD mapserver-7.0.5.ebuild 4509 BLAKE2B a595b08ad87b62ee2239ac4b911a8c762adc22190c9f29679ae37eeff0e0f694943c824ece901c7e46098f32abb7134c4c8083a08da97ff2c3c086005a48eaca SHA512 7b6f3701f6cb18a1423fa73d41b797672c15a81f899897340c26efa91331551d0c5261f517ce67f5813c66c786e75835816eeef8312b7f73197f2956003ac888
 MISC metadata.xml 682 BLAKE2B 28881d5c3c341fc24d970d19e69602942623fe9f180cd3dad30ff37b5c3550c158ec11964a76540bbcdc2e62f8ca1c47be1e58ea8a6cd035ff6d450ce25b77ec SHA512 09ba242fe23bdf10d76b882ac32d9952e88e5bc630eb8569e74cfdacae587ec534e8014d6b015387fa2c63047e130dd1f918340cb382413bcbf14f321a296436
diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
index a412b4ed85eb..262043174b9f 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,8 +21,8 @@ WEBAPP_MANUAL_SLOT=yes
 inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r3 multilib cmake-utils # ruby-ng
 
 DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"