Upstream had dropped python2 support

2 files changed, 42 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42577dfb848f..795d5d274cbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,27 @@
 pkgbase = limnoria-git
 	pkgdesc = An IRC bot based on Supybot, with sqlite3 support and other features (dev channel)
-	pkgver = v0.83.4.1.r4198.6f9deecb
+	pkgver = 20200211
 	pkgrel = 1
 	url = https://github.com/ProgVal/Limnoria
 	arch = any
 	license = 3-clause BSD
 	makedepends = git
-	depends = python2
-	optdepends = python2-charade: Detect page's encoding
-	optdepends = python2-pytz: Enable Time plugin to calculate the time in specified timezone
-	optdepends = python2-dateutil: Enable Time plugin to parse the input time string
-	optdepends = python2-gnupg: GnuPG support
-	optdepends = python2-feedparser: RSS plugin support
-	optdepends = python2-socksipy-branch: SOCKS proxy support
-	optdepends = python2-ecdsa: ECDSA support
+	depends = python>=3.4
+	optdepends = python-charade: Detect page's encoding
+	optdepends = python-pytz: Enable Time plugin to calculate the time in specified timezone
+	optdepends = python-dateutil: Enable Time plugin to parse the input time string
+	optdepends = python-gnupg: GnuPG support
+	optdepends = python-feedparser: RSS plugin support
+	optdepends = python-sqlalchemy: Aka plugin support
+	optdepends = python-socksipy-branch: SOCKS proxy support
+	optdepends = python-mock: For testing only
+	optdepends = python-cryptography: ECDSA support
+	conflicts = limnoria
+	conflicts = limnoria-python3
 	source = git://github.com/ProgVal/Limnoria.git
 	md5sums = SKIP
 
 pkgname = limnoria-git
 
+pkgname = limnoria-python3-git
+
diff --git a/PKGBUILD b/PKGBUILD
index 574cc8001a6d..21bf09068911 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,48 @@
 # Maintainer: Cravix < dr dot neemous at gmail dot com >
 
-pkgname=limnoria-git
+pkgbase=limnoria-git
+pkgname=("limnoria-git" "limnoria-python3-git")
 _pkgname=Limnoria
-pkgver=v0.83.4.1.r4198.6f9deecb
+pkgver=20200211
 pkgrel=1
 pkgdesc="An IRC bot based on Supybot, with sqlite3 support and other features (dev channel)"
 arch=('any')
 url="https://github.com/ProgVal/Limnoria"
 license=('3-clause BSD')
-depends=('python2')
+depends=('python>=3.4')
 makedepends=('git')
-optdepends=("python2-charade: Detect page's encoding"
-            "python2-pytz: Enable Time plugin to calculate the time in specified timezone"
-            "python2-dateutil: Enable Time plugin to parse the input time string"
-            "python2-gnupg: GnuPG support"
-            "python2-feedparser: RSS plugin support"
-            #"python2-sqlalchemy: Alternative DB engine when no SQLite3 engine installed" 
-            # But SQLite module has already been integrated into python package, so it doesn't matter
-            "python2-socksipy-branch: SOCKS proxy support"
-            #"python2-mock: For testing only"
-            "python2-ecdsa: ECDSA support")
+optdepends=("python-charade: Detect page's encoding"
+    "python-pytz: Enable Time plugin to calculate the time in specified timezone"
+    "python-dateutil: Enable Time plugin to parse the input time string"
+    "python-gnupg: GnuPG support"
+    "python-feedparser: RSS plugin support"
+    "python-sqlalchemy: Aka plugin support"
+    "python-socksipy-branch: SOCKS proxy support"
+    "python-mock: For testing only"
+    "python-cryptography: ECDSA support")
+conflicts=('limnoria' 'limnoria-python3')
 source=("git://github.com/ProgVal/$_pkgname.git")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
+    cd "${srcdir}/${_pkgname}"
 
-  printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+    sed -n '1s/[^[:digit:]]//gp' src/version.py
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  
-  python2 setup.py build
+    cd "$srcdir/$_pkgname"
+
+    python3 setup.py build
 }
 
-package() {
-  cd "$srcdir/$_pkgname"
+package_limnoria-git() {
+    cd "$srcdir/$_pkgname"
+
+    python3 setup.py install --root="$pkgdir" || return 1
+}
 
-  python2 setup.py install --root="$pkgdir" || return 1
+package_limnoria-python3-git() {
+    msg "This package contains nothing and is only for migration,"
+    msg "and will be removed in next release."
 }