diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index b7ba57e36a..0132d0f7f6 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1,2 +1 @@
-DIST geopy-1.21.0.tar.gz 254831 BLAKE2B 2b8aa46277ea65cde2e037ee71d42ef42451d1ee3bc38b7a6f89e15293074f80cf52b53bad6a483769fe8ce6d267db27bd1878e6248c0c4b18a92a86df4a2ae9 SHA512 8dc148795251e5bf74948859430856569e7aef38ac09432f86498ec3f5939277d2d548f3c35c6f14e6ef1645fdfa48bf70ab998888ba395f199c08aa8dbe6ed2
-DIST geopy-1.22.0.tar.gz 276268 BLAKE2B 96f366d832e6b949fb5bfb64781243f41b94369c846d6669165752b04ac4a7cfc206a668bba469fef078d4d07b550265506e78be4ed028266578928dbdc34db2 SHA512 696729f41b403ce99afecdbb474774d4cf3cea8dda35ac1feab915a566b59b393db5bd803afb97a855603b8a4398725c40289a29f41546c57ecaff670c69e20a
+DIST geopy-2.0.0.tar.gz 278465 BLAKE2B 08383a509358bf902db6e47f9144380f2694e89f4d2f21f25131f2c885c1a5a9e1111da93374a723a95d117f8bf13b027446e321f098a261624dd8eeeab18577 SHA512 0b572a05c56596f65932ff422827c477d7a1a4f1e42d0cbd53ef9f11e66c60e8f4ab5a169720522c6ee5624826837b4854887a43ed34814ea3520701e60c0c06
diff --git a/dev-python/geopy/geopy-1.21.0.ebuild b/dev-python/geopy/geopy-1.21.0.ebuild
deleted file mode 100644
index bc8525b34c..0000000000
--- a/dev-python/geopy/geopy-1.21.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="
-	https://geopy.readthedocs.io
-	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/geopy-1.22.0.ebuild b/dev-python/geopy/geopy-2.0.0.ebuild
similarity index 75%
rename from dev-python/geopy/geopy-1.22.0.ebuild
rename to dev-python/geopy/geopy-2.0.0.ebuild
index a838b4d5ff..2727113c21 100644
--- a/dev-python/geopy/geopy-1.22.0.ebuild
+++ b/dev-python/geopy/geopy-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -20,16 +20,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	<sci-geosciences/geographiclib-2[${PYTHON_USEDEP}]
-	>=sci-geosciences/geographiclib-1.49[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
+	<sci-geosciences/geographiclib-2[python,${PYTHON_USEDEP}]
+	>=sci-geosciences/geographiclib-1.49[python,${PYTHON_USEDEP}]
 "
+BDEPEND="test? (
+	dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
@@ -38,6 +37,7 @@ distutils_enable_sphinx docs \
 
 python_prepare_all() {
 	# [Errno -3] Temporary failure in name resolution
+	rm test/test_adapters.py || die
 	rm test/geocoders/algolia.py || die
 	rm test/geocoders/arcgis.py || die
 	rm test/geocoders/banfrance.py || die
@@ -46,7 +46,6 @@ python_prepare_all() {
 	rm test/geocoders/geonames.py || die
 	rm test/geocoders/nominatim.py || die
 	rm test/geocoders/photon.py || die
-	rm test/test_proxy.py || die
 
 	# depend on the above and now fail to import
 	rm test/geocoders/openmapquest.py || die
diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml
index fb44591f27..9e3fa8dd44 100644
--- a/dev-python/geopy/metadata.xml
+++ b/dev-python/geopy/metadata.xml
@@ -17,7 +17,4 @@ geopy includes geocoder classes for the OpenStreetMap Nominatim, Google Geocodin
     <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>