diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
new file mode 100644
index 0000000000..d4f7b1ce1c
--- /dev/null
+++ b/dev-python/geopy/Manifest
@@ -0,0 +1 @@
+DIST geopy-1.21.0.tar.gz 254831 BLAKE2B 2b8aa46277ea65cde2e037ee71d42ef42451d1ee3bc38b7a6f89e15293074f80cf52b53bad6a483769fe8ce6d267db27bd1878e6248c0c4b18a92a86df4a2ae9 SHA512 8dc148795251e5bf74948859430856569e7aef38ac09432f86498ec3f5939277d2d548f3c35c6f14e6ef1645fdfa48bf70ab998888ba395f199c08aa8dbe6ed2
diff --git a/dev-python/geopy/geopy-1.21.0.ebuild b/dev-python/geopy/geopy-1.21.0.ebuild
new file mode 100644
index 0000000000..cb9c8146f5
--- /dev/null
+++ b/dev-python/geopy/geopy-1.21.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="
+	http://www.geopy.org
+	https://github.com/geopy/geopy
+	https://pypi.org/project/geopy
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="timezone"
+REQUIRED_USE="test? ( timezone )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<sci-geosciences/geographiclib-2[${PYTHON_USEDEP}]
+	>=sci-geosciences/geographiclib-1.49[${PYTHON_USEDEP}]
+
+	timezone? (
+			dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+				">=dev-python/sphinx_rtd_theme-0.4.0" \
+				dev-python/readme_renderer
+
+python_prepare_all() {
+	# [Errno -3] Temporary failure in name resolution
+	rm test/geocoders/nominatim.py || die
+	rm test/geocoders/geocodefarm.py || die
+	rm test/geocoders/databc.py || die
+	rm test/geocoders/banfrance.py || die
+	rm test/geocoders/arcgis.py || die
+	rm test/test_proxy.py || die
+	rm test/geocoders/geonames.py || die
+	rm test/geocoders/photon.py || die
+
+	# depend on the above and now fail to import
+	rm test/geocoders/openmapquest.py || die
+	rm test/geocoders/pickpoint.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml
new file mode 100644
index 0000000000..01d58c2064
--- /dev/null
+++ b/dev-python/geopy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">geopy</remote-id>
+    <remote-id type="pypi">geopy</remote-id>
+    <remote-id type="github">geopy/geopy</remote-id>
+  </upstream>
+  <use>
+    <flag name="timezone">Enables localized date support</flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild
index 7f8a351c58..749b3a9bc1 100644
--- a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild
+++ b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="C++ library for converting geographic coordinate systems"
 HOMEPAGE="https://sourceforge.net/projects/geographiclib/"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE_GEOIDS_DATASET="
 	geoids_dataset_egm84-30
 	geoids_dataset_egm84-15
@@ -110,6 +110,8 @@ DEPEND="
 S="${WORKDIR}/${MY_P}"
 
 distutils_enable_tests setup.py
+# there are additional docs in the python dir
+distutils_enable_sphinx python/doc
 
 src_prepare() {
 	#TODO: strip cflags
@@ -152,6 +154,7 @@ src_compile() {
 		cd "python" || die
 		python_foreach_impl distutils-r1_python_compile
 		cd ".." || die
+		use doc && build_sphinx python/doc
 	fi
 }
 
@@ -176,6 +179,10 @@ src_install() {
 
 	cmake_src_install
 
+	# remove python things added by the cmake_src_install function
+	# these are installed in the wrong python dir
+	rm -rf "${D}/usr/$(get_libdir)/python" || die
+	# if use python we re-add these python files correctly
 	if use python; then
 		cd "python" || die
 		python_foreach_impl distutils-r1_python_install
@@ -184,8 +191,7 @@ src_install() {
 
 	#TODO: find out if java stuff need something
 
-	rm -rf "${D}/usr/$(get_libdir)/python" || die
-
-	use doc && mkdir -p "${D}/usr/share/${P}" || die
-	use doc && mv "${D}/usr/share/doc/${MY_PN}" "${D}/usr/share/${P}/doc" || die
+	# Installs to wrong doc dir for some reason
+	# Also happens with USE="-doc"
+	mv "${D}/usr/share/doc/${MY_PN}" "${D}/usr/share/doc/${P}" || die
 }