gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 82 deletions

diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index bf69ba73a66a..58703a2d5855 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,6 +1,3 @@
-AUX qrcode-5.1-unicode.patch 961 BLAKE2B f0fffaab08a6e20bf2897b4130f25b1639992a4184114f5ede1833cbbf7e8d9f7aa0fa9ae631d0af8d84ac4c372d96e4f0809fcba6168c2bd6d23a7c39e8baa2 SHA512 f75feb86c8796e73d7089fba8e0c464929452c4be24b2829fd231bd210d2152710529aa3e3266bb88453ee4f69fed2a1f6cdf337a8ff44a345f3f7d56c969af0
-DIST qrcode-5.1.tar.gz 22259 BLAKE2B 1aad710fbfdaa1c1be505038ceedbf02de8bcb2a37ead59265ff03af63b96d6cd740672cb2bd3a8f3b67eb981ed791cf2d53050c02d1499e6efcf1fcce2903c1 SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
-EBUILD qrcode-5.1-r1.ebuild 883 BLAKE2B d3cd3b7b5d3b17b5d924eed58efdc02b3e0e5fc95528227320c9cebbb56dd47501d481f0bca7baeb9edf609907eceaed070646d13b8680f0acd01121aa7a458d SHA512 33cec22fc791244054ad20237ada4831b83f772c09ae9312f616fe22e8eb1b1f9d68d0ece799e53ed7b50c59a5b068d8ee37eeb9d1c4db7fbf941e4d89f52ae5
-EBUILD qrcode-6.1.ebuild 703 BLAKE2B 9d824805372d92a02655cebeb2235576a921b21bebb3171737dc0ca086c254e60851b5d9a8a1784d5aaabbbf9944dad955bd4a0cab83b68af31fd36354872dbb SHA512 69d47ffc2517d23d8cfed8ef30fae7cb4c47c601f9adf8926f990846937b3039584091ba58c76029270fc8cbca041aa53c28d6572a38ec037a9c4b82de3e890c
+EBUILD qrcode-6.1.ebuild 684 BLAKE2B df5ae31fb32dad39f0ade5be0daebad87befe1b552b63a1864f376ae3dcf5d80cdaeb3afe2911bd9d13c71d4aeb7097d4bf7839f6d7181848ca60d9eada5bccc SHA512 48cb0f1a081062a256c9226e4c8c3801efc9374a53827355b651708593ceb71961c56278f215c539d117b2d81bc2156fee220df14d4d8e17b67694e323dc0156
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/files/qrcode-5.1-unicode.patch b/dev-python/qrcode/files/qrcode-5.1-unicode.patch
deleted file mode 100644
index 2d628c68e5a6..000000000000
--- a/dev-python/qrcode/files/qrcode-5.1-unicode.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0a9f17d3afb0ff01f68c2276ec0844d329a6add9 Mon Sep 17 00:00:00 2001
-From: Chris Beaven <smileychris@gmail.com>
-Date: Mon, 3 Nov 2014 10:56:14 -0600
-Subject: [PATCH] Fix script piping to stdout in Python 3
-
-Fixes #66
----
- qrcode/console_scripts.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/qrcode/console_scripts.py b/qrcode/console_scripts.py
-index d215993..c51463b 100755
---- a/qrcode/console_scripts.py
-+++ b/qrcode/console_scripts.py
-@@ -57,7 +57,18 @@ def main(args=sys.argv[1:]):
-         return
- 
-     img = qr.make_image(image_factory=image_factory)
--    img.save(sys.stdout)
-+
-+    sys.stdout.flush()
-+    if sys.version_info[0] >= 3:
-+        buff = sys.stdout.buffer
-+    else:
-+        if sys.platform == 'win32':
-+            import os
-+            import msvcrt
-+            msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
-+        buff = sys.stdout
-+
-+    img.save(buff)
- 
- 
- if __name__ == "__main__":
diff --git a/dev-python/qrcode/qrcode-5.1-r1.ebuild b/dev-python/qrcode/qrcode-5.1-r1.ebuild
deleted file mode 100644
index 2a2e7529533f..000000000000
--- a/dev-python/qrcode/qrcode-5.1-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=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="QR Code generator on top of PIL"
-HOMEPAGE="https://pypi.org/project/qrcode/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# optional deps:
-# - pillow and lxml for svg backend, set as hard deps
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unicode.patch
-)
-
-python_test() {
-	"${PYTHON}" -m unittest discover > /dev/tty | less || die "Testing failed with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/qr.1
-}
diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
index 6478dfae767c..ece12a005c11 100644
--- a/dev-python/qrcode/qrcode-6.1.ebuild
+++ b/dev-python/qrcode/qrcode-6.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # optional deps:
 # - pillow and lxml for svg backend, set as hard deps
@@ -21,8 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest