fix shared library support and parallel build issue.

(Portage version: 2.2_rc61/cvs/Linux i686)

3 files changed, 48 insertions, 9 deletions

diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog
index 2c400f69a74c..81a4118fb582 100644
--- a/app-accessibility/flite/ChangeLog
+++ b/app-accessibility/flite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/flite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.36 2010/01/01 16:03:24 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.37 2010/01/01 22:30:51 williamh Exp $
+
+*flite-1.4-r1 (01 Jan 2010)
+
+  01 Jan 2010; William Hubbs <williamh@gentoo.org> -flite-1.4.ebuild,
+  +flite-1.4-r1.ebuild, +files/flite-1.4-fix-parallel-builds.patch:
+  fix shared library support and parallel build issue.
 
   01 Jan 2010; William Hubbs <williamh@gentoo.org> flite-1.4.ebuild:
   work around paralell make issue. #299032.
diff --git a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
new file mode 100644
index 000000000000..270395877c53
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
@@ -0,0 +1,25 @@
+From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Fri, 1 Jan 2010 12:59:59 -0600
+Subject: [PATCH] fix parallel builds
+
+---
+ main/Makefile |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/main/Makefile b/main/Makefile
+index 0513e59..e4d04fe 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -81,6 +81,8 @@ else
+ shared_libs: nothing
+ endif
+ 
++.NOTPARALLEL: $(ALL)
++
+ $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps)
+ 	$(TOP)/tools/make_voice_list $(VOICES)
+ 	rm -f flite_voice_list.o
+-- 
+1.6.4.4
+
diff --git a/app-accessibility/flite/flite-1.4.ebuild b/app-accessibility/flite/flite-1.4-r1.ebuild
index dfe2756bca7f..a0a2c741b0d1 100644
--- a/app-accessibility/flite/flite-1.4.ebuild
+++ b/app-accessibility/flite/flite-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4.ebuild,v 1.2 2010/01/01 16:03:24 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.1 2010/01/01 22:30:51 williamh Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2"
 LICENSE="BSD as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa oss"
+IUSE="alsa oss static-libs"
 
 S=${WORKDIR}/${P}-release
 
@@ -28,27 +28,35 @@ get_audio() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
 	epatch "${FILESDIR}"/${P}-respect-destdir.patch
 }
 
 src_configure() {
-	econf \
-		--with-audio=$(get_audio) || die "configuration failed"
+	local myconf
+	if ! use static-libs; then
+		myconf=--enable-shared
+	fi
+	myconf="${myconf} --with-audio=$(get_audio)"
+	econf ${myconf} || die "configuration failed"
 }
 
 src_compile() {
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "Failed compilation"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "compilation failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "installation failed"
-	dodoc ACKNOWLEDGEMENTS README
+	dodoc ACKNOWLEDGEMENTS README || die "Documentation installation failed"
+	if ! use static-libs; then
+		rm -rf "${D}"/usr/lib/*.a
+	fi
 }
 
 pkg_postinst() {
 	if [ "$(get_audio)" = "none" ]; then
 		ewarn "you have built flite without audio support."
-		ewarn "If you want audio support for flite, you need"
-		ewarn "alsa or oss in your use flags."
+		ewarn "If you want audio support, re-emerge"
+		ewarn "flite with alsa or oss in your use flags."
 	fi
 }