gentoo resync : 22.10.2018

12 files changed, 200 insertions, 201 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 264ab4b4136b..691424a3969a 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 08bcdec05bb4..081b4524cd41 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,10 +1,11 @@
 AUX mapnik-2.2.0-configure-only-once.patch 737 BLAKE2B 66233c05272cf12c62c04bd87b5c3ab74894ed2887e6d33f5fe82217344a341ade76c3c9df138baa31629a75bc7c65083baf0470e705fbbd48ae830e36402b0c SHA512 30f044c8501536599d625646dc8930d3cdcd14fc1ef6c3ee64c8226fe03a6d0f3cbc5d175f6aff7bc7dc0575206dcd23288828cb6edad264aed3b2b4d9e7874b
 AUX mapnik-2.2.0-dont-run-ldconfig.patch 243 BLAKE2B 8dffa522b7f8cc7a080ebeb3175c953a7a8f457d5c9288a7857aebc1f76cc8b032c11bd46678e2bd50f59ee0e19e7f7172766658640b4a06530ad0163f600e33 SHA512 dd42f09654de246ff6be4cf68fc2b08bb5ec2ae6515e722e89337081ff4b89c8b269fa70d3393f3c6156a539d7a9b1d1f516e9d6ff7f35639669fcfcd20a26ff
+AUX mapnik-3.0.18-icu-61.patch 2148 BLAKE2B 3dfc1a8fe598c13317576a31bd758bd28cf24140b02fd46eaf97e9bbb9cc10c56ad5f2b68ebde4e3ccd12f2275469f556edeee21c6f3b7d92e426a6f0b147730 SHA512 32ff973dde413c85fb03769d7b07dc3e1dcdf9fd2e398fb9a77e618a461a8613056cf978d2e1ff4679738e1122af563c6dd5238dcc1d434a19b70b314ea1faa1
 AUX mapnik-3.0.18-scons.patch 1939 BLAKE2B ece0bf49df2959a33af5f58842a59fe59a2e232f41a6e9542e747f24ebcc99d550370cc742e28ba50f10272ac5f2d31cb4c503559fd55ae4323d9ecdcbab1571 SHA512 e17363609928d6654a9949f944dc8d1745336028019f65d7fd12190c8c88de65cc40dae272dab71626ab9fb69009ebc26f0ae2e569dd9d5e8fd84aa2de0370ac
 AUX mapnik-3.0.9-harbuzz_sharper-upstream.patch 746 BLAKE2B 73ad3bcb237e30447336657b541bd794e9e7786b23961d6a7ee94c1c5c7646e9337ea5a8002a68e15a9a9cae05a21f06e5517a07f4dbd65815a06f88c3a76d12 SHA512 08815cf001db531cec2660d53f8afdc83df0bb9e59cb792487a05fb5dff64aa66fa79e8283b7b2b8aca031e90205ab0dcd0097d8129953fed33432e93e34a2e2
 AUX mapnik-3.0.9-unicode-upstream.patch 264 BLAKE2B 9b2b8a062a861c58bfbe3681d7edc1d115ae85955dd1c1b73e37b9d1f1e690a97037144d957b318cc0921071525eaae4b3a94403842bdebf503d0f8bd195a3e6 SHA512 1f1f58477f5d54408320190b369a3039c70147f6d4c8498a318969661c258a6c7b5e2f26c111e8d543409512c7a98ddb31ece12ac75b5256a06105177e303c9d
 DIST mapnik-3.0.18.tar.bz2 10103474 BLAKE2B de914ffe31940b74114cdf07a9ff13f36c7210d27b84cecd16fda7c429f0c4be7ffb9e677cf1bc8d156298b5f10ed2a41adcbf4f7727bbf85d2f0099950f5c4f SHA512 7af04b9437c83cddedf2b43f7da0622e44178b4ecce80c0349bacf551bf747698d9ec9e4d6eee68c0265feeae5833281215a759de5a1394abbdfdd39eef39661
 DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1
-EBUILD mapnik-3.0.18.ebuild 2768 BLAKE2B fa9fb68ad23c4b17d1163492f375735f26925137327f9b1dc6eefdc9d078e67a6f31331d21a3fcd3f90ff75242bc30429ded2c7f46df7aa08c545cecf43d3efe SHA512 0c27792c584dd10f845bff899318b685cdb7fffb08e3d0335628cf37d9a365b2e53fc65023bc0c229d018e6ae50d27dfeeaabf483f2a7a864013e8a09d948823
+EBUILD mapnik-3.0.18.ebuild 2806 BLAKE2B d732995c0cf6dd805dbc01def9e1185cd6c2424de42d6cd92b07aaf89b6fc9e89d60f95f7de80e0510afda4f1e4bb38a8069b6d77797c086a6e01b34c0443218 SHA512 2ba308aa071f761ee278eda592956d1ce6ae1d932fdab3870fa593d3793c8376154747bd352bb4204caab2a3425884ae52e3ded9234d763cc16d630f9e0dc73f
 EBUILD mapnik-3.0.9-r1.ebuild 2578 BLAKE2B d2c508da64f319b9043ff290f34b3fb99b0bd10f04aa3084108572eeb449ae9ea33131292e06a72807f363b4dc812b560c141e29cb622ffa92ca83e4140a1dac SHA512 8143ee3916c8d4fe4eb54c42dc11e3a5553016a3442b80a5131922a68d9ef47477f91b8c76e3f7a49c418e6b4ffbb78751d64fecef7f191bfb2505e8c6fe7d0a
 MISC metadata.xml 754 BLAKE2B f28f0847b5c78c667dc69f9d7e0ca75b196926ad8b6f98cbc1c529470943b0ecc64bd05fdc1ed3ef289dc60bf54d4f594800fcea44ef20d5e3dd5ba4ad1cfeb7 SHA512 84138433b879b8d48422f7f9d587966b69a28d89effac6cfbf7bd925010c3d118f4296c08de787dbf6649af549acf4fd671a4702acc9d203c3829caca30fc5d1
diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
new file mode 100644
index 000000000000..1330fe6c0fb2
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
@@ -0,0 +1,54 @@
+From 1ddfe6c315487a802f2ea38119255a203a25913c Mon Sep 17 00:00:00 2001
+From: Raul Marin <git@rmr.ninja>
+Date: Tue, 3 Apr 2018 13:18:03 +0200
+Subject: [PATCH] Qualify ICU types explicitly
+
+ICU 61 has dropped the global `using namespace icu;`
+http://site.icu-project.org/download/61#TOC-Migration-Issues
+---
+ include/mapnik/text/scrptrun.hpp | 2 +-
+ src/text/text_layout.cpp         | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp
+index 2161c510d9..c219a2a0d3 100644
+--- a/include/mapnik/text/scrptrun.hpp
++++ b/include/mapnik/text/scrptrun.hpp
+@@ -37,7 +37,7 @@ struct ParenStackEntry
+     UScriptCode scriptCode = USCRIPT_INVALID_CODE;
+ };
+ 
+-class ScriptRun : public UObject {
++class ScriptRun : public icu::UObject {
+ public:
+     ScriptRun();
+ 
+diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp
+index 663cbe11aa..ecf02ab8e3 100644
+--- a/src/text/text_layout.cpp
++++ b/src/text/text_layout.cpp
+@@ -207,6 +207,7 @@ void text_layout::layout()
+ // At the end everything that is left over is added as the final line.
+ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
+ {
++    using BreakIterator = icu::BreakIterator;
+     text_line line(line_limits.first, line_limits.second);
+     shape_text(line);
+ 
+@@ -228,7 +229,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
+     }
+ 
+     mapnik::value_unicode_string const& text = itemizer_.text();
+-    Locale locale; // TODO: Is the default constructor correct?
++    icu::Locale locale; // TODO: Is the default constructor correct?
+     UErrorCode status = U_ZERO_ERROR;
+     std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
+ 
+@@ -336,6 +337,7 @@ inline int adjust_last_break_position (int pos, bool repeat_wrap_char)
+ 
+ void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits)
+ {
++    using BreakIterator = icu::BreakIterator;
+     text_line line(line_limits.first, line_limits.second);
+     shape_text(line);
+     double scaled_wrap_width = wrap_width_ * scale_factor_;
diff --git a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
index 8c0db9a6c0be..5a5a4d1e20f0 100644
--- a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
+++ b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-configure-only-once.patch"
 	"${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch"
 	"${FILESDIR}/${PN}-3.0.18-scons.patch"
+	"${FILESDIR}/${PN}-3.0.18-icu-61.patch"
 )
 
 src_prepare() {
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index c1a278462bb1..2d72eff3b75e 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,8 +1,6 @@
 AUX mapserver-7.0.0-no-applicable-code.patch 812 BLAKE2B b3946628fc518dd37111e6f2293391fb6ddca7ba7ceb019a764c528d3c6e450e3ef5941fa2201995b40efe39e63c78c14a4e321f49f96c811541a99e90e83a71 SHA512 dab7c98095791b369c52d10e6737ac65f60ff7e02b8fcb5bceb2440025fa0552a936a16593aaa66b35434db0659184b667cc54962274510b062690029778a44c
 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.3.tar.gz 2621285 BLAKE2B b2fd9a4050ffee3bf4175971e0588ddc022f473e35c3953a098865898275ae66c2f889aef7df21231a9d9fdbecfda75490c21c67771745f0b6f18dbf11febb8e SHA512 7630461948e7b371c6d4d6d49cc596ad8fc6b076a8bbfdc88358fc076fa0d4ebaaab10663ec9c3c64e246b5735a07cef5cc28eba88b00dd09259048a49d2b81b
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
-EBUILD mapserver-7.0.3.ebuild 4606 BLAKE2B 5db66fd9b135e33e04c2f39e09a0638cade589b5dbcd99f0b6c91b4658a558c39620c6b36893e1f7ea06196a439b55322fa34de7c4cb4f0f93babd914f74ce51 SHA512 593f16f85412b967d8b8acf758d61535814e2fb4d4706a327c4a25947a4320f2e658a396a6786cc63babbfc47fd9a482e90d05f573ed58ab369f177241052a21
 EBUILD mapserver-7.0.5.ebuild 4510 BLAKE2B 6ebcc5ecc23196c283845943ab6eba9033acd1e8113709a1efb96c5d5c4985a289835961bb208f17d4c83d5edb3ff834a4882ded8859633cc771a33f5d330491 SHA512 63f7156c6127b5bf3124a56698c30e2f4e14de229df39fa201d196d3f3f8d89e82a2b32b6c1f0b6b48e51fbd0ab40f9ab5069011a3fa98ce8d1c4d41a134374c
 MISC metadata.xml 682 BLAKE2B 28881d5c3c341fc24d970d19e69602942623fe9f180cd3dad30ff37b5c3550c158ec11964a76540bbcdc2e62f8ca1c47be1e58ea8a6cd035ff6d450ce25b77ec SHA512 09ba242fe23bdf10d76b882ac32d9952e88e5bc630eb8569e74cfdacae587ec534e8014d6b015387fa2c63047e130dd1f918340cb382413bcbf14f321a296436
diff --git a/sci-geosciences/mapserver/mapserver-7.0.3.ebuild b/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
deleted file mode 100644
index 44a5419ef6a1..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-6"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 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"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( php_targets_php5-6 )
-			xslt? ( xml )"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/fcgi
-	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
-	media-libs/giflib
-	net-misc/curl
-	virtual/jpeg:=
-	virtual/libiconv
-	x11-libs/agg
-	bidi? ( dev-libs/fribidi
-			media-libs/harfbuzz )
-	cairo? ( x11-libs/cairo )
-	gdal? ( >=sci-libs/gdal-1.8.0 )
-	geos? ( sci-libs/geos )
-	mysql? ( virtual/mysql )
-	opengl? (
-		media-libs/ftgl
-		media-libs/mesa
-	)
-	perl? ( dev-lang/perl:= )
-	postgis? ( dev-db/postgis )
-	proj? ( sci-libs/proj net-misc/curl )
-	tiff? (
-		media-libs/tiff:=
-		sci-libs/libgeotiff
-	)
-	xml? ( dev-libs/libxml2:2 )
-	xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
-	perl? ( >=dev-lang/swig-2.0 )
-	python? ( >=dev-lang/swig-2.0 )"
-
-need_apache2
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.0-sec-format.patch"  # see https://github.com/mapserver/mapserver/pull/5248
-	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-	use perl && perl_set_version
-	#use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	# unpack A and then copy the php thingies into workdir/php-slot
-	php-ext-source-r2_src_unpack
-	# HACK: and then remove it and replace by symlink
-	local slot
-	for slot in $(php_get_slots); do
-		rm -rf "${WORKDIR}/${slot}" || die
-		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
-	done
-}
-
-src_prepare() {
-	local glibdir="${EPREFIX}/usr/include/glib-2.0"
-	local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
-	sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
-		-i "${S}/CMakeLists.txt" || die
-	sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
-		-i "${S}/CMakeLists.txt" || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DWITH_ORACLESPATIAL=OFF"
-		"-DWITH_SDE=OFF"
-		"-DWITH_APACHE_MODULE=ON"
-		"-DWITH_ICONV=ON"
-		"-DWITH_GD=ON"
-		"-DWITH_GIF=ON"
-		"-DWITH_CURL=ON"
-		"-DWITH_FCGI=ON"
-		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
-		"-DWITH_PROJ=$(usex proj ON OFF)"
-		"-DWITH_WMS=$(usex proj ON OFF)"
-		"-DWITH_KML=$(usex xml ON OFF)"
-		"-DWITH_GEOS=$(usex geos ON OFF)"
-		"-DWITH_GDAL=$(usex gdal ON OFF)"
-		"-DWITH_OGR=$(usex gdal ON OFF)"
-		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
-		"-DWITH_MYSQL=$(usex mysql ON OFF)"
-		"-DWITH_LIBXML2=$(usex xml ON OFF)"
-		"-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
-		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
-		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
-		"-DWITH_CAIRO=$(usex cairo ON OFF)"
-		"-DWITH_PHP=$(usex php ON OFF)"
-		"-DWITH_PYTHON=$(usex python ON OFF)"
-		"-DWITH_PERL=$(usex perl ON OFF)"
-	)
-
-	if use gdal && use proj ; then
-		mycmakeargs+=( "-DWITH_WFS=ON"
-				"-DWITH_WCS=ON"
-				"-DWITH_CLIENT_WMS=ON"
-				"-DWITH_CLIENT_WFS=ON"
-				"-DWITH_SOS=$(usex xml ON OFF)"
-			)
-	else
-		mycmakeargs+=( "-DWITH_WFS=OFF"
-			"-DWITH_WCS=OFF"
-			"-DWITH_CLIENT_WMS=OFF"
-			"-DWITH_CLIENT_WFS=OFF"
-			"-DWITH_SOS=OFF"
-		)
-	fi
-
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
-			[[ -x ${php_config} ]] \
-				|| die "php-config '${php_config}' not valid or not executable"
-
-			local php_include_dir=$(${php_config} --include-dir)
-			[[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
-
-			mycmakeargs+=(
-				-DPHP5_CONFIG_EXECUTABLE="${php_config}"
-				-DPHP5_INCLUDES="${php_include_dir}"
-			)
-		done
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use php ; then
-		php-ext-source-r2_createinifiles
-	fi
-	webapp_src_preinst
-	exeinto "${MY_CGIBINDIR}"
-	doexe "${S}_build/mapserv"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 6c319d2487b4..6b16c82b1673 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -8,6 +8,6 @@ DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed733
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.0.3-r1.ebuild 6233 BLAKE2B df8a8d83be8b563027abc3d7e6f759357449bd9852a205e7583e5055e564da68645df7be5f8aab8107bfa115d5eb48889acdee6c8c98b1eed4f14379e5b9cf07 SHA512 18da6eb489ca5095099c11d20582c1ea140f4c843f3fc6f02c01b8a338a522420a7be44479cd61f9101ecc90621ba5da6581e28dbe7fe90cdb5377fd4f91f096
 EBUILD qgis-3.2.2.ebuild 6200 BLAKE2B af609ca54b0333b34f0f0f6c5d940e88f49093d4ffe4326af010b21f5ac456ddca9dde7d71b3c8fbda78122309401026139c4a1da6e42b3a6e195b610a16dad3 SHA512 59a5b4868a1fa0cc6f5949553918b90f7dce113e0cf8474fda13d445f2ee313d732cb824ac73eee735633bd2fdcbe79ba2d54d485cb3a6744d663a72bbb7abd6
-EBUILD qgis-3.2.3.ebuild 6200 BLAKE2B af609ca54b0333b34f0f0f6c5d940e88f49093d4ffe4326af010b21f5ac456ddca9dde7d71b3c8fbda78122309401026139c4a1da6e42b3a6e195b610a16dad3 SHA512 59a5b4868a1fa0cc6f5949553918b90f7dce113e0cf8474fda13d445f2ee313d732cb824ac73eee735633bd2fdcbe79ba2d54d485cb3a6744d663a72bbb7abd6
+EBUILD qgis-3.2.3.ebuild 6195 BLAKE2B 92beb6aef1915030ae047a9216d2593f2c9a5f0cace785b4ac95aaa38472b1cef8012474eac3f5a59cf2dadb1f93383e6fe0d9016af447404573ad285e40ee1a SHA512 a322aa327c5c2e6512e74597216edb6fef931cb5c2e0a85f28614bda0c5a96b4ba561e1ba2613dc875921a291f4d4dee33cb35ae51ee618b91b7969b777a0a9b
 EBUILD qgis-9999.ebuild 6299 BLAKE2B f0e1b484879bfb2d2545694183f81afd9994eac66575d108c072d74f2ac3f5006c8c1cbb08d46fa4961123089bcb9edb5685255d04c2cd6598ac4282a2810af7 SHA512 ec18b18d2b791372df0a5e3d0d37d76d368a193f465aca05cf2636883f91e1050e7d99dad71d2755ef2f3c1b9fdd99badab9e3c8765c9a54e1492164a831e0aa
 MISC metadata.xml 1211 BLAKE2B 761852f48581c7cca9f9474d1e2e99c751ca2597726cbbb973c82c6292806e4908fcaa091ad4ad5b60f73cea831db2f94be9c7ae3627ad9bfbe0a7572638c929 SHA512 22aa2127957668f8017e20d08297ef222bb1f9fd0a420398ee191426de0b681fb90138bfa8117f67612001d64020455871db4b8a772653d9ee02d7777555e48b
diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.2.3.ebuild
index 23afe352fad8..7c4de2ebd699 100644
--- a/sci-geosciences/qgis/qgis-3.2.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index a86412c8ff11..91f46e35fbae 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,4 +1,5 @@
 DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
 EBUILD viking-1.6.2-r1.ebuild 1732 BLAKE2B 1696a27bbfbaa72b9e49baa87b06b0f0a89a6ee1cee0a936138e46b96f60bdc7bf846d355a8a204429a6f52e63818899674f15dc026c76f129388cef3563ea92 SHA512 9d460c58cb898ce1c65217596c9be4c91311302aec42184c5864ad2826d2116cd30e609e76e2490aae76c3745c3ad48ca150423311e873c33fc3718611e7a7d4
+EBUILD viking-1.6.2-r2.ebuild 1756 BLAKE2B 5d914b4f1ab4d07fba05485d77e6a5802a4c59d5110b49a0c7914367a4684d9a64f8bbdc164bbcbb961b5372eff36fe9ebd58fac4d6ac4567031d12820c7f1ea SHA512 b2672f59cc289c0554989adec8d20eab69b81c27305a9a36c7227f4393afac4b99f03549ae122a59aa497c5ad26f0760df4b85015ad2053b4d120b977e84d438
 MISC metadata.xml 828 BLAKE2B 4ca303eae02e593e48080b7fbd77fbaeff6b617b221621509932b0ef209d64ca356c9aca9504867508f3e857e587ed5db61ed97d12c49dfafe458bbfe66ec567 SHA512 c8b9fe12169e2ea31110188f2bb0aba17138dd325af8ad04d26803bed10ec63657a2de7fcc0ccb774b2731a1a85cf3bdad14c88796e6747ecbe5abb72d88e057
diff --git a/sci-geosciences/viking/viking-1.6.2-r2.ebuild b/sci-geosciences/viking/viking-1.6.2-r2.ebuild
new file mode 100644
index 000000000000..365f8b560b11
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.6.2-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="https://sourceforge.net/projects/viking/"
+IUSE="doc +exif libexif gps +magic mapnik nls sqlite"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+	app-arch/bzip2
+	>=dev-tcltk/expect-5.45.4
+	dev-libs/expat
+	dev-libs/glib:2
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	gps? ( >=sci-geosciences/gpsd-2.96 )
+	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+	magic? ( sys-apps/file )
+	mapnik? ( sci-geosciences/mapnik )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${COMMONDEPEND}
+	sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	app-text/rarian
+	dev-libs/libxslt
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_configure() {
+	econf \
+		--disable-deprecations \
+		--with-libcurl \
+		--with-expat \
+		--enable-google \
+		--enable-terraserver \
+		--enable-expedia \
+		--enable-openstreetmap \
+		--enable-bluemarble \
+		--enable-geonames \
+		--enable-geocaches \
+		--disable-dem24k \
+		$(use_enable exif geotag) \
+		$(use_with libexif ) \
+		$(use_enable gps realtime-gps-tracking) \
+		$(use_enable magic) \
+		$(use_enable mapnik) \
+		$(use_enable nls) \
+		$(use_enable sqlite mbtiles )
+}
+
+src_install() {
+	default
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${PN}.pdf
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index 28a7bbf1c76d..75c5872c2e07 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -2,5 +2,7 @@ AUX xtide-2.13.1-Werror.patch 611 BLAKE2B 624b5e8c67eb1d916a8ce519a22c4590e8e4c1
 AUX xtide-2.13.1-gps-switch.patch 2413 BLAKE2B 87414b04c6fea28ac235e7a497de8363696160691ae5a81d898c5b3d83639e863b2a9b495d69092f3316f07ba431a4d50b6ff63d3e78d6cc3700e42ae0de108e SHA512 0f6dc8399962c76853d75dc00e4929ca7fa9c0f004c47902936b586e231ba8772b333330ae0ec909bb45c13ff393dcf212fabba3b7e52ddaa50e93920a9852f5
 AUX xtide-2.13.2-clang.patch 913 BLAKE2B 0bf2e94888907030f2d5752886d1c39cd89b182c34a3c2471b08cebb57037954c4f27612c3e37f47b70d671106862c66b60e0e4fcf0c8010309f50147484e00b SHA512 5f9d5ea48706cb42a6fe8be8615b54eb67b7304a933f6e7a577ac3ea162a374221cb325766263664dc74c6bb5d1340f9f3417032a663ae446892c17d5561b88b
 DIST xtide-2.13.2.tar.bz2 481183 BLAKE2B b9d294ef1e212ecf2a9850082f0861efd85a8e151da265e3faf06e51a77c2769f68135cad4751edb3517a9dacfc75d45b43f2dc1810351e6d7788228c46ccbfc SHA512 31b35190932413bf5021c82c640ec3f03424807ffd5295abd8ab9554febbe495896bc0d08f901e70e11b04d92c0d1991b8214dcdd5e95e04173f3e7bbf5faec0
+DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
 EBUILD xtide-2.13.2.ebuild 1190 BLAKE2B a6302e79d6e6122b53e46e725b755d55d7e051f2610085a790eed8968f1d2984b38a24b4b56a760bf78987e4273e26344e76cce0983e63caafeb363c9083bf3c SHA512 32e5948a9e7d20633209c3079d13a0fa5bb979f92580b888dc3a5da4cd7104e5d60442b05162273ca4487c910d7f4a84ea422913b80c4385e65f2a077b5eb610
+EBUILD xtide-2.15.1.ebuild 993 BLAKE2B 24cd2e5298197fceec878a491bbc86ccf502b9440302fae6a49f2ba016c805925b1fffdeefaf3b8534ca28d1f1c911b351bddd4b17a77b70888dbb7408e5a755 SHA512 ac6aaa94e37d2673db0eb33747eea2c2a66a60f15b7beee7de9d624d6cbbf79d5ee12953d8f9cf7df1b7165ae376f0a1fa71b85d38da1fb116862ed81a58a8f1
 MISC metadata.xml 244 BLAKE2B 934bb17faea52392265caa18c77fd32ecb9b80303c9f67145928471c0ad0c4e18f0500b35db4de459ad3575c3a111e2e5afa88fd7c3ab40c15d9d1e9446603c4 SHA512 2cf646d59cd730a1d957a67d2a5735dc205f9270342b86b4a201213e3c9455d8a73a640cac5248a4655f93ac2258f8092a3907553818783da3d864e8fe74323a
diff --git a/sci-geosciences/xtide/xtide-2.15.1.ebuild b/sci-geosciences/xtide/xtide-2.15.1.ebuild
new file mode 100644
index 000000000000..351bc65c9bc5
--- /dev/null
+++ b/sci-geosciences/xtide/xtide-2.15.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2-utils
+
+DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/libpng:0=
+	sci-geosciences/gpsd
+	>=sci-geosciences/libtcd-2.2.5_p2
+	x11-libs/libX11
+	x11-libs/libXaw3d[unicode]
+	x11-libs/libXaw3dXft
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXt
+"
+RDEPEND="${DEPEND}
+	media-fonts/font-schumacher-misc
+"
+
+src_install() {
+	default
+
+	echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
+	doenvd 50xtide_harm
+
+	newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
+	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}