Add patch to build on fbsd, #183686 thanks to Nathan Smith. Keyworded ~x86-fbsd.

Package-Manager: portage-2.1.3_rc6

4 files changed, 44 insertions, 21 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 7a582a98c598..ecfba5574002 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.66 2007/06/11 14:10:55 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.67 2007/07/06 10:39:12 uberlord Exp $
+
+  06 Jul 2007; Roy Marples <uberlord@gentoo.org>
+  +files/festival-1.95_beta-fbsd.patch, festival-1.95_beta-r4.ebuild:
+  Add patch to build on fbsd, #183686 thanks to Nathan Smith.
+  Keyworded ~x86-fbsd.
 
   11 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   festival-1.95_beta-r4.ebuild:
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index b480c671942b..36ae5a6f5a8e 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX festival-1.4.3-asterisk.patch 3028 RMD160 42afe825a9c5ff47560aa77d66a38f7450ec6d82 SHA1 cc04a3e5c599b4d38d020376f298aa2529baa976 SHA256 2b5ac32aaee2790c3ba4c19ce6d50b6d632620c65000ebf6c093a9cd8d0e722b
 MD5 b380d6440fe49096f7705d6f1adf01ee files/festival-1.4.3-asterisk.patch 3028
 RMD160 42afe825a9c5ff47560aa77d66a38f7450ec6d82 files/festival-1.4.3-asterisk.patch 3028
@@ -9,6 +6,10 @@ AUX festival-1.95_beta-asterisk.patch 739 RMD160 d333c05bcba43c2713730beec0cd8e1
 MD5 d3ccc7a2b85c1c574ef09b92e1ea88ed files/festival-1.95_beta-asterisk.patch 739
 RMD160 d333c05bcba43c2713730beec0cd8e13bd2f3436 files/festival-1.95_beta-asterisk.patch 739
 SHA256 0331929ddfe43bd424c1a55ad8309920c8b51c6d0c2f651beb926d1eecb322d0 files/festival-1.95_beta-asterisk.patch 739
+AUX festival-1.95_beta-fbsd.patch 651 RMD160 ca72152f1ee67b8057bcafad0727cf4ed585023c SHA1 88bd7d88ae8a99bf1bc9b5d9767dfd7c3dbf61cd SHA256 88212b4f9a75e95151f98850b07fa80b5ad5d1c3192546814f90342428069a63
+MD5 ffe3f92992e08dd2e9ab8d7d16e231fa files/festival-1.95_beta-fbsd.patch 651
+RMD160 ca72152f1ee67b8057bcafad0727cf4ed585023c files/festival-1.95_beta-fbsd.patch 651
+SHA256 88212b4f9a75e95151f98850b07fa80b5ad5d1c3192546814f90342428069a63 files/festival-1.95_beta-fbsd.patch 651
 AUX festival-1.95_beta-gcc41-amd64-int-pointer.patch 11256 RMD160 2c61af99e561996dc4e69926df20c488fbb22744 SHA1 ff75f26459c0e979b20bb0918119f19817ab4cd2 SHA256 34ba1902084915bcd12e57cb8bacbfbaefcf27ffbfa7092756ce12201bfe83f1
 MD5 ff15432edcea34f603774f15378c8fa5 files/festival-1.95_beta-gcc41-amd64-int-pointer.patch 11256
 RMD160 2c61af99e561996dc4e69926df20c488fbb22744 files/festival-1.95_beta-gcc41-amd64-int-pointer.patch 11256
@@ -77,18 +78,18 @@ EBUILD festival-1.95_beta-r3.ebuild 5505 RMD160 3121e6a4a534e150112ef5344ca64308
 MD5 5661bc06081175244176b0955001a1d9 festival-1.95_beta-r3.ebuild 5505
 RMD160 3121e6a4a534e150112ef5344ca643084aa913d2 festival-1.95_beta-r3.ebuild 5505
 SHA256 b7b081d61b513367c21718f12105754c19b274f1ea16946a5e0f67c2a062927d festival-1.95_beta-r3.ebuild 5505
-EBUILD festival-1.95_beta-r4.ebuild 5667 RMD160 cb2f42dae1c0fe636eca0f32940f099b7aa41238 SHA1 3354003bea8326e78196258f4b8db2ba8133e408 SHA256 a4af275bcb8a45d3c8f7c9c546872341397eafd19fe8c211bb8e3f79da83ad29
-MD5 5ce02903fbd764b15870772f39426a97 festival-1.95_beta-r4.ebuild 5667
-RMD160 cb2f42dae1c0fe636eca0f32940f099b7aa41238 festival-1.95_beta-r4.ebuild 5667
-SHA256 a4af275bcb8a45d3c8f7c9c546872341397eafd19fe8c211bb8e3f79da83ad29 festival-1.95_beta-r4.ebuild 5667
+EBUILD festival-1.95_beta-r4.ebuild 5749 RMD160 0878844fe2a23fec9665efdbec5ac8336312b83e SHA1 3b4a07488f48948f693182f95bf954ab00ca2436 SHA256 670fee64df71746bfc8ae87a05389c777feb2e9d3130ce6451a2d20becc7b891
+MD5 e806bd6ebd822c152630caf4f8fabc80 festival-1.95_beta-r4.ebuild 5749
+RMD160 0878844fe2a23fec9665efdbec5ac8336312b83e festival-1.95_beta-r4.ebuild 5749
+SHA256 670fee64df71746bfc8ae87a05389c777feb2e9d3130ce6451a2d20becc7b891 festival-1.95_beta-r4.ebuild 5749
 EBUILD festival-1.95_beta.ebuild 5168 RMD160 975d7c90ae660a8edfd13958c68b70109369fce3 SHA1 b4c732ad02b1922ee7b18d73902d397fa8844f26 SHA256 4c354ebbbaede351148c928fcb2a42a5a7877ef1991e0cb31272aec4ab556d8a
 MD5 b0caf2a641b2c030ac9763ede83b00a2 festival-1.95_beta.ebuild 5168
 RMD160 975d7c90ae660a8edfd13958c68b70109369fce3 festival-1.95_beta.ebuild 5168
 SHA256 4c354ebbbaede351148c928fcb2a42a5a7877ef1991e0cb31272aec4ab556d8a festival-1.95_beta.ebuild 5168
-MISC ChangeLog 13344 RMD160 8010e886f4f03a89f32daea5464fe143a832cd22 SHA1 0ccb8c5851343eb66e4abc26ef376346edb1458d SHA256 fa6f03a191d5c98572d533c6b77bd688cfd0ae4a0aef3cda4fecc8124a0aae3a
-MD5 7ceac966d5468d996b03f1d35ca2bd73 ChangeLog 13344
-RMD160 8010e886f4f03a89f32daea5464fe143a832cd22 ChangeLog 13344
-SHA256 fa6f03a191d5c98572d533c6b77bd688cfd0ae4a0aef3cda4fecc8124a0aae3a ChangeLog 13344
+MISC ChangeLog 13549 RMD160 68945277f42abd94d730c8167ece248f9c23e233 SHA1 516f21239a5c7b1aa475eacbfc7d4f92faecd7f4 SHA256 2b8d0aa854d7485c350117f260cd03c2d26847a85e37b12426082180733f8d5c
+MD5 853764b0f73b42000ef9b3b5fd071677 ChangeLog 13549
+RMD160 68945277f42abd94d730c8167ece248f9c23e233 ChangeLog 13549
+SHA256 2b8d0aa854d7485c350117f260cd03c2d26847a85e37b12426082180733f8d5c ChangeLog 13549
 MISC metadata.xml 248 RMD160 ba4734da964d3d5db60feb339d3e89de2eb87ab6 SHA1 bdd70f0d466d7bea88716581054941113ce22a16 SHA256 b40271c6a99e7610d9df3544a98da28417f406b82a48b04f1a8a9bb474cd04cc
 MD5 dd298b30a3c1071fdfd33569480dcfd3 metadata.xml 248
 RMD160 ba4734da964d3d5db60feb339d3e89de2eb87ab6 metadata.xml 248
@@ -114,10 +115,3 @@ SHA256 879cbf8b4203de586e3770729dc322e5d20bdb881dc65fec379691c8436a0ddf files/di
 MD5 f5ca272d3b45a7370f66686a2b21b10b files/digest-festival-1.95_beta-r4 4596
 RMD160 4cb448ea13d480f2ca172430dd481cd76cbe77ba files/digest-festival-1.95_beta-r4 4596
 SHA256 879cbf8b4203de586e3770729dc322e5d20bdb881dc65fec379691c8436a0ddf files/digest-festival-1.95_beta-r4 4596
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGbVfzKRy60XGEcJIRArzPAKCXfdSxXKSeeCb0sD0daLXttfpqxACfUSyf
-AlqbIe5/uSw1lgwls/bkH0c=
-=5SQ0
------END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/festival-1.95_beta-r4.ebuild b/app-accessibility/festival/festival-1.95_beta-r4.ebuild
index e6f73344f134..69a7676cf733 100644
--- a/app-accessibility/festival/festival-1.95_beta-r4.ebuild
+++ b/app-accessibility/festival/festival-1.95_beta-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta-r4.ebuild,v 1.8 2007/06/11 14:10:55 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta-r4.ebuild,v 1.9 2007/07/06 10:39:12 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -29,7 +29,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 		${SITE}/festvox_us3.tar.gz )"
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="asterisk esd linguas_es mbrola X"
 
 RDEPEND="sys-libs/ncurses
@@ -66,6 +66,9 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-init-scm.patch
 
+	# Allow building on fbsd, #183686
+	epatch ${FILESDIR}/${P}-fbsd.patch
+
 	# gcc 4.1 compatibility patches
 	epatch ${FILESDIR}/${P}-gcc41.patch
 	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
diff --git a/app-accessibility/festival/files/festival-1.95_beta-fbsd.patch b/app-accessibility/festival/files/festival-1.95_beta-fbsd.patch
new file mode 100644
index 000000000000..1d7622007076
--- /dev/null
+++ b/app-accessibility/festival/files/festival-1.95_beta-fbsd.patch
@@ -0,0 +1,21 @@
+--- speech_tools/audio/voxware.cc.orig	2007-06-29 14:37:11 -0700
++++ speech_tools/audio/voxware.cc	2007-06-29 14:37:37 -0700
+@@ -61,7 +61,7 @@
+ #include "EST_error.h"
+ 
+ #ifdef SUPPORT_FREEBSD16
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #include <fcntl.h>
+ int freebsd16_supported = TRUE;
+ int linux16_supported = FALSE;
+--- speech_tools/audio/voxware.cc.orig	2007-06-29 14:53:01 -0700
++++ speech_tools/audio/voxware.cc	2007-06-29 14:53:20 -0700
+@@ -66,6 +66,7 @@
+ int freebsd16_supported = TRUE;
+ int linux16_supported = FALSE;
+ static char *aud_sys_name = "FreeBSD";
++static int stereo_only = 0;
+ #endif
+ 
+ #ifdef SUPPORT_LINUX16