diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
| commit | 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch) | |
| tree | 753b6b08624c34d1ed8414bbe22c45409f7741b9 /dev-python/twisted | |
| parent | be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff) | |
| parent | deba8115d2c2af26df42966b91ef04ff4dd79cde (diff) | |
Merge branch 'edge' into next
Diffstat (limited to 'dev-python/twisted')
| -rw-r--r-- | dev-python/twisted/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/twisted/twisted-19.10.0.ebuild | 9 | ||||
| -rw-r--r-- | dev-python/twisted/twisted-20.3.0.ebuild | 11 |
3 files changed, 19 insertions, 5 deletions
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest index b6a5de1487e3..4483ce309f18 100644 --- a/dev-python/twisted/Manifest +++ b/dev-python/twisted/Manifest @@ -17,6 +17,6 @@ DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03 EBUILD twisted-16.6.0-r3.ebuild 5783 BLAKE2B e6433d34015f3140e93ac698aaaaae9fa822de410debaa5bce42ffc5697e9c11ed0c3180ce8212703746addda39d9b0d4c30dbbef348fb821a65cc6e24d8701d SHA512 181151b8b2667f688fa08ce7aa97e2fc242c8dd168cc5498d17f6224ce18933406ddcf40a8c813a0631f4cd58e498c370d94371043c41d4b18aa44876677b979 EBUILD twisted-18.4.0.ebuild 6270 BLAKE2B edbeb59373d55d728b255223dd7ca09043547c80513be779719704983508dd2be866e4fee90bb023f8817f95659291c262b4d037ba6609164a61d13dd660e5e4 SHA512 ae8aede1151acaa3f94553bdcefc25970e9026f4aef8a81c6a6f8f0a0e7d9c91283ff6eaf1aeb2ed8140021279ed3a985967fd6357b8ad239289604a9cc0a2a5 -EBUILD twisted-19.10.0.ebuild 5325 BLAKE2B bd98bd08ea62530761f7f75918735e1926a29cbcb8ad6e3521001afdc7bdb02d1eba260cc74995bf36e7e142f3a84b933f646db54165e26f50fa12b24b844dc0 SHA512 b779e7af21e8afee8cfeaae8603207f8de83d6564e01800158decbe7fdcbd6079ddd0b6aa14141c301bb23fe15a6bb488531de9607b079d309594b5fc483e4fd -EBUILD twisted-20.3.0.ebuild 5209 BLAKE2B 00b96a61aeaa7efaa34ec6b1eb2782c25cd9f0d3f90a6567d7c6e95c4fd301c9a01059bcd688fc71c5220cc232d493445e47ef1cb754f21812f65cc074a87d14 SHA512 e181af544506d4aebdac748c68ca6e56fbaac4627d5518716c62c589e639fa3cef2560402dff950e9e5d1cb854d963a95988be04329ed5e9369de88aa7e68a4b +EBUILD twisted-19.10.0.ebuild 5626 BLAKE2B ce1efdadb26446207cc15298265331c14826fa3fde3deff9d02b6792d0fa69538bb6aa7a2a0886a0307891dd249fccc7164011d4793978a32cdcaa6aada8d433 SHA512 02c9caeaffa35b155cc993c5bbe3cda32a08d41bd844275892439b55e8824db538e68b6f7343ecddeb8bbd403ca8c1a0b5d7f3af0344a3479e6ff8e08a95fbd1 +EBUILD twisted-20.3.0.ebuild 5488 BLAKE2B 99921ace5a474e645b7f81f6660b8a2498071d88f4434c89da82c8763b1090091dc1db1e6835a3b5b2ad76adfd74647b0bf24be8fe816b683377e125cc0669be SHA512 b5c4f4e73080c4065b2179cacda64d9e5cc51ae377655ddecc9c1b1d928afb97845d70b38716fac19c4138dc45fb7b7a7cc12a96046e534a9f086c066a38afd4 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604 diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild index 1112e8b1d49f..d092c5697894 100644 --- a/dev-python/twisted/twisted-19.10.0.ebuild +++ b/dev-python/twisted/twisted-19.10.0.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}" SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" -KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" LICENSE="MIT" SLOT="0" @@ -86,6 +86,13 @@ python_prepare_all() { # sphinx (including on py2) rm src/twisted/python/test/test_release.py || die + # Conch doesn't work with latest >=OpenSSH 7.6 + # - https://twistedmatrix.com/trac/ticket/9311 + # - https://twistedmatrix.com/trac/ticket/9515 + rm src/twisted/conch/test/test_ckeygen.py || die + rm src/twisted/conch/test/test_conch.py || die + rm src/twisted/conch/test/test_cftp.py || die + # puts system in EMFILE state, then the exception handler may fail # trying to open more files due to some gi magic sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \ diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild index 1f547fbdba48..47624031dc76 100644 --- a/dev-python/twisted/twisted-20.3.0.ebuild +++ b/dev-python/twisted/twisted-20.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 virtualx @@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}" SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" LICENSE="MIT" SLOT="0" @@ -90,6 +90,13 @@ python_prepare_all() { # sphinx (including on py2) rm src/twisted/python/test/test_release.py || die + # Conch doesn't work with latest >=OpenSSH 7.6 + # - https://twistedmatrix.com/trac/ticket/9311 + # - https://twistedmatrix.com/trac/ticket/9515 + rm src/twisted/conch/test/test_ckeygen.py || die + rm src/twisted/conch/test/test_conch.py || die + rm src/twisted/conch/test/test_cftp.py || die + # puts system in EMFILE state, then the exception handler may fail # trying to open more files due to some gi magic sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \ |