diff --git a/appset-qt/PKGBUILD b/appset-qt/PKGBUILD
index 4190a2d..27c11f5 100644
--- a/appset-qt/PKGBUILD
+++ b/appset-qt/PKGBUILD
@@ -28,15 +28,14 @@ build()
   lrelease-qt4 Qt/AppSetTray-Qt/*.ts
   lrelease-qt4 Qt/AppSetRepoEditor-Qt/*.ts
 
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/${pkgname}-${pkgver}-sources
 
-  make INSTALL_ROOT=${pkgdir} install || return 1
+  make INSTALL_ROOT=${pkgdir} install
   # appset-helper daemon
-  install -D -m755 ../appset-helper.service \
-                   ${pkgdir}/usr/lib/systemd/system/appset-helper.service || return 1
+  install -D -m644 ../appset-helper.service ${pkgdir}/usr/lib/systemd/system/appset-helper.service
 }
diff --git a/food_gui/PKGBUILD b/food_gui/PKGBUILD
index b5bfe4c..7554cbf 100644
--- a/food_gui/PKGBUILD
+++ b/food_gui/PKGBUILD
@@ -14,10 +14,10 @@ md5sums=('a206c16e88313b29a02f6b400ce76498')
 
 package()
 {
-  install -D -m755 ${srcdir}/usr/bin/food_gui ${pkgdir}/usr/bin/food_gui || return 1
+  install -D -m755 ${srcdir}/usr/bin/food_gui ${pkgdir}/usr/bin/food_gui
   
-  install -D -m644 ${srcdir}/usr/lib/food_gui/db_eng.dat ${pkgdir}/usr/lib/food_gui/db_eng.dat || return 1
-  install -D -m644 ${srcdir}/usr/lib/food_gui/db_rus.dat ${pkgdir}/usr/lib/food_gui/db_rus.dat || return 1
+  install -D -m644 ${srcdir}/usr/lib/food_gui/db_eng.dat ${pkgdir}/usr/lib/food_gui/db_eng.dat
+  install -D -m644 ${srcdir}/usr/lib/food_gui/db_rus.dat ${pkgdir}/usr/lib/food_gui/db_rus.dat
   
-  install -D -m644 ${srcdir}/usr/share/man/man1/food_gui.1 ${pkgdir}/usr/share/man/man1/food_gui.1 || return 1
+  install -D -m644 ${srcdir}/usr/share/man/man1/food_gui.1 ${pkgdir}/usr/share/man/man1/food_gui.1
 }
diff --git a/ghemical-mpqc/PKGBUILD b/ghemical-mpqc/PKGBUILD
index 0bcaef0..26c7742 100644
--- a/ghemical-mpqc/PKGBUILD
+++ b/ghemical-mpqc/PKGBUILD
@@ -31,13 +31,12 @@ build()
 {
   cd ${srcdir}/${_pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/${_pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ${srcdir}/${_pkgname}.desktop \
-                   ${pkgdir}/usr/share/applications/${_pkgname}.desktop || return 1
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/${_pkgname}.desktop ${pkgdir}/usr/share/applications/${_pkgname}.desktop
 }
diff --git a/git-etc/PKGBUILD b/git-etc/PKGBUILD
index e846e7f..4a419d6 100644
--- a/git-etc/PKGBUILD
+++ b/git-etc/PKGBUILD
@@ -18,27 +18,27 @@ backup=('etc/conf.d/git-etc.conf')
 package()
 {
   # daemon and gui
-  install -D -m755 ${srcdir}/usr/bin/git-etc ${pkgdir}/usr/bin/git-etc || return 1
-  install -D -m755 ${srcdir}/usr/bin/ctrlconf ${pkgdir}/usr/bin/ctrlconf || return 1
+  install -D -m755 ${srcdir}/usr/bin/git-etc ${pkgdir}/usr/bin/git-etc
+  install -D -m755 ${srcdir}/usr/bin/ctrlconf ${pkgdir}/usr/bin/ctrlconf
   install -D -m755 ${srcdir}/usr/lib/python2.7/site-packages/ctrlconf.py \
-                   ${pkgdir}/usr/lib/python2.7/site-packages/ctrlconf.py || return 1
+                   ${pkgdir}/usr/lib/python2.7/site-packages/ctrlconf.py
   mkdir -p ${pkgdir}/usr/lib/python2.7/site-packages/ctrlconf
   install -m644 -t ${pkgdir}/usr/lib/python2.7/site-packages/ctrlconf \
-                ${srcdir}/usr/lib/python2.7/site-packages/ctrlconf/* || return 1
+                ${srcdir}/usr/lib/python2.7/site-packages/ctrlconf/*
   install -D -m644 ${srcdir}/usr/share/applications/ctrlconf.desktop \
-                   ${pkgdir}/usr/share/applications/ctrlconf.desktop || return 1
+                   ${pkgdir}/usr/share/applications/ctrlconf.desktop
   
   # service
   install -D -m644 ${srcdir}/usr/lib/systemd/system/git-etc.service \
-                   ${pkgdir}/usr/lib/systemd/system/git-etc.service || return 1
+                   ${pkgdir}/usr/lib/systemd/system/git-etc.service
   install -D -m644 ${srcdir}/etc/conf.d/git-etc.conf \
-                   ${pkgdir}/etc/conf.d/git-etc.conf || return 1
+                   ${pkgdir}/etc/conf.d/git-etc.conf
   
   # man pages
   install -D -m644 ${srcdir}/usr/share/man/man1/git-etc.1 \
-                   ${pkgdir}/usr/share/man/man1/git-etc.1 || return 1
+                   ${pkgdir}/usr/share/man/man1/git-etc.1
   install -D -m644 ${srcdir}/usr/share/man/man1/ctrlconf.1 \
-                   ${pkgdir}/usr/share/man/man1/ctrlconf.1 || return 1
+                   ${pkgdir}/usr/share/man/man1/ctrlconf.1
   install -D -m644 ${srcdir}/usr/share/man/man5/git-etc.conf.5 \
-                   ${pkgdir}/usr/share/man/man5/git-etc.conf.5 || return 1
+                   ${pkgdir}/usr/share/man/man5/git-etc.conf.5
 }
diff --git a/gromacs4/PKGBUILD b/gromacs4/PKGBUILD
index 9810063..7e45891 100644
--- a/gromacs4/PKGBUILD
+++ b/gromacs4/PKGBUILD
@@ -20,15 +20,15 @@ md5sums=('6a87e7cdfb25d81afa9fea073eb28468')
 
 build() {
   mkdir -p ${srcdir}/double
-  mkdir -p ${pkgdir}/etc/profile.d/
-  mkdir -p ${pkgdir}/usr/share/bash-completion/completions
   msg2 "Building the doulbe precision files"
   cd ${srcdir}/double	
   cmake -DCMAKE_PREFIX=/opt/gromacs_old/ -DCMAKE_INSTALL_PREFIX=/opt/gromacs_old/ -DGMX_THREADS=ON -DGMX_SHARED_LIBS=ON -DGMX_DOUBLE=ON -DGMX_X11=ON -DGMX_DEFAULT_SUFFIX=OFF -DGMX_LIBS_SUFFIX=_4.5 -DGMX_BINARY_SUFFIX=_4.5 ../${_pkgname}-${pkgver}/
-  make -j3
+  make -j5
 }
 
 package() {
+  mkdir -p ${pkgdir}/etc/profile.d/
+  mkdir -p ${pkgdir}/usr/share/bash-completion/completions
   # Cleaning up, kept the csh completion at default location
   msg2 "Making the double precision executables"
   cd ${srcdir}/double
diff --git a/gromacs_mtdec/PKGBUILD b/gromacs_mtdec/PKGBUILD
index 9f031a5..70e9f8e 100644
--- a/gromacs_mtdec/PKGBUILD
+++ b/gromacs_mtdec/PKGBUILD
@@ -16,11 +16,11 @@ build()
 {
   cd ${srcdir}/mtdec
   ./configure --prefix=/usr --program-suffix=_mtd
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/mtdec
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }
diff --git a/kate-latex-plugin/PKGBUILD b/kate-latex-plugin/PKGBUILD
index d544306..093d2b6 100644
--- a/kate-latex-plugin/PKGBUILD
+++ b/kate-latex-plugin/PKGBUILD
@@ -24,11 +24,11 @@ build()
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
         ../${_pkgname}-${pkgver}
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }
diff --git a/kdeplasma-applets-oblikuestrategies/PKGBUILD b/kdeplasma-applets-oblikuestrategies/PKGBUILD
index c511da0..4b9b387 100644
--- a/kdeplasma-applets-oblikuestrategies/PKGBUILD
+++ b/kdeplasma-applets-oblikuestrategies/PKGBUILD
@@ -22,13 +22,13 @@ build ()
   fi
   mkdir ${srcdir}/build && cd ${srcdir}/build
   cmake -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`\
+        -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
         ../${_pkgname}/
-  make || return 1
+  make
 }
 
-package() 
+package()
 {
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }
diff --git a/kdeplasma-applets-oblikuestrategies/kdeplasma-applets-oblikuestrategies.install b/kdeplasma-applets-oblikuestrategies/kdeplasma-applets-oblikuestrategies.install
index d7ee1f1..1280b6d 100644
--- a/kdeplasma-applets-oblikuestrategies/kdeplasma-applets-oblikuestrategies.install
+++ b/kdeplasma-applets-oblikuestrategies/kdeplasma-applets-oblikuestrategies.install
@@ -8,16 +8,10 @@ EOF
 
 post_upgrade()
 {
-  cat << EOF
-Update plasmoids...
-EOF
-  kbuildsycoca4 > /dev/null 2>&1
+  post_install
 }
 
 post_remove()
 {
-  cat << EOF
-Update plasmoids...
-EOF
-  kbuildsycoca4 > /dev/null 2>&1
+  post_install
 }
diff --git a/kdeplasma-applets-pytextmonitor/kdeplasma-applets-pytextmonitor.install b/kdeplasma-applets-pytextmonitor/kdeplasma-applets-pytextmonitor.install
index 946f255..7fa6471 100644
--- a/kdeplasma-applets-pytextmonitor/kdeplasma-applets-pytextmonitor.install
+++ b/kdeplasma-applets-pytextmonitor/kdeplasma-applets-pytextmonitor.install
@@ -11,16 +11,10 @@ EOF
 
 post_upgrade()
 {
-  cat << EOF
-Update plasmoids...
-EOF
-  kbuildsycoca4 > /dev/null 2>&1
+  post_install
 }
 
 post_remove()
 {
-  cat << EOF
-Update plasmoids...
-EOF
-  kbuildsycoca4 > /dev/null 2>&1
+  post_install
 }
diff --git a/kdeplasma-applets-stdin-svn/PKGBUILD b/kdeplasma-applets-stdin-svn/PKGBUILD
index 9aa08d7..27cfa31 100644
--- a/kdeplasma-applets-stdin-svn/PKGBUILD
+++ b/kdeplasma-applets-stdin-svn/PKGBUILD
@@ -12,34 +12,31 @@ url="http://www.kde-look.org/content/show.php/STDIN+Plasmoid?content=92309"
 license=('GPL')
 depends=('kdebase-workspace')
 makedepends=('automoc4' 'cmake' 'subversion')
+source=(${_pkgname}::svn+https://plasmoidstdin.svn.sourceforge.net/svnroot/${_pkgname}/${_pkgver}/trunk)
 install=${pkgname}.install
+md5sums=('SKIP')
 
-_svntrunk="https://plasmoidstdin.svn.sourceforge.net/svnroot/${_pkgname}/${_pkgver}/trunk"
-_svnmod=${_pkgname}
+pkgver()
+{
+  cd ${srcdir}/${_pkgname}
+  local ver=`svnversion`
+  printf "%s" ${ver//[[:alpha:]]}
+}
 
 build()
 {
-  msg "Connecting to SVN server...."
-  if [ -d "${_svnmod}/.svn" ]; then
-    (cd ${_svnmod} && svn up -r ${pkgver})
-  else
-    svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod}
-  fi
-  msg "SVN checkout done or server timeout"
-  msg "Starting build..."
-  
   if [ -d ${srcdir}/build ]; then
     rm -rf ${srcdir}/build
   fi
   mkdir ${srcdir}/build && cd ${srcdir}/build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
         -DCMAKE_BUILD_TYPE=Release \
-        ../${_svnmod}
-  make || return 1
+        ../${_pkgname}
+  make
 }
 
 package()
 {
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }
diff --git a/kdeplasma-applets-stdin-svn/kdeplasma-applets-stdin-svn.install b/kdeplasma-applets-stdin-svn/kdeplasma-applets-stdin-svn.install
index d7ee1f1..1280b6d 100644
--- a/kdeplasma-applets-stdin-svn/kdeplasma-applets-stdin-svn.install
+++ b/kdeplasma-applets-stdin-svn/kdeplasma-applets-stdin-svn.install
@@ -8,16 +8,10 @@ EOF
 
 post_upgrade()
 {
-  cat << EOF
-Update plasmoids...
-EOF
-  kbuildsycoca4 > /dev/null 2>&1
+  post_install
 }
 
 post_remove()
 {
-  cat << EOF
-Update plasmoids...
-EOF
-  kbuildsycoca4 > /dev/null 2>&1
+  post_install
 }
diff --git a/libghemical-mpqc/PKGBUILD b/libghemical-mpqc/PKGBUILD
index d50782c..01e1716 100644
--- a/libghemical-mpqc/PKGBUILD
+++ b/libghemical-mpqc/PKGBUILD
@@ -21,11 +21,11 @@ build()
 {
   cd ${srcdir}/${_pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-openbabel --enable-mpqc --enable-mopac7
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/${_pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }
diff --git a/mathmech/PKGBUILD b/mathmech/PKGBUILD
index b05c608..d588114 100644
--- a/mathmech/PKGBUILD
+++ b/mathmech/PKGBUILD
@@ -26,11 +26,11 @@ build ()
   fi
   mkdir ${srcdir}/build && cd ${srcdir}/build
   cmake ${_cmakekeys} ../
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} instal
 }
diff --git a/mpqc-shared/PKGBUILD b/mpqc-shared/PKGBUILD
index b4895a7..3e04674 100644
--- a/mpqc-shared/PKGBUILD
+++ b/mpqc-shared/PKGBUILD
@@ -18,12 +18,12 @@ build()
 {
   cd ${srcdir}/${_pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-shared
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/${_pkgname}-${pkgver}
-  make installroot=${pkgdir} install || return 1
-  make installroot=${pkgdir} install_devel || return 1
+  make installroot=${pkgdir} install
+  make installroot=${pkgdir} install_devel
 } 
diff --git a/qmmp-qsmmp-git/PKGBUILD b/qmmp-qsmmp-git/PKGBUILD
index b8288cf..03e85dc 100644
--- a/qmmp-qsmmp-git/PKGBUILD
+++ b/qmmp-qsmmp-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=qmmp-qsmmp-git
 _gitname=qsmmp
-pkgver=20130916
+pkgver=qmmp.0.5.34.gcd1ca1a
 pkgrel=1
 pkgdesc="Amarok-like interface for qmmp. Git version"
 arch=('i686' 'x86_64')
@@ -11,18 +11,26 @@ url="http://gitorious.org/qsmmp"
 license=('GPL2')
 depends=('qmmp' 'libqxt')
 makedepends=('git')
-source=("${_gitname}::git+https://gitorious.org/qsmmp/qsmmp.git#branch=qmmp-9999")
+source=(${_gitname}::git+https://gitorious.org/qsmmp/qsmmp.git#branch=qmmp-9999)
 md5sums=('SKIP')
 
+pkgver()
+{
+  cd ${_gitname}
+  local ver=`git describe --long`
+  # because default ver is "qmmp.*"
+  printf "%s" ${${ver//-/.}//qmmp./}
+}
+
 build()
 {
   cd ${srcdir}/${_gitname}
   qmake-qt4 PREFIX=/usr
-  make || return 1
+  make
 }
 
 package()
 {
   cd ${srcdir}/${_gitname}
-  make INSTALL_ROOT=${pkgdir} install || return 1
+  make INSTALL_ROOT=${pkgdir} install
 }
diff --git a/qscite/PKGBUILD b/qscite/PKGBUILD
index 678a97e..89793ad 100644
--- a/qscite/PKGBUILD
+++ b/qscite/PKGBUILD
@@ -30,12 +30,12 @@ prepare()
 build()
 {
   cd ${srcdir}/${pkgname}
-  qmake-qt4 PREFIX=/usr -Wnone qscite-release.pro || return 1
-  make || return 1
+  qmake-qt4 PREFIX=/usr -Wnone qscite-release.pro
+  make
 }
 
 package()
 {
   cd ${srcdir}/${pkgname}
-  make INSTALL_ROOT=${pkgdir} install || return 1
+  make INSTALL_ROOT=${pkgdir} install
 }
diff --git a/quantum-espresso-gpu/PKGBUILD b/quantum-espresso-gpu/PKGBUILD
index 4f82f44..9b7ecfe 100644
--- a/quantum-espresso-gpu/PKGBUILD
+++ b/quantum-espresso-gpu/PKGBUILD
@@ -9,8 +9,13 @@ url="http://qe-forge.org/gf/project/q-e-gpu/"
 license=('GPLv2')
 makedepends=('gcc-fortran' 'blas' 'lapack' 'fftw' 'cuda')
 depends=('quantum-espresso')
-source=(http://qe-forge.org/gf/download/frsrelease/142/452/QE-5.0.2_GPU-r${pkgver}.patch)
-md5sums=('fc74bc210db6c2d88fd8a5f444aab447')
+svn import --username=anonymous --password=""
+source=(espresso::svn+http://qeforge.qe-forge.org/svn/q-e/trunk/espresso
+        espresso/GPU::svn+http://qeforge.qe-forge.org/svn/q-e-gpu/trunk/GPU
+        http://qe-forge.org/gf/download/frsrelease/142/452/QE-5.0.2_GPU-r${pkgver}.patch)
+md5sums=('SKIP'
+         'SKIP'
+         'fc74bc210db6c2d88fd8a5f444aab447')
 
 _qetrunk="http://qeforge.qe-forge.org/svn/q-e/trunk/espresso"
 _qemod=espresso
@@ -20,19 +25,19 @@ _svnmod=GPU
 
 build()
 {
-  msg "Connecting to QE SVN server..."
-  if [ -d "${_qetrunk}/.svn" ]; then
-    (cd ${_qemod} && svn up -r ${_qerev})
-  else
-    svn co ${_qetrunk} -r ${_qerev} ${_qemod} --username=anonymous --password=""
-  fi
-  
-  msg "Connecting to QE-GPU SVN server..."
-  if [ -d "${srcdir}/${_qemod}/${_svnmod}/.svn" ]; then
-    (cd ${srcdir}/${_qemod}/${_svnmod} && svn up -r ${pkgver})
-  else
-    svn co ${_svntrunk} -r ${pkgver} ${srcdir}/${_qemod}/${_svnmod} --username=anonymous --password=""
-  fi
+#   msg "Connecting to QE SVN server..."
+#   if [ -d "${_qetrunk}/.svn" ]; then
+#     (cd ${_qemod} && svn up -r ${_qerev})
+#   else
+#     svn co ${_qetrunk} -r ${_qerev} ${_qemod} --username=anonymous --password=""
+#   fi
+#   
+#   msg "Connecting to QE-GPU SVN server..."
+#   if [ -d "${srcdir}/${_qemod}/${_svnmod}/.svn" ]; then
+#     (cd ${srcdir}/${_qemod}/${_svnmod} && svn up -r ${pkgver})
+#   else
+#     svn co ${_svntrunk} -r ${pkgver} ${srcdir}/${_qemod}/${_svnmod} --username=anonymous --password=""
+#   fi
   
   # build qe
    cd ${srcdir}/${_qemod}/
diff --git a/scidavis/PKGBUILD b/scidavis/PKGBUILD
index 85bd980..33fc170 100644
--- a/scidavis/PKGBUILD
+++ b/scidavis/PKGBUILD
@@ -49,13 +49,13 @@ build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
   qmake-qt4
-  make || return 1
+  make
 }
 
 package ()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALL_ROOT=${pkgdir} install || return 1
+  make INSTALL_ROOT=${pkgdir} install
 
   _pydir=`python2 -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
   python2 `dirname ${_pydir}`/py_compile.py ${pkgdir}/etc/scidavisrc.py