Python3 version

2 files changed, 19 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 19944baab5fc..3171e5079643 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,27 @@
 pkgbase = sat-libervia-hg
-	pkgver = 0.7.0.r1179.bfbfe04209e9
+	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)
+	pkgver = 0.7.0.r1232.4ccc5bb65be2
 	pkgrel = 1
 	url = http://salut-a-toi.org/
 	install = sat-libervia-hg.install
 	arch = any
 	license = AGPL3
-	makedepends = python2-setuptools
-	makedepends = python2-virtualenv
+	makedepends = python-setuptools
 	makedepends = mercurial
-	depends = python2
-	depends = python2-txjsonrpc-git
-	depends = python2-jinja
-	depends = python2-shortuuid-git
+	depends = python
+	depends = python-jinja
+	depends = python-shortuuid-git
 	depends = sat-media-hg
 	depends = sat-xmpp-hg
 	depends = sat-templates-hg
-	depends = python2-zope-interface
-	depends = python2-pyopenssl
-	depends = python2-autobahn
+	depends = python-zope-interface
+	depends = python-pyopenssl
+	depends = python-autobahn
 	depends = dbus
+	provides = sat-libervia
 	options = !strip
-	source = https://ftp.goffi.org/pyjamas/pyjamas.tar.bz2
 	source = hg+https://repos.goffi.org/libervia
-	md5sums = a0d6344951153f79302eb2b6fd08376e
 	md5sums = SKIP
 
 pkgname = sat-libervia-hg
-	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)
-	provides = sat-libervia
-	conflicts = sat-libervia
 
diff --git a/PKGBUILD b/PKGBUILD
index a5f701bf92b8..d8ff653e0398 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,20 @@
 
 pkgname='sat-libervia-hg'
 _realname=libervia
-_pyjamasname=pyjamas
-venv_pyjama='venv'
-pkgver=0.7.0.r1179.bfbfe04209e9
+pkgver=0.7.0.r1232.4ccc5bb65be2
 _version=0.7.0
 pkgrel=1
 url="http://salut-a-toi.org/"
 arch=('any')
-depends=('python2' 'python2-txjsonrpc-git' 'python2-jinja' 'python2-shortuuid-git' 'sat-media-hg' 'sat-xmpp-hg' 'sat-templates-hg' 'python2-zope-interface' 'python2-pyopenssl' 'python2-autobahn' 'dbus')
-makedepends=('python2-setuptools' 'python2-virtualenv' 'mercurial')
+pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)"
+provides=('sat-libervia')
+depends=('python' 'python-jinja' 'python-shortuuid-git' 'sat-media-hg' 'sat-xmpp-hg' 'sat-templates-hg' 'python-zope-interface' 'python-pyopenssl' 'python-autobahn' 'dbus')
+makedepends=('python-setuptools' 'mercurial')
 license=('AGPL3')
 install=$pkgname.install
-source=('https://ftp.goffi.org/pyjamas/pyjamas.tar.bz2'
-        "hg+https://repos.goffi.org/libervia"
-        )
+source=("hg+https://repos.goffi.org/libervia")
 
-md5sums=('a0d6344951153f79302eb2b6fd08376e'
-         'SKIP'
-         )
+md5sums=('SKIP')
 
 options=('!strip')
 
@@ -28,46 +24,10 @@ pkgver() {
     printf "$_version.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
 }
 
-pyjamas_build(){
-    cd $_pyjamasname
-    python2.7 bootstrap.py
-}
-
-build() {
-    pyjamas_build
-    cd "$srcdir/$_realname"
-    PYJSBUILD_PATH="$srcdir/pyjamas/bin/"
-    python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
-    # Compile pyjs
-    mkdir -p $srcdir/$_realname/html
-    mkdir -p $srcdir/$_realname/build/tmp_dir
-    cp -r /usr/lib/python2.7/site-packages/sat_frontends $srcdir/$_realname/build/tmp_dir/sat_frontends
-    cp -r /usr/lib/python2.7/site-packages/sat $srcdir/$_realname/build/tmp_dir/sat
-    cp -r $srcdir/$_realname/libervia $srcdir/$_realname/build/tmp_dir/libervia
-    cd $srcdir/$_realname/browser
-    $PYJSBUILD_PATH/pyjsbuild libervia_main.py  -d -I $srcdir/$_realname/build/tmp_dir/ --no-compile-inplace -o $srcdir/$_realname/html
-    $PYJSBUILD_PATH/pyjsbuild libervia_test.py -d -I $srcdir/$_realname/build/tmp_dir/ --no-compile-inplace -o $srcdir/$_realname/html
-    cp -r $srcdir/$_realname/{$_realname,browser,twisted} $srcdir/fakeinstall/usr/lib/python2.7/site-packages/libervia
-}
 
 package(){
-    pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)"
-    provides=('sat-libervia')
-    conflicts=('sat-libervia')
-    cd "$pkgdir"
-    install -dm755 usr/bin
-    install -dm755 usr/lib/python2.7/site-packages
-    install -dm755 usr/share/doc
-    install -dm755 usr/share/libervia
-    install -dm755 usr/lib/python2.7/site-packages/twisted/plugins
+    cd "$_realname"
+    python setup.py install --root="$pkgdir/" --prefix=/usr --optimize=1 
     install -dm755 etc
     cp ../../sat.conf etc/
-    cd "$srcdir/fakeinstall"
-    cp "$srcdir/$_realname/bin/libervia" "$pkgdir/usr/bin/libervia"
-    mv -v usr/share/doc/libervia "$pkgdir/usr/share/doc/"
-    mv -v usr/share/libervia "$pkgdir/usr/share/libervia/"
-    mv -v usr/lib/python2.7/site-packages/libervia "$pkgdir/usr/lib/python2.7/site-packages/"
-    mv -v usr/lib/python2.7/site-packages/twisted/plugins/* "$pkgdir/usr/lib/python2.7/site-packages/twisted/plugins/"
-    mv -v "$srcdir/$_realname/html" "$pkgdir/usr/share/libervia/"
-    mv -v "$srcdir/$_realname/themes" "$pkgdir/usr/share/libervia"
  }