diff --git a/dev-python/user-agents/Manifest b/dev-python/user-agents/Manifest
index 1655a52f8..3a5b0170d 100644
--- a/dev-python/user-agents/Manifest
+++ b/dev-python/user-agents/Manifest
@@ -1,3 +1,5 @@
DIST user-agents-2.0.tar.gz 9356 BLAKE2B 996130f46e813cca0f7343593ef80c81cf5db335818e03f3ccc770babb775cd522ba508dc323da246e3fbf72bbe010569b5302183ea76f286df63432773acd29 SHA512 0bfd1da8c4b25b521524dfcf9ebb1ea9eaec6f7b72f05f370eb2f180484ecfb54abc0b7c7b4d86c2c5cd6e21bae11581ce8f4587d5b844b135ee48e61a106f58
-EBUILD user-agents-2.0-r1.ebuild 642 BLAKE2B 1c64ad51fa2fc2178ca67dcd855ed29d51481d91deb4fea9acef8bca33db199c624605c706d3433424b29a6b992fbac4de2b13a3291f4d5de864819280646ad2 SHA512 dc735503a06d15e42f7cba411c56d5f828a7ab11a817f7e6fc8dc57ca6879412ec53b1cd2b5246b7c2f7aa7564f67b5b7a8961b9420e9520f056a97235397e15
-MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
+DIST user-agents-2.2.0.tar.gz 9525 BLAKE2B 12fd838b277167b6837413f2dd211dff5ba1539498dcfc0ea2ea44ba1237e901dee0f5242d8fdf1b8d178a16d4819e5ec3050d7fe0a2b964d9c1e0efac7ad317 SHA512 39d17acdb75e0e4e7520b584794db1d07babd98f25e0cb75e9667733897c30610f03b350b93da6938d96317ebe417e7368d794ee7aa134fbba52ac8ab0124aa8
+EBUILD user-agents-2.0-r2.ebuild 820 BLAKE2B ee69b9c8d38e5a56dae98d115c6dc6e17e1c43b65a88bd8027464a3876c273061b53121560603458ea87f9cc58908080e57131ae159274337d1af8cd1d670124 SHA512 fd5c7b86de4dd08a7eed79c67e853279eccfdd518a30b8d373642131f8c7c85022253b602f9638659f6ae79110eabaf8002dbf25a21dcb70840e2e0a7afa2e3b
+EBUILD user-agents-2.2.0.ebuild 821 BLAKE2B 2a194dc5f1efeb70051ee66a9f43f7e0833a1c8d9a5da2f9467db365098ec790492807a03ec2fe2c90bde7b21423ab5008f2a1e6c41fdddbeb58ddb2a1ede351 SHA512 15e6d9eec40f9c9ba69e031eada688fad60290e8f910618235fb1af9dcf5a3abf9845dfd44bf47d2818ca4478d83f35ed365d91b26d13b06881398dc7d380fba
+MISC metadata.xml 454 BLAKE2B 6307614ccc874ebe096e2414f7ba69822a9ffd26ec1426065d4f392567153b2ecf1f2d369aa1ae55145abd3ffe5a7e3e92614a9f49dbe01d215565d5e6a1259d SHA512 4dee423a3aba55738c21b50408725e88557b895525df1b89ab6bdbea4d304f4cfb822372fa0838bd7e8253e7b87c6f59ed5ed2e931dba4c21e4fee893d5b88bf
diff --git a/dev-python/user-agents/metadata.xml b/dev-python/user-agents/metadata.xml
index 70d025d32..bc25878e1 100644
--- a/dev-python/user-agents/metadata.xml
+++ b/dev-python/user-agents/metadata.xml
@@ -5,4 +5,11 @@
b@edevau.net
Andreas Billmeier
+
+ user-agents
+
+ selwin.ong@gmail.com
+ Selwin Ong
+
+
diff --git a/dev-python/user-agents/user-agents-2.0-r1.ebuild b/dev-python/user-agents/user-agents-2.0-r1.ebuild
deleted file mode 100644
index abffbeede..000000000
--- a/dev-python/user-agents/user-agents-2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to identify devices and their capabilities parsing user agent strings"
-HOMEPAGE="https://github.com/selwin/python-user-agents"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="test"
-
-DEPEND="
- ~dev-python/ua-parser-0.10.0[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-
-python_test() {
- py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/user-agents/user-agents-2.0-r2.ebuild b/dev-python/user-agents/user-agents-2.0-r2.ebuild
new file mode 100644
index 000000000..72cb7fe24
--- /dev/null
+++ b/dev-python/user-agents/user-agents-2.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to identify devices (phones, tablets) and their capabilities by parsing browser user agent strings."
+HOMEPAGE="https://github.com/selwin/python-user-agents https://pypi.org/project/user-agents/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DOCS="README.rst"
+
+RDEPEND=">=dev-python/ua-parser-0.8.0[${PYTHON_USEDEP}]"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ nosetests --verbose || die
+ py.test -v -v || die
+}
diff --git a/dev-python/user-agents/user-agents-2.2.0.ebuild b/dev-python/user-agents/user-agents-2.2.0.ebuild
new file mode 100644
index 000000000..2331c0733
--- /dev/null
+++ b/dev-python/user-agents/user-agents-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to identify devices (phones, tablets) and their capabilities by parsing browser user agent strings."
+HOMEPAGE="https://github.com/selwin/python-user-agents https://pypi.org/project/user-agents/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DOCS="README.rst"
+
+RDEPEND=">=dev-python/ua-parser-0.10.0[${PYTHON_USEDEP}]"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ nosetests --verbose || die
+ py.test -v -v || die
+}