diff --git a/dev-python/yams/metadata.xml b/dev-python/yams/metadata.xml
index 32d9b15d99..e6e16e8df0 100644
--- a/dev-python/yams/metadata.xml
+++ b/dev-python/yams/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>myrvogna@electrosphe.re</email>
@@ -7,5 +7,10 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">Berulacks/yams</remote-id>
+		<remote-id type="pypi">YAMScrobbler</remote-id>
+		<maintainer>
+			<name>Derin Yarsuvat</name>
+			<email>derin@ml1.net</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/yams/yams-0.7.3.ebuild b/dev-python/yams/yams-0.7.3.ebuild
index 9b49b70933..77ef4686eb 100644
--- a/dev-python/yams/yams-0.7.3.ebuild
+++ b/dev-python/yams/yams-0.7.3.ebuild
@@ -1,36 +1,31 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 systemd
 
-DESCRIPTION="A Last.FM scrobbler for MPD (Yet Another Mpd Scrobbler)"
+DESCRIPTION="Yet Another MPD Scrobbler (for Last.FM)"
 HOMEPAGE="https://github.com/Berulacks/yams"
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Berulacks/yams.git"
+	EGIT_REPO_URI="https://github.com/Berulacks/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Berulacks/yams/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
-DEPEND="
+RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/python-mpd[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-"
-RDEPEND="
 	media-sound/mpd
-	${DEPEND}
 "
 
 python_prepare_all() {
diff --git a/dev-python/yams/yams-9999.ebuild b/dev-python/yams/yams-9999.ebuild
index 9b49b70933..77ef4686eb 100644
--- a/dev-python/yams/yams-9999.ebuild
+++ b/dev-python/yams/yams-9999.ebuild
@@ -1,36 +1,31 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 systemd
 
-DESCRIPTION="A Last.FM scrobbler for MPD (Yet Another Mpd Scrobbler)"
+DESCRIPTION="Yet Another MPD Scrobbler (for Last.FM)"
 HOMEPAGE="https://github.com/Berulacks/yams"
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Berulacks/yams.git"
+	EGIT_REPO_URI="https://github.com/Berulacks/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Berulacks/yams/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
-DEPEND="
+RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/python-mpd[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-"
-RDEPEND="
 	media-sound/mpd
-	${DEPEND}
 "
 
 python_prepare_all() {