Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/~git/abslibre

15 files changed, 282 insertions, 14 deletions

diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 78b27ad5e..88cc526f6 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,19 +1,20 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=parabola-keyring
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgver=20140623
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
 url='https://projects.parabolagnulinux.org/hackers.git/'
 license=('GPL')
 install=$pkgname.install
+
 source=("http://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
         "http://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz.sig")
+md5sums=('9cf084f1d448c06649851860cec87014'
+         'SKIP')
 
 package() {
-	cd $srcdir/$pkgname-$pkgver
-	make PREFIX=/usr DESTDIR=${pkgdir} install
+	cd "$srcdir/$pkgname-$pkgver"
+	make PREFIX=/usr DESTDIR="${pkgdir}" install
 }
-md5sums=('d50f8ba9f108b38c0e084d21742ea059'
-         'SKIP')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 25cfeb421..d65345435 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=(parabolaweb-utils parabolaweb-dev)
-pkgver=20140616
+pkgver=20140624.3
 pkgdesc="Utilities for managing the ParabolaWeb website application"
 url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
 license=('GPL2')
@@ -12,13 +12,13 @@ _parabolaweb_commit=724f8c309c97aa9af7f963687342e8f37e682204
 
 pkgrel=1
 epoch=1
-arch=('any')
+arch=('i686' 'x86_64')
 
 source=(
-  "https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
-  "requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}"
+	"https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
+	"requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}"
 )
-md5sums=('a3a5c128161a2560368281700bd2c4f7'
+md5sums=('0f7169ffa50fea915344f944a0920bf8'
          '8bf17af4e66f552864bfdc0fd1d472f1')
 
 build() {
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 1c15ca6ed..4360d253e 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,26 +1,27 @@
 # Maintainer: Parabola Project <dev@lists.parabolagnulinux.org>
 
 pkgname=your-freedom
-pkgver=...
-_gitver=...
 pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
 license=('GPL3')
 url="https://projects.parabolagnulinux.org/blacklist.git"
 
+pkgver=20140623.3
+_gitver=a9535cf32f27dd22ee6154d3b73fb52c8a7ae513
 pkgrel=1
+
 arch=('any')
 groups=('base')
 install=${pkgname}.install
 
 makedepends=(librelib)
 source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt?id=${_gitver})
-md5sums=('5fd14982619414fea1882b351607291e')
+md5sums=('d28686e73aeb011bf4dc621d9cb02979')
 
 package() {
 	cd "$srcdir"
 
 	conflicts=($(
-		< blacklist-${pkgver}.txt \
+		< blacklist-${_gitver}.txt \
 		libreblacklist normalize |
 		cut -d: -f1,2 |
 		sed -n 's/:$//p' |
diff --git a/pcr/aspcud/PKGBUILD b/pcr/aspcud/PKGBUILD
index 064a75ea9..b88357290 100644
--- a/pcr/aspcud/PKGBUILD
+++ b/pcr/aspcud/PKGBUILD
@@ -13,6 +13,7 @@ depends=('clasp>=2.1.3' 'gringo>=4.2.1')
 conflicts=('aspcud-svn')
 makedepends=('boost' 'cmake' 're2c')
 source=("http://downloads.sourceforge.net/project/potassco/${pkgname}/${pkgver}/${pkgname}-${pkgver}-source.tar.gz")
+md5sums=(9d014548e36480957cb97486e6312bea)
 
 build() {
     cd "$srcdir/$pkgname-$pkgver-source"
diff --git a/pcr/boswars/PKGBUILD b/pcr/boswars/PKGBUILD
new file mode 100644
index 000000000..86d158904
--- /dev/null
+++ b/pcr/boswars/PKGBUILD
@@ -0,0 +1,57 @@
+# Contributor (Arch)     :Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Contributor (Arch)     : Diogo Leal <estranho@diogoleal.com>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname=boswars
+pkgver=2.7
+pkgrel=4
+pkgdesc="Futuristic real-time strategy game"
+url="http://www.boswars.org"
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('sdl' 'libpng' 'lua51' 'libvorbis' 'libtheora' 'libgl' 'python2')
+makedepends=('glu' 'coreutils') # nproc is in coreutils
+source=("http://www.boswars.org/dist/releases/$pkgname-$pkgver-src.tar.gz"
+        "boswars.sh"
+        "boswars.png"
+        "boswars.desktop")
+sha256sums=('dc3718f531e9ea413cf37e1333b62a4c5e69f1405502d9c59b9e424635135e3e'
+            '8f90601f1aedee2d2b097b3a47200013ec61639ca3dd6c8936dfc733eb5dc634'
+            'f89454681f02df31f5714747563ce30c4643cda96d91b7fc29216dacf92e8b10'
+            '666712c9cf7fff391e6a67f99fdc12f6fce45777ee0891a808cb2a00910c739c')
+
+prepare() {
+  cd $pkgname-$pkgver-src
+
+  # use python2 in doc generator scripts
+  sed 's|env python$|&2|' -i doc/scripts/*.py
+  # fix 'zlib too far back error' of png images (needed for libpng>=1.6)
+  msg2 "Fixing PNG images…"
+  for _f in {maps/antarticum.map/terrain,graphics/ui/ui_*,units/{radar/*,tree*/tree0?}}.png
+  do
+    pngfix -e -w --out=$_f.fixed $_f || : # ignore exit code
+    mv $_f.fixed $_f
+  done
+}
+
+build() {
+  cd $pkgname-$pkgver-src
+
+  # speed up build process with parallel building
+  python2 make.py -j $(nproc)
+}
+
+package(){
+  cd $pkgname-$pkgver-src
+
+  # data
+  install -d "$pkgdir"/opt/bos/languages
+  install -m644 languages/*.po "$pkgdir"/opt/bos/languages
+  cp -r campaigns doc graphics intro maps scripts sounds units "$pkgdir"/opt/bos
+
+  # executable, launcher and .desktop entry
+  install -Dm755 fbuild/release/boswars "$pkgdir"/opt/bos/boswars
+  install -Dm755 ../boswars.sh "$pkgdir"/usr/bin/boswars
+  install -Dm644 ../boswars.png "$pkgdir"/usr/share/pixmaps/boswars.png
+  install -Dm644 ../boswars.desktop "$pkgdir"/usr/share/applications/boswars.desktop
+}
diff --git a/pcr/boswars/boswars.desktop b/pcr/boswars/boswars.desktop
new file mode 100644
index 000000000..10cc4fdd6
--- /dev/null
+++ b/pcr/boswars/boswars.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Bos Wars
+GenericName=Battle of Survival Wars
+Comment=real-time strategy game
+Exec=boswars
+Icon=boswars
+Terminal=false
+Type=Application
+Categories=Game;StrategyGame;
diff --git a/pcr/boswars/boswars.png b/pcr/boswars/boswars.png
new file mode 100644
index 000000000..5c4580506
--- /dev/null
+++ b/pcr/boswars/boswars.png
diff --git a/pcr/boswars/boswars.sh b/pcr/boswars/boswars.sh
new file mode 100644
index 000000000..de30b2ff9
--- /dev/null
+++ b/pcr/boswars/boswars.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /opt/bos/boswars -d /opt/bos $*
diff --git a/pcr/brutalchess/PKGBUILD b/pcr/brutalchess/PKGBUILD
new file mode 100644
index 000000000..eb6d344b9
--- /dev/null
+++ b/pcr/brutalchess/PKGBUILD
@@ -0,0 +1,40 @@
+# Contributor (Arch)     : boenki <boenki at gmx dot de>
+# Contributor (Arch)     : Arkham <arkham at archlinux dot us>
+# Contributor (Arch)     : Rick Rein <jeebusroxors@gmail.com>
+# Contributor (Arch)     : Stefano Esposito <ragnarok@email.it>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname=brutalchess
+pkgver=0.5.2
+pkgrel=5
+pkgdesc="Chess game inspired by 'Battle Chess'. Features full 3D graphics."
+url="http://sourceforge.net/projects/$pkgname"
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('sdl_image' 'freetype2' 'glu')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-alpha-$pkgver-src.tar.gz")
+md5sums=('370476b63091b8d82a9ea57c604dcbab')
+
+prepare() {
+  cd $pkgname-$pkgver/src
+  sed '/<time.h>/ a\#include <limits.h>' -i brutalplayer.cpp
+  sed 's/GLvoid/void/g'                  -i {md3view,objview}.cpp
+  sed '/<string>/ a\#include <unistd.h>' -i {xboardplayer,faileplayer}.cpp
+  sed 's~#include\ <freetype/~#include\ <freetype2/~g' -i fontloader.h
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/bin
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/pcr/pivaders-git/PKGBUILD b/pcr/pivaders-git/PKGBUILD
new file mode 100644
index 000000000..0bee35d23
--- /dev/null
+++ b/pcr/pivaders-git/PKGBUILD
@@ -0,0 +1,28 @@
+# Contributor (Arch)     : Arthur Zamarin <arthurzam@gmail.com> 
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+_pkgname=pivaders
+pkgname=pivaders-git
+pkgver=0.2.r1.g5bffd90
+pkgrel=1
+pkgdesc="Space Invaders game"
+arch=('any')
+url="https://github.com/russb78/${_pkgname}"
+license=('GPL2')
+depends=('python' 'python2-pygame')
+conflicts=('pivaders')
+source=("${_pkgname}::git+git://github.com/russb78/${_pkgname}.git"
+        "${_pkgname}.sh")
+sha1sums=('SKIP'
+          '60183ae638d48bc5493eb318e54fb61a6454cfa3')
+
+pkgver() {
+  cd "${srcdir}/${_pkgname}"
+  git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
+}
+ 
+package() {
+  install -Dm755 "${srcdir}/${_pkgname}.sh" ${pkgdir}/usr/bin/${_pkgname}
+  mkdir -p ${pkgdir}/usr/share/${_pkgname}
+  cp -r ${srcdir}/${_pkgname}/${_pkgname}/* ${pkgdir}/usr/share/${_pkgname}/
+}
diff --git a/pcr/pivaders-git/pivaders.sh b/pcr/pivaders-git/pivaders.sh
new file mode 100644
index 000000000..bfc009a73
--- /dev/null
+++ b/pcr/pivaders-git/pivaders.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+startDir=$(pwd)
+cd /usr/share/pivaders
+./pivaders.py
+cd $startDir
diff --git a/pcr/sl/PKGBUILD b/pcr/sl/PKGBUILD
new file mode 100644
index 000000000..26e1345c5
--- /dev/null
+++ b/pcr/sl/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor (Arch)     : Jakub Luzny <limoto94@gmail.com>
+# Contributor (Arch)     : SanskritFritz (gmail)
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname=sl
+pkgver=5.01
+pkgrel=1
+pkgdesc='Steam Locomotive runs across your terminal when you type "sl" as you meant to type "ls"'
+arch=('i686' 'x86_64' 'arm')
+url="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html"
+license=('free')
+depends=('ncurses')
+makedepends=('git')
+source=("git://github.com/mtoyoda/sl.git")
+md5sums=('SKIP')
+
+build() {
+	cd "$srcdir/sl"
+
+	cc $CFLAGS -o sl sl.c -lcurses
+	gzip -9 -f sl.1
+}
+
+package() {
+	cd "${srcdir}/sl"
+
+	install -Dm 775 sl "$pkgdir/usr/bin/sl"
+	install -Dm 644 sl.1.gz "$pkgdir/usr/share/man/man1/sl.1.gz"
+}
+
+#category: games
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/spyder/PKGBUILD b/pcr/spyder/PKGBUILD
new file mode 100644
index 000000000..1e9c456a1
--- /dev/null
+++ b/pcr/spyder/PKGBUILD
@@ -0,0 +1,51 @@
+# Contributor (Arch)     : Muflone http://url.muflone.com/contacts
+# Contributor (Arch)     : Francois Boulogne <fboulogne@april.org>
+# Contributor (Arch)     : TDY <tdy@gmx.com>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname=spyder
+pkgver=2.2.5
+pkgrel=2
+pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.'
+arch=('any')
+url='http://code.google.com/p/spyderlib/'
+license=('MIT')
+install="${pkgname}.install"
+depends=('python2-pyqt4' 'python2-pyflakes' 'desktop-file-utils' 'gtk-update-icon-cache' 'python2-pyzmq' 'python2-pygments')
+makedepends=('python2-sphinx' 'python2-setuptools')
+optdepends=('python2-pylint: powerful code analysis'
+            'ipython2: enhanced Python interpreter'
+            'python2-rope: editor code completion, calltips and go-to-definition'
+            'python2-sphinx: rich text help on the object inspector'
+            'python2-numpy: N-dimensional arrays'
+            'python2-scipy: signal/image processing'
+            'python2-psutil: memory/CPU usage in the status bar'
+            'python2-h5py: HDF5 support'
+            'python2-matplotlib: interactive 2D/3D data plotting'
+            'pep8-python2: real-time code style analysis'
+            'python2-sympy: symbolic mathematics for the IPython console')
+source=("http://spyderlib.googlecode.com/files/${pkgname}-${pkgver}.zip" 
+        "pylint.patch")
+md5sums=('1c9aa650dae9f883616e917803f8a3be'
+         '3fe95915036634841b619670ad947e96')
+
+prepare() {
+  patch -p0 < "pylint.patch"
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  python2 setup.py build
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+  # Install license file
+  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  # Install icon and desktop file
+  install -D -m644 "scripts/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m644 "spyderlib/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+  # Remove useless spyder_win_post_install script
+  rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py"
+}
diff --git a/pcr/spyder/pylint.patch b/pcr/spyder/pylint.patch
new file mode 100644
index 000000000..faa1edcf1
--- /dev/null
+++ b/pcr/spyder/pylint.patch
@@ -0,0 +1,28 @@
+diff -Naur spyder-2.2.5/spyderplugins/widgets/pylintgui.py spyder-2.2.5-patched/spyderplugins/widgets/pylintgui.py
+--- spyder-2.2.5/spyderplugins/widgets/pylintgui.py	2013-10-12 20:35:52.000000000 +0200
++++ spyder-2.2.5-patched/spyderplugins/widgets/pylintgui.py	2013-11-12 00:42:22.809509805 +0100
+@@ -40,7 +40,7 @@
+ _ = get_translation("p_pylint", dirname="spyderplugins")

+ 

+ 

+-PYLINT_PATH = programs.find_program('pylint')

++PYLINT_PATH = programs.find_program('pylint2')

+ 

+ 

+ def get_pylint_version():

+@@ -48,13 +48,13 @@
+     global PYLINT_PATH

+     if PYLINT_PATH is None:

+         return

+-    process = subprocess.Popen(['pylint', '--version'],

++    process = subprocess.Popen(['pylint2', '--version'],

+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE,

+                                cwd=osp.dirname(PYLINT_PATH),

+                                shell=True if os.name == 'nt' else False)

+     lines = to_unicode_from_fs(process.stdout.read()).splitlines()

+     if lines:

+-        match = re.match('(pylint|pylint-script.py) ([0-9\.]*)', lines[0])

++        match = re.match('(pylint2|pylint-script.py) ([0-9\.]*)', lines[0])

+         if match is not None:

+             return match.groups()[1]

+ 

diff --git a/pcr/spyder/spyder.install b/pcr/spyder/spyder.install
new file mode 100644
index 000000000..62a045c59
--- /dev/null
+++ b/pcr/spyder/spyder.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}