Merge pull request #162 from onkelbeh/rename_tornado

Rename tornado
2022-11-01 17:56:14 +01:00 · 2022-11-01 17:56:14 +01:00 · a6fdb6f41d
parent 764bfc283c e60ad293b5
commit a6fdb6f41d
13 changed files with 100 additions and 17 deletions
--- a/README.md
+++ b/README.md
@ -573,12 +573,12 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E

 ## Licenses
 This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted.
-There are 1522 Ebuilds in total, 1515 of them have in total 1523 (34 different) licenses assigned.
+There are 1523 Ebuilds in total, 1516 of them have in total 1524 (34 different) licenses assigned.

 |License| Ebuilds using it|
 |-------|-----|
 |MIT|882|
-|Apache-2.0|313|
+|Apache-2.0|314|
 |GPL-3|97|
 |BSD|88|
 |LGPL-3|23|
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@ -6,9 +6,9 @@ DIST esphome-2022.10.1.tar.gz 1555809 BLAKE2B e746addb2df675f9977dbc9e3d4431fcb1
 DIST esphome-2022.6.2.tar.gz 1473508 BLAKE2B fd4b6a39d3ec770205b6c76bf24fdb228de5fc18d416f6fa67e621194f97c93f264b59a5fdfe7ab8404dba635d9e9214bcdd10855c6c25929c101cd293aaabb9 SHA512 9b380016580ef7243a735c75dac6a92777cbd963a166f197494693764a0f2592c5ecfba85a8b508377b121aac68d55564021235c0a4314fe278aa3e2feb5ad60
 DIST esphome-2022.8.0.tar.gz 1509796 BLAKE2B 4bef31867b9f53801dc40f3bd15745f34f43ad0ff2b26d5115b581d18f94f033115f80aabcc4767e88e2cb693bc0785781eb1d5340029bcfd931155da1159320 SHA512 9b2a6a7ca914c27ac1ddc3cb4820943805b61d57747977431c8d770a512d5f8bb01faf6a9bafba1af995577d1187ec486326c0624c77e6f975e1d6985c08242d
 DIST esphome-2022.9.3.tar.gz 1551087 BLAKE2B 0f23762654334637e78e3ac0f552cb26e90e590b9d09194a66374eb5245330124168dec2d3be08975de60b46263bd978411b8d15aead005b85e7bed8ffe0111e SHA512 12e7d41adb2db8cf274d2525db8fa52ddc49b4baea50e62244f859b88fc19c494f6ef7b911824c2fc428ce24f63c00ca8a8e9247fdc55cf8643a3b9498677383
-EBUILD esphome-2022.10.1.ebuild 3044 BLAKE2B 6702c93ac70f3cd9f6a8c909111ba244c78cc0cc41adc849171d46ef468f4dd7813873b657cb31010721d74e5dfa1e04746d1403879475d90866d0e5177e099d SHA512 ea7f413298a81548ca71f656c2d35629b9b55cec0bfede538d5b2c31be886e53e3ec3f0941aa6e4708019280d1d5459a9ede0dd7204a285c87e2a023f32ef434
-EBUILD esphome-2022.6.2.ebuild 2883 BLAKE2B 789ab8b1323834d4bdb8d46d1a5c5d347c148035c0a84bbb48b98cf9ddf72e4322f43eaae9f63b962b3385871ba25d4833a4838124d0cdb33e77801f4bb76068 SHA512 f80d34bd3f19ca75ca55d1d470b4876fd5715c3ec42d537dcbed24aaf13f2eae09e23593ddc2f1720760e4b67b748615ec9f1466efb43c75aaf433948a6e8d6b
-EBUILD esphome-2022.8.0.ebuild 3044 BLAKE2B ee852115a20a6e46a8cd07cb3e690ceca45fc6aaf4afe948865c0436c275d0e1c25cc7c1e9eb665bda1aa34af838ecab48c3757bd4c0e9b672ec541cb848052a SHA512 38e28a3e6981ef2e0d147a1f78094172123ab63707c94ec15548a55b92eae59696548ff2c22c077b061b9bd765712cd65f88f9975bb688da7a2124efbc9f67fd
-EBUILD esphome-2022.9.3.ebuild 3044 BLAKE2B 9f747e78ea8395b50f7cd162e08477d09a456cbd607b9068e3fd32839b7e41faf40231bb53e75fbbfb6ffb13f855d4ec90a3245513024c2ad67c264a663cadb3 SHA512 e56616d2fbfc37986fc28884797449aa9de6b91c9f00d543dc54885e35846839161d007800e2923f0c2b16d145ab6c6dbcf6c270ffcd26316715d63f61b3dfa7
-EBUILD esphome-9999.ebuild 2883 BLAKE2B 17202e5afacda09b999c2ab68f76f97ac98c4f45143cc2784db586fe8ca077d5f7550a3da48a4dbd30abe1a2e1ad63a4507a6bf2a256857ea0e53b4930898554 SHA512 0c22f8a2d1351653012be2c72372c8a41faee66073b0374efa9b7efed0dd9e2a5e3a05c0a5f37a5538ae11e858cae52dd39233ff9b188020de03a28b75cb964f
+EBUILD esphome-2022.10.1.ebuild 3043 BLAKE2B 98b4b08918f793608f4fc94af0f37969709b99e6ec1907d75eb3378561ff43962ebd1ab1e943a948b33ffed2c7dcce6c9a11e64bf05bed6295b90fa8e6633b70 SHA512 94a7d995f4b1a3e3ba200759aa8dc549fb6ec13d169c4ba457ad20657c536a02eacf6b5cf4b677e74709e783533d7d38f2b82bfb5dc7828e9d9de61bd952b241
+EBUILD esphome-2022.6.2.ebuild 2882 BLAKE2B eddb47901f58aab7fb6e162a29410847840416f4032ad98d70a289da021294965018043807baee663ff59b8d5b4b4565e36f958867974d11f91db9f812ff0ed7 SHA512 9eb0cb5a595dbe06b3e9052e91b0b2efac3d4f971598d9eed7dd557b69effa64058e7ed02d214c46ee110d8f559e49a5d6824c6b537cdedcba7a8d1eb5a48f53
+EBUILD esphome-2022.8.0.ebuild 3043 BLAKE2B 7c8484cf4ee6a737fb61dbb18ac5dbc67f86ffd8a2d16edc3dcefb71f54f4e019ef7d073c170f45a03a478a1ecb1cf45b1ebe9536831d39478ba076144c7b68d SHA512 c09a999c0668739b3f31e80962d528613dcace1319d873397cd1e41ba9cf9a4215211ef230796d98c2dd6261a749f45142203d8accff97187faec5bb55681991
+EBUILD esphome-2022.9.3.ebuild 3043 BLAKE2B 47f38367dfcec1ca3f507940169e91731f9f94967d061ea847259f39d04823a22ea9f6b5075887f20c50e8b6f445df6356c5cd9429d7f37c280c265f94d83292 SHA512 78b8ad0d3d04cf5c5c893f482fb3e04e0a66f4982798275b064768e56d074179e2fb200ffb634e946df00ea11829337ef4a376457b06745cb36dc95790b98bd0
+EBUILD esphome-9999.ebuild 2882 BLAKE2B 5d960a53a4d8ae6dac6d198846b039b3fc2689417b92eb9f9d0df6ea97da69a71b67c4857aab1a658029749e689781cd0fd3740f25c5c1f40f98e53992b86ce9 SHA512 7cb5849d6b35aef8152bae07fedf91c10707373d5b1e0c8ec4de41eb08541bba7a010fe1a0cbf56d8d035ddc378c4bea7cb46b5a78fdc32abddfd478abfbc248
 MISC metadata.xml 528 BLAKE2B f51bbfdf53280873d115d2aa5720f958fb34aab599c47e22e6ea0bbb5492abd6768902be8c862dedf0e8364c840a4b93f6aa3a6d013e639cc1087b291fcf919a SHA512 7d073562b5e22a06680493fdff1657bc3541f699f677e3d21e37c6b02e638100c0559362ce4edc750094d59660ecedc1e9df194459b858b881a3c26c8aa90659
--- a/dev-embedded/esphome/esphome-2022.10.1.ebuild
+++ b/dev-embedded/esphome/esphome-2022.10.1.ebuild
@ -39,7 +39,7 @@ RDEPEND="
 		~dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
 		~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}]
 		~dev-python/colorama-0.4.5[${PYTHON_USEDEP}]
-		server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] )
+		server? ( ~dev-python/tornado-6.1[${PYTHON_USEDEP}] )
 		~dev-python/tzlocal-4.2[${PYTHON_USEDEP}]
 		>=dev-python/tzdata-2021.1[${PYTHON_USEDEP}]
 		~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
--- a/dev-embedded/esphome/esphome-2022.6.2.ebuild
+++ b/dev-embedded/esphome/esphome-2022.6.2.ebuild
@ -37,7 +37,7 @@ RDEPEND="
 	~dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
 	~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}]
 	~dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] )
+	server? ( ~dev-python/tornado-6.1[${PYTHON_USEDEP}] )
 	~dev-python/tzlocal-4.2[${PYTHON_USEDEP}]
 	>=dev-python/tzdata-2021.1[${PYTHON_USEDEP}]
 	~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
--- a/dev-embedded/esphome/esphome-2022.8.0.ebuild
+++ b/dev-embedded/esphome/esphome-2022.8.0.ebuild
@ -39,7 +39,7 @@ RDEPEND="
 		~dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
 		~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}]
 		~dev-python/colorama-0.4.5[${PYTHON_USEDEP}]
-		server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] )
+		server? ( ~dev-python/tornado-6.1[${PYTHON_USEDEP}] )
 		~dev-python/tzlocal-4.2[${PYTHON_USEDEP}]
 		>=dev-python/tzdata-2021.1[${PYTHON_USEDEP}]
 		~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
--- a/dev-embedded/esphome/esphome-2022.9.3.ebuild
+++ b/dev-embedded/esphome/esphome-2022.9.3.ebuild
@ -39,7 +39,7 @@ RDEPEND="
 		~dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
 		~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}]
 		~dev-python/colorama-0.4.5[${PYTHON_USEDEP}]
-		server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] )
+		server? ( ~dev-python/tornado-6.1[${PYTHON_USEDEP}] )
 		~dev-python/tzlocal-4.2[${PYTHON_USEDEP}]
 		>=dev-python/tzdata-2021.1[${PYTHON_USEDEP}]
 		~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
--- a/dev-embedded/esphome/esphome-9999.ebuild
+++ b/dev-embedded/esphome/esphome-9999.ebuild
@ -35,7 +35,7 @@ RDEPEND="server? ( acct-group/${PN} acct-user/${PN} )
 		~dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
 		~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}]
 		~dev-python/colorama-0.4.5[${PYTHON_USEDEP}]
-		server? ( ~www-servers/tornado-6.2[${PYTHON_USEDEP}] )
+		server? ( ~dev-python/tornado-6.2[${PYTHON_USEDEP}] )
 		~dev-python/tzlocal-4.2[${PYTHON_USEDEP}]
 		>=dev-python/tzdata-2021.1[${PYTHON_USEDEP}]
 		~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
--- a/dev-python/rocketchat-API/Manifest
+++ b/dev-python/rocketchat-API/Manifest
@ -1,3 +1,3 @@
-DIST rocketchat-API-0.6.1.tar.gz 4980 BLAKE2B 190186b2ea9ce31727f7bee897b835211ec0bb03ae3ee911f88e13c707120efdfe26756cd083a6c829ee2ddf4544af698b16ddb2be73da47b95880423df7d244 SHA512 e2fffb7d33af705ce45ea9d192025311a8837d6fe7b0a6a11d1a05b3b4b5963d9cd3c584f3b129151ed74c94144c492d23dd38de83ca56216b21bcf198b6b957
-EBUILD rocketchat-API-0.6.1.ebuild 793 BLAKE2B 18d4a46d73946f496c2bca437dce274e1d1fd3fe7d8bd51a15e88750a482027e8cfcbfb41da56c44e86822011b17df37b15a2e0a5e9375a15f16db6693d34d16 SHA512 b737c3811e245a4f7eab40f5d7d62992b0b11dfd571462b885852b98948cd2491f059236d5b3f17528e909b6897889cd95d0ef5e0510d10c773ce489f8670eb8
+DIST rocketchat-API-0.6.1.gh.tar.gz 6043 BLAKE2B 414df5265002fb5144706d4289de8e8e3568e3376e23743c0646fed5d52bf8924f27302ba59d5c96f4d634a2d89904397d047fc5efd490f729ae0c8ec8128781 SHA512 dea76b7d47ad438d5719743386d893c17f40f4eddf8c1095fe34e8e7f4089b0467a5d720d73ceedfdc98102a817de3f165a3c88545c6b26b76aa83b54c4ddcbf
+EBUILD rocketchat-API-0.6.1.ebuild 809 BLAKE2B 7226aaa923a93c9488fd86524fb4386017bbcf7719a72f12449d22f36650ff381084c340447f5040160edb8a69b7a091519eff1651e749f32690eff7b9e7d3ec SHA512 7ccf2c165e704973810929c56fe5664108c6e1ae997f847298dd9942a04b507f6d0f3ba4d516dfc23b572699d7492c3e154180f3fbf7e05feb4f88acde141859
 MISC metadata.xml 474 BLAKE2B f1275f73f8a3cae362ffe1739e0b1e5d93b8a3916c4e02808e6af3da46fa1454448a9ae760bfb94a93d7ca5b469440d6db7929c5616c6f2fc1a6e15e3d3bc7d1 SHA512 e84fdd83ceeaa4a89a37fedb231c99a42cfdd1349c8df191bb778e9f199e5a40749a9d0c54d4cd0129874b9679f79ab5efdfcf069d6d84193c3f2a7b9c10c520
--- a/dev-python/rocketchat-API/rocketchat-API-0.6.1.ebuild
+++ b/dev-python/rocketchat-API/rocketchat-API-0.6.1.ebuild
@ -9,8 +9,8 @@ inherit distutils-r1

 DESCRIPTION="Python API wrapper for Rocket.Chat"
 HOMEPAGE="https://github.com/jadolg/rocketchat_API https://pypi.org/project/rocketchat-API/"
-MY_PN=${PN//-/_}
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+MY_PN=${PN/-/_}
+SRC_URI="https://github.com/jadolg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"

 LICENSE="MIT"
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@ -0,0 +1,3 @@
+DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8
+EBUILD tornado-6.1-r1.ebuild 1634 BLAKE2B bbf34c096b3e9fe87c57e1abdfe19978430fe383f644cdeaad4fd3e968cf5c32772dab4b88af84564b9f5ae8d2b1c3469e0ded550c12bd97de019619dad9517e SHA512 3aaddc7f5920d9060b854381e98cd0ada63148345604fc648735c5acc5846aa098c353b6d7a5cf08022fdd4e4e60c401ae0b612744bea337a530019d0011709b
+MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
--- a/dev-python/tornado/metadata.xml
+++ b/dev-python/tornado/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tornado</remote-id>
+    <remote-id type="github">tornadoweb/tornado</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/tornado/tornado-6.1-r1.ebuild
+++ b/dev-python/tornado/tornado-6.1-r1.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="
+	https://www.tornadoweb.org/
+	https://github.com/tornadoweb/tornado/
+	https://pypi.org/project/tornado/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinxcontrib-asyncio
+
+src_prepare() {
+	# Disable deprecation-warnings-as-errors because tornado has a lot of stuff deprecated in 3.10
+	sed 's/warnings.filterwarnings("error", category=DeprecationWarning, module=r"tornado\\..*")//' \
+		-i tornado/test/runtests.py || die
+	# broken upstream
+	sed -i -e 's:test_multi_line_headers:_&:' \
+		tornado/test/httpclient_test.py || die
+	# network-sandbox? ipv6?
+	sed -i -e 's:test_localhost:_&:' \
+		tornado/test/netutil_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x ASYNC_TEST_TIMEOUT=60
+	cd "${T}" || die
+	"${EPYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
--- a/etc/portage/package.accept_keywords/98_esphome
+++ b/etc/portage/package.accept_keywords/98_esphome
@ -4,7 +4,7 @@
 =dev-python/bottle-0.12.16 ~amd64
 =dev-python/colorama-0.3.9-r1 ~amd64
 =dev-python/lockfile-0.12.2-r1 ~amd64
-=www-servers/tornado-5.1.1 ~amd64
+=dev-python/tornado-5.1.1 ~amd64
 =dev-python/twisted-18.7.0 ~amd64
 =dev-python/automat-0.7.0 ~amd64
 =dev-python/constantly-15.1.0-r1 ~amd64