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

9 files changed, 15 insertions, 121 deletions

diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD
index e1e3eb0c4..20d442fd6 100644
--- a/pcr/babeld/PKGBUILD
+++ b/pcr/babeld/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer (AUR): Yann Lopez <arch at lonewulf dot net>
 # Maintainer (Parabola): fauno <fauno@parabola.nu>
 pkgname=babeld
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Loop-free distance-vector routing protocol"
 arch=(i686 x86_64 mips64el)
@@ -28,5 +28,5 @@ package() {
 
   install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE
 }
-md5sums=('4ad44bca59f594a629306ac5c9b89d57'
+md5sums=('406bbd940e3a9019d832d20e277266f2'
          'SKIP')
diff --git a/~mtjm/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD
index 237b6c9bd..f5b96f752 100644
--- a/~mtjm/python2-postfix-policyd-spf/PKGBUILD
+++ b/pcr/python2-postfix-policyd-spf/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Samed Beyribey <ras0ir@eventualis.org>
 pkgname=python2-postfix-policyd-spf
 _pkgname=pypolicyd-spf
-pkgver=0.8.1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="Python2 Postfix Sender Policy Framework (SPF) filter"
 arch=('any')
@@ -12,14 +12,17 @@ license=('GPL')
 depends=('postfix' 'python2-pyspf' 'python2')
 conflicts=('python-postfix-policyd-spf')
 options=(!emptydirs)
-source=(http://launchpad.net/pypolicyd-spf/0.8/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
-md5sums=('a37c209e88e4dc419f62ae7c6b52f0e7')
- 
+backup=(etc/python-policyd-spf/policyd-spf.conf)
+source=(http://launchpad.net/pypolicyd-spf/1.1/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
+sha256sums=('f8999a9febc5ccb4a66f9961e4ec2d8f81b407bdc3ac1c84563cd5085429cdea')
+
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
- 
-  python2 setup.py build || return 1
-  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
-  install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf || return 1
+  cd "$srcdir/$_pkgname-$pkgver" 
+  python2 setup.py build
 }
 
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+  install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf
+}
diff --git a/~mtjm/python2-pydns/PKGBUILD b/pcr/python2-pydns/PKGBUILD
index cf5f4b388..cf5f4b388 100644
--- a/~mtjm/python2-pydns/PKGBUILD
+++ b/pcr/python2-pydns/PKGBUILD
diff --git a/~mtjm/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD
index abb3bfa5f..abb3bfa5f 100644
--- a/~mtjm/python2-pyspf/PKGBUILD
+++ b/pcr/python2-pyspf/PKGBUILD
diff --git a/~mtjm/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD
index ff338e0d4..3bbe41397 100644
--- a/~mtjm/ttf-beteckna/PKGBUILD
+++ b/pcr/ttf-beteckna/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ttf-beteckna
 pkgver=0.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A geometric sans serif typeface inspired by the popular Futura"
 arch=('any')
 url="http://gnu.ethz.ch/linuks.mine.nu/beteckna/"
diff --git a/~mtjm/ttf-beteckna/ttf.install b/pcr/ttf-beteckna/ttf.install
index 33b7d6549..33b7d6549 100644
--- a/~mtjm/ttf-beteckna/ttf.install
+++ b/pcr/ttf-beteckna/ttf.install
diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE
deleted file mode 100644
index 304031cb6..000000000
--- a/~mtjm/python-coverage/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-# COPYRIGHT AND LICENSE
-#
-# Copyright 2001 Gareth Rees.  All rights reserved.
-# Copyright 2004-2010 Ned Batchelder.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
diff --git a/~mtjm/python-coverage/PKGBUILD b/~mtjm/python-coverage/PKGBUILD
deleted file mode 100644
index f9acc0d94..000000000
--- a/~mtjm/python-coverage/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
-
-pkgname=(python-coverage python2-coverage)
-pkgver=3.5.1
-pkgrel=1
-pkgdesc="Code coverage measurement for Python"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://nedbatchelder.com/code/coverage/"
-license=('BSD')
-makedepends=('python' 'python2' 'python-distribute' 'python2-distribute')
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=(!emptydirs)
-install=
-source=("http://pypi.python.org/packages/source/c/coverage/coverage-${pkgver}.tar.gz" LICENSE)
-md5sums=('410d4c8155a4dab222f2bc51212d4a24'
-         'f86a7dcb9a1bc636cdbcc19a96d19b2c')
-
-# Tests are not run, since upstream removes them from release tarballs.
-
-build() {
-  cd $srcdir
-  cp -r coverage-$pkgver build-py2k
-  cp -r coverage-$pkgver build-py3k
-  cd build-py2k
-  python2 setup.py build
-  cd ../build-py3k
-  python setup.py build
-}
-
-package_python-coverage() {
-  depends=('python' 'python-distribute')
-  cd "$srcdir/build-py3k"
-  python setup.py install --root="$pkgdir/" --optimize=1
-  install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-coverage() {
-  depends=('python2' 'python2-distribute')
-  cd "$srcdir/build-py2k"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  # Name the script differently.
-  mv $pkgdir/usr/bin/coverage $pkgdir/usr/bin/coverage2
-  install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/~mtjm/python2-pyflakes/PKGBUILD b/~mtjm/python2-pyflakes/PKGBUILD
deleted file mode 100644
index 397c487b7..000000000
--- a/~mtjm/python2-pyflakes/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 64234 2012-02-11 00:28:07Z arodseth $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: TDY <tdy@gmx.com>
-# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
-
-pkgname=python2-pyflakes
-pkgver=0.5.0
-pkgrel=1
-pkgdesc='A lint-like tool for Python to identify common errors quickly without executing code'
-arch=('any')
-url='http://pypi.python.org/pypi/pyflakes'
-license=('custom:MIT')
-depends=('python2')
-provides=('pyflakes')
-conflicts=('pyflakes')
-replaces=('pyflakes')
-source=("http://pypi.python.org/packages/source/p/pyflakes/pyflakes-${pkgver}.tar.gz")
-md5sums=('568dab27c42e5822787aa8a603898672')
-
-build() {
-  cd pyflakes-${pkgver}
-
-  python2 setup.py build
-}
-
-package() {
-  cd pyflakes-${pkgver}
-
-  python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
-
-  install -D -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/pyflakes/LICENSE
-}