gentoo resync : 03.03.2021

5 files changed, 84 insertions, 8 deletions

diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index 5e37d53d4d3e..c33639e39d7d 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -1,4 +1,6 @@
+AUX pdfrw-fix-import-collections-warning.patch 1450 BLAKE2B 143b5365d1d79cae346ed7c383a3d961bbf370422540c3e051e0e9ceb4c5e44a3fe7ee949f5f4254ae295ba3aa34987ec5f2f30b50918880aa9b272b2728af53 SHA512 dece6967a707e81520a5dfd58e77b0b1a5fccc2f38e20f09be5ca2a209d0472fc7f0c79b47ff2fea2252a62126c76bda508f8bc4088dbec62a57ea1e95bd21ca
+AUX pdfrw-static-fix-import-collections-warning.patch 527 BLAKE2B e7ccd07d60e5afd7c98b81c1f6209ef539a6b0bed3ae4a96e6179d86bd73bdb6e4f673242730aea2e3535fd2a35b560f2d2bd8a84d0599f52e0525b7310088f6 SHA512 6d626d216c3201145825faf7d042b516a18bbeb570b098c46abccdfe85fe5613d166c8256a6b240a35aeb527a4c2b555fe2059a0fcbc0310ce9432ee26cdd11c
 DIST pdfrw-0.4-1.tar.gz 143615 BLAKE2B 281dc94c762dcc776e2c9c84609b59ca32387510bcfbec39271a6073533f9ad5d416cf4250b3dcd8564973d197ce090719c5561f58b972c89d463b90723ac8e6 SHA512 f2ef6a966cb1b947425679e6c16e658b5d1dbc13d62fb2e1edc278508b03f6c6847b3c83dab8bcd7df3438e587df066bc16b653461ae402bb8688ddb05f4e886
 DIST pdfrw-static_pdfs-d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz 25243391 BLAKE2B 5c491d56c9731352907787bbe10b8b3ac362f0c7892ddcd15a1299d3b2b4bb604662f6231aa22478290992a345e769af2e2c2459a25a16c370ea05fa68101f80 SHA512 9bf1d5ddc8f55b40b50041e745579406bb0036fb7795ac40064aad7cdf592869051ba84a5ab080042e237690bb2f1811b86b2a4424535aa4c367f6e29a0c34eb
-EBUILD pdfrw-0.4_p1.ebuild 1600 BLAKE2B 35cc2d51d2a6699ff4525159312c335d5049c70eb5755edd40b0d994df4482e2fba794b42b71db2fb8804ca0742db2d87368a01fbed3f3f72f1a43efe6b1aa27 SHA512 b1c697810aa14830b468ffe5c3840cd3df0309f88db73172d3fb352bde967e520c7492e6f8252efa8e0e6091eb7d6692e19eedae7f5e5ce3980a734321ad6ea7
-MISC metadata.xml 385 BLAKE2B b0005d90a18dd6fc946a8d578b876cc0b18d3f8ccd5208bc99c9e514d5a13e5e8991bdaebe5983edafa18c5e8388da6db54f2669d9e1aa6b9205ac7280b38992 SHA512 92a6a0b16cea383eb074ec90baacdd17daffd2644f8a2574db3d1843e06b9ca5fbd6bfd8d2ff6452c2b10519f0ae6967df4dbf9a5d0265b5ad951166b7a6d226
+EBUILD pdfrw-0.4_p1.ebuild 1598 BLAKE2B 9b86fe593207fc8bcd7344945b30e50f3a78111c7f22582a887d28a554ca06e7b61ac26096690f9b7cc6c6549aee3b45e0ec5c805d3d008df181053cf75e1a50 SHA512 c17afb9e835abf2b241809771c63eab2a03efcd79d890b787de95d0d2d9b07d5acff1cb565c9b30a4c47799071690f84a2f677027d4f962ba17f8f50fc87fe7a
+MISC metadata.xml 391 BLAKE2B a926eab8ff8ea510f4c418fa13b3adc8ce9a3498eaf16880a2a2ed944312b6eaf162809236f5499dec6ab310ace105c9ca8ee13c046ca030f5013545f4af20e1 SHA512 c0518288da1389feb27e291b69254fe7fce0f4b6f28eb75fbeedaa343900d0808171ab4018a275b6e1aad3c48c9fa4b1056e8bec80a02a7b02cd4879d82bcb97
diff --git a/dev-python/pdfrw/files/pdfrw-fix-import-collections-warning.patch b/dev-python/pdfrw/files/pdfrw-fix-import-collections-warning.patch
new file mode 100644
index 000000000000..fe5971264d86
--- /dev/null
+++ b/dev-python/pdfrw/files/pdfrw-fix-import-collections-warning.patch
@@ -0,0 +1,48 @@
+diff --git a/pdfrw/pdfreader.py b/pdfrw/pdfreader.py
+index 2c9c3a2..feb025b 100644
+--- a/pdfrw/pdfreader.py
++++ b/pdfrw/pdfreader.py
+@@ -12,9 +12,10 @@ of the object.
+ '''
+ import gc
+ import binascii
+-import collections
+ import itertools
+ 
++from collections import defaultdict
++
+ from .errors import PdfParseError, log
+ from .tokens import PdfTokens
+ from .objects import PdfDict, PdfArray, PdfName, PdfObject, PdfIndirect
+@@ -340,7 +341,7 @@ class PdfReader(PdfDict):
+ 
+     def parse_xref_stream(self, source, int=int, range=range,
+                           enumerate=enumerate, islice=itertools.islice,
+-                          defaultdict=collections.defaultdict,
++                          defaultdict=defaultdict,
+                           hexlify=binascii.hexlify):
+         ''' Parse (one of) the cross-reference file section(s)
+         '''
+diff --git a/tests/expected.py b/tests/expected.py
+index d153fc3..62c29aa 100644
+--- a/tests/expected.py
++++ b/tests/expected.py
+@@ -12,8 +12,8 @@
+ '''
+ 
+ import os
+-import collections
+ from pdfrw.py23_diffs import convert_load
++from collections import defaultdict
+ 
+ root_dir = os.path.dirname(__file__)
+ result_dir = 'tmp_results'
+@@ -28,7 +28,7 @@ for sourcef in ('mytests.txt', 'expected.txt'):
+ 
+ 
+ def results():
+-    results = collections.defaultdict(set)
++    results = defaultdict(set)
+     with open(expectedf, 'rb') as f:
+         for line in f:
+             line = convert_load(line)
diff --git a/dev-python/pdfrw/files/pdfrw-static-fix-import-collections-warning.patch b/dev-python/pdfrw/files/pdfrw-static-fix-import-collections-warning.patch
new file mode 100644
index 000000000000..95d20358a4b6
--- /dev/null
+++ b/dev-python/pdfrw/files/pdfrw-static-fix-import-collections-warning.patch
@@ -0,0 +1,26 @@
+diff --git a/__main__.py b/__main__.py
+index 55c6e3a..fa9dd47 100644
+--- a/tests/static_pdfs/__main__.py
++++ b/tests/static_pdfs/__main__.py
+@@ -14,10 +14,11 @@ Part of github.com/pmaupin/static_pdfs.
+ 
+ import sys
+ import os
+-import collections
+ import hashlib
+ import static_pdfs
+ 
++from collections import defaultdict
++
+ params = sys.argv[1:]
+ 
+ destroy = params == ['destroy']
+@@ -35,7 +36,7 @@ md5.
+ ''')
+ 
+ 
+-found = collections.defaultdict(list)
++found = defaultdict(list)
+ 
+ sys.stdout.write('\n\nReading PDFs:\n\n')
+ 
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
index fe2a825dbce0..d9e05d70094d 100644
--- a/dev-python/pdfrw/metadata.xml
+++ b/dev-python/pdfrw/metadata.xml
@@ -1,9 +1,9 @@
 <?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 type="person">
+		<email>nerdboy@gentoo.org</email>
+		<name>Steve Arnold</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
index 701e68557c1d..43e32b1d00f4 100644
--- a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..8} )
 
 inherit distutils-r1
 
 PDFS_COMMIT=d646009a0e3e71daf13a52ab1029e2230920ebf4
 DESCRIPTION="PDF file reader/writer library"
-HOMEPAGE="https://github.com/pmaupin/pdfrw"
+HOMEPAGE="https://github.com/sarnold/pdfrw"
 
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/sarnold/hexdump.git"
+	EGIT_REPO_URI="https://github.com/sarnold/pdfrw.git"
 	EGIT_BRANCH="main"
 	inherit git-r3
 else