Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre

19 files changed, 101 insertions, 37 deletions

diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD
index 62670e767..3772895de 100644
--- a/pcr/command-not-found/PKGBUILD
+++ b/pcr/command-not-found/PKGBUILD
@@ -14,7 +14,7 @@ depends=('boost-libs' 'tdb' 'libarchive' 'wget')
 makedepends=('boost' 'cmake')
 install='install'
 
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('cceea11367dd1847f08c94212f380ea5')
 
 mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}")
diff --git a/pcr/conkeror/PKGBUILD b/pcr/conkeror/PKGBUILD
index 2561d5220..d7f1068e4 100644
--- a/pcr/conkeror/PKGBUILD
+++ b/pcr/conkeror/PKGBUILD
@@ -14,7 +14,7 @@ license=('MPL1.1' 'GPL2' 'LGPL2.1')
 depends=('xulrunner' 'desktop-file-utils')
 install=conkeror.install
 
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
+source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz"
         'conkeror.sh')
 md5sums=('a59ddc563eb8de7e8be6465aa023102d'
          '11c6c76a2639254754b34a542f1965a1')
diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD
index 796b4125d..87341e195 100644
--- a/pcr/etckeeper/PKGBUILD
+++ b/pcr/etckeeper/PKGBUILD
@@ -16,7 +16,7 @@ makedepends=('bzr' 'python2') # bzr must be there at compile time to have bzr su
 optdepends=('git' 'hg' 'bzr' 'darcs' 'python2: for bzr support')
 backup=(etc/etckeeper/etckeeper.conf)
 
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" $pkgname-archlinux.conf)
+source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz" $pkgname-archlinux.conf)
 md5sums=('75d13168ca79b9f53dfa6c9603924975'
          '99d8d2838f49fa0f2f21c9e37948100d')
 
diff --git a/pcr/git-annex-static/PKGBUILD b/pcr/git-annex-static/PKGBUILD
index 96477a265..676caa9ae 100644
--- a/pcr/git-annex-static/PKGBUILD
+++ b/pcr/git-annex-static/PKGBUILD
@@ -18,7 +18,7 @@ arch=('i686' 'x86_64')
 depends=('git' 'gsasl')
 makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
 options=(strip !makeflags !distcc !emptydirs)
-source=(https://repo.parabolagnulinux.org/other/git-annex-static/${_pkgname}-${pkgver}-${_srcrel}-any.src.tar.xz{,.sig}
+source=(https://repo.parabola.nu/other/git-annex-static/${_pkgname}-${pkgver}-${_srcrel}-any.src.tar.xz{,.sig}
         SRCBUILD)
 replaces=('git-annex')
 provides=('git-annex')
diff --git a/pcr/nel-hg/PKGBUILD b/pcr/nel-hg/PKGBUILD
index a26be232a..ee596739f 100644
--- a/pcr/nel-hg/PKGBUILD
+++ b/pcr/nel-hg/PKGBUILD
@@ -14,7 +14,7 @@ depends=('libpng' 'libjpeg' 'libwww-hg' 'boost' 'freetype2'
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
 conflicts=('ryzom-nel' 'ryzom-client')
 # options=(!strip) # for debbuging propurses
-source=("https://repo.parabolagnulinux.org/other/$srcpkgname/$srcpkgname-$pkgver.tar.gz")
+source=("https://repo.parabola.nu/other/$srcpkgname/$srcpkgname-$pkgver.tar.gz")
 sha256sums=('ad05f08004a80758a13566061ce29edfe4803c0c62e30190c437c781038c254e')
 
 
diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD
index 85eb45b90..cd94d428c 100644
--- a/pcr/nginx-passenger/PKGBUILD
+++ b/pcr/nginx-passenger/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=nginx-passenger
 _nginxver=1.6.2
 _passengerver=4.0.53
 pkgver=$_nginxver.passenger.$_passengerver
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 pkgdesc+=" (with Passenger module)"
 conflicts=('nginx')
@@ -39,9 +39,9 @@ source=($url/download/nginx-$_nginxver.tar.gz
         service
         logrotate)
 md5sums=('d1b55031ae6e4bce37f8776b94d8b930'
-         'ce85ed506a084112eaa015a3642007d9'
+         '385dceac05c10e59a3dab44d188353aa'
          '5dd4d09914a4403b9df778ec1d66167c'
-         '3441ce77cdd1aab6f0ab7e212698a8a7')
+         '19a26a61c8afe78defb8b4544f79a9a0')
 
 build() {
   cd "$srcdir/passenger-release-$_passengerver"
diff --git a/pcr/nginx-passenger/logrotate b/pcr/nginx-passenger/logrotate
index e0fa9ec4c..61237601f 100644
--- a/pcr/nginx-passenger/logrotate
+++ b/pcr/nginx-passenger/logrotate
@@ -1,9 +1,10 @@
 /var/log/nginx/*log {
 	missingok
 	create 640 http log
+	su http log
 	sharedscripts
 	compress
 	postrotate
-		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
+		test ! -r /run/nginx.pid || kill -USR1 `cat /run/nginx.pid`
 	endscript
 }
diff --git a/pcr/opentracker/PKGBUILD b/pcr/opentracker/PKGBUILD
index f1940b8f8..2834866aa 100644
--- a/pcr/opentracker/PKGBUILD
+++ b/pcr/opentracker/PKGBUILD
@@ -11,7 +11,7 @@ license=('custom:Beer' 'GPL')
 makedepends=('libowfat' 'cvs')
 depends=('bash' 'zlib')
 backup=('etc/opentracker/config')
-source=("http://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+source=("http://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
 'opentracker.service'
 'license.txt')
 md5sums=('64956fd9bc7b453b4862b8ba15a27511'
diff --git a/pcr/packer/PKGBUILD b/pcr/packer/PKGBUILD
index 5354d0192..a5ac9980b 100644
--- a/pcr/packer/PKGBUILD
+++ b/pcr/packer/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="Bash wrapper for pacman and aur"
 url="http://github.com/keenerd/packer"
 license=("GPL3")
 arch=('any')
-source=("https://repo.parabolagnulinux.org/other/~aurelien/packer/packer-${pkgver}.tar.gz")
+source=("https://repo.parabola.nu/other/~aurelien/packer/packer-${pkgver}.tar.gz")
 
 makedepends=('git')
 depends=('grep' 'sed' 'bash' 'curl' 'pacman' 'jshon' 'expac')
diff --git a/pcr/pandoc-static/PKGBUILD b/pcr/pandoc-static/PKGBUILD
index c87c31842..85d2f9e09 100644
--- a/pcr/pandoc-static/PKGBUILD
+++ b/pcr/pandoc-static/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=pandoc-static
 _pkgname=pandoc
 pkgver=1.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libraries)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -18,12 +18,12 @@ depends=('icu>=54' 'icu<55' 'gmp' 'libffi' 'zlib')
 makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
 optdepends=('texlive-most: for PDF creation')
 options=(strip !makeflags !distcc !emptydirs)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
 md5sums=('dd2667b233b5f97b2841ae09895c2ac2')
 
-declare -A flags
+declare -gA _flags
 _flags[pandoc]='https make-pandoc-man-pages'
-_flags[pandoc-citeproc]='small_base bibutils hexpat unicode_collation'
+_flags[pandoc_citeproc]='small_base bibutils hexpat unicode_collation'
 
 _packages=(hs-bibutils network hexpat text text-icu hsb2hs
   http-client-0.3.8.2
@@ -62,13 +62,18 @@ prepare() {
 
 build() (
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir ../build
+  mkdir -p ../build
 
   export LANG="en_US.utf8"
   export HOME="${srcdir}"
   export PATH="${srcdir}/build/usr/bin:${PATH}"
 
   while read hkpkg; do
+    if [ -d "$srcdir"/build/usr/share/doc/*/"$hkpkg" ]; then
+      msg2 'Skipping %s' "$hkpkg"
+      continue
+    fi
+
     msg2 'Building %s' "$hkpkg"
     pushd "$hkpkg" >/dev/null
     case "$hkpkg" in
@@ -83,7 +88,7 @@ build() (
         ;;
       pandoc-citeproc-*)
         cabal configure -v \
-          --flags="embed_data_files ${_flags[pandoc-citeproc]}" \
+          --flags="embed_data_files ${_flags[pandoc_citeproc]}" \
           --prefix=/usr
         cabal build
         ;;
@@ -100,11 +105,13 @@ package() {
 
   msg2 "Installing pandoc..."
   cd ${_pkgname}-${pkgver}
-  runghc Setup.hs copy --destdir="${pkgdir}/"
+  cabal copy --destdir="${pkgdir}/"
+  install -Dm644 {,"$pkgdir"/usr/share/}man/man1/pandoc.1
+  install -Dm644 {,"$pkgdir"/usr/share/}man/man5/pandoc_markdown.5
 
   msg2 "Installing pandoc-citeproc..."
   cd ../pandoc-citeproc-*
-  runghc Setup.hs copy --destdir="${pkgdir}/"
+  cabal copy --destdir="${pkgdir}/"
 
   msg2 "Installing extra executables..."
   cp -av "${srcdir}"/build/usr/bin/* "${pkgdir}"/usr/bin/
@@ -112,10 +119,6 @@ package() {
   msg2 "Removing library files..."
   rm -rfv "$pkgdir"/usr/lib
 
-  msg2 "Correctiong file permissions in /usr/share/..."
-  find "${pkgdir}"/usr/share -type f -exec chmod -v 644 -- {} +
-  find "${pkgdir}"/usr/share -type d -exec chmod -v 755 -- {} +
-
   msg2 "Installing licenses..."
   install -d                                 "${pkgdir}"/usr/share/licenses/${pkgname}
   cp -rv "${srcdir}"/build/usr/share/doc/*/* "${pkgdir}"/usr/share/licenses/${pkgname}
diff --git a/pcr/perspectives-server/PKGBUILD b/pcr/perspectives-server/PKGBUILD
index 8867faa37..fcb5ae794 100644
--- a/pcr/perspectives-server/PKGBUILD
+++ b/pcr/perspectives-server/PKGBUILD
@@ -10,7 +10,7 @@ arch=('any')
 license=('GPL3')
 depends=('openssl' 'python2>=2.7' 'python2-m2crypto'
          'python2-cherrypy' 'python2-sqlalchemy')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         perspectives-server.{conf,cron,service,install})
 install="${pkgname}.install"
 optdepends=('python2-psycopg2: for postgresql storage'
diff --git a/pcr/printrun-stable/PKGBUILD b/pcr/printrun-stable/PKGBUILD
index f8f2bd4df..9336ab004 100644
--- a/pcr/printrun-stable/PKGBUILD
+++ b/pcr/printrun-stable/PKGBUILD
@@ -19,7 +19,7 @@ optdepends=(
 #	'python2-tornado: for prontserve'
 )
 
-source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz")
+source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver.tar.gz")
 md5sums=('bc19f5b4570e178d435da04747c18e42')
 
 mkdepends=('git')
diff --git a/pcr/printrun/PKGBUILD b/pcr/printrun/PKGBUILD
index 4d4788911..e04dfec41 100644
--- a/pcr/printrun/PKGBUILD
+++ b/pcr/printrun/PKGBUILD
@@ -15,7 +15,7 @@ optdepends=(
 #	'python2-tornado: for prontserve'
 )
 
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('d8b04115306d7b6b07d712af15383db7')
 
 mkdepends=('git')
diff --git a/pcr/qt-at-spi-git/PKGBUILD b/pcr/qt-at-spi-git/PKGBUILD
index d53a10982..304b2a2d1 100644
--- a/pcr/qt-at-spi-git/PKGBUILD
+++ b/pcr/qt-at-spi-git/PKGBUILD
@@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('at-spi2-core' 'qt4>=4.8' 'kdelibs>=4.8')
 makedepends=('cmake' 'automoc4')
 
-source=("https://repo.parabolagnulinux.org/other/$_pkgname/$pkgname-$pkgver.tar.gz" 'qt-accessibility.sh')
+source=("https://repo.parabola.nu/other/$_pkgname/$pkgname-$pkgver.tar.gz" 'qt-accessibility.sh')
 md5sums=('688accf9c2f517a526885733aad821a4'
          'f0c8551ed54f5d4e5daf7ddac9189aaa')
 
diff --git a/pcr/qxmlrpc/PKGBUILD b/pcr/qxmlrpc/PKGBUILD
index b39b40890..dbf352489 100644
--- a/pcr/qxmlrpc/PKGBUILD
+++ b/pcr/qxmlrpc/PKGBUILD
@@ -8,7 +8,7 @@ url="https://code.google.com/p/qxmlrpc"
 license=('LGPL')
 depends=('qt')
 makedepends=('subversion')
-source=("https://repo.parabolagnulinux.org/other/$pkgname-$pkgver-$pkgrel-any.src.tar.xz"{,.sig}
+source=("https://repo.parabola.nu/other/$pkgname-$pkgver-$pkgrel-any.src.tar.xz"{,.sig}
         "01_build_targets.patch"
         "02_staticlib_removed.patch"
         "03_client.h_include_fix.patch"
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 418f53640..b654280c4 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -15,7 +15,7 @@ depends=('libpng' 'libjpeg' 'libwww-hg' 'boost' 'freetype2' 'luabind' 'libogg' '
 #conflicts=('ryzom' 'ryzom-client') # see above
 conflicts=('ryzom' 'ryzom-client' 'nel-hg' 'ryzom-nel')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'boost' 'rrdtool')
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz")
 sha256sums=('fce7d94f1c55afd939ab4943af6480b0d20d4f74f5d357029777f84ac661f869')
 
 mksource=("$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${hgver}")
diff --git a/pcr/systemd-knock/PKGBUILD b/pcr/systemd-knock/PKGBUILD
index 296e2a47c..932fe14cd 100644
--- a/pcr/systemd-knock/PKGBUILD
+++ b/pcr/systemd-knock/PKGBUILD
@@ -2,10 +2,11 @@
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-pkgbase=systemd
+_pkgbase=systemd
+pkgbase=systemd-knock
 pkgname=('systemd-knock' 'libsystemd-knock')
 pkgver=217
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -13,7 +14,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'libxslt' 'util-linux' 'linux-api-headers' 'lz4' 'pam' 'python'
              'python-lxml' 'quota-tools' 'shadow' 'xz')
 options=('strip' 'debug')
-source=("http://www.freedesktop.org/software/$pkgbase/$pkgbase-$pkgver.tar.xz"
+source=("http://www.freedesktop.org/software/$_pkgbase/$_pkgbase-$pkgver.tar.xz"
         '0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch'
         '0001-sd-dhcp-client-clean-up-raw-socket-sd_event_source-w.patch'
         '0001-shared-install-avoid-prematurely-rejecting-missing-u.patch'
@@ -42,8 +43,9 @@ md5sums=('e68dbff3cc19f66e341572d9fb2ffa89'
          '107c489f27c667be4101aecd3369b355'
          'bde43090d4ac0ef048e3eaee8202a407')
 
+
 prepare() {
-  cd "$pkgbase-$pkgver"
+  cd "$_pkgbase-$pkgver"
 
   patch -Np1 <../0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch
   patch -Np1 <../0001-sd-dhcp-client-clean-up-raw-socket-sd_event_source-w.patch
@@ -58,7 +60,7 @@ prepare() {
 }
 
 build() {
-  cd "$pkgbase-$pkgver"
+  cd "$_pkgbase-$pkgver"
 
   local timeservers=({0..3}.arch.pool.ntp.org)
 
@@ -114,7 +116,7 @@ package_systemd-knock() {
           etc/udev/udev.conf)
   install="systemd.install"
 
-  make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install
+  make -C "$_pkgbase-$pkgver" DESTDIR="$pkgdir" install
 
   # don't write units to /etc by default. some of these will be re-enabled on
   # post_install.
@@ -168,13 +170,13 @@ package_systemd-knock() {
   mv "$pkgdir"/usr/lib/lib{systemd,{g,}udev}*.so* usr/lib
 
   # include MIT license, since it's technically custom
-  install -Dm644 "$srcdir/$pkgbase-$pkgver/LICENSE.MIT" \
+  install -Dm644 "$srcdir/$_pkgbase-$pkgver/LICENSE.MIT" \
       "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
 }
 
 package_libsystemd-knock() {
   pkgdesc="systemd client libraries with support for stealth TCP sockets"
-  depends=('glib2' 'glibc' 'libgcrypt' 'xz')
+  depends=('glib2' 'glibc' 'libgcrypt' 'lz4' 'xz')
   license=('GPL2')
   provides=('libgudev-1.0.so' 'libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
             'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so' "libsystemd=$pkgver")
diff --git a/pcr/weboob/PKGBUILD b/pcr/weboob/PKGBUILD
new file mode 100644
index 000000000..a1748c397
--- /dev/null
+++ b/pcr/weboob/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): speps <speps@aur.archlinux.dot.org>
+
+pkgname=weboob
+pkgver=1.0
+pkgrel=1
+pkgdesc="A collection of applications to interact websites without a web browser."
+arch=('any')
+url="http://weboob.org/"
+license=('AGPL3')
+
+# This list is based on setup.py
+# Supposedly python3 compatible, but tools/date.py throws a syntax error
+_python=python2
+depends=(
+  $_python-pyqt4
+
+  $_python-lxml
+  $_python-feedparser
+  $_python-requests
+  $_python-dateutil
+  $_python-yaml
+  $_python-prettytable
+
+  $_python-pillow
+)
+if [[ $_python == python2 ]]; then
+  depends+=(
+    python2-gdata # for Python < 3.0
+    python2-mechanize # for Python < 3.0
+    python2-futures # for Python < 3.2
+  )
+fi
+
+makedepends=($_python-setuptools)
+optdepends=('libyaml: for more performance'
+            "$_python-simplejson: for more performance")
+install="$pkgname.install"
+source=("https://symlink.me/attachments/download/289/$pkgname-$pkgver.tar.gz")
+md5sums=('38f832f1b8654441adafe8558faa7109')
+
+package() {
+  cd $pkgname-$pkgver
+  $_python setup.py install --optimize=1 --root="$pkgdir" \
+          --qt --xdg
+}
diff --git a/pcr/weboob/weboob.install b/pcr/weboob/weboob.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/weboob/weboob.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}