[arch-commits] Commit in borg/repos/community-x86_64 (3 files)

[Eli Schwartz]

    Date: Tuesday, June 12, 2018 @ 17:23:10
  Author: eschwartz
Revision: 342599

archrelease: copy trunk to community-x86_64

Added:
  borg/repos/community-x86_64/PKGBUILD
    (from rev 342598, borg/trunk/PKGBUILD)
Deleted:
  borg/repos/community-x86_64/PKGBUILD
  borg/repos/community-x86_64/borg.coveragerc

-----------------+
 PKGBUILD        |  112 +++++++++++++++++++++++++++---------------------------
 borg.coveragerc |   23 -----------
 2 files changed, 58 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-12 17:22:53 UTC (rev 342598)
+++ PKGBUILD	2018-06-12 17:23:10 UTC (rev 342599)
@@ -1,54 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Vlad M. <vlad at archlinux.net>
-
-pkgname=borg
-_pkgname=borgbackup
-pkgver=1.1.6
-pkgrel=1
-pkgdesc='Deduplicating backup program with compression and authenticated encryption'
-url='https://borgbackup.github.io/'
-license=('BSD')
-arch=('x86_64')
-depends=('acl' 'lz4' 'openssl' 'python-msgpack' 'python-setuptools' 'xz' 'zstd')
-optdepends=('openssh: repositories on remote hosts'
-            'python-llfuse: mounting backups as a FUSE file system')
-makedepends=('cython' 'python-sphinx' 'python-guzzle-sphinx-theme')
-checkdepends=('python-pytest' 'python-pytest-cov' 'python-pytest-benchmark' 'python-mock')
-provides=('borgbackup')
-replaces=('borgbackup')
-source=("https://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
-        borg.coveragerc)
-sha256sums=('a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930'
-            '183814ae70fce7bbcf04dbbf3866eaf76867896a4327f8a3b553e095d1ff360f')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  sed -i "s/msgpack-python>=.*/msgpack',/g" setup.py
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py build
-}
-
-check() {
-  cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3.6/"
-  LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
-    --cov-config="$srcdir/borg.coveragerc" --benchmark-skip --pyargs borg.testsuite -v \
-    -k 'not test_non_ascii_acl'
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  python setup.py -q install --root="$pkgdir" --optimize=1
-
-  install -Dm644 scripts/shell_completions/bash/borg \
-    "$pkgdir/usr/share/bash-completion/completions/borg"
-  install -Dm644 scripts/shell_completions/fish/borg.fish \
-    "$pkgdir/usr/share/fish/completions/borg.fish"
-  install -Dm644 scripts/shell_completions/zsh/_borg "$pkgdir/usr/share/zsh/site-functions/_borg"
-
-  install -Dm644 -t "$pkgdir/usr/share/man/man1/" "docs/man/"*.1
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: borg/repos/community-x86_64/PKGBUILD (from rev 342598, borg/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-12 17:23:10 UTC (rev 342599)
@@ -0,0 +1,58 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Vlad M. <vlad at archlinux.net>
+
+pkgname=borg
+_pkgname=borgbackup
+pkgver=1.1.6
+pkgrel=2
+pkgdesc='Deduplicating backup program with compression and authenticated encryption'
+url='https://borgbackup.github.io/'
+license=('BSD')
+arch=('x86_64')
+depends=('acl' 'lz4' 'openssl' 'python-msgpack' 'python-setuptools' 'xz' 'zstd')
+optdepends=('openssh: repositories on remote hosts'
+            'python-llfuse: mounting backups as a FUSE file system')
+makedepends=('cython' 'python-sphinx' 'python-guzzle-sphinx-theme')
+checkdepends=('python-pytest' 'python-pytest-cov' 'python-pytest-benchmark' 'python-mock')
+provides=('borgbackup')
+replaces=('borgbackup')
+source=("https://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
+        "https://github.com/borgbackup/borg/pull/3891/commits/d6ce4d9e7e28b89fbedcd883cac2912415164449.patch")
+sha256sums=('a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930'
+            '9974ffa97694a06c9b30b943176775ccc02927c1baea165955ab5c6e3cab85d4')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  # msgpack versions are constantly broken: https://bugs.archlinux.org/task/58974
+  patch -p1 -i ../d6ce4d9e7e28b89fbedcd883cac2912415164449.patch
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  python setup.py build
+}
+
+check() {
+  cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3.6/"
+  LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
+    --benchmark-skip --pyargs borg.testsuite -v \
+    -k 'not test_non_ascii_acl'
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python setup.py install --root="$pkgdir" --optimize=1
+
+  # remove junk files
+  rm -r "$pkgdir"/usr/lib/python*/site-packages/{.benchmarks,.coverage}
+
+  install -Dm644 scripts/shell_completions/bash/borg \
+    "$pkgdir/usr/share/bash-completion/completions/borg"
+  install -Dm644 scripts/shell_completions/fish/borg.fish \
+    "$pkgdir/usr/share/fish/completions/borg.fish"
+  install -Dm644 scripts/shell_completions/zsh/_borg "$pkgdir/usr/share/zsh/site-functions/_borg"
+
+  install -Dm644 -t "$pkgdir/usr/share/man/man1/" "docs/man/"*.1
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: borg.coveragerc
===================================================================
--- borg.coveragerc	2018-06-12 17:22:53 UTC (rev 342598)
+++ borg.coveragerc	2018-06-12 17:23:10 UTC (rev 342599)
@@ -1,23 +0,0 @@
-[run]
-branch = True
-source = src/borg
-omit =
-    */borg/__init__.py
-    */borg/__main__.py
-    */borg/_version.py
-    */borg/fuse.py
-    */borg/support/*
-    */borg/testsuite/*
-    */borg/hash_sizes.py
-
-[report]
-exclude_lines =
-    pragma: no cover
-    pragma: freebsd only
-    pragma: unknown platform only
-    def __repr__
-    raise AssertionError
-    raise NotImplementedError
-    if 0:
-    if __name__ == .__main__.:
-ignore_errors = True