From 243e3c6915ead64b51bcc0b7310f610c8d33c710 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Thu, 7 Jun 2018 19:08:40 +0200
Subject: [PATCH] Twisted: update to 18.4.0, add python3 flavor

---
 srcpkgs/Twisted/template                      | 20 ++-----
 srcpkgs/{Twisted => python-Twisted}/INSTALL   |  0
 srcpkgs/{Twisted => python-Twisted}/REMOVE    |  0
 .../python-Twisted/python3-Twisted.INSTALL    |  5 ++
 srcpkgs/python-Twisted/python3-Twisted.REMOVE |  5 ++
 srcpkgs/python-Twisted/template               | 55 +++++++++++++++++++
 srcpkgs/python3-Twisted                       |  1 +
 7 files changed, 71 insertions(+), 15 deletions(-)
 rename srcpkgs/{Twisted => python-Twisted}/INSTALL (100%)
 rename srcpkgs/{Twisted => python-Twisted}/REMOVE (100%)
 create mode 100644 srcpkgs/python-Twisted/python3-Twisted.INSTALL
 create mode 100644 srcpkgs/python-Twisted/python3-Twisted.REMOVE
 create mode 100644 srcpkgs/python-Twisted/template
 create mode 120000 srcpkgs/python3-Twisted

diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template
index 689bb351e08..6bc623451a6 100644
--- a/srcpkgs/Twisted/template
+++ b/srcpkgs/Twisted/template
@@ -1,20 +1,10 @@
 # Template file for 'Twisted'
 pkgname=Twisted
 version=17.9.0
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools python-zope.interface python-service_identity
- python-constantly python-incremental python-automat python-hyperlink"
-makedepends="${hostmakedepends} python-devel"
-depends="${makedepends/python-devel/}"
-pycompile_module="twisted"
-short_desc="Event-driven networking engine written in Python"
+revision=2
+build_style=meta
+depends="python-Twisted>=${version}_${revision}"
+short_desc="Event-driven networking engine written in Python (transitional dummy package)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://twistedmatrix.com/"
+homepage="https://twistedmatrix.com/"
 license="MIT"
-distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.bz2"
-checksum=0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/Twisted/INSTALL b/srcpkgs/python-Twisted/INSTALL
similarity index 100%
rename from srcpkgs/Twisted/INSTALL
rename to srcpkgs/python-Twisted/INSTALL
diff --git a/srcpkgs/Twisted/REMOVE b/srcpkgs/python-Twisted/REMOVE
similarity index 100%
rename from srcpkgs/Twisted/REMOVE
rename to srcpkgs/python-Twisted/REMOVE
diff --git a/srcpkgs/python-Twisted/python3-Twisted.INSTALL b/srcpkgs/python-Twisted/python3-Twisted.INSTALL
new file mode 100644
index 00000000000..632dfe8fa02
--- /dev/null
+++ b/srcpkgs/python-Twisted/python3-Twisted.INSTALL
@@ -0,0 +1,5 @@
+case ${ACTION} in
+post)
+	python3 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1
+	;;
+esac
diff --git a/srcpkgs/python-Twisted/python3-Twisted.REMOVE b/srcpkgs/python-Twisted/python3-Twisted.REMOVE
new file mode 100644
index 00000000000..2952b307eae
--- /dev/null
+++ b/srcpkgs/python-Twisted/python3-Twisted.REMOVE
@@ -0,0 +1,5 @@
+case ${ACTION} in
+purge)
+	find /usr/lib/python3.*/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
+	;;
+esac
diff --git a/srcpkgs/python-Twisted/template b/srcpkgs/python-Twisted/template
new file mode 100644
index 00000000000..446e8617834
--- /dev/null
+++ b/srcpkgs/python-Twisted/template
@@ -0,0 +1,55 @@
+# Template file for 'python-Twisted'
+pkgname=python-Twisted
+version=18.4.0
+revision=1
+wrksrc="Twisted-${version}"
+build_style=python-module
+pycompile_module="twisted"
+hostmakedepends="python-setuptools python3-setuptools
+ python-incremental python3-incremental"
+makedepends="python-devel python3-devel"
+depends="python-setuptools python-zope.interface python-service_identity
+ python-constantly python-incremental python-automat python-hyperlink"
+short_desc="Asynchronous networking framework written in Python (Python2)"
+maintainer="Juan RP <xtraeme@voidlinux.eu>"
+homepage="https://twistedmatrix.com/"
+license="MIT"
+distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.bz2"
+checksum=a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9
+
+alternatives="
+ twisted:cftp:/usr/bin/cftp2
+ twisted:ckeygen:/usr/bin/ckeygen2
+ twisted:conch:/usr/bin/conch2
+ twisted:mailmail:/usr/bin/mailmail2
+ twisted:pyhtmlizer:/usr/bin/pyhtmlizer2
+ twisted:tkconch:/usr/bin/tkconch2
+ twisted:trial:/usr/bin/trial2
+ twisted:twist:/usr/bin/twist2
+ twisted:twistd:/usr/bin/twistd2"
+
+post_install() {
+	vlicense LICENSE
+}
+
+python3-Twisted_package() {
+	alternatives="
+	 twisted:cftp:/usr/bin/cftp3
+	 twisted:ckeygen:/usr/bin/ckeygen3
+	 twisted:conch:/usr/bin/conch3
+	 twisted:mailmail:/usr/bin/mailmail3
+	 twisted:pyhtmlizer:/usr/bin/pyhtmlizer3
+	 twisted:tkconch:/usr/bin/tkconch3
+	 twisted:trial:/usr/bin/trial3
+	 twisted:twist:/usr/bin/twist3
+	 twisted:twistd:/usr/bin/twistd3"
+	pycompile_module="twisted"
+	depends="python3-setuptools python3-zope.interface python3-service_identity
+	 python3-constantly python3-incremental python3-automat python3-hyperlink"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/bin/*3
+		vmove usr/lib/python3*
+		vlicense LICENSE
+	}
+}
diff --git a/srcpkgs/python3-Twisted b/srcpkgs/python3-Twisted
new file mode 120000
index 00000000000..e4bef537851
--- /dev/null
+++ b/srcpkgs/python3-Twisted
@@ -0,0 +1 @@
+python-Twisted
\ No newline at end of file