gentoo resync : 30.05.2020

4 files changed, 39 insertions, 6 deletions

diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index bd26cf29cc47..4d319934b565 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -3,5 +3,7 @@ AUX python-magic-0.4.15-fix-gzip-test-2.patch 1060 BLAKE2B 8cf89892d316d8f9da9a0
 AUX python-magic-0.4.15-fix-gzip-test.patch 768 BLAKE2B f97629ea04b4b9ba191087fd1eb3dbb0ed10deb81428754a6edfbd48ac48e0b8ae208b7e9c16e31876d050c9935eaf48165cd97ed58eb5cb72949d0fa221a32c SHA512 790c87209c131c4e394f605669297262b91ca6034309d910902dc19e28691102df0b66cb2392fc8c21727bb16c8af9baf6a316c0b6ca29c9ba542fdb49580e2b
 AUX python-magic-0.4.15-fix-jpeg-test.patch 1768 BLAKE2B 64899d227643a8a09d27e0f7cc5c80ac366cd8e0d70d4ccc076df51794cf0fac14dd1f6e4f5426fe84600bbfdf35fc8e1ea571bab7839f753720fceb575d4658 SHA512 5e31ae71c01334af8e781b2aaeb98da38a68a7772d39e5eb7b231623cb4ac66652a66888a3eae5d35b07cac3024944176a52c4ebf1336b976d68f9c558cbdef5
 DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
-EBUILD python-magic-0.4.15-r1.ebuild 1218 BLAKE2B 5fa719dcaf768abbea0e02a569bb109a8e364128d398bb1c0edf43a8acdabd8e32f4ca210d6c8c0203c61217afdfc9719dbc64eb4491becc50d330cd41955cdf SHA512 e3e488196034e9960ab00dc87192e0bafa8424d0315ac03e6672b67b9306a0b722a4c78a23253dab36127632dd3478ca20447ef7e1f1ac0a58efc3d7d5afa870
-MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
+DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
+EBUILD python-magic-0.4.15-r1.ebuild 1179 BLAKE2B 401a4db2a9d6aefb67229c51e53da0aa9fc36ab99159c8579cdda0429b4666e880307b532eb2405c4e2b30dfe4451d600b20684f20b73b162c7833eb7e5d455d SHA512 8eed0841af63fd4290a9d391cbcb10bc4b112e89f5c4c5a24ad5c5854447c850fc7fc1e689733f3068b62dc361eed6ef0f57126441d434034c32074ec664f166
+EBUILD python-magic-0.4.18.ebuild 760 BLAKE2B d9fe02ef4c6f110cbe8bd930d5499ecd60a7a95895e70616cc8cc2416ef591398be2d95024e045bf3405f355b9c6fd3e04a888972dc622fe69f1e46ddedf97c5 SHA512 d5e76e1fdf28041a5d068321e21f0d58025286d8e9bad43210a9dd71e256e743614a09857d42d79415fe5e9293e3a806ae79fcd25b373105a3aa32d5ffabc23c
+MISC metadata.xml 498 BLAKE2B 74961e260f07110e36c46b4ecba047d325fa74c5b7d45376976720cbe378d8fdac68be1075b3027dfe0b80c8b60445e2449c9d437a2e04c7e5eaadedc9ce0d6b SHA512 1e4c6799db1664066d98cce7fdc47f0397e8dd42acaa479e0610fd4273c15c5314a47289aae2a31f7157207d019069b1b322592a1825b516a66461fcefd23429
diff --git a/dev-python/python-magic/metadata.xml b/dev-python/python-magic/metadata.xml
index fb7c68fe033c..dd6d746af2f6 100644
--- a/dev-python/python-magic/metadata.xml
+++ b/dev-python/python-magic/metadata.xml
@@ -5,7 +5,10 @@
     <email>thev00d00@gentoo.org</email>
     <name>Ian Whyman</name>
   </maintainer>
-  <longdescription>Python interface to the libmagic file type identification library.</longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">python-magic</remote-id>
     <remote-id type="github">ahupp/python-magic</remote-id>
diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index f5239ed659cc..47ed926109ab 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
 
 inherit distutils-r1
 
@@ -20,8 +20,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="sys-apps/file[-python]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
+	test? ( sys-apps/file )
 "
 
 PATCHES=(
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
new file mode 100644
index 000000000000..681cb207e6ef
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="https://github.com/ahupp/python-magic"
+# https://github.com/ahupp/python-magic/pull/178
+SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/file[-python]"
+BDEPEND="
+	test? ( sys-apps/file )
+"
+
+python_test() {
+	local -x LC_ALL=en_US.UTF-8
+	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
+}