From d5bd16cdfdca335d508fc70f74c71c5e7c39a5ee Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Mon, 20 Apr 2020 08:59:02 +0200
Subject: [PATCH 1/3] python-Django: update to 1.11.29

python2 support is dropped after 2.0
---
 srcpkgs/python-Django/template | 25 ++++++-------------------
 srcpkgs/python-Django/update   |  2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template
index 65a98e41032..c9560b379ac 100644
--- a/srcpkgs/python-Django/template
+++ b/srcpkgs/python-Django/template
@@ -1,35 +1,22 @@
 # Template file for 'python-Django'
 pkgname=python-Django
-version=1.11.25
-revision=2
+version=1.11.29
+revision=1
 archs=noarch
 wrksrc="Django-${version}"
-build_style=python-module
-pycompile_module="django"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-pytz python-setuptools"
 short_desc="High-level Python2 Web framework"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="BSD-3-Clause"
 homepage="https://www.djangoproject.com/"
 distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
-checksum=5314e8586285d532b7aa5c6d763b0248d9a977a37efec86d30f0212b82e8ef66
+checksum=4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c
 alternatives="django:django-admin:/usr/bin/django-admin2"
 
 post_install() {
 	vlicense LICENSE
 	rm -f ${DESTDIR}/usr/bin/django-admin.py*
-}
-
-python3-Django_package() {
-	archs=noarch
-	pycompile_module="django"
-	depends="python3-setuptools python3-pytz"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="django:django-admin:/usr/bin/django-admin3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
+	mv ${DESTDIR}/usr/bin/django-admin{,2}
 }
diff --git a/srcpkgs/python-Django/update b/srcpkgs/python-Django/update
index 25ef51d109a..ce4668c41ee 100644
--- a/srcpkgs/python-Django/update
+++ b/srcpkgs/python-Django/update
@@ -1 +1 @@
-ignore="*a* *b* *rc*"
+ignore="*a* *b* *rc* [2-9]*"

From 12b3071c57c455a2824f4c69acdfa962debb91ce Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Mon, 20 Apr 2020 08:59:28 +0200
Subject: [PATCH 2/3] python3-Django: update to 2.2.12

---
 srcpkgs/python3-Django          |  1 -
 srcpkgs/python3-Django/template | 22 ++++++++++++++++++++++
 srcpkgs/python3-Django/update   |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/python3-Django
 create mode 100644 srcpkgs/python3-Django/template
 create mode 100644 srcpkgs/python3-Django/update

diff --git a/srcpkgs/python3-Django b/srcpkgs/python3-Django
deleted file mode 120000
index 982476f995b..00000000000
--- a/srcpkgs/python3-Django
+++ /dev/null
@@ -1 +0,0 @@
-python-Django
\ No newline at end of file
diff --git a/srcpkgs/python3-Django/template b/srcpkgs/python3-Django/template
new file mode 100644
index 00000000000..5babef1aff7
--- /dev/null
+++ b/srcpkgs/python3-Django/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-Django'
+pkgname=python3-Django
+version=2.2.12
+revision=1
+archs=noarch
+wrksrc="Django-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytz python3-setuptools"
+short_desc="High-level Python3 Web framework"
+maintainer="Eivind Uggedal <eivind@uggedal.com>"
+license="BSD-3-Clause"
+homepage="https://www.djangoproject.com/"
+distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
+checksum=69897097095f336d5aeef45b4103dceae51c00afa6d3ae198a2a18e519791b7a
+alternatives="django:django-admin:/usr/bin/django-admin3"
+
+post_install() {
+	vlicense LICENSE
+	rm -f ${DESTDIR}/usr/bin/django-admin.py*
+	mv ${DESTDIR}/usr/bin/django-admin{,3}
+}
diff --git a/srcpkgs/python3-Django/update b/srcpkgs/python3-Django/update
new file mode 100644
index 00000000000..25ef51d109a
--- /dev/null
+++ b/srcpkgs/python3-Django/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From 686eade38a71307e8b4505f996c7e088cbf5ad7c Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Mon, 20 Apr 2020 09:05:33 +0200
Subject: [PATCH 3/3] python3-Django: update to 3.0.5

---
 srcpkgs/python3-Django/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Django/template b/srcpkgs/python3-Django/template
index 5babef1aff7..0aa04c0821d 100644
--- a/srcpkgs/python3-Django/template
+++ b/srcpkgs/python3-Django/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Django'
 pkgname=python3-Django
-version=2.2.12
+version=3.0.5
 revision=1
 archs=noarch
 wrksrc="Django-${version}"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="BSD-3-Clause"
 homepage="https://www.djangoproject.com/"
 distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
-checksum=69897097095f336d5aeef45b4103dceae51c00afa6d3ae198a2a18e519791b7a
+checksum=d4666c2edefa38c5ede0ec1655424c56dc47ceb04b6d8d62a7eac09db89545c1
 alternatives="django:django-admin:/usr/bin/django-admin3"
 
 post_install() {