5 files changed, 18 insertions, 47 deletions
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 283444ccdb98..fe19908e7815 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,3 +1,2 @@
-DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
-DIST python-magic-0.4.19.gh.tar.gz 863519 BLAKE2B 2e777612d55256ba955e199fc6734f6e68b8cf996222820192cf9730b2c274b2f6be2d5fe58c92cce741047d77b79b0447c5961a056e1788d924d34cedba1d40 SHA512 1d78077fe02b4ab8c8aa1720064f2b5d19f304310ca88c1fada2dbafa5118820b6d7e3f031e3d7df5394ad480872d8bcd33489fec1ce2e6e0d9d84a7325040f1
 DIST python-magic-0.4.20.gh.tar.gz 863539 BLAKE2B 27f345b138068a44670456209b9f87e9715c475787bcfff396c711cb0f768ee83599b9e6ebbc4c0c73c6867c3653518938b51116d28e3d77a758a6d1b860c7b9 SHA512 3927958a6957177d1a6e8bcbbb3723f489018f9037b619bbf7478ab68ba2ddd52d9a0caf18e6a73671e8e5e1cb8a9efb957756ba9547a7dd66ab6ba293f37826
+DIST python-magic-0.4.22.gh.tar.gz 863567 BLAKE2B 6994869e4cc5ba5ff7ae1a6ac6117f5b1553a11079fb5faaa23b48ee241b2615e2514270f66c55b417b4051d6a5aedd7c289f139c23842979e4af0cdb7a34e3a SHA512 7f16c090a713be4ecc25727f0195bddfadfa9f54507899e35f48bd268ea1d78637ca024ecf02e331a8988a931e430f7346bb5f4b46e58ddc1ff03ec678640e6d
diff --git a/dev-python/python-magic/metadata.xml b/dev-python/python-magic/metadata.xml
index cbbc97a4c4c4..73aef413fa03 100644
--- a/dev-python/python-magic/metadata.xml
+++ b/dev-python/python-magic/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-    <name>Ian Whyman</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">python-magic</remote-id>
-    <remote-id type="github">ahupp/python-magic</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>thev00d00@gentoo.org</email>
+  <name>Ian Whyman</name>
+ </maintainer>
+ <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>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
deleted file mode 100644
index 7278b47f5221..000000000000
--- a/dev-python/python-magic/python-magic-0.4.18.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-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}"
-}
diff --git a/dev-python/python-magic/python-magic-0.4.20.ebuild b/dev-python/python-magic/python-magic-0.4.20.ebuild
index 023fc69a8768..a9839b485751 100644
--- a/dev-python/python-magic/python-magic-0.4.20.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-magic/python-magic-0.4.19.ebuild b/dev-python/python-magic/python-magic-0.4.22.ebuild
index 023fc69a8768..023fc69a8768 100644
--- a/dev-python/python-magic/python-magic-0.4.19.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.22.ebuild