fix shared library support and parallel build issue.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 51 insertions, 11 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/Manifest b/app-accessibility/flite/Manifest
index e9983653bfb3..bd3f0b9b58ab 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,6 +1,7 @@
 AUX const.patch 466 RMD160 1e904127dbd32b3de46c224022330b9406dd79b5 SHA1 91d4f78f1a08e952e9f3890b6a0f851ee342a05b SHA256 31df1356f8ada98927f786903c3f69ca45c46d810cb6c1971a029296ccbff4f3
 AUX flite-1.3-alsa-support.patch 11007 RMD160 bfa1bcc6c9ff713f289944ff7b5400cd1ef07ff3 SHA1 a8a90225fb9f5cfded5943c8ab22a92208b0b07f SHA256 f43266bc5c70c12512be6a8e1980d5d5551d7624bd27a678431d53df695cf01d
 AUX flite-1.3-shared-libs.patch 7663 RMD160 d5b73272ed794b3b8b1a83d041eb6c3d9f81178c SHA1 b07a01729607805dea2c13c3990adc31be866600 SHA256 b7cc0a8fe5f4e71a8bc83dd6e4442d641fb909fd812826dc66e9c3749c65027b
+AUX flite-1.4-fix-parallel-builds.patch 599 RMD160 81e74758731d7aaf9f820b232c56206bcb8af235 SHA1 0607706f5d88e94a28e7e02f2a49437c6b229cde SHA256 bfd51888ea533bb9ee74cadb68b2e507cb715ab5043aa679b7f42ab52336a7a1
 AUX flite-1.4-respect-destdir.patch 1902 RMD160 01ff0c79ff294f4108432c56cbf205f5103e82c7 SHA1 a146918a4cafc95b8b881beb6c1a79ce0380868f SHA256 093538c3a7cd2b9b9edd1f0956a34c4261c3ccdd4feb55e8ecedc338562495f3
 DIST flite-1.2-release.tar.bz2 7817919 RMD160 e261cda8212590d1c3edb66826d404e5ad0f4c2f SHA1 ed80430a2098f780b0fd145555ce8f437d7415b2 SHA256 10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2
 DIST flite-1.3-release.tar.gz 10663835 RMD160 a908acfd196754783ee4665ac84ea860d54bcf80 SHA1 233144a772de72741ae1aa2292f672c30224afb3 SHA256 922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b
@@ -8,6 +9,6 @@ DIST flite-1.4-release.tar.bz2 15163897 RMD160 d821c45aa8d0c4ce8fef28c7bcead70b5
 DIST flite_lexfix.tar.gz 2857920 RMD160 fea1ad471b22d47f802951824f28b79baa6b16fd SHA1 8647b3925b1d2340394f15c712fb28576934f4ff SHA256 caa81ffa962b31dbbc0211bc20506a2bb02c707695b286f072c8ec264e32252c
 EBUILD flite-1.2-r1.ebuild 1727 RMD160 9f558bcda554e565b00dd4c942b9dd02f281cda6 SHA1 5ccfe230de572bcc42991ab7192c10174752dcce SHA256 225d508baab31c9a22baf02e9f59758d0bda6458ed94ade0f503004d67ca115b
 EBUILD flite-1.3.ebuild 1576 RMD160 075433dceca6da37f5850e89ac05c33d1c5f38a9 SHA1 a0db2654ea791da35b8a3f9ae5ba0ced33a26846 SHA256 a225dae1b897ae224c166bae272ab129f8a1e6af4112b8dbc1932168d3ccedc8
-EBUILD flite-1.4.ebuild 1230 RMD160 2229b056e87ce44cf153aa8733af8a1396f489da SHA1 be5c04cb0d44cb34abf5953f11ed7b285715a465 SHA256 49093b35569c18a75e855680c06e211fff014fc42ca7cb924ca7ac6fbfdf3a59
-MISC ChangeLog 4556 RMD160 95d0ab744e30ffba4c334096165e0aaaa7721c0b SHA1 9a75c98f68eece046eaf1ee16b8a51ca5d54988e SHA256 d221fb478d0cab23eff3a86b47caaadf1892bce75e466c10ab1b3df9b23f719f
+EBUILD flite-1.4-r1.ebuild 1496 RMD160 1811db7a00e56e245ed6870d727b9a6f39498830 SHA1 62c484358f5a748863d8e36cfc84b688f910cbc6 SHA256 c3a637703e014fcdc81ca07ff41afd0fa214ac5996d1dee6db4b327e4bc214b6
+MISC ChangeLog 4779 RMD160 15146c3684f8dfa38d74de3a79c0f65c826aa2f8 SHA1 7cbc212006b42c4333ec250df11e34392d2fc29f SHA256 68599dc82cfe6ec5f684dec54d30c729a85a63c4568f4dd7addfec692b6ef19d
 MISC metadata.xml 185 RMD160 75382db82e4c69d70f2d53f63363adec302720e5 SHA1 90563c269eff265fbd369095c606bc383cc07232 SHA256 b6de40518e01d3ef5447352b3f476c1f5b8e6ae53d5e654a2fb9e4ee7fdbe135
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
 }