[arch-commits] Commit in espeak-ng/trunk (PKGBUILD)

[Alexander Epaneshnikov]

    Date: Sunday, April 3, 2022 @ 11:44:33
  Author: alex19ep
Revision: 1180981

upgpkg: espeak-ng 1.51-1 upstream release

Modified:
  espeak-ng/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-03 11:21:36 UTC (rev 1180980)
+++ PKGBUILD	2022-04-03 11:44:33 UTC (rev 1180981)
@@ -1,55 +1,39 @@
 # Maintainer: Daniel M. Capella <polyzen at archlinux.org>
 # Maintainer: Alexander Epaneshnikov <alex19ep at archlinux.org>
 
-pkgname=('espeak-ng' 'espeak-ng-espeak')
-pkgbase=espeak-ng
-pkgver=1.50
-pkgrel=5
+pkgname=espeak-ng
+pkgver=1.51
+pkgrel=1
 pkgdesc='Multi-lingual software speech synthesizer'
 url=https://github.com/espeak-ng/espeak-ng
 arch=('x86_64')
 license=('GPL3')
+depends=('pcaudiolib')
 makedepends=('pcaudiolib' 'ruby-ronn-ng')
+replaces=('espeak-ng-espeak')
+provides=('espeak-ng-espeak')
+conflicts=('espeak-ng-espeak' 'espeak')
 options=(debug)
-source=("$url/archive/$pkgver/espeak-ng-$pkgver.tar.gz"
-        'espeak-ng-fix-699.patch::https://github.com/espeak-ng/espeak-ng/commit/e11cd42b03d1628f7a0cf45c9406123282e25c63.patch')
-b2sums=('c64c2a474374d4b6fe13bf3a99f5dfb661923c13ebd6c0bc323e7f26d9d90945c7075cc5c8f4b51e5db3303632c8c9daca7a65a1883e09d7c3faf63dd725ea3f'
-        'c90b6c1a08fed25183ae1601f1935e7742878a6242b5cd2bb87d19fa9b3e89d62f5c4432d388e9dcb6a0921ba188aeffe4d63143142b4070ad49dce4c758f45c')
+source=("$url/archive/$pkgver/espeak-ng-$pkgver.tar.gz")
+b2sums=('230e8860247bdd44a26ba7281fadb7486e7fff90de229c71fb883693badfc141d5ad883769d6cead150f43560a5c47152cada4fcb5a28c0b0384dacaad2c9d09')
 
 prepare() {
   cd espeak-ng-$pkgver
   ./autogen.sh
-
-  # https://github.com/espeak-ng/espeak-ng/issues/699
-  patch --forward --strip=1 --input=../espeak-ng-fix-699.patch
 }
 
 build() {
   cd espeak-ng-$pkgver
-  ./configure --prefix=/usr --with-extdict-{ru,zh,zhy}
+  ./configure --prefix=/usr
   make src/espeak-ng src/speak-ng
-  make -j1
+  make
 }
 
-package_espeak-ng() {
-  depends=('pcaudiolib')
-  optdepends=('espeak-ng-espeak: for *speak symlinks')
+package() {
   cd espeak-ng-$pkgver
   make DESTDIR="$pkgdir" install
   mv "$pkgdir"/usr/share/vim/{addons,vimfiles}
-  rm -r "$pkgdir"/usr/{bin/*speak,include/espeak,share/vim/registry}
+  rm -r "$pkgdir"/usr/{include/espeak,share/vim/registry}
 }
 
-package_espeak-ng-espeak() {
-  pkgdesc+=' (*speak symlinks)'
-  depends=('espeak-ng')
-  conflicts=('espeak')
-  install -d "$pkgdir"/usr/{bin,include/espeak,share/man/man1}
-  ln -s espeak-ng "$pkgdir"/usr/bin/espeak
-  ln -s speak-ng "$pkgdir"/usr/bin/speak
-  ln -s ../espeak-ng/speak_lib.h "$pkgdir"/usr/include/espeak/speak_lib.h
-  ln -s espeak-ng.1.gz "$pkgdir"/usr/share/man/man1/espeak.1.gz
-  ln -s speak-ng.1.gz "$pkgdir"/usr/share/man/man1/speak.1.gz
-}
-
 # vim:set ts=2 sw=2 et: