gentoo Easter resync : 12.04.2020

4 files changed, 31 insertions, 28 deletions

diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 0ea5a9d3f6f6..5e642714d71d 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,7 +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-2.patch 1060 BLAKE2B 8cf89892d316d8f9da9a0c1cc6e1699c98c9d6090d528cc724cd0e6f79534ea544af8cef62f6f8de9158ff2ba6d298fbb5998768e9cc59a22d891ce1604262ae SHA512 3928569010650ff53c84accbad94db55d79c89af1aee94c31dfaf2dff4d01952779fad8c704d6324222115ec8dc02e07e1934a7db0b2c8ee9366f64409123f3c
 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 1067 BLAKE2B cb48ffa9a345986798c368c955d5e667bca3cd5efc0e88a0ee792507c3fbafa9700a2e8b180a30ec63ee86a93e425b08c571c0443b07ac54c910dc639cf92bea SHA512 920fc9e0aab54f6e39043da8257684a79cea5408fd647ea2064c70707c790df8f7815c7d0dfd670af52b24b69313e33618cd483ad2b30fbec4e1af5d0a4fd809
-EBUILD python-magic-0.4.15.ebuild 620 BLAKE2B 14c8efa6b1daabd27660bfffe24ca5e6dd4b9c8e74e2ea7c4c07c85551510714912a369cdda75aea25b6208d5302fbf11d1ad578fdcb110beadd98bc344f6da1 SHA512 ab297382df0432ef7f4be3166e361211883c294ad8ff75d0bf2f49ec3aa03a0baf2904dded9e0f8b1078d4b46077ca2404640dca65c208a2b9a018cfeefaa3b2
+EBUILD python-magic-0.4.15-r1.ebuild 1216 BLAKE2B 591e01d75f081130e7d47aae2e8ab79908840c4e692f28ef6a0e6497394afd51e19497a48edc68f045f31c9286b0a10cd2ba8adc01ff80a5eca69c287e8f29f2 SHA512 4254715a02f154b2ef5dd36a5f321d233ff77380dc7f3adb5b7abbd569e2eb9603e285072d3a8f5efd16707f1ca4ffbc0e1874326867f242ac8f89cbbea39be9
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch
new file mode 100644
index 000000000000..4dd362ebb610
--- /dev/null
+++ b/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch
@@ -0,0 +1,26 @@
+From 18c909c4c98463d8292a7d1733aec007f178f1e5 Mon Sep 17 00:00:00 2001
+From: Adam Hupp <adam@hupp.org>
+Date: Sat, 11 Jan 2020 21:57:24 -0800
+Subject: [PATCH] Hopefully fix #105
+
+---
+ test/test.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index 62e8a03..c15227d 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -78,7 +78,11 @@ def test_descriptions(self):
+                  'gzip compressed data, was "test", last modified'
+                  ': Sun Jun 29 01:32:52 2008, from Unix',
+                  'gzip compressed data, was "test", last modified'
+-                 ': Sun Jun 29 01:32:52 2008, from Unix, original size 15'),
++                 ': Sun Jun 29 01:32:52 2008, from Unix, original size 15',
++                 'gzip compressed data, was "test", '
++                 'last modified: Sun Jun 29 01:32:52 2008, '
++                 'from Unix, original size modulo 2^32 15'
++                ),
+                 'text.txt': 'ASCII text',
+             }, buf_equals_file=False)
+         finally:
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 8f25dcdad7e6..0f6fcb3f12ad 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
@@ -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 arm hppa ia64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -31,6 +31,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-gzip-test.patch"
 	# https://github.com/ahupp/python-magic/commit/4bda684f8b461cc1f69593799efcf6afe8397756
 	"${FILESDIR}/${P}-fix-jpeg-test.patch"
+	# https://github.com/ahupp/python-magic/commit/18c909c4c98463d8292a7d1733aec007f178f1e5
+	"${FILESDIR}/${P}-fix-gzip-test-2.patch"
 )
 
 python_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
deleted file mode 100644
index bda6697e8b72..000000000000
--- a/dev-python/python-magic/python-magic-0.4.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/file[-python]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}