gentoo resync : 12.03.2021

18 files changed, 179 insertions, 326 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 5a4a99d932bf..8db80913658e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index dcf46ea3830a..abadc1b587c7 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -3,5 +3,5 @@ DIST gnome-maps-3.36.4.tar.xz 4006520 BLAKE2B 4fb76e23580556c357c5a4a246a2505214
 DIST gnome-maps-3.36.6.tar.xz 4006804 BLAKE2B 4d7684a13b5bace21e7a9d6b97b9b4b91a6fc5cbdbc98c1a776f157c5b1747b16669602e6167afd254d4fe72f8c4d7c9ac27c22089efd07839a6f35bf68b1c31 SHA512 bd72ede45edf851fdbd815278838c34b42145fcccb18bd33ff5e732238797eadc0fe4e0279072c0dd9bfd7b5d88329d8e537ceb3072e186fbc213d63cdef1e72
 EBUILD gnome-maps-3.36.4.1.ebuild 1395 BLAKE2B 9e3bda52a28a2a22dd9c4bdb1ab74a5fc4711f0e32334fea0857a3e0929d5948e6d79ba495df40f184c01ab89db42b870fb8d1215dd53ce31b7e424ab80503b5 SHA512 24fe4a2e948be7b42a97a7a870d3b0b5727c4d8ca611d564e24c7acf8b0a7f227b0a6560d8d4b4b0316e8320c1d6c2cb6fb47b40e9a81a90f1bd1d58685eacb1
 EBUILD gnome-maps-3.36.4.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af
-EBUILD gnome-maps-3.36.6.ebuild 1395 BLAKE2B 19587c3dd665a3d0187105f6d3cfc8c7fce1181de1221148dca44a2ef63d7b537955b2d2acca12e403a23cf3fa6406568548d138c15e201580b20aa84ba81c7a SHA512 285081e72173a72e5d277079a6b24ad129ccc73f0f7ef636000d2f99bbace893de070ed5a210565d93768aaec4f05e58f4bba34c8606ab5969344c9cf539b8c7
+EBUILD gnome-maps-3.36.6.ebuild 1394 BLAKE2B 9fc4b208bf5956d96b044864d887ca7e43b00d63de07d213d1f1f97d07ae8bc47132b75d84f93167e92a24c6527c32c1146acec2d0b0c396449739eeb0609115 SHA512 38839b6eeac13515120a731552f3a332689afd7520890f43070fa57e8b1e56eb146abc7c77650326677a46920c93409bb7ae60e3db062e3db12497727196dc8f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
index dab03a1129c9..cd66078597a1 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index c52a88107cf6..5403cd4c1c64 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,7 +1,5 @@
 AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
-DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
-EBUILD grass-7.8.4.ebuild 6955 BLAKE2B 346e166fcfcf361898eb92ef2cc121cc45a7f1ed9ecfbf21c3f3378cb1960ef46eb159d3af8eaa9e5e579f79694ca2053293c6718d861f2be3d3fd5e93b66701 SHA512 7ef8a4655cfe07f4b7f1a904a49975fd40b475c8b3af375a11b00c31d7163a105e0e5d73130cb5bd2f1336bb484f47c9b588df5879a94c6ddb0c1f3e72f4e000
-EBUILD grass-7.8.5.ebuild 6943 BLAKE2B 4305e0aebe3a6003f9b5eba3f6bacbc77100dafdfad53c75ea8636de6d0a71e70f7f4f09f8529cb3ae12e555c0ba04cd69347a363bfe6ab3fa7c50c595a0391c SHA512 e860008ff54b797b70a5e3e15df40b422138ae25e1e2525960aa5c61b372eaf6b9e24e070c87aad50e823c75e106b204ce6e3a1df1dcd155fc10e28d84186463
-EBUILD grass-9999.ebuild 6938 BLAKE2B dc511eb75c66a24d3f9532e1b9ab6434db4ccfa75949ec39112629051274be8758c3a3e8f3dd7c2e898cf2c9ad500950db9b1f554985c03723b55595564a407b SHA512 dca61e9ec300dd15872e05cc68c12a69f2c1860005d344608d142cc3a3fae10da63a1908d3e5268f17095aa0666c254d234a3a985a2210558bc3507dddcb8fab
+EBUILD grass-7.8.5.ebuild 6941 BLAKE2B fb4f2f5cfa068cc90b45f94fd5ddc19415a66b7fce9f34b5b3c6d71002de226e192f4740e140e9444a616e8498bf4b616e3718448e21fd1d85df2d73cb42a9b7 SHA512 80397ff07c02942ddb2d7ffe2ade1ba88c6baa5563ceddf20d707cb522c2703c6615acd83e29581735f3d8e989436c2e1672be68d4e680032be38f9a9132b130
+EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de
 MISC metadata.xml 1058 BLAKE2B fcaa70c36866e086db663b4f5fb00f7a0ba4d725af2c69752e060134203758bf8b094f958dae363c9343f60ced6f9958d59ad5cab775affbf4234ae39b227e92 SHA512 eefd4994f62f769eb2359c20871d2ad816713186e6b536afa4493d363b086a37d156a8220f54432fc94199854ba98a97eb995e1e00f228f0ea4add1f395ae6e0
diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild
deleted file mode 100644
index 8b203f7441c8..000000000000
--- a/sci-geosciences/grass/grass-7.8.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs 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.8.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 zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sci-libs/proj
-	sci-libs/xdrfile
-	sys-libs/zlib
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	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:4.0
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-7.8-flock.patch"
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		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=$(eselect blas show)
-		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
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-	eautoreconf
-
-	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
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local 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
-
-	eapply_user
-}
-
-src_configure() {
-	if use X; then
-		local WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite /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/proj
-		--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)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \
-		prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
-		PREFIX="${ED}"/usr/ \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	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="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
-	for f in "${scriptMakeDir}"/*; do
-		file="${f##*/}"
-		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase=/usr/$(get_libdir)/${MY_PM}
-	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
-GISBASE = os.path.normpath(\"${gisbase}\"):" \
-		-i "${ED}"/usr/bin/${MY_PM} || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
-
-	# set proper python interpreter
-	sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
-		-i "${ED}"/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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index d75683b80dcf..eb00d1ab6a89 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+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 zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index b2455ab8dc84..a77634827df1 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -10,9 +10,8 @@ WX_GTK_VER="3.0-gtk3"
 
 inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
 
-PV="7.9"
-MY_PM=${PN}$(ver_cut 1-2 ${PV})
-MY_PM=${MY_PM/.}
+MY_P="${PN}7.9"
+MY_PM="${MY_P/.}"
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
 HOMEPAGE="https://grass.osgeo.org/"
@@ -181,9 +180,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}" \
-		INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \
-		prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
-		PREFIX="${ED}"/usr/ \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
 		install
 
 	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 07f5cad82d0f..d1c912102969 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1,4 @@
+AUX mapserver-7.6.2-proj8.patch 544 BLAKE2B 607130bce382bfb4198d8ef4f45048d1091d842cab29730f85149e7250b9659ebe93ac47b79e2addddbfc480d11c5a30d5f07b91479dedcfc9678d7a69404fb1 SHA512 5b2e2a33027c23e812fbd4c358320980886fd16ea1a127bf8945dff396a1038b79f1a139f304c16469117794d227bf7ce0863caaca85a3be518f3807fcb8ce0d
 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
-EBUILD mapserver-7.6.2.ebuild 7301 BLAKE2B d20e59b7f0841ecbf3727188109a55ccea38e6160cfb97d23bcd1946e8ff119a53c0d0d84e287097e21c1d3030e37ee0b515fc8a375e8a2695b82f9a9916a2a5 SHA512 570eef7f8b4e1bb4713fa87d779337141182b114bb064689528fc1837d013d3fa96f4d39ae8335777177f58650ccd01de04fff611f37ece58197b4c30af5f066
+EBUILD mapserver-7.6.2-r1.ebuild 7112 BLAKE2B 40fa1ca799cf844b29320b78e5ec776dac0b414c9332c08cbcc404b9c925c8851c9abd903456646d637cf58ead3cdf729f2c56fdb0c5525d5bcbab5dda77bd3e SHA512 0acc19957a1cb900b915045507edb652ff57168eb150a1314e44fab41ef6da04b0d29f150aead83ec3e4e87b19d6b64951fa13749ae039a39978acd4258b2e3b
 MISC metadata.xml 496 BLAKE2B 5903d53c86d30548162025cfed484a3405ea3a9bd611d475177a355a374b7a4bbf73d439a1c1457176d3f7f58355da06d842327407437c89cab426473be22bab SHA512 2dc21e4e1a785b4dff3de94bc3c621dfd4c3dfe092761681b4ffc536532f7f87b6a9fbbd0dc82895132ebd3cdb0f5750e6fe77b681c49d5996d9233096478a8e
diff --git a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
new file mode 100644
index 000000000000..24a5066c01c9
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
@@ -0,0 +1,19 @@
+https://github.com/MapServer/MapServer/issues/6249
+
+From e56a020789c024f985c61e49d66f3eb92d350232 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 8 Mar 2021 15:19:50 +0100
+Subject: [PATCH] FindProj.cmake: allow finding PROJ 8 that has no longer
+ proj_api.h (fixes #6249)
+
+--- a/cmake/FindProj.cmake
++++ b/cmake/FindProj.cmake
+@@ -6,7 +6,7 @@
+ #    PROJ_LIBRARY
+ 
+ 
+-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)
++FIND_PATH(PROJ_INCLUDE_DIR NAMES proj.h proj_api.h)
+ 
+ FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i)
+ 
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
index 1c0f539edc56..b6827ae663d0 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTE: We have to stick with EAPI 6 for now because of the
-# depend.apache eclass.
-EAPI=6
+EAPI=7
 
 # Variables for the miscellaneous bindings we provide
 PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="php_mapscriptng"
 PHP_EXT_SKIP_PHPIZE="yes"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4"
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 WEBAPP_MANUAL_SLOT=yes
 WEBAPP_OPTIONAL=yes
 
-# NOTE: Similarly, we cannot go cmake-utils -> cmake until we're on EAPI 7
-inherit cmake-utils depend.apache eapi7-ver perl-functions php-ext-source-r3 python-r1 webapp
+inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
 
 DESCRIPTION="Development environment for building spatially enabled webapps"
 HOMEPAGE="https://mapserver.org/"
@@ -77,9 +74,8 @@ RDEPEND="
 	)
 	python? ( ${PYTHON_DEPS} )
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	perl? ( >=dev-lang/swig-4.0 )
 	php? ( >=dev-lang/swig-4.0 )
@@ -89,6 +85,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-proj8.patch
+)
+
 want_apache2 apache
 
 pkg_setup() {
@@ -97,7 +97,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	use php && php-ext-source-r3_src_prepare
 	use python && python_copy_sources
@@ -163,7 +163,7 @@ src_configure() {
 	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
 
 	# Configure the standard build first
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# Minimal build for bindings
 	# Note that we use _generate_cmake_args to get a clean config each time, then add
@@ -174,7 +174,7 @@ src_configure() {
 			"-DWITH_PYTHON=ON"
 		)
 
-		python_foreach_impl cmake-utils_src_configure
+		python_foreach_impl cmake_src_configure
 		python_foreach_impl python_optimize
 	fi
 
@@ -193,7 +193,7 @@ src_configure() {
 				"-DPHP_INCLUDES=${PHPPREFIX}"
 			)
 
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_configure
+			BUILD_DIR="${S}/php${slot}" cmake_src_configure
 
 			# Return to where we left off, in case we add more
 			# to this phase.
@@ -203,10 +203,10 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use python ; then
-		python_foreach_impl cmake-utils_src_compile
+		python_foreach_impl cmake_src_compile
 	fi
 
 	if use php ; then
@@ -216,7 +216,7 @@ src_compile() {
 			php_init_slot_env "${slot}"
 
 			# Force cmake to build in it
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_compile
+			BUILD_DIR="${S}/php${slot}" cmake_src_compile
 
 			# Return to where we left off, in case we add more
 			# to this phase.
@@ -230,7 +230,7 @@ src_install() {
 	use apache && webapp_src_preinst
 
 	if use python ; then
-		python_foreach_impl cmake-utils_src_install
+		python_foreach_impl cmake_src_install
 		python_foreach_impl python_optimize
 	fi
 
@@ -241,14 +241,14 @@ src_install() {
 		for slot in $(php_get_slots) ; do
 			php_init_slot_env "${slot}"
 
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_install
+			BUILD_DIR="${S}/php${slot}" cmake_src_install
 
 			cd "${S}" || die
 		done
 	fi
 
 	# Install this last because this build is the most "fully-featured"
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use apache ; then
 		# We need a mapserver symlink available in cgi-bin
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index fde46b6a9ef6..29482902ba4a 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -3,5 +3,5 @@ AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9
 DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c9911f76e05a6f8e96cd741ca291b74e238a06b6d01fbd8bac9c43bdd73788e8ef0c035d75290ffb631a15ee0b9f749e5 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0
 DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747
 EBUILD osm-gps-map-1.1.0.ebuild 898 BLAKE2B f3e1d64725ee9f2cd4f55f2ae99f97a95af06daac009dd0d8e95aa63fa00c02ebf349649fa1267df74a8c3c01cf5ebb8ec37edc9a27b1bd5e42460c1e3b19eb5 SHA512 11128628973eb0bf7bf32e7ce3e40d7d8df67d27eef722b102bfb87d5359f3b256938c27c685e82ba9d3c6415403d0c7f89870b74fbd0b04188b7b14189dad57
-EBUILD osm-gps-map-1.2.0.ebuild 921 BLAKE2B df11c52257beb538b358becad6ed0fa8baad921a08298641d0d757be324fddc7f2c4ab272f7a5d548c7d498ccc6fc8017670f9d1576adec990dfef19502634f4 SHA512 2d8d003d96da69902d612f7011e01a9d606059bbe505ae0fc9077a231f869996376e312423a2af5385cb6b111f44c803292b33eb0589d273d864e6e2c87ef9a2
+EBUILD osm-gps-map-1.2.0.ebuild 918 BLAKE2B 58c078a9fb9bbed6746317ced574f9a5695d844ae5a06b43bf5e5edb4be986e281b7253c43d0b63b9a28c7c4ef8d475a0be5c8ec42a418d6f4ed544ea95e0b31 SHA512 45193dc3ddfaf474747e6f409ab8bc8e32667e4ef3c0a537234f6037a4099844619a855f506c56dae2ef51c09e1ee76646068616aa595913f77c9d90b41bb662
 MISC metadata.xml 327 BLAKE2B 33d0eccf4eaefa31ad6a2a5fa2aea8ac9a03e9c423c8c96400c4a6921429886bcba4c388f8ed739af67673bc00cc07a038b4664a23c6a808b1b9a699866860c1 SHA512 67dd8500028be31b9bbae47ea255981f82762bc6a1c2a98b1d76c04e09e3bd794bdcac589e09c9158425e9ed8500a2d8d02d5add82e5d269848ca19b4fd299ea
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
index c3e71e3e18e0..2edd466b3145 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.16.0:2
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index abb611e15775..5c546606bcd5 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -3,5 +3,5 @@ AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3d
 DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
 DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070
 EBUILD routino-3.2.ebuild 719 BLAKE2B 2ebcbe7a5356b375512a682696f4bc39eb337f4a9f87362af1f003dd6c99423c4ce168fa2896590abcfc860412068d84ee80face8b3c871499042ab51c092ab6 SHA512 ea8d262efbe278b659b935bce78dcba5b1418d76edaf8f296c62315ee33533e8dd4d218b1f65f87399de63bb7762fe4a0e2cd2752ea3740993d5cdf23e40d1c4
-EBUILD routino-3.3.2.ebuild 1634 BLAKE2B 75fffeac50b909ddb6ee26b9c1a3347fc86ddd8754cd2457c513a1dcc8a3b0526e3679532ee7c4e5ba9b79b9b6c20560ad841c91935eae387b44158b911804cf SHA512 d23c0795affec6903e85a4ef134bd1e6a16948d5ed450e77e5e7c9158002ae01e651f484928794396d239d4b2b3bbd390907a1074ee72547bf23572a51a865ef
+EBUILD routino-3.3.2.ebuild 1632 BLAKE2B 6daeac8ab82c7e148db3e0ac8737f93b48a45a62cfe4e5fbae7d247fee256defdc45ebf1e3e225e28749988cebc2ca793b3f203f120f4148facff34c41b37945 SHA512 1ae54bb4307df0a0330ab1bd19b9929315085ad81dd46b67b7ac90406e17d3e9d9197736ca341803ced53268c4137194e902cf79e75dab1c359da9aa19936fda
 MISC metadata.xml 893 BLAKE2B cdfadafcae0c3898788652b567a8145efb0f98aa819df589d32c49ead219222691b19361b90c8bc5153fef1659d3c2d7e6933a21fcb86db9dfa37ab774d8d2b5 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff
diff --git a/sci-geosciences/routino/routino-3.3.2.ebuild b/sci-geosciences/routino/routino-3.3.2.ebuild
index 0ea8e4a10d4e..85bcfcaf76bd 100644
--- a/sci-geosciences/routino/routino-3.3.2.ebuild
+++ b/sci-geosciences/routino/routino-3.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://routino.org/download/${P}.tgz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 34df0a20593b..ae59c85b4af9 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,5 +1,6 @@
 AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
-DIST viking-1.7.tar.bz2 3438343 BLAKE2B 2fbf154c94a0bc745e353dd07e67424b5dd27fab1e0158cac4afe2bf8e7d0d9e1d452b3275219fdd8599ebf2044c17267899f2b0508fc36f274557c1db253320 SHA512 ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600
+DIST viking-1.8.tar.gz 5207444 BLAKE2B 6a9b786dd23e643a68c25d68e2e14c5a38d2fe6a4a57f6266e13d9208f8c3b49c122921ecf4c54c2630bf9a11e5288346643b4bf92aad67824e8c928de270f84 SHA512 c401e69a6038e4b20c5a2fdecb8b028156e7e8829dd9d48596b0501b6e0a364dc6cc0ab0a8c4bcc731b5c6721835d3cfb605b76ec3b266dab2426df12c321e62
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.7-r1.ebuild 1939 BLAKE2B af65d6185272c5a71256e8928de8c4dc06c2da8a930ecdb08b89e8016b53073afd29f0e90786c76d2802ddc7d96e4dfdadcb789df88bac2f3bee56b88c3c1739 SHA512 18a4ffdafe72f226e8538e9a1a5214839d35881e6f86453f2faf73217c1ecf48c6b5a5e219abf4126b8df93bb70c7b0be2e69ec647b44a9f9b52621262d2de02
-MISC metadata.xml 907 BLAKE2B 10a21eba422ae7af3ffe08730b31f9304352b3a286b9f91b1e96e202fc5d631d37847ea8ae864b7476d39a705fa82dd90958134915f4572adfbc2d5f359cb0d2 SHA512 5ccd7d0323e266977a06e74c9896e211b903d40915631771956cddf8176ad01c5e4b4df7b8f5494c78ae92027cb9314d354254cc671cb498238059d6465d96b7
+EBUILD viking-1.8-r1.ebuild 2005 BLAKE2B fa260af8911ce785a8784a44746fd364dfeeb34bd8e34eefd752d212e7f23baa76447df37fb197fc3b9de32cd47e3d97fd304ab1e740d27a0c05c6c73e1310ae SHA512 76716a6434498e46bf2733abc7380cc2a0f1177d058d9e2eee0c757026805e473d09a9ac135d507da95661506979faf2fd14161b4a9ee1704db951c8576050de
+EBUILD viking-1.8.ebuild 2037 BLAKE2B 5e9cf7ad142e3178da1ac92a50adee5f67d28655b02b594fd385c1c1a9582f27e6eaaddf7c0296d7d812ab31a8434608a2e056787d125c8842cd85238dfa491b SHA512 fa63ac4da0792172a596ce1a68de4d6c0213e0618bcac9958c0a6e36ffd0ee3eae162a83b04959a93e46e6cc0ef96456dceedd215ae48734aedafe9008d41bc4
+MISC metadata.xml 833 BLAKE2B b0c8b498cf7786b610e6528448bfab45e88967dca7cc59779ea9e3f51684f7ca85296de3b258971adf23618e1a60bed663be32ecf85a367157d0e7381010aa8d SHA512 8354f387678813b1c78e28a8b28475fca3a148297bcd13555f6e3fdf5fea600b242f82f68265c16cb760d927b6adf07b7dd328a06ff245e8eef70fa3833717df
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index 12c39a7e155e..7051ff1293ba 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -15,9 +15,6 @@
     <flag name="libexif">
       Use <pkg>media-libs/libexif</pkg> for EXIF support
     </flag>
-    <flag name="mapnik">
-      Enable a layer based on mapnik
-    </flag>
     <flag name="oauth">
       Enable OAuth authentication for OSM
     </flag>
diff --git a/sci-geosciences/viking/viking-1.8-r1.ebuild b/sci-geosciences/viking/viking-1.8-r1.ebuild
new file mode 100644
index 000000000000..fc94ad904522
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.8-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="https://github.com/viking-gps/viking/"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth"
+SRC_URI="
+	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
+	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+	app-arch/bzip2
+	>=dev-tcltk/expect-5.45.4
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nettle
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
+	gps? ( >=sci-geosciences/gpsd-3.20 )
+	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+	magic? ( sys-apps/file )
+	oauth? ( net-libs/liboauth )
+"
+RDEPEND="${COMMONDEPEND}
+	sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	app-text/rarian
+	dev-libs/libxslt
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare()
+{
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-deprecations \
+		--with-libcurl \
+		--with-expat \
+		--enable-google \
+		--enable-nettle \
+		--enable-terraserver \
+		--enable-expedia \
+		--enable-openstreetmap \
+		--enable-bluemarble \
+		--enable-geonames \
+		--enable-geocaches \
+		--disable-dem24k \
+		--disable-mapnik \
+		--enable-mbtiles \
+		$(use_enable exif geotag) \
+		$(use_with libexif ) \
+		$(use_enable geoclue) \
+		$(use_enable gps realtime-gps-tracking) \
+		$(use_enable magic) \
+		$(use_enable nls) \
+		$(use_enable oauth)
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc "${DISTDIR}"/${PN}.pdf
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/sci-geosciences/viking/viking-1.7-r1.ebuild b/sci-geosciences/viking/viking-1.8.ebuild
index 49c888a29271..144c066bb68e 100644
--- a/sci-geosciences/viking/viking-1.7-r1.ebuild
+++ b/sci-geosciences/viking/viking-1.8.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils
+inherit autotools xdg-utils
 
 DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://sourceforge.net/projects/viking/"
-IUSE="doc +exif libexif geoclue gps +magic mapnik nls oauth sqlite"
+HOMEPAGE="https://github.com/viking-gps/viking/"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth sqlite"
 SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
+	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
+	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,11 +26,10 @@ COMMONDEPEND="
 	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
-	geoclue? ( app-misc/geoclue:2.0 )
-	gps? ( >=sci-geosciences/gpsd-2.96 )
+	geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
+	gps? ( >=sci-geosciences/gpsd-3.20 )
 	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
 	magic? ( sys-apps/file )
-	mapnik? ( sci-geosciences/mapnik )
 	oauth? ( net-libs/liboauth )
 	sqlite? ( dev-db/sqlite:3 )
 "
@@ -40,6 +39,7 @@ RDEPEND="${COMMONDEPEND}
 DEPEND="${COMMONDEPEND}
 	app-text/gnome-doc-utils
 	dev-util/intltool
+	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	app-text/rarian
 	dev-libs/libxslt
@@ -47,7 +47,15 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}/${P}-no-common.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare()
+{
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
@@ -63,12 +71,12 @@ src_configure() {
 		--enable-geonames \
 		--enable-geocaches \
 		--disable-dem24k \
+		--disable-mapnik \
 		$(use_enable exif geotag) \
 		$(use_with libexif ) \
 		$(use_enable geoclue) \
 		$(use_enable gps realtime-gps-tracking) \
 		$(use_enable magic) \
-		$(use_enable mapnik) \
 		$(use_enable nls) \
 		$(use_enable oauth) \
 		$(use_enable sqlite mbtiles )
@@ -82,11 +90,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
 }