Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/antiword/PKGBUILD
	community/apcupsd/PKGBUILD
	community/busybox/PKGBUILD
	community/chrpath/PKGBUILD
	community/driftnet/PKGBUILD
	community/emesene/PKGBUILD
	community/fdm/PKGBUILD
	community/fftw2/PKGBUILD
	community/gsynaptics/PKGBUILD
	community/gtk-rezlooks-engine/PKGBUILD
	community/httptunnel/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/libopenraw/PKGBUILD
	community/mashup/PKGBUILD
	community/pcb/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/preload/PKGBUILD
	community/rlog/PKGBUILD
	community/scponly/PKGBUILD
	community/splint/PKGBUILD
	community/wmname/PKGBUILD
	community/xosd/PKGBUILD
	community/xxkb/PKGBUILD
	community/znc/PKGBUILD
	core/glibc/PKGBUILD
	core/libtool/PKGBUILD
	extra/at/PKGBUILD
	extra/autogen/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/cdrdao/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/cmt/PKGBUILD
	extra/compface/PKGBUILD
	extra/dasher/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/dmapi/PKGBUILD
	extra/docker/PKGBUILD
	extra/dvd+rw-tools/PKGBUILD
	extra/dvdrtools/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gecko-sharp-2.0/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/gnome-vfsmm/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphite/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3/PKGBUILD
	extra/java-access-bridge/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/koffice/PKGBUILD
	extra/ladspa/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libdc1394/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libglademm/PKGBUILD
	extra/libgnomecanvasmm/PKGBUILD
	extra/libsigsegv/PKGBUILD
	extra/libstdc++5/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/lua/PKGBUILD
	extra/mcpp/PKGBUILD
	extra/metalog/PKGBUILD
	extra/mp3wrap/PKGBUILD
	extra/mt-st/PKGBUILD
	extra/naim/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/oxine/PKGBUILD
	extra/php/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pstoedit/PKGBUILD
	extra/qt/PKGBUILD
	extra/speex/PKGBUILD
	extra/sweep/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib-extras/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/ypbind-mt/PKGBUILD
	gnome-unstable/caribou/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/cogl/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/empathy/empathy.install
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/gdm/fix_external_program_directories.patch
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-contacts/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gnome-utils/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/mash/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/mx/PKGBUILD
	gnome-unstable/pulseaudio/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/pygobject2/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/sushi/PKGBUILD
	gnome-unstable/totem/PKGBUILD
	gnome-unstable/upower/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-gtk/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD
	multilib/lib32-nspr/PKGBUILD
	multilib/lib32-nss/PKGBUILD
	multilib/lib32-nss/add_spi+cacert_ca_certs.patch
	multilib/lib32-openssl/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	testing/util-linux/PKGBUILD

1 files changed, 102 insertions, 106 deletions

diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD
index 20e894daa..4ec82f8d7 100644
--- a/extra/festival/PKGBUILD
+++ b/extra/festival/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127865 2011-06-19 00:11:13Z eric $
+# $Id: PKGBUILD 137968 2011-09-13 09:17:12Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Simo Leone <neotuli@gmail.com>
@@ -6,7 +6,7 @@
 pkgname=festival
 pkgver=2.1
 _suffix=release
-pkgrel=2
+pkgrel=3
 pkgdesc="A general multi-lingual speech synthesis system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cstr.ed.ac.uk/projects/festival/"
@@ -15,123 +15,119 @@ depends=('perl')
 options=('!makeflags')
 source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz"
         "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz"
-		"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
-		"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
-		"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
-		'speechconfig.patch'
-		'festconfig.patch'
-		'config.guess'
-		'config.sub')
+	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
+	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
+	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
+	'speechconfig.patch'
+	'festconfig.patch'
+	'festival-shared-build.patch')
 md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
          '6920ddc75b042910a3bcfee3ab106938'
          '6a2ee4fed7c3ebedf197a3b8524ccb87'
          '84af32a914d996f57bc4cb36fe8cdc97'
          'aa80f9250065b318325f16fdad3a4484'
-         '550abd77dc20e444673d6ecf87a60fe9'
+         'c30ae990baca40c9c2b1d5cd27502139'
          '348cc033430aee7989463198818ae74c'
-	 'fad4f4cc5caad203dee58165a1412b80'
-	 '7905ae2a747db79964eb9a1693a15c2b')
+         '46132b1cd86a982007312def49ab176a')
 
 build() {
-	# Install updated config.guess and config.sub
-	cp "$srcdir/config.guess" "$srcdir/config.sub" "$srcdir/festival"
-	cp "$srcdir/config.guess" "$srcdir/config.sub" "$srcdir/speech_tools"
+  cd "$srcdir"
+  patch -Np0 -i "$srcdir/festival-shared-build.patch"
 
-	# Build Speech Tools first
-	cd "$srcdir/speech_tools"
-	patch -Np1 -i "$srcdir/speechconfig.patch"
+  # Build Speech Tools first
+  cd "$srcdir/speech_tools"
+  patch -Np1 -i "$srcdir/speechconfig.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
 
-	./configure --prefix=/usr --sysconfdir=/etc
-	make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+  # Build Festival itself
+  cd "$srcdir/festival"
+  patch -Np1 -i "$srcdir/festconfig.patch"
 
-	# Build Festival itself
-	cd "$srcdir/festival"
-	patch -Np1 -i "$srcdir/festconfig.patch"
+  # Avoid make failure on making scripts and docs
+  sed -i "s#examples bin doc#examples#" Makefile
 
-	# Avoid make failure on making scripts and docs
-	sed -i "s#examples bin doc#examples#" Makefile
-
-	./configure --prefix=/usr --sysconfdir=/etc
-	make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
 }
 
 package() {
-	# Install Speech Tools first
-	cd "$srcdir/speech_tools"
-	install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
-
-	#binaries
-	#move binaries over wrappers (FS#7864)
-	for i in $(grep -l 'EST shared script' bin/*); do
-		cp -f main/$(basename $i) bin;
-	done
-	install -m755 -t "$pkgdir"/usr/bin bin/[a-z]*
-	rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program}
-
-	#libraries
-	install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.*
-	ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
-	ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
-	install -m644 -t "$pkgdir"/usr/lib lib/lib*.a
-
-	#headers
-	for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
-	  install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h
-	done
-
-	# Install Festival itself
-	cd "$srcdir"/festival
-
-	#binaries
-	install -m755 src/main/festival "$pkgdir"/usr/bin/
-	install -m755 src/main/festival_client "$pkgdir"/usr/bin/
-	install -m755 examples/benchmark "$pkgdir"/usr/bin/
-	install -m755 examples/dumpfeats "$pkgdir"/usr/bin/
-	install -m755 examples/durmeanstd "$pkgdir"/usr/bin/
-	install -m755 examples/latest "$pkgdir"/usr/bin/
-	install -m755 examples/make_utts "$pkgdir"/usr/bin/
-	install -m755 examples/powmeanstd "$pkgdir"/usr/bin/
-	install -m755 examples/run-festival-script "$pkgdir"/usr/bin/
-	install -m755 examples/saytime "$pkgdir"/usr/bin/
-	install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/
-	install -m755 examples/text2pos "$pkgdir"/usr/bin/
-	install -m755 examples/text2wave "$pkgdir"/usr/bin
-
-	#libraries
-	install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/
-
-	#headers
-	install -dm755 "$pkgdir"/usr/include/festival
-	install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h
-
-	mkdir -p "$pkgdir"/usr/share/festival
-	#install -m644 -t "$pkgdir"/usr/share/festival lib/*.scm
-	#need to clean up but requires knowing which files are actually needed...
-	cp -aR lib/* "$pkgdir"/usr/share/festival
-	rm -f $(find "$pkgdir"/usr/share/festival -name Makefile)
-	rm -f $(find "$pkgdir"/usr/bin -name Makefile)
-
-	#create voices directory
-	install -dm755 "$pkgdir"/usr/share/festival/voices
-
-	#licenses
-	install -D -m644 "$srcdir"/festival/COPYING \
-	                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-	install -D -m644 "$srcdir"/speech_tools/README \
-	                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other
-
-	#################################################################
-	# Ok now some general cleanups
-	for i in $(find "$pkgdir"/usr/include/ -type f); do
-		sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
-		-e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
-		-e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \
-		-e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g'\
-		-e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \
-		-e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \
-		-e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \
-		-e 's,"festival\.h",\<festival/festival.h\>,g' \
-		-e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \
-		-e 's,"Phone\.h",\<festival/Phone.h\>,g' $i
-	done
+ # Install Speech Tools first
+  cd "$srcdir/speech_tools"
+  install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
+
+  #binaries
+  #move binaries over wrappers (FS#7864)
+  for i in $(grep -l 'EST shared script' bin/*); do
+    cp -f main/$(basename $i) bin;
+  done
+  install -m755 -t "$pkgdir"/usr/bin bin/[a-z]*
+  rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program}
+
+  #libraries
+  install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.*
+  ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
+  ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so
+  ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
+  install -m644 -t "$pkgdir"/usr/lib lib/lib*.a
+
+  #headers
+  for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
+    install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h
+  done
+
+  # Install Festival itself
+  cd "$srcdir"/festival
+
+  #binaries
+  install -m755 src/main/festival "$pkgdir"/usr/bin/
+  install -m755 src/main/festival_client "$pkgdir"/usr/bin/
+  install -m755 examples/benchmark "$pkgdir"/usr/bin/
+  install -m755 examples/dumpfeats "$pkgdir"/usr/bin/
+  install -m755 examples/durmeanstd "$pkgdir"/usr/bin/
+  install -m755 examples/latest "$pkgdir"/usr/bin/
+  install -m755 examples/make_utts "$pkgdir"/usr/bin/
+  install -m755 examples/powmeanstd "$pkgdir"/usr/bin/
+  install -m755 examples/run-festival-script "$pkgdir"/usr/bin/
+  install -m755 examples/saytime "$pkgdir"/usr/bin/
+  install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/
+  install -m755 examples/text2pos "$pkgdir"/usr/bin/
+  install -m755 examples/text2wave "$pkgdir"/usr/bin
+
+  #libraries
+  install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/
+  install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/
+  ln -sf libFestival.so.2.1.0 "$pkgdir"/usr/lib/libFestival.so
+
+  #headers
+  install -dm755 "$pkgdir"/usr/include/festival
+  install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h
+
+  mkdir -p "$pkgdir"/usr/share/festival
+  cp -aR lib/* "$pkgdir"/usr/share/festival
+  rm -f $(find "$pkgdir"/usr/share/festival -name Makefile)
+  rm -f $(find "$pkgdir"/usr/bin -name Makefile)
+
+  #create voices directory
+  install -dm755 "$pkgdir"/usr/share/festival/voices
+
+  #licenses
+  install -D -m644 "$srcdir"/festival/COPYING \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 "$srcdir"/speech_tools/README \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other
+
+  # Ok now some general cleanups
+  for i in $(find "$pkgdir"/usr/include/ -type f); do
+    sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
+      -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
+      -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \
+      -e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g' \
+      -e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \
+      -e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \
+      -e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \
+      -e 's,"festival\.h",\<festival/festival.h\>,g' \
+      -e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \
+      -e 's,"Phone\.h",\<festival/Phone.h\>,g' $i
+  done
 }