Merge branch 'master' of ssh://gparabola/abslibre

3 files changed, 78 insertions, 2 deletions

diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 8ca94ddab..25048150c 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=texlive-bin-libre
 pkgver=2011.1
 _luatex_ver=0.70.1
-pkgrel=5
+pkgrel=5.1
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('t1lib' 'gd' 'poppler>=0.18.1' 'libsigsegv' 'zziplib')
 makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
-conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.18.2')
+conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.18.3')
 replaces=('texlive-bin')
 options=('!libtool')
 url='http://tug.org/texlive/'
diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE
new file mode 100644
index 000000000..304031cb6
--- /dev/null
+++ b/~mtjm/python-coverage/LICENSE
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000..f9acc0d94
--- /dev/null
+++ b/~mtjm/python-coverage/PKGBUILD
@@ -0,0 +1,47 @@
+# 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"
+}