update pkgbuild

many improvements and fixes.

4 files changed, 62 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c488c4d0cae..ffbeb5ad1951 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,38 @@
 pkgbase = speech-dispatcher-git
 	pkgdesc = High-level device independent layer for speech synthesis interface (development version)
-	pkgver = 0.9.0.rc2.r7.gd25ed10d
+	pkgver = 0.11.0.rc2.r3.gd8accf2b
 	pkgrel = 1
 	url = http://www.freebsoft.org/speechd
 	arch = x86_64
 	license = GPL2
 	license = FDL
-	makedepends = autoconf
+	makedepends = glib2
 	makedepends = intltool
 	makedepends = espeak-ng
-	makedepends = libltdl
-	makedepends = python-xdg
+	makedepends = libtool
+	makedepends = python-pyxdg
 	makedepends = dotconf
 	makedepends = libpulse
 	makedepends = libao
 	makedepends = git
-	source = speech-dispatcher-git::git+https://github.com/brailcom/speechd.git
+	options = !emptydirs
+	source = speech-dispatcher::git+https://github.com/brailcom/speechd.git
 	sha512sums = SKIP
 
 pkgname = speech-dispatcher-git
-	depends = libspeechd-git=0.9.0.rc2.r7.gd25ed10d-1
-	depends = libltdl
-	depends = python-xdg
+	depends = libspeechd-git=0.11.0.rc2.r3.gd8accf2b-1
+	depends = glib2
+	depends = libtool
+	depends = python-pyxdg
 	depends = dotconf
 	depends = libpulse
 	depends = libao
 	optdepends = festival: Speech output using Festival
-	optdepends = espeak: Speech output using ESpeak
+	optdepends = espeak-ng: Speech output using ESpeak-ng
 	optdepends = pulseaudio: PulseAudio support
 	provides = speech-dispatcher
 	conflicts = speech-dispatcher
 	backup = etc/speech-dispatcher/clients/emacs.conf
-	backup = etc/speech-dispatcher/modules/ibmtts.conf
-	backup = etc/speech-dispatcher/modules/espeak-generic.conf
 	backup = etc/speech-dispatcher/modules/espeak.conf
 	backup = etc/speech-dispatcher/modules/espeak-ng.conf
 	backup = etc/speech-dispatcher/modules/swift-generic.conf
@@ -42,13 +42,12 @@ pkgname = speech-dispatcher-git
 	backup = etc/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf
 	backup = etc/speech-dispatcher/modules/dtk-generic.conf
 	backup = etc/speech-dispatcher/modules/llia_phon-generic.conf
-	backup = etc/speech-dispatcher/modules/ivona.conf
 	backup = etc/speech-dispatcher/modules/epos-generic.conf
 	backup = etc/speech-dispatcher/modules/flite.conf
-	backup = etc/speech-dispatcher/modules/pico-generic.conf
 	backup = etc/speech-dispatcher/speechd.conf
 
 pkgname = libspeechd-git
+	depends = glib2
+	depends = libtool
 	provides = libspeechd
 	conflicts = libspeechd
-
diff --git a/PKGBUILD b/PKGBUILD
index a2089db31810..b4ba2d0f7db7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Michael Taboada <michael@2mb.solutions>
 # Maintainer: Storm Dragon <stormdragon2976@gmail.com>
-# Contributor: alex19EP <aarnaarn2@gmail.com>
+# Maintainer: Alexander Epaneshnikov <aarnaarn2@gmail.com>
+# Maintainer: Michael Taboada <michael@2mb.solutions>
 # Contributor: Kyle <kyle@free2.ml>
 # Contributor: Steve Holmes <steve.holmes88@gmail.com>
 # Contributor: Alexander Jenisch <nt@divzero.at>
@@ -9,75 +9,81 @@
 
 pkgbase=speech-dispatcher-git
 pkgname=(speech-dispatcher-git libspeechd-git)
-pkgver=0.9.0.rc2.r7.gd25ed10d
+pkgver=0.11.0.rc2.r3.gd8accf2b
 pkgrel=1
-arch=('x86_64')
 pkgdesc="High-level device independent layer for speech synthesis interface (development version)"
+arch=('x86_64')
+url='http://www.freebsoft.org/speechd'
 license=('GPL2' 'FDL')
-url="http://www.freebsoft.org/speechd"
-makedepends=('autoconf' 'intltool' 'espeak-ng' 'libltdl' 'python-xdg' 'dotconf' 'libpulse' 'libao' 'git')
-source=(${pkgname}::'git+https://github.com/brailcom/speechd.git')
+makedepends=('glib2' 'intltool' 'espeak-ng' 'libtool' 'python-pyxdg' 'dotconf'
+             'libpulse' 'libao' 'git')
+options=('!emptydirs')
+source=(${pkgname%-git}::'git+https://github.com/brailcom/speechd.git')
 sha512sums=('SKIP')
 
+pkgver() {
+	cd "${pkgname%-git}"
+	git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 prepare() {
-	cd "$pkgname"
+	cd "${pkgname%-git}"
 	autoreconf -i
 }
 
 build() {
-	cd "$pkgname"
+	cd "${pkgname%-git}"
 	./configure --prefix=/usr \
-		--enable-shared \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--localedir=/usr/share/speech-dispatcher/locale \
-		--with-systemdsystemunitdir=/usr/lib/systemd/system \
-		--with-espeak-ng
+	            --sysconfdir=/etc \
+	            --localedir=/usr/share/speech-dispatcher/locale \
+	            --libexecdir=/usr/lib/speech-dispatcher/ \
+	            --localstatedir=/var \
+	            --with-systemdsystemunitdir=/usr/lib/systemd/system \
+	            --enable-shared \
+	            --with-espeak-ng
 	make
 }
 
 package_speech-dispatcher-git() {
-	depends=("libspeechd-git=$pkgver-$pkgrel" 'libltdl' 'python-xdg' 'dotconf' 'libpulse' 'libao')
+	depends=("libspeechd-git=$pkgver-$pkgrel" 'glib2' 'libtool' 'python-pyxdg' 'dotconf' 'libpulse' 'libao')
 	optdepends=('festival: Speech output using Festival'
-		'espeak: Speech output using ESpeak'
-		'pulseaudio: PulseAudio support')  
-	provides=("speech-dispatcher")
+	            'espeak-ng: Speech output using ESpeak-ng'
+	            'pulseaudio: PulseAudio support')
 	conflicts=("speech-dispatcher")
-	backup=(etc/speech-dispatcher/clients/emacs.conf
-		etc/speech-dispatcher/modules/ibmtts.conf
-		etc/speech-dispatcher/modules/espeak-generic.conf
-		etc/speech-dispatcher/modules/espeak.conf
-		etc/speech-dispatcher/modules/espeak-ng.conf
-		etc/speech-dispatcher/modules/swift-generic.conf
-		etc/speech-dispatcher/modules/festival.conf
-		etc/speech-dispatcher/modules/cicero.conf
-		etc/speech-dispatcher/modules/espeak-mbrola-generic.conf
-		etc/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf
-		etc/speech-dispatcher/modules/dtk-generic.conf
-		etc/speech-dispatcher/modules/llia_phon-generic.conf
-		etc/speech-dispatcher/modules/ivona.conf
-		etc/speech-dispatcher/modules/epos-generic.conf
-		etc/speech-dispatcher/modules/flite.conf
-		etc/speech-dispatcher/modules/pico-generic.conf
-		etc/speech-dispatcher/speechd.conf)
+	provides=("speech-dispatcher")
+	backup=('etc/speech-dispatcher/clients/emacs.conf'
+	        'etc/speech-dispatcher/modules/espeak.conf'
+	        'etc/speech-dispatcher/modules/espeak-ng.conf'
+	        'etc/speech-dispatcher/modules/swift-generic.conf'
+	        'etc/speech-dispatcher/modules/festival.conf'
+	        'etc/speech-dispatcher/modules/cicero.conf'
+	        'etc/speech-dispatcher/modules/espeak-mbrola-generic.conf'
+	        'etc/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf'
+	        'etc/speech-dispatcher/modules/dtk-generic.conf'
+	        'etc/speech-dispatcher/modules/llia_phon-generic.conf'
+	        'etc/speech-dispatcher/modules/epos-generic.conf'
+	        'etc/speech-dispatcher/modules/flite.conf'
+	        'etc/speech-dispatcher/speechd.conf'
+	)
 
-	cd "$pkgname"
+	cd "${pkgname%-git}"
 	make DESTDIR="${pkgdir}" install
 
 	install -d "${pkgdir}/var/log/speech-dispatcher"
 
 	sed -i 's|includedir=.*|includedir=${prefix}/include/speech-dispatcher|g' "${pkgdir}/usr/lib/pkgconfig/speech-dispatcher.pc"
 
-	mkdir -p ${srcdir}/libspeechd/usr/lib
-	mv "${pkgdir}"/usr/include ${srcdir}/libspeechd/usr
-	mv "${pkgdir}"/usr/lib/libspeechd*so* ${srcdir}/libspeechd/usr/lib
+	mkdir -p "${srcdir}"/libspeechd/usr/lib
+	mv "${pkgdir}"/usr/include "${srcdir}"/libspeechd/usr
+	mv "${pkgdir}"/usr/lib/libspeechd*so* "${srcdir}"/libspeechd/usr/lib
 }
 
 package_libspeechd-git() {
-	provides=("libspeechd")
+	depends=('glib2' 'libtool')
 	conflicts=("libspeechd")
+	provides=("libspeechd")
 	mkdir -p "${pkgdir}"/usr/lib
 
-	mv ${srcdir}/libspeechd/usr/include "${pkgdir}"/usr
-	mv ${srcdir}/libspeechd/usr/lib/* "${pkgdir}"/usr/lib
+	mv "${srcdir}"/libspeechd/usr/include "${pkgdir}"/usr
+	mv "${srcdir}"/libspeechd/usr/lib/* "${pkgdir}"/usr/lib
 }
diff --git a/speech-dispatcher-git.install b/speech-dispatcher-git.install
deleted file mode 100644
index 4cba3241344d..000000000000
--- a/speech-dispatcher-git.install
+++ /dev/null
@@ -1,22 +0,0 @@
-info_dir=/usr/share/info
-info_files=('speech-dispatcher.info'
-    'ssip.info'
-    'spd-say.info')
-
-post_install() {
-  [[ -x /usr/bin/install-info ]] || return 0
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ -x /usr/bin/install-info ]] || return 0
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/speech-dispatcherd.service b/speech-dispatcherd.service
deleted file mode 100644
index ce21c565011c..000000000000
--- a/speech-dispatcherd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Speech-Dispatcher an high-level device independent layer for speech synthesis.
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/speech-dispatcher -d 
-
-[Install]
-WantedBy=multi-user.target