Applied an extensive patch by Alexander Epaneshnikov that updates the PKGBUILD, fixes versioning and other housekeeping issues, and builds split espeak-ng-git and espeak-ng-espeak-git packages.

2 files changed, 56 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 390ae2c2cda6..aee736703353 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Oct 11 18:43:07 UTC 2019
 pkgbase = espeak-ng-git
-	pkgdesc = Next generation open source speech synthesizer based on Espeak (git version)
-	pkgver = 0.0
+	pkgdesc = Multi-lingual software speech synthesizer (development version)
+	pkgver = 1.50.r410.g49930f48
 	pkgrel = 1
 	url = https://github.com/espeak-ng/espeak-ng
 	arch = aarch64
@@ -11,15 +9,22 @@ pkgbase = espeak-ng-git
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = pcaudiolib
 	makedepends = git
-	makedepends = ruby-ronn
-	depends = gcc-libs
-	depends = pcaudiolib
-	provides = espeak-ng=0.0
-	conflicts = espeak
-	conflicts = espeak-test
-	source = git+https://github.com/espeak-ng/espeak-ng.git
+	makedepends = ruby-ronn-ng
+	source = espeak-ng::git+https://github.com/espeak-ng/espeak-ng.git
 	md5sums = SKIP
 
 pkgname = espeak-ng-git
+	depends = pcaudiolib
+	optdepends = espeak-ng-espeak-git: for *speak symlinks
+	provides = espeak-ng
+	conflicts = espeak-ng
 
+pkgname = espeak-ng-espeak-git
+	pkgdesc = Multi-lingual software speech synthesizer (development version) (*speak symlinks)
+	depends = espeak-ng-git
+	provides = espeak-ng-espeak
+	provides = espeak
+	conflicts = espeak-ng-espeak
+	conflicts = espeak
diff --git a/PKGBUILD b/PKGBUILD
index a3faeb3e76b8..575fcac3a46d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,55 @@
 # Maintainer: Kyle <kyle@gmx.ca>
-pkgname=espeak-ng-git
-_gitname=espeak-ng
-pkgver=0.0 # determined from git origin
+# contributor: Alexander Epaneshnikov <aarnaarn2@gmail.com>
+
+pkgname=('espeak-ng-git' 'espeak-ng-espeak-git')
+pkgbase=espeak-ng-git
+pkgver=1.50.r410.g49930f48
 pkgrel=1
-pkgdesc="Next generation open source speech synthesizer based on Espeak (git version)"
+pkgdesc="Multi-lingual software speech synthesizer (development version)"
 arch=('aarch64' 'armv6h' 'armv7h' 'i686' 'x86_64')
 url="https://github.com/espeak-ng/espeak-ng"
 license=('GPL3')
-depends=(gcc-libs pcaudiolib)
-optdepends=()
-makedepends=('git' 'ruby-ronn')
-provides=("espeak-ng=${pkgver}")
-conflicts=(espeak espeak-test)
-source=('git+https://github.com/espeak-ng/espeak-ng.git')
+makedepends=('pcaudiolib' 'git' 'ruby-ronn-ng')
+source=(${pkgname%-git}::'git+https://github.com/espeak-ng/espeak-ng.git')
 md5sums=('SKIP')
 
 pkgver() {
-  cd $_gitname
-  # Use the tag of the last commit
-  printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+  cd ${pkgname%-git}
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
-  # Espeak-ng doesn't yet support multi-threaded builds. Overriding MAKEFLAGS fixes this here for now.
-  MAKEFLAGS="-j 1"
-  cd $_gitname
+prepare() {
+  cd ${pkgname%-git}
   ./autogen.sh
-  ./configure --prefix=/usr
-  make
 }
 
-package() {
-  cd $_gitname
-  make DESTDIR="$pkgdir/" install
-  cd $pkgdir/usr/bin
-  cd ../lib
-    for f in libespeak-ng.so*; do
-    ln -s "$f" $(echo $f|sed 's|-ng||')
-  done
+build() {
+  cd ${pkgname%-git}
+  ./configure --prefix=/usr --with-extdict-{ru,cmn,yue}
+  make src/espeak-ng src/speak-ng
+  make -j1
+}
+
+package_espeak-ng-git() {
+  depends=('pcaudiolib')
+  optdepends=('espeak-ng-espeak-git: for *speak symlinks')
+  provides=('espeak-ng')
+  conflicts=('espeak-ng')
+  cd ${pkgname%-git}
+  make DESTDIR="$pkgdir" install
+  mv "$pkgdir"/usr/share/vim/{addons,vimfiles}
+  rm -r "$pkgdir"/usr/{bin/*speak,include/espeak,share/vim/registry}
 }
 
-# vim:set ts=2 sw=2 et:
+package_espeak-ng-espeak-git() {
+  pkgdesc+=' (*speak symlinks)'
+  depends=('espeak-ng-git')
+  provides=('espeak-ng-espeak' 'espeak')
+  conflicts=('espeak-ng-espeak' 'espeak')
+  install -d "$pkgdir"/usr/{bin,include/espeak,share/man/man1}
+  ln -s /usr/bin/espeak-ng "$pkgdir"/usr/bin/espeak
+  ln -s /usr/bin/speak-ng "$pkgdir"/usr/bin/speak
+  ln -s /usr/include/espeak-ng/speak_lib.h "$pkgdir"/usr/include/espeak/speak_lib.h
+  ln -s /usr/share/man/man1/espeak-ng.1.gz "$pkgdir"/usr/share/man/man1/espeak.1.gz
+  ln -s /usr/share/man/man1/speak-ng.1.gz "$pkgdir"/usr/share/man/man1/speak.1.gz
+}