[arch-commits] Commit in brltty/trunk (PKGBUILD brltty.install brltty.tmpfiles)

[David Runge]

    Date: Monday, September 2, 2019 @ 10:54:25
  Author: dvzrv
Revision: 361487

upgpkg: brltty 6.0-3

Adding maintainer. Switching to current upstream (https://brltty.app). Switching to correct license (LGPL2.1). Moving libxaw, bluez-libs to makedepends/optdepends.
Moving cython to makedepends and adding python to optdepends. Adding ocaml-{ctypes,findlib} to makedepends and ocaml to optdepends for ocaml support.
Adding java-environment to makedepends and java-runtime to optdepends for Java support. Adding polkit to makedepends and optdepends for polkit support.
Adding liblouis to depends. Adding tmpfiles.d integration for the post_install() generated /etc/brlapi.key. Minor cleanups.

Added:
  brltty/trunk/brltty.tmpfiles
Modified:
  brltty/trunk/PKGBUILD
  brltty/trunk/brltty.install

-----------------+
 PKGBUILD        |   68 ++++++++++++++++++++++++++++++++----------------------
 brltty.install  |   14 +++++------
 brltty.tmpfiles |    1 
 3 files changed, 49 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-02 08:18:22 UTC (rev 361486)
+++ PKGBUILD	2019-09-02 10:54:25 UTC (rev 361487)
@@ -1,4 +1,4 @@
-# Maintainer:
+# Maintainer: David Runge <dave at sleepmap.de>
 # Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
@@ -5,42 +5,56 @@
 
 pkgname=brltty
 pkgver=6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Braille display driver for Linux/Unix"
-arch=(x86_64)
-url="http://mielke.cc/brltty"
-license=(GPL LGPL)
-depends=(libxaw gpm icu tcl bluez-libs)
-makedepends=(at-spi2-core tcl speech-dispatcher cython espeak)
+arch=('x86_64')
+url="https://brltty.app"
+license=('LGPL2.1')
+depends=('gpm' 'icu' 'liblouis' 'tcl')
+makedepends=('at-spi2-core' 'bluez-libs' 'cython' 'espeak' 'java-environment'
+'libxaw' 'ocaml-ctypes' 'ocaml-findlib' 'polkit' 'speech-dispatcher')
 optdepends=('at-spi2-core: X11/GNOME Apps accessibility'
             'atk: ATK bridge for X11/GNOME accessibility'
-            'speech-dispatcher: speech-dispatcher driver'
-            'espeak: espeak driver')
+            'bluez-libs: bluetooth support'
+            'espeak: espeak driver'
+            'java-runtime: Java support'
+            'libxaw: X11 support'
+            'ocaml: OCaml support'
+            'polkit: PolicyKit support'
+            'python: Python support'
+            'speech-dispatcher: speech-dispatcher driver')
 backup=(etc/brltty.conf)
 options=('!emptydirs')
 install=brltty.install
-source=(http://mielke.cc/brltty/archive/brltty-$pkgver.tar.xz
-        brltty.service brltty.sysusers)
-sha256sums=('cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7'
-            'a342a5e9d36f00a320e1d23d91c482bd5445af52588334307b7e9c09a8cc38ec'
-            '0df1ab5cca644c6deb1090976a4e459243c15668fd5c3bafb278aa629878ec07')
+source=("https://brltty.app/archive/${pkgname}-${pkgver}.tar.bz2"
+        "${pkgname}.service"
+        "${pkgname}.tmpfiles"
+        "${pkgname}.sysusers")
+sha512sums=('b114cb55916109ddeb472df1e5d206c27e93cab64c4b51f82cf0887f63f6fa90064230f769302b1ba9ba7259079026a83e7b7ed46ba20a40676a487df317902e'
+            '5da854db7612b7fcc1f1a8da0825e19509158041ceedbefc7649d220fd94a17c11044985abfc435b65a8b795c19dd2d16ff05f59641e57805f710b76570a5af4'
+            'a530fe66983768f9dc544af01c586abc101dfa2ed76885b4f1fd78c483b59e8445f2c0dbbfb865dd1cf2874342c346bd35ce978ab246e9cdd31d2d489a14e770'
+            'cc2e2d5f33d4e11d6ff828aefc0773ccdc02127ce2f00649c1e3f8d4b39b90789f4a0e41385b344f850c38bd4a1df36d3d9d413a59144d431defdd343633f800')
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --mandir=/usr/share/man \
-    --with-tables-directory=/usr/share/brltty \
-    --with-screen-driver=lx \
-    --enable-gpm \
-    --disable-java-bindings \
-
+  cd "${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --localstatedir=/var \
+              --mandir=/usr/share/man \
+              --with-tables-directory=/usr/share/brltty \
+              --with-screen-driver=lx \
+              --enable-gpm
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-  install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
-  install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service"
-  install -Dm644 ../brltty.sysusers "$pkgdir"/usr/lib/sysusers.d/brltty.conf
+  cd "${pkgname}-${pkgver}"
+  make INSTALL_ROOT="${pkgdir}" install
+  install -vDm 644 "Documents/${pkgname}.conf" -t "${pkgdir}/etc/"
+  install -vDm 644 "../${pkgname}.service" \
+    -t "${pkgdir}/usr/lib/systemd/system/"
+  install -vDm 644 "../${pkgname}.sysusers" \
+    "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -vDm 644 "../${pkgname}.tmpfiles" \
+    "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }

Modified: brltty.install
===================================================================
--- brltty.install	2019-09-02 08:18:22 UTC (rev 361486)
+++ brltty.install	2019-09-02 10:54:25 UTC (rev 361487)
@@ -1,12 +1,12 @@
 post_install () {
-     if [ ! -e /etc/brlapi.key ]; then
-         mcookie >/etc/brlapi.key
-         chmod 0640 /etc/brlapi.key
-         chgrp brlapi /etc/brlapi.key
-         echo "Please add your user to the brlapi group."
-     fi
+  [ ! -e /etc/brlapi.key ] && mcookie -v > /etc/brlapi.key
+  echo "Please add your user to the brlapi group."
 }
 
 post_upgrade () {
-    post_install
+  post_install
 }
+
+post_remove() {
+  [ -e /etc/brlapi.key ] && rm -v /etc/brlapi.key
+}

Added: brltty.tmpfiles
===================================================================
--- brltty.tmpfiles	                        (rev 0)
+++ brltty.tmpfiles	2019-09-02 10:54:25 UTC (rev 361487)
@@ -0,0 +1 @@
+z /etc/brlapi.key 0640 root brlapi -