gentoo resync : 08.10.2021

3 files changed, 75 insertions, 8 deletions

diff --git a/dev-python/django-js-asset/Manifest b/dev-python/django-js-asset/Manifest
index 4ef11ac33134..c03fc9d52817 100644
--- a/dev-python/django-js-asset/Manifest
+++ b/dev-python/django-js-asset/Manifest
@@ -1,3 +1,4 @@
-DIST django-js-asset-1.2.2.tar.gz 4436 BLAKE2B e6b2ff1b2b90da5ae95af08b28eb1970e6e0edffee7eeec0a4697855040c4afd0febcc569d0a78c46bca80835b404367c426019016e5089b3aed984916e13cc2 SHA512 ea050c5093abd8312733b1402e275fcb44f0702c27e28aeb64d0470a8514cd85906707915556a9878b669c96918813c4bf2b69d281d33f18fcc7c143f8ae9f48
-EBUILD django-js-asset-1.2.2.ebuild 574 BLAKE2B 20caa6c28ddd1585684114b97bda885e6e1d9c45dec7e3db717586a30814480e465cdfdf48227641a27bfd2af401dcdd360276007aa15b2e58283e55263a92cc SHA512 7c8bbf158be812136a9f1d501f8ede95afeefaf21b5566dabc16393e3faa5f01417d0fa7ec3e85d3981ee61289168c0889a3734c851e092f1e5a175ee50b8a9d
+AUX django-js-asset-1.2.2-fix-django3.patch 1881 BLAKE2B 74ce319a395f14dbd4e3f84b8e460ebb73df733f2070b1d805014930e6030a947d77d1bc1c66b8c206c5dfaf58358ff754491ccb6a58588b9e8a52c6aa0cdad0 SHA512 a18ca46e27ddb31c836c4b7c6e1d7d449622278da0c585d2ea8a0a4d1178c5a571c1bf7ba7dc8803d291e9bf0085a22223a553d1d219bf7539288401d1c128ea
+DIST django-js-asset-1.2.2.gh.tar.gz 6367 BLAKE2B 5b24d3a2cf1ca2b28b82e581541dcb58aa2bf25d99f865007730c00211452dc5a062dc014b47fd1d10020d2a0b8f74060910460dec4f95be2b83c5c6d7bfb4d2 SHA512 ad2c51399da9b5d75305c0fa257cc75496df3f6704a827a0d297a4d762712039c3ebd921afbe6e10672626f1badd8637728292dd700ba41c4192c95ec73095a9
+EBUILD django-js-asset-1.2.2.ebuild 733 BLAKE2B 4228642154df38d83116b614399b8f726b2604f9ca8f6d99beb392a13fba771e2c796a31b6a847b410e2c15a299c129c67180181015a4b73af6bac7d7a0a9f3c SHA512 17d26ede102924fec2ea9ca1bcbfdf25983bf2d7003ad11ee0c8b2e1f3f544e36a73440a8ccb1d0a95c6b208cac7e34102985180d993149ec4745f0c8041dda1
 MISC metadata.xml 246 BLAKE2B bbeaabf225f3b131a4c28d6f20d9ff944642645041d0f9a257ef05e2f1865b1c76c465b7769b7142285d25b77107999d719d73f75db841eb92b92b39d5f7a1c9 SHA512 abb5f9c6ef30b9cc55e01db0aa0093ff146eae298d3b9348226d9835b39e040b6096bc2ac7fa8ae74c55fa94e83f706ae3d2b3b755ed31c8222eb29748c0a8ac
diff --git a/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild b/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
index 16175edec804..5704b6a31f05 100644
--- a/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
+++ b/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
@@ -3,20 +3,31 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="script tag with additional attributes for django.forms.Media"
 HOMEPAGE="https://github.com/matthiask/django-js-asset"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/matthiask/django-js-asset/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/django-1.17[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( ${RDEPEND} )"
 
-distutils_enable_tests setup.py
+PATCHES=(
+	"${FILESDIR}/${P}-fix-django3.patch"
+)
+
+python_test() {
+	cd tests || die
+	local -x DJANGO_SETTINGS_MODULE=testapp.settings
+	django-admin test -v 2 || die
+}
diff --git a/dev-python/django-js-asset/files/django-js-asset-1.2.2-fix-django3.patch b/dev-python/django-js-asset/files/django-js-asset-1.2.2-fix-django3.patch
new file mode 100644
index 000000000000..4ab0484b17e0
--- /dev/null
+++ b/dev-python/django-js-asset/files/django-js-asset-1.2.2-fix-django3.patch
@@ -0,0 +1,55 @@
+From 232536ba50a2e1a0cffc6046dbcdfdec22cb0d9e Mon Sep 17 00:00:00 2001
+From: Matthias Kestenholz <mk@feinheit.ch>
+Date: Fri, 15 May 2020 08:51:33 +0200
+Subject: [PATCH] Adapt the test suite to changes in Django
+
+--- a/tests/testapp/test_js_asset.py
++++ b/tests/testapp/test_js_asset.py
+@@ -1,11 +1,15 @@
+ from __future__ import unicode_literals
+ 
++import django
+ from django.forms import Media
+ from django.test import TestCase
+ 
+ from js_asset.js import JS
+ 
+ 
++JS_TYPE = ' type="text/javascript"' if django.VERSION < (3, 1) else ""
++
++
+ class AssetTest(TestCase):
+     def test_asset(self):
+         media = Media(
+@@ -25,15 +29,17 @@ def test_asset(self):
+             html,
+         )
+         self.assertInHTML(
+-            '<script type="text/javascript" src="/static/app/test.js"></script>',  # noqa
++            '<script{} src="/static/app/test.js"></script>'.format(JS_TYPE),  # noqa
+             html,
+         )
+         self.assertInHTML(
+-            '<script type="text/javascript" src="/static/app/asset.js" data-the-answer="42" id="asset-script"></script>',  # noqa
++            '<script{} src="/static/app/asset.js" data-the-answer="42" id="asset-script"></script>'.format(  # noqa
++                JS_TYPE
++            ),
+             html,
+         )
+         self.assertInHTML(
+-            '<script type="text/javascript" src="/static/app/asset-without.js"></script>',  # noqa
++            '<script{} src="/static/app/asset-without.js"></script>'.format(JS_TYPE),
+             html,
+         )
+ 
+@@ -42,7 +48,9 @@ def test_absolute(self):
+         html = "%s" % media
+ 
+         self.assertInHTML(
+-            '<script type="text/javascript" src="https://cdn.example.org/script.js"></script>',  # noqa
++            '<script{} src="https://cdn.example.org/script.js"></script>'.format(
++                JS_TYPE
++            ),
+             html,
+         )
+