4 files changed, 15 insertions, 54 deletions
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 1018bfd4179d..9091c40204d1 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,2 @@
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-DIST dnspython-2.0.0.tar.gz 221903 BLAKE2B 540fb5fb12791dad6bae4007a77201092c8d5e64b7d82b23d5e3d16f48b49f73c90b85a6c8a83fa056a35cf7975ea2ad4a030f2b1fb1b87948bf1703adabb9d6 SHA512 3b38850fcacb0dd25ac0345201474f297c402617e8d706f3061c42172d697103075098e62ca0ac4e0e29967e00407f32f41789ac7bf070fba5aec0af9882e0fb
 DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
diff --git a/dev-python/dnspython/dnspython-2.0.0.ebuild b/dev-python/dnspython/dnspython-2.0.0.ebuild
deleted file mode 100644
index da779ee88329..000000000000
--- a/dev-python/dnspython/dnspython-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="https://www.dnspython.org/ https://pypi.org/project/dnspython/"
-SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	!dev-python/dnspython:py2
-	!dev-python/dnspython:py3"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -i -e '/network_avail/s:True:False:' \
-		tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.1.0.ebuild b/dev-python/dnspython/dnspython-2.1.0.ebuild
index 6fd283c0966b..0472c16b4057 100644
--- a/dev-python/dnspython/dnspython-2.1.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/dnspython/metadata.xml b/dev-python/dnspython/metadata.xml
index f7d785e66620..9515548a578d 100644
--- a/dev-python/dnspython/metadata.xml
+++ b/dev-python/dnspython/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <longdescription>
 dnspython is a DNS toolkit for Python. It supports almost all of the record
 types. It can be used for queries, zone transfers, and dynamic updates. It
 supports TSIG authenticated messages and EDNS0.  dnspython provides both high
@@ -13,7 +13,7 @@ and low level access to DNS. The high level classes perform queries for data
 of a given name, type, and class, and return an answer set. The low level
 classes allow direct manipulation of DNS zones, messages, names, and records.
 	</longdescription>
-	<longdescription lang="ja">
+ <longdescription lang="ja">
 DNSPythonはPython言語用のDNSツールキットです。ほとんどのレコード・タイプをサポー
 トします。クエリー、ゾーン・トランスファー、ダイナミック・アップデートができます
 。TSTGメッセージ認証とEDNS0をサポートします。DNSPythonは高水準でのアクセスと低水
@@ -21,8 +21,9 @@ DNSPythonはPython言語用のDNSツールキットです。ほとんどのレ�
 い、その戻り値を使います。低水準はゾーン、メッセージ、ネーム、レコードを直接操作
 します。
 	</longdescription>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">dnspython</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="pypi">dnspython</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file