gentoo resync : 25.09.2021

4 files changed, 71 insertions, 2 deletions

diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index 70128e310378..7bcbd8151c0a 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,3 +1,6 @@
+AUX django-filter-21.1-test-skipIf.patch 1054 BLAKE2B 96b9c5bfd9cb5f530dab0ad8bb5b80507596a5ce28f694a1f84bc954ca9de596063bf9c88850e6c5db2758b362463de0f9ae451d34023918d313617fdf2b2715 SHA512 bb0d05b7ee78ef8e4b95f51ceddde7bb3068688bb4fc6805f73787c6a23b38c4230fef5cbf591738b6069eb897840d791b6f414b1a74ad21f776226ef2bfda38
 DIST django-filter-2.4.0.tar.gz 146904 BLAKE2B 994b07c0f5e511451964f4f1e007ff9906975600d0bc8a02dcbeb86f91bf906490ca394ca95c23c57c1fff25a447f50a40054c0abfe385300f9db87645753978 SHA512 0584222b46add89aa7dd1dfd334fdd19903e0119d455a2c46644c501a66df224f9f51c33394d130bcd1fc0f28c6ede6d6853b9790430040ec7228f9a1dc55264
+DIST django-filter-21.1.tar.gz 154188 BLAKE2B f0ae3119a1dfa466e6630f7da44db1531172991b137fe9420ed533a7b3d4177f689f07fed115566854bd40e5e23f4e9f2f73be32188af2c067a81a95fbccc5a3 SHA512 df2b02bfa93874d9684a26394778203b827c6459ab8cc8c581677e6ccfeedf1323085f53fb52cfc3e0e0a3d27f86de655366bcd4be361502ce86e65b4a4e84d0
 EBUILD django-filter-2.4.0.ebuild 534 BLAKE2B b1f3032964c78d6722f05f711b62ad10a1a871c1e46f3e6ccaa7caf697a11661a60b7832f3b04737a4cf1c424a0b68ebc8b71408c9c518d3eb26ee09f8e59e48 SHA512 32160f83365c53b49991335dfbb4420f943f849354832e38ab914d25434b72cd46beac326aafbea6cab995ac1a7ff530bc07fb6501e6d0e063eaeb7e92d85010
-MISC metadata.xml 244 BLAKE2B 07fb8b3f9b519727bab4c5273673efc0d495dc6170f7c778b6b1fc3c3ac472427f387f458df46138eab4091a8d47dd0cab6c7e0d9a113a50837a5bc140db2b52 SHA512 71fc78414133f82f9b0dcd53c97a0ca3840c01c726b027e317512c71d0480fce9c52a16a16f84c1bca674f96b25abbabdba0799da2a27fcc7cdfd164da553f5f
+EBUILD django-filter-21.1-r2.ebuild 817 BLAKE2B d08cb66a3af23d3e6aa72e541b80e453fb47ab7021e13d86b9f345239508968593e69c0cfe05572e035e61e96db2a3263d62dc85fc902f6e26cca26bb50b4d75 SHA512 63f33f5b37eea71c4add1d596b325a6a999e0b14bd8ed7bc7ff23e97859c0a35b9af90b7051435e726a680c0391496312443e049880884039b04ccbf18218ef7
+MISC metadata.xml 384 BLAKE2B d1de931c4e164f99bc55c099b97a44887f5907fa487bb165d5c386458ecca7f18a13803e7be0180cddbc17195c5d5fe3219524f49b30e6c81303d221d6f764b9 SHA512 c316163f5ef1a02754589764a5a585fefc60b9921775d56a558ffcc87896071764d55c6c5cb4dd436eee17b0fee87330a4cca38884cca76521f8098e9fe2e60b
diff --git a/dev-python/django-filter/django-filter-21.1-r2.ebuild b/dev-python/django-filter/django-filter-21.1-r2.ebuild
new file mode 100644
index 000000000000..23b5fd509266
--- /dev/null
+++ b/dev-python/django-filter/django-filter-21.1-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
+HOMEPAGE="https://github.com/carltongibson/django-filter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/coreapi[${PYTHON_USEDEP}]
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-skipIf.patch
+)
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	django-admin test -v 2 || die
+}
diff --git a/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch b/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch
new file mode 100644
index 000000000000..adaf8ba428d1
--- /dev/null
+++ b/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch
@@ -0,0 +1,27 @@
+From db97686a9950cc1a372d27dfbb90b19ceece3f65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 24 Sep 2021 21:22:41 +0200
+Subject: [PATCH] Fix inverted skipIf for CrispyFormsCompatTests tests
+
+The test is being wrongly skipped when crispy_forms are installed
+rather than the other way around.
+---
+ tests/rest_framework/test_filterset.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/rest_framework/test_filterset.py b/tests/rest_framework/test_filterset.py
+index f8b5aae..b6a658d 100644
+--- a/tests/rest_framework/test_filterset.py
++++ b/tests/rest_framework/test_filterset.py
+@@ -38,7 +38,7 @@ class FilterSetFilterForFieldTests(TestCase):
+         self.assertEqual(result.extra['widget'], BooleanWidget)
+ 
+ 
+-@skipIf(is_crispy(), 'django_crispy_forms must be installed')
++@skipIf(not is_crispy(), 'django_crispy_forms must be installed')
+ @override_settings(INSTALLED_APPS=settings.INSTALLED_APPS + ('crispy_forms', ))
+ class CrispyFormsCompatTests(TestCase):
+ 
+-- 
+2.33.0
+
diff --git a/dev-python/django-filter/metadata.xml b/dev-python/django-filter/metadata.xml
index 7b48ab146c6f..ee17f6d46218 100644
--- a/dev-python/django-filter/metadata.xml
+++ b/dev-python/django-filter/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-filter</remote-id>
+		<remote-id type="github">carltongibson/django-filter</remote-id>
 	</upstream>
 </pkgmetadata>