Fix building with gcc-4.3 #209036.

Package-Manager: portage-2.2_pre5

4 files changed, 43 insertions, 8 deletions

diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index 93fff7a51eb3..5369bfe1ed33 100644
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/recode
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.47 2008/01/19 15:00:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.48 2008/04/20 08:32:59 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/recode-3.6-gcc43.patch, recode-3.6-r2.ebuild:
+  Fix building with gcc-4.3 #209036.
 
   19 Jan 2008; Fabian Groffen <grobian@gentoo.org> recode-3.6-r1.ebuild,
   recode-3.6-r2.ebuild:
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index c2c20b46c038..f949540607f2 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX recode-3.6-debian-11.patch 1913 RMD160 9ff3db7b29de3179b57b9388a21e0617bc1660ff SHA1 29a17eae88ee24a592c7dad9777d3b3185a3ace6 SHA256 6074d5afb34439aac9a98205ae6ea46393cccb869bbd6bb07bea77b99eb14944
+AUX recode-3.6-gcc43.patch 500 RMD160 dc3745e26c6f3c408bd10c2280d7e074b71b45b8 SHA1 9a372391949b4a7c0eae8302fd5a93931cc73360 SHA256 168d5eeb1e4290283d1dbdb5bf97b1ccbd52428366179d8f091cc0bc7bf2a147
 AUX recode-3.6-ppc-macos.diff 649 RMD160 3620b56b93721088ed5e716374160b3e8eacb139 SHA1 5910760fbef68738fdc65b4835e0d54889b36a36 SHA256 8a2d3bb5438f6fdf04d5eae753d6d7b35dcd975bc8ea26f2b418a59889dddb7a
-DIST recode-3.6-debian.diff.bz2 19327 RMD160 4a2d205e1e47d96ae3b8197cc42bfb2040d0fedd SHA1 d2ec73dbe0a6b80437eba201bdb278627a87a00e SHA256 cbe93e79b7b3745d60aa2dc3ad4eea86becc302a863bc21c929654c937d6f71d
 DIST recode-3.6.tar.gz 1751886 RMD160 97dcb2544472c9025689452a94bed98ea36374b5 SHA1 2de90cd2ba553bc07d75a29913ea4424dd9e616b SHA256 e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
-EBUILD recode-3.6-r1.ebuild 1073 RMD160 dd61ceb850016a9ceb016c4c43ed03b48254a1aa SHA1 ae5d723ce8b960eadcb0a1e639d517d56e61d20d SHA256 9fcc44e046aa56b60e64ba8fa32158aa33ca46eda5ae74094cb640ac35f93132
-EBUILD recode-3.6-r2.ebuild 1217 RMD160 199af4b27d35cfd4d7efa110f9b3ff18f8c11f8b SHA1 a5f3bfaec6ed3288bb1c6164f860a3e889382d3d SHA256 27c0dd36f3521a33d68682fb9f7addb0745db5264a13c8631910f4800dfb46c6
-MISC ChangeLog 5620 RMD160 3eac9be5372340ac73b5538a5e0f5600d8f08b9f SHA1 5aa997c1ada5c906fd3703445bc29ee177f44111 SHA256 e8cee9cca50ba173db5718d6ccc6dd315cbed7f2dd242eeac4d8d0b0e9346ae6
+EBUILD recode-3.6-r2.ebuild 1305 RMD160 4ff211bd1f70f9b988d63cc0ac98adc1dcf58a9f SHA1 89cdd1cde4909aaeb52484870e40802217d0e41e SHA256 f957f57d9ffb8e5ff8e25ae0fbf75d4b9c6b58af9129eba0f4ff16ef0f09dc87
+MISC ChangeLog 5762 RMD160 7c0436b5238379ca0f50b0c429db0132d54947ac SHA1 6b10777889a2e73971a913211ed4de43c9f17bab SHA256 96dcc46e3d4d0049f41b9fdabad064eb5b7c1c17eb7d6cfd697b31ddd9e231b4
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFICv/Bj9hvisErhMIRArFaAJ9istwrHxKhI13arcCF9/z6Wn5EtgCffVPv
+aEojBBYC56Sq7X1mZE0uDVQ=
+=SoWF
+-----END PGP SIGNATURE-----
diff --git a/app-text/recode/files/recode-3.6-gcc43.patch b/app-text/recode/files/recode-3.6-gcc43.patch
new file mode 100644
index 000000000000..beaf26e9a3e1
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-gcc43.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/209036
+
+fix building with gcc-4.3
+
+--- src/recodext.h	2008-04-03 18:35:42 +0000
++++ src/recodext.h	2008-04-03 18:36:32 +0000
+@@ -215,10 +215,10 @@
+     struct recode_single *unsurfacer;
+ 
+     /* Non zero if this is an acceptable charset (not only a surface).  */
+-    enum recode_symbol_type type : 3;
++    enum recode_symbol_type type : 2;
+ 
+     /* Non zero if this one should be ignored.  */
+-    bool ignore : 2;
++    bool ignore : 1;
+   };
+ 
+ struct recode_surface_list
+
diff --git a/app-text/recode/recode-3.6-r2.ebuild b/app-text/recode/recode-3.6-r2.ebuild
index 0e1129d68b0a..9b3f79d09a7e 100644
--- a/app-text/recode/recode-3.6-r2.ebuild
+++ b/app-text/recode/recode-3.6-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.21 2008/01/19 15:00:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.22 2008/04/20 08:32:59 vapier Exp $
 
-inherit flag-o-matic eutils libtool toolchain-funcs
+inherit eutils libtool toolchain-funcs
 
 DEB_VER=11
 DESCRIPTION="Convert files between various character sets"
@@ -20,6 +20,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-debian-${DEB_VER}.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch #209036
+	sed -i '1i#include <stdlib.h>' src/argmatch.c || die
 
 	# Needed under FreeBSD, too
 	epatch "${FILESDIR}"/${P}-ppc-macos.diff
@@ -37,7 +39,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO
 	rm -f "${D}"/usr/lib/charset.alias
 }