Fix underlinking, bug #493204 by Jaakko Perttilä; drop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

9 files changed, 37 insertions, 423 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 86af64f730f9..60a9af144e20 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/speech-tools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.85 2013/08/07 22:46:11 neurogeek Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.86 2015/01/07 10:06:47 pacho Exp $
+
+  07 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/speech-tools-2.1-underlinking.patch,
+  -files/speech-tools-1.2.96_beta-gcc42.patch,
+  -files/speech-tools-1.2.96_beta-gcc43-include.patch,
+  -files/speech-tools-1.2.96_beta-gcc44.patch,
+  -speech-tools-1.2.96_beta-r2.ebuild, -speech-tools-1.2.96_beta.ebuild,
+  -speech-tools-2.0.95_beta.ebuild, speech-tools-2.1-r2.ebuild:
+  Fix underlinking, bug #493204 by Jaakko Perttilä; drop old
 
   07 Aug 2013; <neurogeek@gentoo.org> speech-tools-2.1-r2.ebuild:
   Bumped rev on patchset and added a patch to fix ncurses[tinfo]. Closes
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch
deleted file mode 100644
index 1810a96e6446..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- speech_tools/config/compilers/egcs.mak	2001-04-04 13:55:32.000000000 +0200
-+++ speech_tools/config/compilers/egcs.mak	2007-08-28 23:08:01.000000000 +0200
-@@ -54,7 +54,7 @@
- CXX=$(EGCS_CXX)
- 
- ifndef EGCS_MAKE_SHARED_LIB
--    MAKE_SHARED_LIB = gcc -shared -fno-shared-data -o XXX -Xlinker -h -Xlinker XXX
-+    MAKE_SHARED_LIB = gcc -shared -o XXX -Xlinker -h -Xlinker XXX
- else
-     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
- endif
---- speech_tools/config/compilers/gcc_defaults.mak	2006-08-05 17:37:59.000000000 +0200
-+++ speech_tools/config/compilers/gcc_defaults.mak	2007-08-28 23:08:30.000000000 +0200
-@@ -76,12 +76,12 @@
- PROFILE_gprof_CXXFLAGS  = -pg
- PROFILE_gprof_LINKFLAGS = -pg
- 
--SHARED_CCFLAGS  = -fPIC -fno-shared-data
--SHARED_CXXFLAGS  = -fPIC -fno-shared-data
--SHARED_LINKFLAGS = -fno-shared-data
-+SHARED_CCFLAGS  = -fPIC
-+SHARED_CXXFLAGS  = -fPIC
-+SHARED_LINKFLAGS =
- 
- ifndef GCC_MAKE_SHARED_LIB
--    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
-+    MAKE_SHARED_LIB = $(CXX) -shared -o XXX
- else
-     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
- endif
---- speech_tools/doc/estjavaapp.sgml	2001-04-04 13:55:32.000000000 +0200
-+++ speech_tools/doc/estjavaapp.sgml	2007-08-28 23:08:43.000000000 +0200
-@@ -105,7 +105,7 @@
- 	&shellprompt; <userinput>cd tmpdir</userinput>
- 	&shellprompt; <userinput>ar x ../libgcc.a</userinput>
- 	&shellprompt; <userinput>cd ..</userinput>
--	&shellprompt; <userinput>gcc -shared -fno-shared-data -o libgcc.so.2.7.2 tmpdir/*.o</userinput>
-+	&shellprompt; <userinput>gcc -shared -o libgcc.so.2.7.2 tmpdir/*.o</userinput>
- </screen>
- </para>
- </sect1>
---- speech_tools/stats/EST_DProbDist.cc	2004-09-30 14:53:36.000000000 +0200
-+++ speech_tools/stats/EST_DProbDist.cc	2007-08-28 23:21:17.000000000 +0200
-@@ -310,7 +310,7 @@
-     if (type == tprob_discrete)
- 	return 0;
-     else
--	return (int)scounts.list.head();
-+	return (long)scounts.list.head();
- }
- 
- int EST_DiscreteProbDistribution::item_end(int idx) const
-@@ -326,7 +326,7 @@
-     if (type == tprob_discrete)
- 	return ++idx;
-     else
--	return (int)next((EST_Litem *)idx);
-+	return (long)next((EST_Litem *)idx);
- }
- 
- const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch
deleted file mode 100644
index 6ab7ebf56614..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur speech_tools-orig/base_class/EST_TSimpleMatrix.cc speech_tools/base_class/EST_TSimpleMatrix.cc
---- speech_tools-orig/base_class/EST_TSimpleMatrix.cc	2004-09-30 06:53:35.000000000 -0600
-+++ speech_tools/base_class/EST_TSimpleMatrix.cc	2008-01-05 11:00:07.000000000 -0600
-@@ -42,6 +42,7 @@
- 
- #include "EST_TSimpleMatrix.h"
- #include "EST_TVector.h"
-+#include <cstring>
- #include <fstream>
- #include <iostream>
- #include "EST_cutils.h"
-diff -Naur speech_tools-orig/base_class/EST_TSimpleVector.cc speech_tools/base_class/EST_TSimpleVector.cc
---- speech_tools-orig/base_class/EST_TSimpleVector.cc	2006-07-06 06:57:18.000000000 -0600
-+++ speech_tools/base_class/EST_TSimpleVector.cc	2008-01-05 11:00:32.000000000 -0600
-@@ -42,6 +42,7 @@
- 
- #include "EST_TSimpleVector.h"
- #include "EST_matrix_support.h"
-+#include <cstring>
- #include <fstream>
- #include "EST_cutils.h"
- 
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch
deleted file mode 100644
index 98f8fda2f7ca..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- speech_tools/speech_class/EST_wave_io.cc.orig	2009-05-26 03:49:24.000000000 -0700
-+++ speech_tools/speech_class/EST_wave_io.cc	2009-05-26 03:54:01.000000000 -0700
-@@ -68,7 +68,7 @@
- 
- int nist_get_param_int(const char *hdr, const char *field, int def_val)
- {
--    char *p;
-+    const char *p;
-     int val;
- 
-     if (((p=strstr(hdr,field)) != NULL) &&
-@@ -84,7 +84,8 @@
- 
- char *nist_get_param_str(const char *hdr, const char *field, const char *def_val)
- {
--    char *p,*val;
-+    const char *p;
-+    char *val;
-     int size;
- 
-     if (((p=strstr(hdr,field)) != NULL) &&
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch
new file mode 100644
index 000000000000..35011735cc8c
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch
@@ -0,0 +1,11 @@
+--- speech_tools.orig/config/systems/GentooLinux.mak.old	2013-11-24 01:49:44.000000000 +0200
++++ speech_tools/config/systems/GentooLinux.mak	2013-11-24 13:04:14.327758435 +0200
+@@ -38,6 +38,7 @@
+  ###########################################################################
+ 
+ MANDIR=$(INSTALL_PREFIX)/share/man
++GENTOO_ALSA_LIBS=$(shell pkg-config --libs alsa)
+ GENTOO_CURSES_LIBS=$(shell pkg-config --libs ncurses)
+ # Gentoo does not use termcap
+-OS_LIBS = $(GENTOO_CURSES_LIBS) $(LDFLAGS) -ldl
++OS_LIBS = $(GENTOO_ALSA_LIBS) $(GENTOO_CURSES_LIBS) $(LDFLAGS) -ldl
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
deleted file mode 100644
index 1a78e868a5be..000000000000
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.6 2012/12/28 18:24:29 ulm Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-MY_P=${MY_P/_beta/-beta}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
-SRC_URI="http://www.festvox.org/packed/festival/1.96/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-patches.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nas X"
-
-DEPEND="nas? ( media-libs/nas )
-	X? ( x11-libs/libX11
-		x11-libs/libXt )
-	!<app-accessibility/festival-1.96_beta
-	!sys-power/powerman"
-
-S="${WORKDIR}/speech_tools"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch"
-	epatch
-	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' main/siod_main.cc
-}
-
-src_configure() {
-	local CONFIG=config/config.in
-	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
-	if use nas; then
-		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
-	fi
-	if [ ! use X ]; then
-		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak
-	fi
-	append-ldflags $(no-as-needed)
-	econf || die
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \
-		OPTIMISE_LINKFLAGS="${LDFLAGS}" || die "Compile failed"
-}
-
-src_install() {
-	dolib.so lib/libest*.so*
-
-	dodoc "${S}"/README
-	dodoc "${S}"/lib/cstrutt.dtd
-
-	insinto /usr/share/doc/${PF}
-	doins -r lib/example_data
-
-	insinto /usr/share/speech-tools
-	doins -r config base_class
-
-	insinto /usr/share/speech-tools/lib
-	doins -r lib/siod
-
-	cd include
-	insinto /usr/include/speech-tools
-	doins -r *
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-
-	cd ../bin
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="${D}/usr/bin/${file}"
-		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	cd "${S}"
-	exeinto /usr/$(get_libdir)/speech-tools
-	for file in `find main -perm +100 -type f`; do
-		doexe ${file}
-	done
-
-	#Rename to avoid file collisions. See bug #287983
-	mv "${D}/usr/bin/dp" "${D}/usr/bin/speech-dp"
-	#Remove /usr/bin/resynth as it is broken. See bug #253556
-	rm "${D}/usr/bin/resynth"
-}
-
-pkg_postinst() {
-	elog "The /usr/bin/dp wrapper script has been renamed to /usr/bin/speech-dp"
-	elog "due to file collision with other programs."
-	elog "See bug #287983 for more details"
-
-	elog "The /usr/bin/resynth program has been removed since it is broken"
-	elog "See bug #253556 for more details"
-}
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
deleted file mode 100644
index 49457ee2b3c1..000000000000
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.17 2012/12/28 18:24:29 ulm Exp $
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-MY_P=${MY_P/_beta/-beta}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
-SRC_URI="http://www.festvox.org/packed/festival/latest/${MY_P}.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="nas X"
-
-RDEPEND="nas? ( media-libs/nas )
-	X? ( x11-libs/libX11
-		x11-libs/libXt )
-	!<app-accessibility/festival-1.96_beta
-	!sys-power/powerman"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/speech_tools
-
-src_unpack() {
-	local CONFIG=${S}/config/config.in
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-gcc42.patch \
-		"${FILESDIR}"/${P}-gcc43-include.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-
-# set compiler flags for base_class
-	sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" "${S}"/base_class/Makefile
-
-	# enable building shared libraries
-	sed -i -e "s/#.*\(SHARED=2\)/\1/" ${CONFIG}
-
-	use nas && sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
-	use X || sed -i -e "s/-lX11 -lXt//" "${S}"/config/modules/esd_audio.mak
-}
-
-src_compile() {
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	dolib.so lib/libest*.so.1*
-	dosym libestbase.so.1.2.96.1 /usr/$(get_libdir)/libestbase.so
-	dosym libestools.so.1.2.96.1 /usr/$(get_libdir)/libestools.so
-	dosym libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
-	dolib.a lib/{libestbase.a,libestools.a,libeststring.a}
-
-	cd bin
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="/usr/bin/${file}"
-		dosed "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		dosed "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-		dosed "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	cd "${S}"
-	exeinto /usr/$(get_libdir)/speech-tools
-	for file in `find main -perm +100 -type f`; do
-		doexe ${file}
-	done
-
-	insinto /usr/share/speech-tools
-	doins -r config
-
-	insinto /usr/share/speech-tools/lib
-	doins -r lib/siod
-
-	insinto /usr/share/doc/${PF}
-	doins -r lib/example_data
-
-	cd include
-	insinto /usr/include/speech-tools
-	doins -r *
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-	cd "${S}"
-
-	dodoc "${S}"/README
-	dodoc "${S}"/lib/cstrutt.dtd
-}
diff --git a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
deleted file mode 100644
index abe4569d8e7d..000000000000
--- a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.6 2012/12/28 18:24:29 ulm Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-MY_P=${MY_P/_beta/-beta}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
-SRC_URI="http://www.festvox.org/packed/festival/${PV%_beta}/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-patches.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nas X"
-
-DEPEND="nas? ( media-libs/nas )
-	X? ( x11-libs/libX11
-		x11-libs/libXt )
-	!<app-accessibility/festival-1.96_beta
-	!sys-power/powerman"
-
-S="${WORKDIR}/speech_tools"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch"
-	epatch
-	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' main/siod_main.cc
-}
-
-src_configure() {
-	local CONFIG=config/config.in
-	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
-	if use nas; then
-		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
-	fi
-	if [ ! use X ]; then
-		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak
-	fi
-	econf || die
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \
-		OPTIMISE_LINKFLAGS="${LDFLAGS}" || die "Compile failed"
-}
-
-src_install() {
-	dolib.so lib/libest*.so*
-
-	dodoc "${S}"/README
-	dodoc "${S}"/lib/cstrutt.dtd
-
-	insinto /usr/share/doc/${PF}
-	doins -r lib/example_data
-
-	insinto /usr/share/speech-tools
-	doins -r config base_class
-
-	insinto /usr/share/speech-tools/lib
-	doins -r lib/siod
-
-	cd include
-	insinto /usr/include/speech-tools
-	doins -r *
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-
-	cd ../bin
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="${D}/usr/bin/${file}"
-		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	cd "${S}"
-	exeinto /usr/$(get_libdir)/speech-tools
-	for file in `find main -perm +100 -type f`; do
-		doexe ${file}
-	done
-
-	#Rename to avoid file collisions. See bug #287983
-	mv "${D}/usr/bin/dp" "${D}/usr/bin/speech-dp"
-	#Remove /usr/bin/resynth as it is broken. See bug #253556
-	rm "${D}/usr/bin/resynth"
-}
-
-pkg_postinst() {
-	elog "The /usr/bin/dp wrapper script has been renamed to /usr/bin/speech-dp"
-	elog "due to file collision with other programs."
-	elog "See bug #287983 for more details"
-
-	elog "The /usr/bin/resynth program has been removed since it is broken"
-	elog "See bug #253556 for more details"
-}
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
index 3236e806177b..e22821f93338 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.4 2013/08/07 22:46:11 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.5 2015/01/07 10:06:47 pacho Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -19,18 +19,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
 
-PDEPEND="nas? ( media-libs/nas )
+RDEPEND="
+	nas? ( media-libs/nas )
 	X? ( x11-libs/libX11
 		x11-libs/libXt )
 	>=media-libs/alsa-lib-1.0.20-r1
 	!<app-accessibility/festival-1.96_beta
 	!sys-power/powerman
-	>=sys-libs/ncurses-5.6-r2"
-
-DEPEND="${PDEPEND}
-		virtual/pkgconfig"
-
-RDEPEND=${PDEPEND}
+	>=sys-libs/ncurses-5.6-r2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/speech_tools"
 
@@ -42,6 +42,9 @@ src_prepare() {
 
 	#WRT bug #309983
 	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" "${S}"/config/systems/sparc_SunOS5.mak
+
+	# Fix underlinking, bug #493204
+	epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch
 }
 
 src_configure() {
@@ -53,12 +56,12 @@ src_configure() {
 	if ! use X; then
 		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak
 	fi
-	econf || die
+	econf
 }
 
 src_compile() {
 	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die "Compile failed"
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {