Fix for gcc-4.3, bug #226523.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 39 insertions, 4 deletions

diff --git a/app-accessibility/yasr/ChangeLog b/app-accessibility/yasr/ChangeLog
index 40f7af050b8c..ea23de744371 100644
--- a/app-accessibility/yasr/ChangeLog
+++ b/app-accessibility/yasr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/yasr
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/yasr/ChangeLog,v 1.20 2008/06/27 02:59:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/yasr/ChangeLog,v 1.21 2008/06/28 23:40:16 loki_val Exp $
+
+  28 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/yasr-0.6.9-gcc43.patch, yasr-0.6.9.ebuild:
+  Fix for gcc-4.3, bug #226523.
 
   27 Jun 2008; William Hubbs <williamh@gentoo.org> yasr-0.6.5.ebuild,
   yasr-0.6.7.ebuild, yasr-0.6.8.ebuild, yasr-0.6.9.ebuild:
diff --git a/app-accessibility/yasr/Manifest b/app-accessibility/yasr/Manifest
index 7319d9a770b8..665fa5656ba4 100644
--- a/app-accessibility/yasr/Manifest
+++ b/app-accessibility/yasr/Manifest
@@ -1,3 +1,4 @@
+AUX yasr-0.6.9-gcc43.patch 987 RMD160 640e2bd31d514d4c709b990b2a050ac7a6954d7f SHA1 5f2e4179dd0a58eb41178924f7cc3a8d520ca7ab SHA256 6ec4991154946e011daded5db791414f7a47bc3e67af742716de57be070801ed
 DIST yasr-0.6.5.tar.gz 200896 RMD160 1535b71878edfb64fa5e8552a4092c1d9e89415a SHA1 c628fbfb2fe82c9dd243538d5a8eaec66220b961 SHA256 437192a10d4c11b502ef1f904e801aa99d24933e4afc44a05319131e37cc1ded
 DIST yasr-0.6.7.tar.gz 201786 RMD160 0d3ee4356dfd01f4aa0529d1e504004f77353894 SHA1 19f6434011b05573241774b2cd8a2ce0ea08fa51 SHA256 dee640ae4a4c813f8248816f9457788737f4b90e38fe9e1a857f4eaf42dec159
 DIST yasr-0.6.8.tar.bz2 191917 RMD160 d3e634351220f973db6decbd69caffa5b887aefd SHA1 e82f72900b6d1e04989ae0d2a1e7738d85bf89b5 SHA256 c54f5da482db5112c86e50947e2c9a482750bf879ae9b60a6391f57cbcfbac0c
@@ -5,6 +6,6 @@ DIST yasr-0.6.9.tar.gz 235768 RMD160 2b4774ff8d2d58e25a39ed1ec6e5a709e9cde8cd SH
 EBUILD yasr-0.6.5.ebuild 798 RMD160 8a8b12f2d816c9eae75c173171b6d46938bb2338 SHA1 b60c9035193480bae9f63b021d3617a0ecee8000 SHA256 56c40e2e32f964967981f2357c8fdcd4b04eb15513cf21f94178f27460beee0f
 EBUILD yasr-0.6.7.ebuild 836 RMD160 3a939d38cf3fb8bff43b079d0ae5b8d7f4fc6e51 SHA1 e4c140736c8c9f745586223d60eb6449b7e73f16 SHA256 9df0700c4d59e90f76429e752921b1dbde0706de10ac81ee5b47cd6e69491e05
 EBUILD yasr-0.6.8.ebuild 1154 RMD160 96c12008d4577f9630135f7cc173b8733ab5409a SHA1 f7ee0f09b48bc1be601ca6990a9267ffa687fc56 SHA256 721d3c4a4f3cc5002b00ed7a96d706b43b888e75dea4134baca8f271d3b67998
-EBUILD yasr-0.6.9.ebuild 987 RMD160 b23ef9f3a272d6c4fa6d9e82176d9e19a653e5bd SHA1 9663bd60bda55cdb8f4744e680c4ad481d81095d SHA256 5b3ed5f1b6fbce9aa25891f0e0c398863b6f723768095ed5da37e5c2989dd2e3
-MISC ChangeLog 2530 RMD160 811b1740acaf9943ae1d7d3b1fe5583634caa265 SHA1 cb0336cf17a14301d89832ad1d596ac2b490edf0 SHA256 f8e34be9cb4609c4a19e8eb66533e86522d8ffc3927ecd38c5497c985b42e020
+EBUILD yasr-0.6.9.ebuild 1045 RMD160 d52a555acd42cf98263755a38c2d1d9af35b2a31 SHA1 ffd0138873c83da5f4d5bfb1512979427cc4eab0 SHA256 e5ec8bf1242b6b7f2bbe61adf9932e0bc2ae9607e68b65be73e207df9d4e3c81
+MISC ChangeLog 2668 RMD160 1c433b47dc510208c1e048f2b676d903fa994f34 SHA1 78d497f718e61e8ccd9c38a7f962396f25815f29 SHA256 20573289f3e2d0b7d505a7bea5c065299952b109612bc555f2a98fc1b024c41a
 MISC metadata.xml 167 RMD160 748756d87964a656252634c3b174df2cf3d6feb0 SHA1 f15052c659417013d87758244f8f0dbf3edf0e11 SHA256 faea5d20797fb2bd27f84fe03dd6f85939e51c0f2c467676ea62bab4041bf7f5
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch
new file mode 100644
index 000000000000..ee2b1a6ef7bd
--- /dev/null
+++ b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch
@@ -0,0 +1,26 @@
+diff -NrU5 yasr-0.6.9.orig/yasr/yasr.h yasr-0.6.9/yasr/yasr.h
+--- yasr-0.6.9.orig/yasr/yasr.h	2008-06-29 01:23:44.000000000 +0200
++++ yasr-0.6.9/yasr/yasr.h	2008-06-29 01:37:00.000000000 +0200
+@@ -306,22 +306,10 @@
+ extern void opt_say(int num, int flag);
+ extern void opt_set(int num, void *val);
+ extern void opt_queue_empty(int ll);
+ extern void opt_write(FILE * fp);
+ 
+-/* openpty.c prototypes */
+-extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
+-
+-/* cfmakeraw.c prototypes */
+-extern void cfmakeraw(struct termios *);
+-
+-/* login_tty.c prototypes */
+-extern int login_tty(int);
+-
+-/* forkpty.c prototypes */
+-extern int forkpty(int *, char *, struct termios *, struct winsize *);
+-
+ /* tbc - Would it be more efficient to ensure that "blank" grids always held
+    ascii 0x20 rather than ascii 0x00? */
+ #define y_isblank(ch) ((ch & 0xdf) == 0)
+ #define cblank(r, c)  ((win->row[r][c] & 0xdf) == 0)
+ #define ttssend(x)    if (x) tts_send(x, strlen(x))
diff --git a/app-accessibility/yasr/yasr-0.6.9.ebuild b/app-accessibility/yasr/yasr-0.6.9.ebuild
index 90b786014c9e..fa8f215abfd5 100644
--- a/app-accessibility/yasr/yasr-0.6.9.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/yasr/yasr-0.6.9.ebuild,v 1.4 2008/06/27 02:59:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/yasr/yasr-0.6.9.ebuild,v 1.5 2008/06/28 23:40:16 loki_val Exp $
+
+inherit base
 
 DESCRIPTION="general-purpose console screen reader"
 HOMEPAGE="http://yasr.sourceforge.net/"
@@ -14,6 +16,8 @@ IUSE=""
 DEPEND=">=sys-devel/autoconf-2.58"
 RDEPEND=""
 
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
 src_compile() {
 	econf --datadir='/etc' || die "econf failed"
 	emake || die "emake failed"