gentoo resync : 15.01.2020

4 files changed, 7 insertions, 37 deletions

diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 0d30a183bd03..34fe482a162a 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,9 +1,7 @@
 AUX python-magic-0.4.15-fix-buffer-test.patch 2817 BLAKE2B d8eb024f3e2e3d5e5fa22f9375eb9ada1bdfbf0fecb9b501a2c2938dbfaebcdd0b853ce406536166444f3154618fbceade1940bab112433076e41edfb889a4a5 SHA512 72a9d171c7421f354c504e7a0066e7ba51feb404f28ea3dee26223d44f42ad9f41ad94c7854d81d9510df4967c8a0692664e1a5e8a1444e59fe92f137fbda35f
 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.10.tar.gz 3950 BLAKE2B f672b95082a68ff8fb2c4b50da0d22316456cda4b72b92d4244fdcd47c43bf599821a9577c76d99bc2a3ae578f4ff05aa76efcfcde684f27a06b90e28d58235e SHA512 8dadfd069bbca574a159dc034fca84fb110a3015ba54fa62c715006b586a5fd10373a5108a4847887bd86c6b7f2c4da90dfb7041cd5e4d51829ac1b94b8e1a03
 DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
-EBUILD python-magic-0.4.10.ebuild 603 BLAKE2B 679fd83141d603baa4de122f1ea1aefeffd5d4d16d0309a66d04fc1a70b35d8345dd6652dbd4ad73a03c6b81c80d51a55ce0f23ed3ed0d2cfcdbaf46ba7f5752 SHA512 b50c0bbd8009e048f3cee051db69146c8267654f771fb33c4f3976d42ca21ebe411b0496a189cf437ae2d4d8ff0c12f928d1915e7bac12d40d802c752a4d128d
-EBUILD python-magic-0.4.15-r1.ebuild 1066 BLAKE2B a444d7bc19546b113083207494b312e801a558235a9d22a4ebaee4529b089f76f1bb2aa1b9dbebc584a8ae8f3417366011800547aa2368fca0768679036bd969 SHA512 7122fc88e7333e219483b1738a2d8766adce672db706d86f2433e1433ba732dac1cf4f7dda5e0a2bd4440e1e89895865682c843b515f1882061b6b338920f121
-EBUILD python-magic-0.4.15.ebuild 624 BLAKE2B da59d210c28070e70455b3257a836c8a85c797cc5c0dd2968e6f927d68399f0f7a6b6bb1585f547ac75576e69f3b2ecd5b77f9bf073eb8ca7a71c2fda29c9633 SHA512 3031bdc1c70365bcfb784eae5e3059ebae3b63753be7532a4658fd5d27538deb6706ef2ad72d840943a355cd0613b2933ead4f86c7c7634306a21aa7ba5ee042
+EBUILD python-magic-0.4.15-r1.ebuild 1066 BLAKE2B b86b78ccc5d3c5239a4b9008ea203eceacfc8d0ce7f1209634ac036f8f113c06fd7de23d26287bb778168e103ea53c0e74839f37496aa26aaaa9b34df52ad625 SHA512 43102ccac2ddf39faca6cca218efc3d586ef8df84f0ac71575833d8498d3798b20a58cb09cc4c9879ee414fc7297f537bd1aa47262a6e0fda32d8adfddfae31c
+EBUILD python-magic-0.4.15.ebuild 620 BLAKE2B 14c8efa6b1daabd27660bfffe24ca5e6dd4b9c8e74e2ea7c4c07c85551510714912a369cdda75aea25b6208d5302fbf11d1ad578fdcb110beadd98bc344f6da1 SHA512 ab297382df0432ef7f4be3166e361211883c294ad8ff75d0bf2f49ec3aa03a0baf2904dded9e0f8b1078d4b46077ca2404640dca65c208a2b9a018cfeefaa3b2
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/python-magic-0.4.10.ebuild b/dev-python/python-magic/python-magic-0.4.10.ebuild
deleted file mode 100644
index e4a368ca597a..000000000000
--- a/dev-python/python-magic/python-magic-0.4.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/file[-python]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# https://github.com/ahupp/python-magic/issues/97
-RESTRICT="test"
-
-python_test() {
-	esetup.py test
-}
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 5bdd8c4f02e1..56dcadd63704 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-magic/python-magic-0.4.15.ebuild b/dev-python/python-magic/python-magic-0.4.15.ebuild
index 8cb0050942da..bda6697e8b72 100644
--- a/dev-python/python-magic/python-magic-0.4.15.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1