Fix broken build on gcc-4.1.

(Portage version: 2.1.1)
 (Signed Manifest commit)

2 files changed, 32 insertions, 41 deletions

diff --git a/net-proxy/middleman/Manifest b/net-proxy/middleman/Manifest
index 59b2f3d3d2d8..07e80e11e72d 100644
--- a/net-proxy/middleman/Manifest
+++ b/net-proxy/middleman/Manifest
@@ -1,18 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 82e1da6e4a83c736ba79e6578df30e30 ChangeLog 4825
+AUX conf.d/mman 138 RMD160 2a0b077046d4650c855b4b64068bc770e59e8a8f SHA1 d81c11126d621f2afd609ebdedd1f04ce0e9eb91 SHA256 fd3a29f1dcb5581a123d092ae4c26e76338ce04f2184481ac48de3de2af09e1a
 MD5 cca46008c83644944b263535a7d2ead1 files/conf.d/mman 138
-MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1-r2 67
+RMD160 2a0b077046d4650c855b4b64068bc770e59e8a8f files/conf.d/mman 138
+SHA256 fd3a29f1dcb5581a123d092ae4c26e76338ce04f2184481ac48de3de2af09e1a files/conf.d/mman 138
+AUX init.d/mman 968 RMD160 fdd1d24ce133ec83806270d057b6d6587324fac6 SHA1 e6d11df5c28351e28d5c323ee4622cbb58c03ab2 SHA256 e47a9298a87ffb48174ce3680ee0d7c8872f89cdf8e93caaedb8f17baae7130f
 MD5 de3be299916f4858bbad3e953757ddf4 files/init.d/mman 968
-MD5 bb883e451ed1555f5171f3b196874712 files/middleman-2.0.1-gcc-34.patch 1091
+RMD160 fdd1d24ce133ec83806270d057b6d6587324fac6 files/init.d/mman 968
+SHA256 e47a9298a87ffb48174ce3680ee0d7c8872f89cdf8e93caaedb8f17baae7130f files/init.d/mman 968
+AUX middleman-2.0.1-gcc41.patch 2341 RMD160 fe88f048cbbd2a94ac7e0d12edf3687710d674e6 SHA1 6640ca14ac83fac9046b798ccae957e1906877a2 SHA256 d51ddbfb1e1e9c153bf08c8443d28fcaebad1c66d77ed4eda849c25ad444bdc6
+MD5 a757bb9af881ed44e6c9a2d94adceda0 files/middleman-2.0.1-gcc41.patch 2341
+RMD160 fe88f048cbbd2a94ac7e0d12edf3687710d674e6 files/middleman-2.0.1-gcc41.patch 2341
+SHA256 d51ddbfb1e1e9c153bf08c8443d28fcaebad1c66d77ed4eda849c25ad444bdc6 files/middleman-2.0.1-gcc41.patch 2341
+AUX middleman-2.0.1-putlog-fix.patch 3671 RMD160 3aff40f145760e21a1c24989a3c160a65cc81081 SHA1 0f0a6e596a820f25c90271449712d6d9220be48e SHA256 41a4c84f40264d5e808f08f6074d4492f6ec8b10f0c2de8f77a279b254e4a0ec
 MD5 22c116e20fcb12dbd46cbb38125f2e68 files/middleman-2.0.1-putlog-fix.patch 3671
+RMD160 3aff40f145760e21a1c24989a3c160a65cc81081 files/middleman-2.0.1-putlog-fix.patch 3671
+SHA256 41a4c84f40264d5e808f08f6074d4492f6ec8b10f0c2de8f77a279b254e4a0ec files/middleman-2.0.1-putlog-fix.patch 3671
+DIST middleman-2.0.1.tar.gz 743404 RMD160 8139602064976c3280a629255f0dafb6e6a1837c SHA1 2f73cbec93c777d4e1b5f6f09d5f40ea10344e07 SHA256 c1a90e62aaec6b7ccfab03259536835f5eeee10fc9ed6a0aa9da083bdf87502a
+EBUILD middleman-2.0.1-r2.ebuild 1684 RMD160 c9fcd3e891b2c6d9ae0dbd594d6cbf440c0dc676 SHA1 6ca352f95173caf5ff71a935854242f13bd7e4a8 SHA256 956bab3520f992b9e74e018b4a08e2c1f9514d518fb3645eb95b5c2563f82e92
+MD5 9510124f1affd030fb0d43a541d9c5d4 middleman-2.0.1-r2.ebuild 1684
+RMD160 c9fcd3e891b2c6d9ae0dbd594d6cbf440c0dc676 middleman-2.0.1-r2.ebuild 1684
+SHA256 956bab3520f992b9e74e018b4a08e2c1f9514d518fb3645eb95b5c2563f82e92 middleman-2.0.1-r2.ebuild 1684
+MISC ChangeLog 5008 RMD160 2dcf7c2a6baf6e57327e40d22c13e8dc178cd11c SHA1 f520de492d05fd4eb4c2b503af79828236501383 SHA256 24e0be61dd0a2f52166590a8d85b34f8e90ec67addd8fe24119ec2b5a9c6da2d
+MD5 3ed559a8f7eddab43eb3352e6692f417 ChangeLog 5008
+RMD160 2dcf7c2a6baf6e57327e40d22c13e8dc178cd11c ChangeLog 5008
+SHA256 24e0be61dd0a2f52166590a8d85b34f8e90ec67addd8fe24119ec2b5a9c6da2d ChangeLog 5008
+MISC metadata.xml 1012 RMD160 a24038d1cc7817d22f8c471c085c61e1838e0fc9 SHA1 88b61e3b40cd3f17c94c8be4bc97a7b97ef2fad8 SHA256 abb1aa5f14ecf6150aba97b6b0baba0244a5b57ef64c182383792213e7a23333
 MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
-MD5 d2f7134bb2490307110b56f0e61d4331 middleman-2.0.1-r2.ebuild 1685
+RMD160 a24038d1cc7817d22f8c471c085c61e1838e0fc9 metadata.xml 1012
+SHA256 abb1aa5f14ecf6150aba97b6b0baba0244a5b57ef64c182383792213e7a23333 metadata.xml 1012
+MD5 71a68dccbb9db2c188d7a791d42898f6 files/digest-middleman-2.0.1-r2 247
+RMD160 b4e600b558ca8b7759f42c1a9581c3fa522abce7 files/digest-middleman-2.0.1-r2 247
+SHA256 dc77abd1cee1a8da133870268b7e1c48f660d1190a159806c4aa2cd9a23481ba files/digest-middleman-2.0.1-r2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEP2lnjG8pv1lIUX4RArd8AJ49Kt2QwflNKSEDbZGp7igy6iGZsgCgkTk7
-3upvYrdLyveaqU1xunQjvnM=
-=JaLv
+iD8DBQFFFk+i3sf9c6kjmR8RAnakAKCJJLzGp4kXNAfZtW4S9qriw7bsgACggRiH
+CB8IcQfB+RuQ+VyUTV+XhyU=
+=/d2+
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/middleman/files/middleman-2.0.1-gcc-34.patch b/net-proxy/middleman/files/middleman-2.0.1-gcc-34.patch
deleted file mode 100644
index 0e046b043413..000000000000
--- a/net-proxy/middleman/files/middleman-2.0.1-gcc-34.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru middleman-2.0.1.orig/src/main.c middleman-2.0.1/src/main.c
---- middleman-2.0.1.orig/src/main.c	2004-03-12 00:28:57.000000000 +0200
-+++ middleman-2.0.1/src/main.c	2005-04-06 21:12:10.580927424 +0300
-@@ -407,7 +407,7 @@
- #else
- 	pcre_free = xfree;
- 	// grr... argument to malloc is int on some systems, and long on others
--	(void *) pcre_malloc = (void *) xmalloc;
-+	(void *&) pcre_malloc = (void *) xmalloc;
- #endif
- 
- 	global->dns_cache = hash_create(DNS_HASH_SIZE);
-diff -Nru middleman-2.0.1.orig/src/stats.c middleman-2.0.1/src/stats.c
---- middleman-2.0.1.orig/src/stats.c	2004-03-12 00:27:16.000000000 +0200
-+++ middleman-2.0.1/src/stats.c	2005-04-06 21:11:29.636151976 +0300
-@@ -175,7 +175,7 @@
- 
- 	sc.name = stat;
- 	sc.type = type | StatCounter::CALLBACK;
--	(void *)sc.value.callback = (void *)cb;
-+	(void *&)sc.value.callback = (void *)cb;
- 
- 	counter_list.push_back(sc);
- 
-@@ -193,7 +193,7 @@
- 
- 	sc.name = stat;
- 	sc.type = type | StatCounter::CALLBACK;
--	(void *)sc.value.callback = (void *)cb;
-+	(void *&)sc.value.callback = (void *)cb;
- 
- 	counter_list.push_back(sc);
-