gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 86 deletions

diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 6e48ed28b2b3..a3fd56e7db29 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,6 +1,3 @@
-DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-EBUILD dnspython-1.15.0-r1.ebuild 1044 BLAKE2B 95f3e626a32a3106913f8c8ec84235e3520ac17289454b69e742f598e5e7d9c13f4b65cc746b30d7c810853312df7e31ecd18efae404a4796a679472c3f5ca96 SHA512 dbfa3c78dd2183a93f64ddd3ba5e0035452c302b492b748a0da0c898a617864ebde479adff35aabf5f7083b38de8638a22f9063159e9710a3588717d1fd32242
-EBUILD dnspython-1.16.0-r1.ebuild 1127 BLAKE2B c85c96b947676d3860ebed78d86e60fac257e397ed74db5869ff7be94733336b3696e1e6ec5bcbf38e335d2a53c3a3daa8aa675e0cdca42d14415f8d346d42c4 SHA512 de1d87496c193811a9ee5f632f0133304006ca6f307486aeac28bce3bf6382cfaf7c25ede8c30ea2a992a6c72f2e81615d57beb4518c531692c7d88742f34773
-EBUILD dnspython-1.16.0.ebuild 1113 BLAKE2B fcd7b4a8ce1737e9a3fcbf366e51460d5094b18db0447c57e4c138a036572d5c991eeb782887ed04c157c6b1f9d431e0ffef01650d51289223be05e76e036f19 SHA512 6081183c776c2db38035bfe36c58d62c059425dd482775020fb4ecbc301fbb083db5ad921f242eb0194ec218c910027113d4d22a08e7924fd95b23eaafacea32
-MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
+EBUILD dnspython-1.16.0-r1.ebuild 1116 BLAKE2B c92e4ba153503cf6162d3f5a4add22ee79506f160b1bd1342f4fb85aa191effe70986db8e95bfb39c334297320f229e9465684a5c885dc0a284d798a975d8e4c SHA512 77deffa58cadcf4e742338bbad1546b069e3ef0df39e754b2d262cdc9ee843ccdbe8c8baf0f77904803c79b3390eeec04630da7f01fdbc887cb49237b39764b7
+MISC metadata.xml 1482 BLAKE2B ff7895525a5fc62d104bf3039aa4154d0dbd5b097b5ae213c7e34713c968077b914b7a93ea881f43ea604e97b90f68b8f871a301f136de26ef4d98f0167be02c SHA512 63892286866fa85cc0a750157b3a2b98fdf4d3ef6edf61a879548c8e851cbeaa88cbfda52eaf98f1baf80e72a4ea2ffd2ceafe9794bf9a35ef3367ae5d3c2ded
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
deleted file mode 100644
index 951394e1211e..000000000000
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-	!dev-python/dnspython:py2
-	!dev-python/dnspython:py3"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip"
-
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	cd tests || die
-	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-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-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
index 03b92222bbba..10d63a177c18 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
@@ -13,7 +13,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 ~sh ~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 test"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
deleted file mode 100644
index 49f1888507f1..000000000000
--- a/dev-python/dnspython/dnspython-1.16.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=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	!dev-python/dnspython:py2
-	!dev-python/dnspython:py3"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-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/metadata.xml b/dev-python/dnspython/metadata.xml
index e990a706f75a..f7d785e66620 100644
--- a/dev-python/dnspython/metadata.xml
+++ b/dev-python/dnspython/metadata.xml
@@ -21,6 +21,7 @@ DNSPythonはPython言語用のDNSツールキットです。ほとんどのレ�
 い、その戻り値を使います。低水準はゾーン、メッセージ、ネーム、レコードを直接操作
 します。
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">dnspython</remote-id>
 	</upstream>