Add fix by Victor Ostorga for build failure with gcc-4.4 #269240 by 404 Error.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 32 insertions, 14 deletions

diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog
index f170206e0a83..20f1fa12c0fc 100644
--- a/sys-fs/reiser4progs/ChangeLog
+++ b/sys-fs/reiser4progs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/reiser4progs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.36 2009/01/18 06:22:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.37 2009/05/11 05:54:29 vapier Exp $
+
+  11 May 2009; Mike Frysinger <vapier@gentoo.org> reiser4progs-1.0.7.ebuild,
+  +files/reiser4progs-1.0.7-gcc-4.4.patch:
+  Add fix by Victor Ostorga for build failure with gcc-4.4 #269240 by 404
+  Error.
 
 *reiser4progs-1.0.7 (18 Jan 2009)
 
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index e1f445085427..63912249446e 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX reiser4progs-1.0.6-preen.patch 2401 RMD160 4c6819f04a791e006d8cc29ccb319aba9dd2dce4 SHA1 c7aaedbaa069fe668e2b1f33211b5bc0741b19a2 SHA256 65cfe93fb1aaa4fdd05f01b36e1213a0c21b7267ebc87a8c42000495072b34f4
+AUX reiser4progs-1.0.7-gcc-4.4.patch 311 RMD160 c7975242c67610888cd6a694b64b0c90a520bf57 SHA1 6873e21bfddf38bdb0f3dfcb9106444e0daebcd8 SHA256 5d0fc888af703911457f42b16d4da76cfdcb5c38c08387c21f5f5e4e111160bf
 DIST reiser4progs-1.0.6.tar.gz 799613 RMD160 1ed86a37f4f52fe47a5c873cb13d253c69c05ae7 SHA1 9acc4f829c5760ee159cb3f507e58478e578990d SHA256 a0d19b85fec4641d0d4189b756182110577c06719773825126e5c314fa35d574
 DIST reiser4progs-1.0.7.tar.gz 844126 RMD160 6f6a6b5defdcea19f13857768596ff477f0cc877 SHA1 5e29580e6610105346ff88635d48eb37acb3ae67 SHA256 1211996ad3efebc0ca543aea2f67527d33e50fce1b827ad341e207f171d94d96
 EBUILD reiser4progs-1.0.6-r2.ebuild 1668 RMD160 2d3141d139bd16b3e43e868918ae12b99380ed54 SHA1 05310d8345f36697a58ef1982975a8682ff8d20f SHA256 23884507a5c8c3848984bef93c4272ac845d54a2078c1e50d069235ec1cbf9db
 EBUILD reiser4progs-1.0.6.ebuild 1613 RMD160 e0d3f058f43264b09e16af50f8e0ff2ed3ea6388 SHA1 7b4a4ec31403fee40a9aa9caf240068bde26aebf SHA256 4dd4564286f21b948650b9aeaff17d5c497738e68d9d6b0328c1c8d989a50d06
-EBUILD reiser4progs-1.0.7.ebuild 1498 RMD160 d1a5e3026d4fce27ca359f3949d65e3110b7bae7 SHA1 f40b4d23a21383526a5e78d088b7a7e72235667e SHA256 fcd083315499a833956da757793cc302f8193aca7559cac8686cc659462b5f66
-MISC ChangeLog 5213 RMD160 4c1d7c854bdf13a2eec475a8e32e049998f780a5 SHA1 a57baded941b046bcab5bdbe22cc48e63d2b7bd9 SHA256 0153779e81f9a2bbaa53bf35a14225c2ec5201514613c6023eaa07fdfee7ebc3
+EBUILD reiser4progs-1.0.7.ebuild 1545 RMD160 0c38d54ef0bd3de47fac187c4f4b6415b95bb657 SHA1 2568633b268bbce1dcf5b5795d09549e8b069794 SHA256 596f3006fe93c6cbaa6894dc1abf85a352f6b46665ed9028da6488abbc9dc16d
+MISC ChangeLog 5417 RMD160 74471d3451da71cb25e5339ddb92a35def93ebde SHA1 4f5c7466e9a0c5df40c14cb6c3aa39430908ea69 SHA256 4006df27bddac8268efa71882b0107e75db0506e9976f1299ac0cfc54df35b6d
 MISC metadata.xml 267 RMD160 ff256714690dbcb9f54233ec9a4fbe77f11068f6 SHA1 f12cbf59a4688ee6b663b50b6a9a1871f096b71b SHA256 afd6f362214e67e2c73e745c7bb7e78c46c190a9c9ecf0712722850d23515e6b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmQddcACgkQn/5bYzqsSmGCtACcCstnYFDdJKVW71PcK2gWwW0g
-iDkAoKg5TiuU6A60nhlGn/5iwx5dzruR
-=wguE
+iEYEARECAAYFAkoHvZsACgkQn/5bYzqsSmGJCwCfQyNxcyygOYYJofeTR9AXPhoj
+Ne4AoJ43HhoTmqc0iciQIAR0ZwctCRdE
+=LbZn
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch
new file mode 100644
index 000000000000..3f32af5d78b4
--- /dev/null
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/269240
+
+fix build failure when using gcc-4.4
+
+--- reiser4progs-1.0.7/plugin/node/node40/node40.c
++++ reiser4progs-1.0.7/plugin/node/node40/node40.c
+@@ -994,7 +994,7 @@
+ 	func = cb_comp_key3;
+ #elif defined(ENABLE_LARGE_KEYS)
+ 	func = cb_comp_key4;
+-#elif
++#else
+ 	func = NULL;
+ #endif
+ 	
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild
index b782d56f2185..041e350a4d71 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.2 2009/02/09 18:28:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.3 2009/05/11 05:54:29 vapier Exp $
 
-inherit multilib
+inherit multilib eutils
 
 MY_P=${PN}-${PV/_p/-}
 DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
@@ -22,11 +22,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	cat <<-EOF > run-ldconfig
-		#!/bin/sh
-		true
-	EOF
+	epatch "${FILESDIR}"/${P}-gcc-4.4.patch #269240
+	printf '#!/bin/sh\ntrue\n' > run-ldconfig
 }
 
 src_compile() {