cosmetics changes

1 files changed, 32 insertions, 35 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b17506cc6754..6ad64c7671da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: jnanar <info@agayon.be>
 
-pkgbase='sat-libervia-hg'
-pkgname=('sat-libervia-hg')
+pkgname='sat-libervia-hg'
+pkgbase=$pkgname
 _realname=libervia
 _pyjamasname=pyjamas
 venv_pyjama='venv'
@@ -10,12 +10,12 @@ VERSION=0.6.1
 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' 'python-virtualenv' 'mercurial')
+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')
 license=('AGPL3')
 install=$pkgbase.install
-source=('ftp://ftp.goffi.org/pyjamas/pyjamas.tar.bz2'
-        "hg+http://repos.goffi.org/libervia"
+source=('https://ftp.goffi.org/pyjamas/pyjamas.tar.bz2'
+        "hg+https://repos.goffi.org/libervia"
         )
 
 md5sums=('a0d6344951153f79302eb2b6fd08376e'
@@ -25,51 +25,48 @@ md5sums=('a0d6344951153f79302eb2b6fd08376e'
 options=('!strip')
 
 pkgver() {
-         cd "$_realname"
-         printf "$VERSION.r%s.%s" "$(hg identify -n)" "$(hg identify -i)" 
+        cd "$_realname"
+        printf "$VERSION.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
 }
 
-    
 pyjamas_build(){
  	virtualenv $venv_pyjama -ppython2.7 --system-site-packages
 	cd $_pyjamasname
-	source $srcdir/$venv_pyjama/bin/activate	
+	source $srcdir/$venv_pyjama/bin/activate
 	python2.7 bootstrap.py
 	deactivate
 }
-                 
+
 build() {
         pyjamas_build
         cd "$srcdir/$_realname"
-        install -dm755 "$srcdir/fakeinstall/"
+#        install -dm755 "$srcdir/fakeinstall/"
         PYJSBUILD_PATH="$srcdir/pyjamas/bin/"
         PATH=$PATH:$PYJSBUILD_PATH LIBERVIA_INSTALL=arch NO_PREINSTALL_OPT=nopreinstall SAT_INSTALL=nopreinstall python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
 	cp -r $srcdir/$_realname/src/{browser,pages,common,server,twisted} $srcdir/fakeinstall/usr/lib/python2.7/site-packages/libervia
 }
 
-package_sat-libervia-hg(){
-         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
-	 # HTML destination
-	 install -dm755 usr/share/libervia/html	 
-	 cd "$srcdir/fakeinstall"
-         cp "$srcdir/libervia/src/libervia.sh" "$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/libervia-0.6.1.1-py2.7.egg-info "$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/libervia/html" "$pkgdir/usr/share/libervia/"
-	 mv -v "$srcdir/libervia/themes" "$pkgdir/usr/share/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
+	# HTML destination
+	install -dm755 usr/share/libervia/html
+	cd "$srcdir/fakeinstall"
+        cp "$srcdir/libervia/src/libervia.sh" "$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/libervia-0.6.1.1-py2.7.egg-info "$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/libervia/html" "$pkgdir/usr/share/libervia/"
+	mv -v "$srcdir/libervia/themes" "$pkgdir/usr/share/libervia"
  }