diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 0bc3cc7d2..62a520717 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,13 +1,11 @@
-DIST ruamel-yaml-0.15.85.tar.gz 395243 BLAKE2B 647969aae263119426b4079a189ea4f58278028d897610cef4c3833dab0893440b002aa1ed0e46741a16b4f97a6ecb631f8de18552939b22b2a7e2518647e6b9 SHA512 65ea50a50e2b4ff96fe881c9aef9aef02060f0759f1ee35a254be1a647f2b5f0ef906ed33da0eeb3e7be8dc9ff89737840cf57578e4817ec2b7431cd2bcbfb1f
-DIST ruamel-yaml-0.15.87.tar.gz 396176 BLAKE2B 64eaed12fc7afd873c81f862e37e5812fdbb4edf48bbea9b18f340d10f52e24a790a5f62f1feb7103ecd7374cc489e11977b1a5f15c0d1ce0df40e899949f105 SHA512 4ad826e28a8e556844b6ca273c3be375aa65ae4cdaca5a06c7daf1476c402fd081ab46a24e6e57d8bf140cce0c53a7f5c884897942b7e6382328d22d1f691889
 DIST ruamel-yaml-0.15.88.tar.gz 396304 BLAKE2B 82b00a64691df48f1bc8b47a101ca488762e7bb2a0746b95caaddf2944f4e11079290366de45c98cbe287bf96cd907d93b3a3af1e2e69f64d595fd2b77e670d0 SHA512 95500ce679546c8224d85183881b5c8ba6af0c002110edb000a7b4aef88a9217d565fa0032aa298e26e921051ccae8e040f68acad3f7c8abd79752b5e46105b6
 DIST ruamel-yaml-0.15.89.tar.gz 396878 BLAKE2B 949b36665c9071d6a57674a51b2c6c8ea5a29d943019b92acd7703f77fe5ea3d5a0244de99f4ccc41c714d65f0625a3d7ce4c4257558ca0de7d3e1f7eb947274 SHA512 3ad266f069b4e522fb9044c1b87fd007ec2e6c4a316332d55939861491e36b87a28f7f1f3c230960d50c15f0b66834cf2db5807aafa5348e1cddf863e935ac4b
 DIST ruamel-yaml-0.15.91.tar.gz 397339 BLAKE2B 66f713cf3fd6e0c8900d22a3525a69c77dccc1e0c8039c7bc05f0829d2e7f38a1b83da9acde78273059129b432fc6bebfd3afe5844c9e7205b859de73a8743f6 SHA512 c9c9de649a40cb55953005a2fa991112c34a699409379c3c04d33f9f42efa7d0e43fb4c7e7f5caea1b6a86af4e0785925c541632bca88ab6b9c52969260b705a
 DIST ruamel-yaml-0.15.94.tar.gz 398392 BLAKE2B 0203656b39488c659a917a5ea90149885953c86b45c97df24ca47403b56703479384a5c4df491df08f269e8545bad96efd568d73916cfb245bc5034e6ab359fa SHA512 4a1854503e16f44c5090abb041a6838ed2ffaa8ea36deb2781f12f4b303ec33fb5a4901a9ff798755d38efc4251aa4ae92596001bbdf63a5703de4ab72f76a8e
-EBUILD ruamel-yaml-0.15.85.ebuild 1087 BLAKE2B fe35232884bdba17a279e989221f600bbc2d8d7a957a739dc92da4c954277a3dad0c7fb79a9a30c6a6e864aaa60dba275ca8433e897d612fb383049a253a6917 SHA512 4d0d1fb236dd3b9ff9df73665a3866e4b3602fc64db6fd123d5c75f9565e5fde61001cabfbf6c1ab552aab1785cd5ac3f146100da01cda1696ffeeae06b60222
-EBUILD ruamel-yaml-0.15.87.ebuild 1087 BLAKE2B fe35232884bdba17a279e989221f600bbc2d8d7a957a739dc92da4c954277a3dad0c7fb79a9a30c6a6e864aaa60dba275ca8433e897d612fb383049a253a6917 SHA512 4d0d1fb236dd3b9ff9df73665a3866e4b3602fc64db6fd123d5c75f9565e5fde61001cabfbf6c1ab552aab1785cd5ac3f146100da01cda1696ffeeae06b60222
+DIST ruamel-yaml-0.15.97.tar.gz 400728 BLAKE2B 04b957ba7739ceebcfc802d86252ace5bba8960cc75ff0bea00ef8ba25e945e80ef878a9699d1a8d1664ed8e39d23eb47542f2bf70e0628b1bd1904d80e8c034 SHA512 2c61609867147c3fd9fde77d03c589848765a068893197ae4aab4417933a7f54b46c4eb81e9359d116fd45a37f5e5e357ab3ea19d0b19455f2ab3c022a40349e
 EBUILD ruamel-yaml-0.15.88.ebuild 1087 BLAKE2B fe35232884bdba17a279e989221f600bbc2d8d7a957a739dc92da4c954277a3dad0c7fb79a9a30c6a6e864aaa60dba275ca8433e897d612fb383049a253a6917 SHA512 4d0d1fb236dd3b9ff9df73665a3866e4b3602fc64db6fd123d5c75f9565e5fde61001cabfbf6c1ab552aab1785cd5ac3f146100da01cda1696ffeeae06b60222
 EBUILD ruamel-yaml-0.15.89.ebuild 1087 BLAKE2B fe35232884bdba17a279e989221f600bbc2d8d7a957a739dc92da4c954277a3dad0c7fb79a9a30c6a6e864aaa60dba275ca8433e897d612fb383049a253a6917 SHA512 4d0d1fb236dd3b9ff9df73665a3866e4b3602fc64db6fd123d5c75f9565e5fde61001cabfbf6c1ab552aab1785cd5ac3f146100da01cda1696ffeeae06b60222
 EBUILD ruamel-yaml-0.15.91.ebuild 1087 BLAKE2B fe35232884bdba17a279e989221f600bbc2d8d7a957a739dc92da4c954277a3dad0c7fb79a9a30c6a6e864aaa60dba275ca8433e897d612fb383049a253a6917 SHA512 4d0d1fb236dd3b9ff9df73665a3866e4b3602fc64db6fd123d5c75f9565e5fde61001cabfbf6c1ab552aab1785cd5ac3f146100da01cda1696ffeeae06b60222
 EBUILD ruamel-yaml-0.15.94.ebuild 1087 BLAKE2B fe35232884bdba17a279e989221f600bbc2d8d7a957a739dc92da4c954277a3dad0c7fb79a9a30c6a6e864aaa60dba275ca8433e897d612fb383049a253a6917 SHA512 4d0d1fb236dd3b9ff9df73665a3866e4b3602fc64db6fd123d5c75f9565e5fde61001cabfbf6c1ab552aab1785cd5ac3f146100da01cda1696ffeeae06b60222
+EBUILD ruamel-yaml-0.15.97.ebuild 1087 BLAKE2B fe35232884bdba17a279e989221f600bbc2d8d7a957a739dc92da4c954277a3dad0c7fb79a9a30c6a6e864aaa60dba275ca8433e897d612fb383049a253a6917 SHA512 4d0d1fb236dd3b9ff9df73665a3866e4b3602fc64db6fd123d5c75f9565e5fde61001cabfbf6c1ab552aab1785cd5ac3f146100da01cda1696ffeeae06b60222
 MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.87.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.87.ebuild
deleted file mode 100644
index 2f9074155..000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.87.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://bitbucket.org/ruamel/yaml"
-MY_PN="${PN//-/.}"
-SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)
-"
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	# This file produced by setup.py breaks finding system-wide installed
-	# ruamel.std.pathlib due to shared namespace
-	rm "${BUILD_DIR}/lib/ruamel/__init__.py" || die
-
-	py.test -v _test/test_*.py || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.85.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild
similarity index 100%
rename from dev-python/ruamel-yaml/ruamel-yaml-0.15.85.ebuild
rename to dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild