summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/Manifest.gzbin300434 -> 300597 bytes
-rw-r--r--dev-python/PyQt5/Manifest2
-rw-r--r--dev-python/PyQt5/PyQt5-5.9.2.ebuild2
-rw-r--r--dev-python/docker-py/Manifest6
-rw-r--r--dev-python/docker-py/docker-py-3.1.1.ebuild55
-rw-r--r--dev-python/docker-py/docker-py-3.1.4.ebuild (renamed from dev-python/docker-py/docker-py-3.1.0.ebuild)0
-rw-r--r--dev-python/pkginfo/Manifest2
-rw-r--r--dev-python/pkginfo/pkginfo-1.4.2.ebuild47
-rw-r--r--dev-python/pycairo/Manifest8
-rw-r--r--dev-python/pycairo/pycairo-1.15.4.ebuild65
-rw-r--r--dev-python/pycairo/pycairo-1.16.1.ebuild65
-rw-r--r--dev-python/pycairo/pycairo-1.16.3-r1.ebuild (renamed from dev-python/pycairo/pycairo-1.16.2.ebuild)24
-rw-r--r--dev-python/pycairo/pycairo-1.16.3.ebuild65
-rw-r--r--dev-python/pygit2/Manifest2
-rw-r--r--dev-python/pygit2/pygit2-0.26.4.ebuild26
-rw-r--r--dev-python/python-recaptcha/Manifest2
-rw-r--r--dev-python/python-recaptcha/python-recaptcha-2.0.1.ebuild21
-rw-r--r--dev-python/pyzor/Manifest4
-rw-r--r--dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch45
-rw-r--r--dev-python/pyzor/metadata.xml22
-rw-r--r--dev-python/pyzor/pyzor-1.0.0-r1.ebuild70
-rw-r--r--dev-python/sip/Manifest2
-rw-r--r--dev-python/sip/sip-4.19.8.ebuild2
-rw-r--r--dev-python/tqdm/Manifest4
-rw-r--r--dev-python/tqdm/tqdm-4.19.8.ebuild30
-rw-r--r--dev-python/tqdm/tqdm-4.8.4.ebuild20
-rw-r--r--dev-python/twine/Manifest4
-rw-r--r--dev-python/twine/files/twine-1.11.0-tests.patch18
-rw-r--r--dev-python/twine/metadata.xml12
-rw-r--r--dev-python/twine/twine-1.11.0.ebuild40
30 files changed, 352 insertions, 313 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index eec33b49d7f6..b059cea2743c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 4c93273a52f7..3b2eb38cd3b8 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -4,5 +4,5 @@ DIST PyQt5_gpl-5.7.1.tar.gz 3733746 BLAKE2B de8aea058876d740f391901434fa2c7ca176
DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
EBUILD PyQt5-5.10.1.ebuild 5681 BLAKE2B b14acb52f6f25a74333445c589af13415749a8bc60dfa50a9fa82f597b24856d0b6dbd10c061142103b85817ad4c4980d38baaf4fe7db1d5958e17631580430e SHA512 d99e76127a3445ef4ba7865213df1191bd4c967b5a7acf8389ee7d5521c95bc498e5dcd4c31478fd3f81f07ed457f81481f4bac6e978c3c5a2e190beb8e18e09
EBUILD PyQt5-5.7.1.ebuild 5547 BLAKE2B 29e51fddc17c2cb03213d244f929165cc95d71b870fe121efed70166f0aeef5a6fd6d2ea9803c0038cfd37363e5abf9de66e0ac89d8e186a9c3fdad988809188 SHA512 187e6664388e61b62066e95797d0a467b30941441ff83872fbeed16abfdbacf5d4bf5ecc575f93ca83fa09e3be16af993d358bf99f3c16f76610aaceb27b1900
-EBUILD PyQt5-5.9.2.ebuild 5684 BLAKE2B 112240ab66ced96c8dc49a1df6df80ee9833297db2a23e22e197acb78e034ee0e6ed45ecfeae136787ee0ca808bd977eae315c37ad1bb0bf54375be2dd4c28f4 SHA512 3df5af3b273a243b23d883a6ef8541551d1195f8ae035c2bba578154488fc0301b8bdf54ea144936841a32cde92dd0319d6b36b64a08614b287c6fe6ffc85d90
+EBUILD PyQt5-5.9.2.ebuild 5682 BLAKE2B 93851df68078e98b065a17126c72410333e4deffe3179e8977da2879ddf8fd7a613548957ad59db669b75efee515ccfab2475c3bd23c1e825325c346ccf0ff36 SHA512 25b4c7a922723a400d3050ccfb931e3594c608bf77268fcf57f33ae94112083fa9d5ea0db92746e70c6a774f9ed644a06165ddb85135d7bfe424895423bcce8e
MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
index e465a1c6492b..881db94f185d 100644
--- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
# TODO: QtNfc
IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 2d56829003f7..9f5415eef68e 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,9 +1,7 @@
DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
-DIST docker-py-3.1.0.tar.gz 201288 BLAKE2B 0aa7f712952aac86df37f4eb8f9c60c71199454472ac14d50ee2fd5acdf1980adea6b9f065fdb920999e8d657ae37028e0aff90dd82c3e8b3b13850d748c0e97 SHA512 7f69e6095f36b7a526367bf2762704f5dc5337ba81b2733ad0b683edc271ab17f548da4398176f2e1ffaad41f8f445e1c790af14d815404ad4df7a25d0ff0b7b
-DIST docker-py-3.1.1.tar.gz 201637 BLAKE2B f94ba89922eb62891113bef2b5f3d034eba0f6e91aeb657c265aa72e3b66ad5f6eba6430faae99485236689ef22e09eed3461126d84b51f369ef3004179e89c5 SHA512 139967232d687af9379e18abd1fd133fa655b6247055ae24fe9c8be02a1900d3af0bfcf0d994b7807c3623a3d1fd57e80ca18ce882855bae593321f0a85432f6
+DIST docker-py-3.1.4.tar.gz 202064 BLAKE2B 6ee3672cd1f62cd570d3939805465698879d747215b8424bc4edd79253c5bc25d193582dbfa6aa423f9b183d477486d6347f65ac7245d601d3f1fe2a1fd124ed SHA512 78081010ce4027156d3b4ebafee6023f387ee8e7ee4d77ee671a16a3fcb646fca91c5c36cfbaf94157f8a524a3e1a09b9cbfabf304e278a3c1e0132df5d13d13
EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
-EBUILD docker-py-3.1.0.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
-EBUILD docker-py-3.1.1.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
+EBUILD docker-py-3.1.4.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-3.1.1.ebuild b/dev-python/docker-py/docker-py-3.1.1.ebuild
deleted file mode 100644
index 8108a4abde8e..000000000000
--- a/dev-python/docker-py/docker-py-3.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
- >=dev-python/docker-pycreds-0.2.2[${PYTHON_USEDEP}]
- !~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/six-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
- )
- doc? (
- dev-python/recommonmark[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
- )
-"
-
-python_prepare_all() {
- sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- sphinx-build docs html || die "docs failed to build"
- HTML_DOCS=( html/. )
- fi
-}
-
-python_test() {
- py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.1.0.ebuild b/dev-python/docker-py/docker-py-3.1.4.ebuild
index 8108a4abde8e..8108a4abde8e 100644
--- a/dev-python/docker-py/docker-py-3.1.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.1.4.ebuild
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index be2ad4213e37..62a1ab89f3dd 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,5 @@
DIST pkginfo-1.2.1.tar.gz 31072 BLAKE2B 57ce5f6147b97af513dfdc6137180e5561822096cdbd21b673c49522384622c58f9eba8c65f24b54bc1e76dc0c6feede5d43e8aac945d94ffe79ea220e830470 SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a
+DIST pkginfo-1.4.2.tar.gz 33539 BLAKE2B d3cfc6bf7a9e748902b1f63434c745d8abf4e144c0a2b5d7a90236bfc2ce7f94922b0e08e5a08b13ba2025159bd90fecee25d9abdb283e7d52de0d34386aba59 SHA512 536628a2a2472e999695a115449a76f971453aea7ac3a08f10d9b08dfdf4a7b8e67c6010c6f18d300472a6afc8dff33331c955cc2f7bdb357504cd6a36390da3
EBUILD pkginfo-1.2.1.ebuild 1404 BLAKE2B f78e5e721aa3532b5b8faf2e83622cfdc3351dbeb1b29864204f0cfbca37e5e928783df45af56346adb3c2261d8a51c0e071bcf0df45e7ae84e0f990bb043973 SHA512 586dc0ac518fd8cbe9d438659d4f3cf922c7479f26d0ce439b81dc812baf0044e5b8ffe15feae12df55ce53f6f45501a9e09e735486e84594d93b369f2b305c2
+EBUILD pkginfo-1.4.2.ebuild 1343 BLAKE2B bda79c2bf65bcf58dbaabaa71b033e37b8486cdc7a5e4f604faf8f88fd9f93d68d573552179ecc971b3ffad50985112415c62cb6411df467eb315b35b4a354d6 SHA512 a0eca4c824909c9cfc503486338b466c52daf5e07cb877d5cfa613824152430df4f2bb02ea904a69cd27ebe96bc1280ae7d2b828c61e33cddb0d31d1773c8ee0
MISC metadata.xml 320 BLAKE2B 70ca2a2666e83f11a892b1c3e155512ebb6992f2b02911aa86609ba66ac72ce4c5af72acf513c92b6a9d542d510379ed6963a94a4a1e16d0909c2461e8b6d5ee SHA512 8f2cf51568e86fb0ebbaf5eb2476f6c7f7121abecec606626aafe5395b2e9530009e77be890d389daa563b6ee47af311cbdeb121518351b0e99da0c591c0502c
diff --git a/dev-python/pkginfo/pkginfo-1.4.2.ebuild b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
new file mode 100644
index 000000000000..a006ae9cbcac
--- /dev/null
+++ b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
+HOMEPAGE="https://pypi.python.org/pypi/pkginfo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Disable tests that seek to read the version of pkginfo from an installed state
+ # These test will still become installed and testable once installed
+ sed -e 's:test_w_directory_no_EGG_INFO:_&:' \
+ -e 's:test_w_module_and_metadata_version:_&:' \
+ -e 's:test_w_package_name_and_metadata_version:_&:' \
+ -i pkginfo/tests/test_utils.py || die
+ sed -e 's:test_ctor_w_path_nested_egg_info:_&:' \
+ -i pkginfo/tests/test_develop.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ "${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/.build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index a46174f1cb6f..862ce67dc03e 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,11 +1,5 @@
DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b01372902d86f88558cf63ab2ec1999dac036b349d84dff0bdcae5126998c5e921f05bab54b708a29ca2381b8d1371ac44 SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8
-DIST pycairo-1.15.4.tar.gz 178436 BLAKE2B 23c5064f537b8d8be12bb64df375c1d5be8962f80adf2437115dde59c18c3755a693b0cb8b3bee248ce8c906f23acfa264f2da6e02770bc59d823beba1bc9e7b SHA512 7e785d23393a8d0c5aca9a4440eb64b0eca9a60c1a18b0dc8452edd6de9422c743d082530387bcbedd34d52377d0892ad395998e9467ba08e22c318684cbee34
-DIST pycairo-1.16.1.tar.gz 180516 BLAKE2B 0a144eb6f17bc6621b16e00ddd40784e16e5950667d57927ee238e76d4966e828d8da3d6983e09655d3eb2d3526dcb8a44da6c48e14268cd78e1d463e59b8779 SHA512 757870dd28d037d0af96308e2d1eb5d55ca2025aabda66031dc77790692e420b07802ccdbeefee430825553ed993830bc6f74de83b717e6fa876108f7b54e144
-DIST pycairo-1.16.2.tar.gz 180430 BLAKE2B 06b7f8b6c574b7afab738c7f0fecf78efafd06759394fbfe529a908011173e46aa0d89a5d041f9ec27fad8abb89b13fced8fbc0a567c8183f2072c70a3a8e357 SHA512 a5ac07f96f6607b1b40912b000c8b3b2114e75a6b8b314f1b68d2f5bb408dd7823c464d096c8cc26164219a961b448a4ea90b5a76683fb1807180f83cbc3b300
DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
EBUILD pycairo-1.15.3.ebuild 1607 BLAKE2B 0fff3a866314ff4dcf9fdfdfaa865b504859be58ddbce3e7ffc64568d744b5ef0cf7558e045aaf1d9c474c457d9ce50c19c978b27accfe2e52e94cf00a3c9879 SHA512 a61afcf8066d8b14d1b117e7952d82d1265668005f976b20a1d53fcabf3d5bd792a62cc24b765d3113016f9b1870ad7e922d05ee017868fcaed03109866a9618
-EBUILD pycairo-1.15.4.ebuild 1616 BLAKE2B f587a875f864f1d08465f421e48b2935378dfe9c2e5a6d421aa39b1d00f11c6622fae6e0fe95bc3bc79a8126b069f77599daa5a2c191ee47399d58d52fb1753d SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b
-EBUILD pycairo-1.16.1.ebuild 1625 BLAKE2B ce04c871a936b4bbe291c36e6cc40b6e307b609a2e415e96921f8b6b44b8524bebdcb11c57575cfcfaeaaa11f96c69f232950fc960a891422c202107f061a0ed SHA512 c6dc09c531862cccbb5f5debcffe8f2bd92c6022439d36e1e2496fbb8654bf18e2db9ec92ab1064b4d561a4e453e6fbd5d21587691e74e796609f00c6091de27
-EBUILD pycairo-1.16.2.ebuild 1625 BLAKE2B ce04c871a936b4bbe291c36e6cc40b6e307b609a2e415e96921f8b6b44b8524bebdcb11c57575cfcfaeaaa11f96c69f232950fc960a891422c202107f061a0ed SHA512 c6dc09c531862cccbb5f5debcffe8f2bd92c6022439d36e1e2496fbb8654bf18e2db9ec92ab1064b4d561a4e453e6fbd5d21587691e74e796609f00c6091de27
-EBUILD pycairo-1.16.3.ebuild 1625 BLAKE2B ce04c871a936b4bbe291c36e6cc40b6e307b609a2e415e96921f8b6b44b8524bebdcb11c57575cfcfaeaaa11f96c69f232950fc960a891422c202107f061a0ed SHA512 c6dc09c531862cccbb5f5debcffe8f2bd92c6022439d36e1e2496fbb8654bf18e2db9ec92ab1064b4d561a4e453e6fbd5d21587691e74e796609f00c6091de27
+EBUILD pycairo-1.16.3-r1.ebuild 1105 BLAKE2B 374130298e8dff7eec60c10aca71d1ffa100b5f257dfd4c78a07af3030b15c34d16dc25b160feb02569bbecdf8e92bc0af16ecf3b13ef6858ddf3afedfa67744 SHA512 a2766f7af185c6e51c4a04df7b27050f7f1b592f94f5b6788973d89f2be47266dedd675f9e35a824f0ddf1b6496d87ec1b220da6b6e669bfe749f36a5c09276a
MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.15.4.ebuild b/dev-python/pycairo/pycairo-1.15.4.ebuild
deleted file mode 100644
index 77146c084dc0..000000000000
--- a/dev-python/pycairo/pycairo-1.15.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="
- >=x11-libs/cairo-1.13.1[svg,xcb?]
-"
-DEPEND="${RDEPEND}
- xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
- doc? ( dev-python/sphinx )
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-
-python_prepare_all() {
- # Fix pkgconfig path
- sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py build ${enable_xpyb}
-}
-
-python_compile_all() {
- use doc && emake -C docs
-}
-
-python_test() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py test ${enable_xpyb}
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/. )
-
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.16.1.ebuild b/dev-python/pycairo/pycairo-1.16.1.ebuild
deleted file mode 100644
index ec09aca8d651..000000000000
--- a/dev-python/pycairo/pycairo-1.16.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="
- >=x11-libs/cairo-1.13.1[svg,xcb?]
-"
-DEPEND="${RDEPEND}
- xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
- doc? ( dev-python/sphinx )
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-
-python_prepare_all() {
- # Fix pkgconfig path
- sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py build ${enable_xpyb}
-}
-
-python_compile_all() {
- use doc && emake -C docs
-}
-
-python_test() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py test ${enable_xpyb}
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/. )
-
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.16.2.ebuild b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
index ec09aca8d651..8c80861142db 100644
--- a/dev-python/pycairo/pycairo-1.16.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
@@ -15,14 +15,12 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
+IUSE="doc examples test"
-# Note: xpyb is used as the C header, not Python modules
RDEPEND="
- >=x11-libs/cairo-1.13.1[svg,xcb?]
+ >=x11-libs/cairo-1.13.1[svg]
"
DEPEND="${RDEPEND}
- xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
doc? ( dev-python/sphinx )
test? (
dev-python/pytest[${PYTHON_USEDEP}]
@@ -30,28 +28,12 @@ DEPEND="${RDEPEND}
)
"
-python_prepare_all() {
- # Fix pkgconfig path
- sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py build ${enable_xpyb}
-}
-
python_compile_all() {
use doc && emake -C docs
}
python_test() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py test ${enable_xpyb}
+ esetup.py test
}
python_install_all() {
diff --git a/dev-python/pycairo/pycairo-1.16.3.ebuild b/dev-python/pycairo/pycairo-1.16.3.ebuild
deleted file mode 100644
index ec09aca8d651..000000000000
--- a/dev-python/pycairo/pycairo-1.16.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="
- >=x11-libs/cairo-1.13.1[svg,xcb?]
-"
-DEPEND="${RDEPEND}
- xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
- doc? ( dev-python/sphinx )
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-
-python_prepare_all() {
- # Fix pkgconfig path
- sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py build ${enable_xpyb}
-}
-
-python_compile_all() {
- use doc && emake -C docs
-}
-
-python_test() {
- local enable_xpyb
- python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
- esetup.py test ${enable_xpyb}
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/. )
-
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 4e66e83e26e1..ac63243a85f1 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,5 @@
DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
+DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
EBUILD pygit2-0.26.3.ebuild 629 BLAKE2B dbc3175935de2fe72cebb7cbb4e5e18769f921c013fc42c093ac47cf19fbca8d582557f7ad0af5d273db7882137a873314be3616d53abf875adfbf35d7ecb61d SHA512 52cf3c56b1d268b0f39c88fb24fd9286215e722aaac6519a5eadd5fb30c17abebb63107a2991f9ebce0b5b8be5933eca603c63599944794a2958785c42a27ca8
+EBUILD pygit2-0.26.4.ebuild 631 BLAKE2B 62288ed0b0d944a2d0e4cd4a4528659ff99b66bf548befbfe7f55b6f211544db4335fbb3ebe905196fde60c3690c62ac1123f20a126417b39f7d58229725b5a9 SHA512 22f40d281816744fedf18a9418a1e4d1c2fce7986c9516256cce9fb4976cd44208e8712ebddfe9b513222a234605257338bb77e313f395d2bd5cce9393c5aba9
MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.26.4.ebuild b/dev-python/pygit2/pygit2-0.26.4.ebuild
new file mode 100644
index 000000000000..64a6fc92b351
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.26.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eapi7-ver
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ =dev-libs/libgit2-$(ver_cut 1-2)*
+ >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+ esetup.py test --args='-v'
+}
diff --git a/dev-python/python-recaptcha/Manifest b/dev-python/python-recaptcha/Manifest
index 80c791b42e88..513bf5642979 100644
--- a/dev-python/python-recaptcha/Manifest
+++ b/dev-python/python-recaptcha/Manifest
@@ -1,3 +1,5 @@
DIST python-recaptcha-2.0.0.tar.gz 5556 BLAKE2B b752915eb95343d7cbce483f49ce9d93ecf837c85a1615e414e14226c54dc60ede3187bd127e09769106a7eb06156ab2b73b0a3839743c29b6aba6e6c4d96951 SHA512 3a60062f36833888a110d5979ca7a7f46cef927bfcf427aba72d2f6a99a9c401b20bea997ff8fb2b8435876bed3880371a84568b95da1341940d275cba8ff178
+DIST python-recaptcha-2.0.1.tar.gz 5439 BLAKE2B e985affe7d008f0dda270c9251315cbe381fc2a72514a219f422a1405c41e3d621326cfa32285588d4b5785c0e21251370546847695815b77ede81812d8eddad SHA512 103c0cf65d67fe3e4d4ca5bb0a208ea221642b1a6c11ad1997e3f1cfa56360c81665fc593354f6ea776deea43cbf72c97f3376e2b77fc275332cddee8b3a9739
EBUILD python-recaptcha-2.0.0.ebuild 771 BLAKE2B 5889d47423245f88faa125e5d0983210b6023357c74476b19ff340a5f572e64172e1b184be9eb0e0f9e41cca817462c5f829c7fd30cdce0c8e4c779d05771a87 SHA512 c4bcecacfb9d341e0e6bb9c56ef7628fdb874e2683bbe431bdecdabb990d91fdb9a3c0015f947c4ea1f89eb3fd9162a1a0b63cef749ef4fc211441d4fbf5472f
+EBUILD python-recaptcha-2.0.1.ebuild 609 BLAKE2B d781fa4d9cf79033a2a300f5cfd704d6f3ebd6a8ef11c93507a0b85815dc41f59e46a7e07240d12c5fcf7eae3ae013bb2bb85b516d42ac5c5a50b60adbd62271 SHA512 0bcfab41a0a5c05d4c54adbcd0f3c5054f3144f7affb1123390bcc567d8673c44f796a7ede736c9dcb69fb348b58f4b4f260ad5c578acf175a37a14998db5e98
MISC metadata.xml 427 BLAKE2B ba42439a7701580eec32dbadf9a62d7bc8ffbb966d8e997724ff6bd72c366c3db7e2b92a966a7b88a4d2c5f28773c26fecdd6842003682d408c1833bf80795e6 SHA512 7bebdf6b10791c257952c29c3eba4c6886ed240823c14190c5652fbefefa847e25d1ade70e0d611011da9a627459cd5aaca81d6dd0ee57fa848146c3fbac0dcf
diff --git a/dev-python/python-recaptcha/python-recaptcha-2.0.1.ebuild b/dev-python/python-recaptcha/python-recaptcha-2.0.1.ebuild
new file mode 100644
index 000000000000..12afe927a4cc
--- /dev/null
+++ b/dev-python/python-recaptcha/python-recaptcha-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
+HOMEPAGE="https://github.com/redhat-infosec/python-recaptcha"
+SRC_URI="https://github.com/redhat-infosec/python-recaptcha/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ !dev-python/recaptcha-client"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 546ae5496e5e..7b15a58e96de 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,3 +1,5 @@
+AUX read-stdin-as-binary-in-get_input_msg.patch 1702 BLAKE2B 96c64d79036e094418eb75251ff0d512122d7ec1300f4dccfba8c49e0ede6cfd76d314fb58b2f70e45ab99e3a87f1d8e0db042fdfbed66d43a0bbbdc70b0c839 SHA512 d47c20baf7875f717e81bc6ec09b2ca80f0dc498a021db6d7bd0942df016f884efdc6c183acbc07d2ecb6998989d23fec624589e5b3bcd8b26e16684ebb4494e
DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
+EBUILD pyzor-1.0.0-r1.ebuild 2083 BLAKE2B bf4ba2210ac60205f9052add4b9073edcee002ab715a526438352a612836aa979a008d3a971b23ff5417a4608e29191350c86156135defeeb5699c1c1b17fb21 SHA512 2e9acfa976a6f01ca69b0b92980e001d223533b183e46da98235c04235eaf7a559d7eb1a5670eaa8b00d6d2a956632e2b385451a4b2882b188f2706630e02610
EBUILD pyzor-1.0.0.ebuild 1797 BLAKE2B 9e3cd862816d96ecb273cd796271c27ac74d95ddaa31f572b450528c52275af3ac396f1e6d8c58e7542a3116a3436e37e9543374d8db74a78eac49a2ad146e41 SHA512 08044189249d9c0530d5007424b9ec6e9a5b92f3ef518c80e41779612ae00195cfddaf54406c8ac667bfc7ba4e1424391a7c58bfaac98d6377730f94119f25a1
-MISC metadata.xml 637 BLAKE2B 054e473895702d6518b728122bb1aef32478886fcc0bbdf7fbb1cb1ec1c4bbcee50bcb7dc9802fb07b10ccc8c7b4d620c828eea7827ee72209716673fa0f6646 SHA512 067c5454713ea8fd1d14378537f65eec5c1c58b0b73a05a9a401b6e80afc46050e5f2020cfefff5d5925140f5b02128f44f179480066f8f325efd61b049899a2
+MISC metadata.xml 1061 BLAKE2B d2ad7e863f055f46e4ab2048cd8cf042444476da9423743c246ede1f6b3f2b8be4b9f980da10e741726ae25625af09a8ce6eeb7710c2f5a8ceb4cc4f915d2e61 SHA512 58d18a197dd3575d7644f0e9f446344ccfcc321d33493fadfd89f7f233a1dc58e0c899b42a3ae72b219dc1327e2de6eeaf90a8de3735fdc0dc1f6c67c5cc8722
diff --git a/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch b/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
new file mode 100644
index 000000000000..81668e369377
--- /dev/null
+++ b/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
@@ -0,0 +1,45 @@
+From 6332a429ed415187599ecce7d8a169ee19f0bbe5 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 4 Mar 2018 17:34:33 -0500
+Subject: [PATCH 1/1] scripts/pyzor: read stdin as binary in _get_input_msg().
+
+Reading stdin in python-3.x is done as text, with a best-guess
+encoding. But this can go awry: for example, if an iso-8859-1 message
+is passed in and if python guesses the "utf-8" encoding, then read()
+will fail with a UnicodeDecodeError on non-ASCII characters. For
+example, the "copyright" symbol is a single byte 0xa9 in iso-8859-1,
+and the utf-8 decoder can't handle it:
+
+ UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa9... invalid
+ start byte
+
+Instead -- and as was done in python-2.x -- we can read stdin as
+binary using the new get_binary_stdin() function. Afterwards, we use
+email.message_from_bytes() instead of the email.message_from_file()
+constructor to parse the byte data. The resulting function is able to
+correctly parse these messages.
+
+Closes: https://github.com/SpamExperts/pyzor/issues/64
+---
+ scripts/pyzor | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/pyzor b/scripts/pyzor
+index 567a7f9..1ba632f 100755
+--- a/scripts/pyzor
++++ b/scripts/pyzor
+@@ -171,7 +171,10 @@ def _get_input_digests(dummy):
+
+
+ def _get_input_msg(digester):
+- msg = email.message_from_file(sys.stdin)
++ # Read and process stdin as bytes because we don't know its
++ # encoding. Python-3.x will try to guess -- and can sometimes
++ # guess wrong -- leading to decoding errors in read().
++ msg = email.message_from_bytes(get_binary_stdin().read())
+ digested = digester(msg).value
+ yield digested
+
+--
+2.13.6
+
diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
index 601b2a901647..d88c249a89ff 100644
--- a/dev-python/pyzor/metadata.xml
+++ b/dev-python/pyzor/metadata.xml
@@ -1,15 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>mjo@gentoo.org</email>
+ </maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<use>
- <flag name="pyzord">enable support for pyzord</flag>
- <flag name="mysql">Enables mysql support</flag>
- <flag name="redis">Enables redis support</flag>
- <flag name="gevent">Enable support for the gevent based handler</flag>
+ <flag name="pyzord">Enable the pyzord server daemon</flag>
+ <flag name="gdbm">
+ Enables the Gdbm back-end database engine for pyzord
+ </flag>
+ <flag name="mysql">
+ Enables the MySQL back-end database engine for pyzord through
+ <pkg>dev-python/mysql-python</pkg>. Only works with python-2.x!
+ </flag>
+ <flag name="redis">
+ Enables the redis back-end database engine for pyzord through
+ <pkg>dev-python/redis-py</pkg>
+ </flag>
+ <flag name="gevent">
+ Use <pkg>dev-python/gevent</pkg> to enable asynchronous operation
+ </flag>
</use>
<upstream>
<remote-id type="github">SpamExperts/pyzor</remote-id>
diff --git a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..14e1ee840724
--- /dev/null
+++ b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PV="1-0-0"
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="https://github.com/SpamExperts/pyzor"
+SRC_URI="${HOMEPAGE}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gdbm gevent mysql pyzord redis test"
+
+# The mysql-python library is always required for the MySQL engine. We
+# depend on it conditionally here because otherwise repoman will balk at
+# the potential conflict between PYTHON_TARGETS and USE=mysql. But as a
+# result, if you try to use the MySQL engine with python-3.x, it just
+# won't work because you'll be missing the library.
+RDEPEND="pyzord? (
+ gdbm? ( $(python_gen_impl_dep 'gdbm') )
+ mysql? ( $(python_gen_cond_dep \
+ 'dev-python/mysql-python[${PYTHON_USEDEP}]' python2_7) )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
+)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( ${RDEPEND} )"
+
+# TODO: maybe upstream would support skipping tests for which the
+# dependencies are missing?
+REQUIRED_USE="pyzord? ( || ( gdbm mysql redis ) )
+ test? ( gdbm mysql redis )"
+S="${WORKDIR}/${PN}-release-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/read-stdin-as-binary-in-get_input_msg.patch" )
+
+python_test() {
+ # The suite is py2 friendly only
+ if ! python_is_python3; then
+ PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
+ fi
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( docs/.build/html/. )
+ distutils-r1_python_install_all
+}
+
+src_install () {
+ distutils-r1_src_install
+
+ if use pyzord; then
+ dodir /usr/sbin
+ mv "${D}"usr/bin/pyzord* "${ED}usr/sbin" \
+ || die "failed to relocate pyzord"
+ else
+ rm "${D}"usr/bin/pyzord* || die "failed to remove pyzord"
+ fi
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 664f3e862ab2..7a6b919bff3e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -4,6 +4,6 @@ DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c239
DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
-EBUILD sip-4.19.8.ebuild 2775 BLAKE2B e772cf0b5accf8bc66fe552ebc46aa598acc7d9236ceda9be82e16ab7884008986ef94516d47b0d79373a4c525cc35861ab34910da66b6ac7b8641a3910f503e SHA512 4ea02bccb959e0c9f2437de6fd105118aaf10942ca2b6133efc085e7e8247e40aba79cc047426ad5c43d37819ead66f61a943e46bb092ef899b511fef7c1c616
+EBUILD sip-4.19.8.ebuild 2773 BLAKE2B de0f30edccb4cb5bf042308b7625838f9412cce433ec2f44a622a0cd86e96c473c3243acb079a4d5c3a65152434cf6c84fe04a4d86de0c53bab2dbf76fd09647 SHA512 e1024ac4438826589567afd1c902a64b8070f774ce1b38c819dfc0fd00f8ff9a7be76bf88293867dee651722110e5509da149b8465ed5d0e3bc6f8cf6e3e3197
EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.8.ebuild b/dev-python/sip/sip-4.19.8.ebuild
index 74ab120a1387..79f92e130626 100644
--- a/dev-python/sip/sip-4.19.8.ebuild
+++ b/dev-python/sip/sip-4.19.8.ebuild
@@ -24,7 +24,7 @@ fi
# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
SLOT="0/12"
LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc"
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 2d325409e23e..387c39723efa 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,8 +1,8 @@
DIST tqdm-4.10.0.tar.gz 615329 BLAKE2B 59cc8db43281a22cabfb895f81c3b6f3cf4e62e67e725ae0a7137497337fea492787f7154e99fa3601f39c1b2e4ddafa5911b6a80ebac6e4e4e7f3c6575d09d5 SHA512 5c7719e13f57cf7f42e81e2514ae4db5cf72b010ead25aa8bcd4ad0037e0a374bf353c15f43f4b64337142f3c2562b952b5e18aea70634c9b11d6b82af51546e
DIST tqdm-4.19.4.tar.gz 72037 BLAKE2B 5f2ed14b6f72f16e141dd47d30559e694398420de97b7bea67e6cc10b75288a3829f206fe4b8e7965a95cb93a7bd2d70a073c35a310b0e94eca68600d0cf67b1 SHA512 56d1f2cd8f7a56964611f0399c6f8f6c64740428e38ebde6778397340b57787a3409de2755269c1a26db38cd85ddf3c90636a36d742eb2b51d8736e5ad6c5989
-DIST tqdm-4.8.4.tar.gz 609527 BLAKE2B 3c7265f0c2f09c39a0e7d5061e8f1f12557b8e2e5b24fcbf6e8b32c596c23d04f4b940a69f35eb3ad358e232ec4a086876f605ee86bbdd487ea2714a4f53c811 SHA512 21a43e1cdfae5ce9c1db386043391c0d32f0d0ce7b3337054296cfffbbc68a57deef77efd597a0be6805023052e84724649cb29116fd8614a21a2f28440a5889
+DIST tqdm-4.19.8.tar.gz 73140 BLAKE2B 05147ed8458233808d30b8548b8b46fba0cd8ff117e085677418060a286e99ca5d6970e1dfd8e3206d1a95502f46afb27b528cc635ed98491f28668443184d86 SHA512 b375971384fba11ef8b73a504f1415795244324f2ba3e2fe9c5fdf4c367f070c0026e97bbb546c7bb20badd00a9755b910f3992fe4baf21365c162b7f3e48ecd
EBUILD tqdm-4.10.0.ebuild 473 BLAKE2B 3263d67ead8147dc81f1e5e9838eae6c91bf1ae472a9142e33d06003cc9c10b689adaf997030e98d7b5eaf1477a53bb03851501841db36182fa6d96ab3f46bb9 SHA512 dd28063384e54dabab2681afb79b5b2911c2cb4f5fa848b76c7593d9fa85127e519aeeb38cf6ab0828965a824c2b57dcaba71ca2f3b1517157e8609807776931
EBUILD tqdm-4.19.4.ebuild 584 BLAKE2B 347c41515e56264a67e4df85476a97af29b3ee17d66a4bb9ec3372388da3b6df27d34a7f53fc6aaecd2000be0404d5115c88831447552d6ce51ce00a271e4538 SHA512 5ed60db4cebe447ce5628f18d4acf2a904a356549f8d40c5dcc7fa9f12c5fa7e4d1a005dc307a223c7ad76fba444726fe4bcce82ee77ab2a2d812db5fd3fc265
-EBUILD tqdm-4.8.4.ebuild 471 BLAKE2B 9d8bb0e5691295114f8f23634bcef277ec3dc5a216337ba2554c403fd034051f8ad08a183012ebf7ea78a0156d8b014b9eca0557fb352b60ccab1726b06f7b79 SHA512 41af95e83c05d41cb0b67d07bc65215f38bbbda7008b817f807d27f3ecf66d21749810e9852ee6125af67d226a1a85cdaffc592b3f6b8b1ff6692d894115bec8
+EBUILD tqdm-4.19.8.ebuild 686 BLAKE2B 9aaf393ebf6bf3cf8e8d6a188baafe3e2a034e2e9dd35432ce30e8b4de422fd0c567f41c4be1e42e8f9a5f46d4115999e2a92d228c60d60aa27b4ba3a1ecda34 SHA512 175f820512f8172cad65aeb20dfa74fba42e3109f8177f38153dbd53574c927aae3a78a7d2e68fb5d8328c1bf598b4853419a9d2ab5d679a3c901a7ddbacbb21
EBUILD tqdm-9999.ebuild 447 BLAKE2B ba7909ad62a57de2b1ea70801480f3babf48d0f03baefc208c50b44c78ff0703ba13ff964a16eeb2ab6a60364caac20b65546ec144a7fcc5eb3edd5dd71fc729 SHA512 18b0dd43b0ccd13c8fe824a63ab84acfb902867dca4c0a26754e29bf8a22d4d9582b4172398e41c1975e9154422696d07414159d5bf06adafe124d4bbd9503cf
MISC metadata.xml 611 BLAKE2B 508436ed86075ea93acdfda799c34f6b05b38ed48c77e5673cbb11d1b424be1a0b98be584ecdf4544848ffd0061dcab39d24bb67d2d0ef631d295d8f91d02cd5 SHA512 62ef0673bcb397648689769eac6e735f5de8a3df69d41e63a04b2e9b79cef3fea64c2183ab9bc83827dd7d1e1f982b0decb17ebaee96bbf4928bd9a545fac29c
diff --git a/dev-python/tqdm/tqdm-4.19.8.ebuild b/dev-python/tqdm/tqdm-4.19.8.ebuild
new file mode 100644
index 000000000000..fd3e7a7aba04
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.19.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+SRC_URI="https://github.com/tqdm/tqdm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i -e "s#man/man1#share/man/man1#" setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_install_all() {
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/tqdm/tqdm-4.8.4.ebuild b/dev-python/tqdm/tqdm-4.8.4.ebuild
deleted file mode 100644
index 465b8244c8e4..000000000000
--- a/dev-python/tqdm/tqdm-4.8.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Add a progress meter to your loops in a second."
-HOMEPAGE="https://github.com/tqdm/tqdm"
-SRC_URI="https://github.com/tqdm/tqdm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
new file mode 100644
index 000000000000..42e5012cc411
--- /dev/null
+++ b/dev-python/twine/Manifest
@@ -0,0 +1,4 @@
+AUX twine-1.11.0-tests.patch 432 BLAKE2B f912ae6e51652c299d4b99f2db69f6daa309f0a04e89205fa207e6ed8073c84b212ac6c24a344850b5d11e9a55eb0e6924c0c3306517726c262df1c298114c2e SHA512 a997ca1f2d077a3a23374bc816cc4d6d295c8912a3a28fa6bc404891fe6699e88d98febcf8867e137906b4e5994ab73ea0899fd5045768f30f482d845b295f6d
+DIST twine-1.11.0.tar.gz 55301 BLAKE2B 88e88bc88a6dc8320064b3e296d85f1614d1ecf1628c8442737566ac58c3296b2292f147c0b39047a1d13a3ac98297fd7a77a0ba6fdb6ff04e59d16bc8ed463a SHA512 28e588f26b59bc9f4a8481caf2353934ad6927734762ffebb4416c147ec9e6dffb37092def20a76eb888c94b27f97e013dacc42c63e5dcda30f4290bb6c90a22
+EBUILD twine-1.11.0.ebuild 1167 BLAKE2B 85fdadb933fdae6ebe7901cf9346fa0d3c38f3cd294f54491457d59dcbee4f4c4a2a74deb18f9c12b6edce2f26b49fad9c9ce84dbfb1d6f1531b4c1874cf555c SHA512 37e54167c2f2e0343ca1ca7d54c243fa576eccdb8853788e8090107af09b229b783e79a5baba191c5d942056570517bfffc42c3b3ceb9bba2b20a242e0227626
+MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/files/twine-1.11.0-tests.patch b/dev-python/twine/files/twine-1.11.0-tests.patch
new file mode 100644
index 000000000000..386a4ebcf3ab
--- /dev/null
+++ b/dev-python/twine/files/twine-1.11.0-tests.patch
@@ -0,0 +1,18 @@
+Check for python2 support first, then python3. This should help avoid importing
+the wrong module for python2 where the builtins module can be provided by the
+futures package.
+
+--- twine-1.11.0/tests/test_utils.py
++++ twine-1.11.0/tests/test_utils.py
+@@ -19,9 +19,9 @@
+ import textwrap
+
+ try:
+- import builtins
+-except ImportError:
+ import __builtin__ as builtins
++except ImportError:
++ import builtins
+
+ import pytest
+
diff --git a/dev-python/twine/metadata.xml b/dev-python/twine/metadata.xml
new file mode 100644
index 000000000000..3b7872fa6a97
--- /dev/null
+++ b/dev-python/twine/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">twine</remote-id>
+ <remote-id type="github">pypa/twine</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild
new file mode 100644
index 000000000000..053b8a767636
--- /dev/null
+++ b/dev-python/twine/twine-1.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.python.org/pypi/twine"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarballs don't contain test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}
+ >=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+ >=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5})
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+python_test() {
+ py.test -v tests || die "tests fail with ${EPYTHON}"
+}