diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b7e645d7d..a9243ba8b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -60,6 +60,7 @@
   * add pytest-tornasync-0.6.0
   * patch locationsharinglib against pinned versions
   * update linode-api-4.1.9_beta1, fix some problems
+  * update keyrings_alt-3.4.0
 
 2020-09-05
   * repair iglo-1.2.7, drop iglo-1.2.5, abondoned anyway: https://github.com/jesserockz/python-iglo/issues/1#issuecomment-558479023
diff --git a/dev-python/keyrings_alt/Manifest b/dev-python/keyrings_alt/Manifest
index 56bbf873c..2fa5f24a4 100644
--- a/dev-python/keyrings_alt/Manifest
+++ b/dev-python/keyrings_alt/Manifest
@@ -2,7 +2,6 @@ DIST keyrings.alt-3.1.1.tar.gz 28193 BLAKE2B 3e209880009aa129646e5b21c622851ca49
 DIST keyrings.alt-3.2.0.tar.gz 32000 BLAKE2B c53c79e173ff513124bb90ad828d76894d10e72538ab9f5b307085e4a08af42d1463ab31d3ed69438d3b1b1b4c25400e57e8cec1e3910c0e50012b99a35e896c SHA512 972f5622775de404dd71b318df36136b13e1bca6ccaac23e4250afb1a5f4e0d1772fd63b7abaeda152b4420765e2a393a2b93adeb6469821c4efc5ac9d526dcc
 DIST keyrings.alt-3.4.0.tar.gz 31630 BLAKE2B a35346df32697c2eed3e592c28664d8984a6d03d591c01828d79da68018d2b1b52fa563502db4e46b81d39f950e86c35ef7dfd69021478538509ebd9020a2bfe SHA512 4a8d9e9721163a696a0f7dbdff94d8f5cd61ea023824a9a5f60e4c422a3b1002ee7e3f610cfe618ef755354cc3275095f262ef2f510257f96c04a6fd9a0037e5
 EBUILD keyrings_alt-3.1.1-r1.ebuild 1063 BLAKE2B fed6e4e96472219457611979099b05714034b3b0103283eeb22382e3a108a489596d2b3332ae21aa4720c3611f27bed41f42ac46ad6b56b82f7c2bc8229a14f1 SHA512 52e8788c2e9e380f2872f6d23a16d8b17e9df639ce3019cfc0a1353648c88459cb2bf8e189ab6ceeafc0eefc395049bc0b1493eee45d0ccd95b6c92b699dee1b
-EBUILD keyrings_alt-3.1.1.ebuild 1229 BLAKE2B ae72c76d1ef52c4a1840d22f3f9d1db9fae5f98a75aa10b91676624781db231fd874f65c18641a03fda14665c703aa0f87b8a2ddea5e9e2947d1a84155f6d1c8 SHA512 9da5287422a2bd29343abb58856fa91451ee382bccce66b9481b5b497d4211b4025184ebaf6c751a0b7e2baf99a0439b6ff55fea37e64d9becc5df0a3003b9ef
 EBUILD keyrings_alt-3.2.0.ebuild 1063 BLAKE2B fed6e4e96472219457611979099b05714034b3b0103283eeb22382e3a108a489596d2b3332ae21aa4720c3611f27bed41f42ac46ad6b56b82f7c2bc8229a14f1 SHA512 52e8788c2e9e380f2872f6d23a16d8b17e9df639ce3019cfc0a1353648c88459cb2bf8e189ab6ceeafc0eefc395049bc0b1493eee45d0ccd95b6c92b699dee1b
-EBUILD keyrings_alt-3.4.0.ebuild 1077 BLAKE2B a147afc836f4d1d8ea5fefa6d3edd412492969e9499b08f6f9e80165ff0c1d2ec8972e6e20f9632696db6dff617d0c68f9142127ebb72e0451f5bd271e83083b SHA512 d8bcac6a6ad78f45d7740bba706ad8a3336022a302b22911a6e0e7643a0a5296efc82f5f59dbafa77f2b47c2f404be4b415e5d68cf0492653390f5798cc9f3a1
-MISC metadata.xml 566 BLAKE2B efee499eac8ef019f191da814a14375d3c8dd3c386c5e6b786ab6d1e2296a77c7c526a7ee810a4a5645cc08ca552020adfea09e0b7c56c4b263d525055c4a2d0 SHA512 5ab79615841ae32488de5941e547e2174aa2ffc45aec131f7024b055f1de43f411ac487f1fdc5e9eb8cfdd0cf380cdfe6f1b2bacef5eefb4d7ecdb8fe310f06f
+EBUILD keyrings_alt-3.4.0.ebuild 746 BLAKE2B 186a873056d6df6cc7cc9f2d087f33580e04d80386d9770ccd3b086df30707bb1beaa953e05f548115ddf78332211978ba475f07cf840c881829adb0d4b6dd4c SHA512 53753930996dedf1d223be2756545483311931113cad1db123ad388703f4afecb0840f68363d3f283bc30d1eee2da36ae624848dcedb4d93fca860f925ce181c
+MISC metadata.xml 457 BLAKE2B 7c7f67b3b13220d278e8c85fe689697f22472769caf0e912a9c2f43e8c072fe3b24895f8bca577186d726fd2aa8dc0d7f3e5d0033799a8144c48a6c2c32a27f2 SHA512 9d74dfd683743244c7ef2c9192a49ca7c3aa0d58977049030f105cc8fe93e2ab4bcc7af21c77a40e1664e81c3597a49814d8c28c721275d44413dec52dfde312
diff --git a/dev-python/keyrings_alt/keyrings_alt-3.1.1.ebuild b/dev-python/keyrings_alt/keyrings_alt-3.1.1.ebuild
deleted file mode 100644
index a1275a497..000000000
--- a/dev-python/keyrings_alt/keyrings_alt-3.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Alternate keyring implementations"
-HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.org/project/keyrings.alt/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
-		<dev-python/fs-2[${PYTHON_USEDEP}]
-		dev-python/gdata[$(python_gen_usedep 'python2*')]
-		dev-python/keyczar[$(python_gen_usedep 'python2*')]
-		dev-python/pycrypto[$(python_gen_usedep 'python*')]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# Multiple failures
-RESTRICT=test
-
-python_prepare_all() {
-	sed \
-		-e "s:find_packages():find_packages(exclude=['tests']):g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild b/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild
index 40c999397..e45f85b7e 100644
--- a/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild
+++ b/dev-python/keyrings_alt/keyrings_alt-3.4.0.ebuild
@@ -1,47 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 
-MY_PN="${PN/_/.}"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Alternate keyring implementations"
 HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.org/project/keyrings.alt/"
+MY_PN="${PN/_/.}"
+MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
-#RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 RDEPEND=""
-DEPEND="${RDEPEND}
+BDEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
-		<dev-python/fs-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
-S=${WORKDIR}/${MY_P}
-
-# Multiple failures
-RESTRICT=test
-
-python_prepare_all() {
-	sed \
-		-e "s:find_packages():find_packages(exclude=['tests']):g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
 python_test() {
+	nosetests --verbose || die
 	py.test -v -v || die
 }
diff --git a/dev-python/keyrings_alt/metadata.xml b/dev-python/keyrings_alt/metadata.xml
index 95417e74c..9e62e0968 100644
--- a/dev-python/keyrings_alt/metadata.xml
+++ b/dev-python/keyrings_alt/metadata.xml
@@ -2,16 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
+    <email>b@edevau.net</email>
+    <name>Andreas Billmeier</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">keyrings.alt</remote-id>
-    <doc>https://pythonhosted.org/keyrings.alt/</doc>
     <maintainer status="unknown">
       <email>jaraco@jaraco.com</email>
       <name>Jason R. Coombs</name>
     </maintainer>
-    <remote-id type="github">jaraco/keyrings.alt</remote-id>
   </upstream>
 </pkgmetadata>