diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3dcbe0d5b..d1aee7a73 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+2021-04-10
+ * remove /update EAPI5 Ebuilds
+ * re-add geopy-1.21.0
+
 2021-04-05
  * bump zwave-js-server-python-0.23.1
  * update wakeonlan-2.0.0
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 938e75568..23351e91c 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1,5 +1,7 @@
 DIST geopy-1.20.0.tar.gz 252386 BLAKE2B 684d1651a28aa1a72317c9afc5c0f4dde0340eb5cef45dea28c956aa15ebc5fff2f55947b4eee5781ff6142dd1f34d4db2c9b5497b1864e3a986cc40ba064824 SHA512 c8aae44f6fd403c4a48bbf865293bfaa2de332b61324fd0fc9498a0d77b78b0512441b33b34159184477a385aac5f9d90ae57892c0f0d670e36cc74e106cbcd5
+DIST geopy-1.21.0.tar.gz 254831 BLAKE2B 2b8aa46277ea65cde2e037ee71d42ef42451d1ee3bc38b7a6f89e15293074f80cf52b53bad6a483769fe8ce6d267db27bd1878e6248c0c4b18a92a86df4a2ae9 SHA512 8dc148795251e5bf74948859430856569e7aef38ac09432f86498ec3f5939277d2d548f3c35c6f14e6ef1645fdfa48bf70ab998888ba395f199c08aa8dbe6ed2
 DIST geopy-2.0.0.tar.gz 107026 BLAKE2B d145279603e6b47d52879057950bd16cc78ff21068f31aeabc67ab116bec09dbc2a45e5b548eab75f4099c5de7450dfee31edc54f1cb48e6532e866e6c9cadc3 SHA512 99411b42d8878736a1bd1de5b5eca4d037fea4d465bb8a689d9da99fb9f186dae32d59985ee9ae95eed1094edd7fa2af12e8c69cf63c8c6770aa1266f8de975d
 EBUILD geopy-1.20.0-r1.ebuild 2324 BLAKE2B 075510df496c90a1604c6ebaacfb291da99a3f82b4dd751129631b1e802486a5966e017d423ee8088ea3c24a37b105b4afe66b39f48267ea23a85c4665527527 SHA512 8dceed791d2b6c2a9ec9d13459b76729396ed945df72dd8dd433f52fe55e251271bba251165235f31f6e6cb22559bb5ce767fb021e4191c968e9b9a5a2440f8e
+EBUILD geopy-1.21.0.ebuild 2325 BLAKE2B 97f7779b3f08ca8587060136ff6722403e0ef948f6fef73c30fb6696ab594b3bc28df84f2736f000ccc7b31b2fda1406d62676807ec1cb1fd0cc5c971be376e0 SHA512 55e72ce98ab88ecf924ef305cfe4125ab93b91750fbe81d22824983cc48fbb2a2741b55574003ed6f749864efa6d116f24d9deacddbf7ac3ff4595da01c61b5e
 EBUILD geopy-2.0.0.ebuild 804 BLAKE2B 3d994118ca835774b604c33fc73c9096d57fac868b746e39a8b9e3df51347b8e72b8d10cb55e41949f51ff70fa3391c03c55f6c9279197f9d0a8e9efe3f02d25 SHA512 6d0be79de1446d5086cbf497a0e524f6d200c3b5b9bf43d579e12777e28c9718bc0455539bd3a227e27041d0be8d53df7cc4123c721b51a75f6d686fe1731dd8
 MISC metadata.xml 449 BLAKE2B dafff0aa78f14e7fda69991dd573ae4b293af8a3ce9f846f01f95618dd18f286b6e37605b1425d812825cd8861dd9ab75d3ce5f12a7e71ac6769a1d3f82358c9 SHA512 af7b5f15f30d494423a32a6129aed8c29f3606b2f4002abc4503c444fd2016731608c61adeecd6aa362213ede74d2f92ebfeba5a2da3b5ceae8a5aa2d2f16d21
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 000000000..729c91455
--- /dev/null
+++ b/dev-python/geopy/geopy-1.21.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="https://www.geopy.org/ https://github.com/geopy/geopy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test doc timezone -yahoo"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
+				dev-python/placefinder[${PYTHON_USEDEP}] )
+		 timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+
+REQUIRED_USE="test? ( yahoo timezone )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	# prevent install of test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+}
+
+python_test() {
+	# broken tests
+	rm test/geocoders/openmapquest.py
+	sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py
+	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
+	# i.e. "You should provide an api key and a username with a password"
+	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
+	# It appears it MAY stem from nose rather than geopy's suite
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}