Fix for gcc-4.3, bug #227203. Thanks to Marek Miller <mlm@shells.pl>

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

4 files changed, 40 insertions, 10 deletions

diff --git a/app-dicts/babytrans/ChangeLog b/app-dicts/babytrans/ChangeLog
index c4e670080d08..10c3be86367d 100644
--- a/app-dicts/babytrans/ChangeLog
+++ b/app-dicts/babytrans/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/babytrans
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/ChangeLog,v 1.17 2007/07/25 15:47:33 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/ChangeLog,v 1.18 2008/06/28 23:02:41 loki_val Exp $
+
+  28 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/babytrans-0.9.2-gcc43.patch, babytrans-0.9.2-r3.ebuild:
+  Fix for gcc-4.3, bug #227203. Thanks to Marek Miller <mlm@shells.pl>
 
   25 Jul 2007; Samuli Suominen <drac@gentoo.org> babytrans-0.9.2-r3.ebuild:
   Fix homepage.
diff --git a/app-dicts/babytrans/Manifest b/app-dicts/babytrans/Manifest
index 3cb788806b8f..248bfff48537 100644
--- a/app-dicts/babytrans/Manifest
+++ b/app-dicts/babytrans/Manifest
@@ -1,8 +1,9 @@
 AUX babytrans-0.9.2-gcc.patch 241 RMD160 93193323ed957fea07c73a6e7baa08851c9ebaf5 SHA1 63e0bdf02a9ad351e7f3a9a62a815a70f873f9a8 SHA256 7903b362bfdb4e79ccd3c6c0289642066a8d96831033062a13e4f1a71e3fede0
+AUX babytrans-0.9.2-gcc43.patch 551 RMD160 adafa33a0688e96c8171726170a4eeaa11f1d522 SHA1 ad95c2b7cca606af6b418967deacb8b2eba17d9d SHA256 11eda009eea1831908c317763fa8231b03f5c5f7ae06a4d4379bf619633461f3
 AUX babytrans-0.9.2-nls.patch 414 RMD160 c8b5516bf8f70c661109a362a7d70a71a75f5e9a SHA1 78573a27d8cce79ba9fc4a951e086f54a32a528d SHA256 aa69d6210a5dc33360eb5003b8ef8aeb87b15a4a08b95195599608a4b007952e
 AUX dictionary 450 RMD160 81bae90cb3f06430d68c7e96214824b2b19e9b1a SHA1 bef4e09d9d9248c0debc25be726a6a87005862e3 SHA256 eb4a7c9d753fab3285140bf9f6469f34d9281e4b10a38e820d9431a645261fc9
 DIST babytrans-0.9.2.tar.gz 223204 RMD160 7aee66927c42a0442a502e5d20b80328c539f848 SHA1 187992c666aca14dce7907095b5204ddc78c128f SHA256 4db842c6df54f79b1b454f888157157dbd3d3f84b4234f5ed8180ead4bd5fdd2
 EBUILD babytrans-0.9.2-r2.ebuild 956 RMD160 e9807b188e277e16e3aa3cc8a880ae12b1e85e7d SHA1 eb5e5362e296c239e71dbfb31971dda0f30ef92a SHA256 01ff19bb38f5017967a26ad45a9cc15cee4444de5f07faee6902832e04d3c74f
-EBUILD babytrans-0.9.2-r3.ebuild 1190 RMD160 6e3347235de7db6d7130d3bf6a7a00a6234c1d32 SHA1 46e07edcb7f87b7ca57c153fbd812ec988918688 SHA256 df516bca398111f0c3f559c70d2c8cfc76e1da99c1ac95737730293937b09538
-MISC ChangeLog 2989 RMD160 c0d7a22515fed790fbd6bc84803b6cf2a3cf7b06 SHA1 8a8acda9aa28237a24ec0bc8a27955d1761b9349 SHA256 781fbef90de8b06410ae686921d960e2d1c8afe1dbac07ffbe615b0b58dd7e4b
+EBUILD babytrans-0.9.2-r3.ebuild 1241 RMD160 7ed65f5d9185c05e37ad74efcf0485e880d004cb SHA1 875223f6dbe0b3eef9d104a601d8ae99d3ee3efc SHA256 7542a2b4bbe1872ef571addbd3b9c98ad755910ecc8e9b740f3934f8618f525a
+MISC ChangeLog 3183 RMD160 278eddc6977865b5c81bbe851218cae5dc9b76ae SHA1 4c0b48936ec7865b98a8cb9d1bba2d075c3f2323 SHA256 df5a4268839ebf3674128c3d55950d2dd2f30c950728c643989b2f7c59667636
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
diff --git a/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild b/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild
index 204cd33a718f..64a35c74a580 100644
--- a/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild
+++ b/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild,v 1.8 2007/07/25 15:47:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild,v 1.9 2008/06/28 23:02:41 loki_val Exp $
 
 inherit eutils
 
@@ -19,20 +19,21 @@ RDEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}/src
-	epatch ${FILESDIR}/${P}-gcc.patch
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 
 	# Using make install instead of einstall causes a problem with sandbox.
 	# This simple patch is supposed to solve this.
 	cd ${S}/po
-	epatch ${FILESDIR}/${P}-nls.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
 }
 
 src_install() {
 	# Requested by bug 72019
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 
 	insinto /usr/share/babytrans
-	doins ${FILESDIR}/dictionary
+	doins "${FILESDIR}"/dictionary
 	dodoc AUTHORS README
 }
 
diff --git a/app-dicts/babytrans/files/babytrans-0.9.2-gcc43.patch b/app-dicts/babytrans/files/babytrans-0.9.2-gcc43.patch
new file mode 100644
index 000000000000..1f9e1e446343
--- /dev/null
+++ b/app-dicts/babytrans/files/babytrans-0.9.2-gcc43.patch
@@ -0,0 +1,24 @@
+--- src/main.cc.orig	2008-06-15 16:22:24.000000000 +0000
++++ src/main.cc	2008-06-15 16:22:40.000000000 +0000
+@@ -32,6 +32,8 @@
+ #include <string>
+ #include <vector>
+ #include <cerrno>
++#include <cstdlib>
++#include <cstring>
+ 
+ #include <sys/stat.h> // for stat()
+ #include <unistd.h> // for stat()
+
+--- src/libbab.cc.orig	2008-06-15 16:28:41.000000000 +0000
++++ src/libbab.cc	2008-06-15 16:29:03.000000000 +0000
+@@ -30,6 +30,8 @@
+ #include <list>
+ #include <cctype>
+ #include <cerrno>
++#include <cstring>
++
+ 
+ #ifdef ENABLE_NLS
+ #include <libintl.h>
+