sys-apps/pkgcore: Backport metadata.xsd update

Signed-off-by: Michał Górny <mgorny@gentoo.org>

7 files changed, 64 insertions, 3 deletions

diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch
new file mode 100644
index 000000000000..84aaf93f73db
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch
@@ -0,0 +1,40 @@
+From cc7be6516d25cfa27b25b5c0ced6b8a8514d46e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Mar 2021 21:19:46 +0100
+Subject: [PATCH] data: Sync metadata.xsd for proxied="" attr
+
+---
+ data/xml-schema/metadata.xsd | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd
+index db243abb..d2e3d4ff 100644
+--- a/data/xml-schema/metadata.xsd
++++ b/data/xml-schema/metadata.xsd
+@@ -127,6 +127,8 @@
+ 		</xs:choice>
+ 		<xs:attribute name='type' type='maintainerTypeAttrType'
+ 			use='required'/>
++		<xs:attribute name='proxied' type='maintainerProxiedAttrType'
++			default='no'/>
+ 		<xs:attribute name='restrict' type='restrictAttrType'
+ 			default=''/>
+ 	</xs:complexType>
+@@ -138,6 +140,14 @@
+ 		</xs:restriction>
+ 	</xs:simpleType>
+ 
++	<xs:simpleType name='maintainerProxiedAttrType'>
++		<xs:restriction base='xs:token'>
++			<xs:enumeration value='yes'/>
++			<xs:enumeration value='no'/>
++			<xs:enumeration value='proxy'/>
++		</xs:restriction>
++	</xs:simpleType>
++
+ 	<xs:complexType name='upstreamMaintainerType'>
+ 		<xs:all>
+ 			<xs:element name='email' type='emailType'
+-- 
+2.30.2
+
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r2.ebuild
index 794dab08f1bf..ae71f17fba64 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-metadata-xsd.patch"
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
 )
 
 python_test() {
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14-r2.ebuild
index 259e6675cd17..1b83ff68afb3 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.14-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 python_test() {
 	esetup.py test
 }
diff --git a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.2-r1.ebuild
index 42c6a3cacd81..7858e1db8e95 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.2-r1.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
 python_install_all() {
diff --git a/sys-apps/pkgcore/pkgcore-0.11.3.ebuild b/sys-apps/pkgcore/pkgcore-0.11.3-r1.ebuild
index 0bed083a982f..77bcb3f7c746 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.3.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.3-r1.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
 python_install_all() {
diff --git a/sys-apps/pkgcore/pkgcore-0.11.4.ebuild b/sys-apps/pkgcore/pkgcore-0.11.4-r1.ebuild
index d98868c1bf84..ac8e37a7a3f7 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.4.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.4-r1.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
 src_test() {
diff --git a/sys-apps/pkgcore/pkgcore-0.11.5.ebuild b/sys-apps/pkgcore/pkgcore-0.11.5-r1.ebuild
index d98868c1bf84..ac8e37a7a3f7 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.5.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.5-r1.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
 src_test() {