Add patch to fix compilation with gcc-4 by Robert Marmorstein <rmmarm AT wm DOT edu>; bug #124794

(Portage version: 2.1_pre7-r3)

4 files changed, 82 insertions, 6 deletions

diff --git a/dev-perl/Net-RawIP/ChangeLog b/dev-perl/Net-RawIP/ChangeLog
index a3b19399b6d5..6bc792b1b923 100644
--- a/dev-perl/Net-RawIP/ChangeLog
+++ b/dev-perl/Net-RawIP/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/Net-RawIP
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-RawIP/ChangeLog,v 1.17 2006/02/27 02:32:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-RawIP/ChangeLog,v 1.18 2006/04/03 16:58:44 halcy0n Exp $
+
+  03 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/Net-RawIP-0.2-gcc4.patch, Net-RawIP-0.2.ebuild:
+  Add patch to fix compilation with gcc-4 by Robert Marmorstein <rmmarm AT wm
+  DOT edu>; bug #124794
 
   27 Feb 2006; Jeroen Roovers <jer@gentoo.org> Net-RawIP-0.2.ebuild:
   Stable on hppa (bug #122049).
diff --git a/dev-perl/Net-RawIP/Manifest b/dev-perl/Net-RawIP/Manifest
index c63401671e32..b201d10ed75c 100644
--- a/dev-perl/Net-RawIP/Manifest
+++ b/dev-perl/Net-RawIP/Manifest
@@ -4,9 +4,12 @@ SHA256 13881f37c5acc47aa1ee1464e9dd7bc0501431bb1a27712fd3f83f697bd49cda ChangeLo
 MD5 0140999a96bcf98f2f30592239c481d5 Net-RawIP-0.1.ebuild 1544
 RMD160 5f33b2cce28b2d588ff65f6f20e6bb72bea21009 Net-RawIP-0.1.ebuild 1544
 SHA256 154f3b8e9145ff128ef63ca1e8782192debb2e4c1c338118115b37c8dbfe648b Net-RawIP-0.1.ebuild 1544
-MD5 73544d7712be5fc03df814629465fa58 Net-RawIP-0.2.ebuild 1550
-RMD160 f890592725a8fca36270de6a23fb503597f089f8 Net-RawIP-0.2.ebuild 1550
-SHA256 95f3f28807be619f9e999ce0bab86606d8196612af9a9e7659175433c6e2b7ab Net-RawIP-0.2.ebuild 1550
+MD5 94f0e463455e79d888d0eb1685649fe8 Net-RawIP-0.2.ebuild 1596
+RMD160 df96ab92bb02f4429cbb6595c9141208f1d555f9 Net-RawIP-0.2.ebuild 1596
+SHA256 4563eb675665ca70c940585b4c319c0aa1292e55e8fa63947b14439b7b677e8c Net-RawIP-0.2.ebuild 1596
+MD5 1b1bcdad120c1fd19787a71780511dcb files/Net-RawIP-0.2-gcc4.patch 2188
+RMD160 d36ba43894466c0b58e102757af0bb7e376474bc files/Net-RawIP-0.2-gcc4.patch 2188
+SHA256 2f63784ab3c392d9a35e675efcb811f3ee02b804fd20ed2e4a100a713bd5d599 files/Net-RawIP-0.2-gcc4.patch 2188
 MD5 ddbdc35d582bfa957c8346ece75890f5 files/digest-Net-RawIP-0.1 64
 RMD160 84534ac9c84b6371f64d6c5b262bffa0053ab816 files/digest-Net-RawIP-0.1 64
 SHA256 bfad5491eea552fd48f45b1ee20e15c19fe886f007c3291f3c5d7014f2c5866d files/digest-Net-RawIP-0.1 64
diff --git a/dev-perl/Net-RawIP/Net-RawIP-0.2.ebuild b/dev-perl/Net-RawIP/Net-RawIP-0.2.ebuild
index b0d2c0ea4317..e1e3df0eae9b 100644
--- a/dev-perl/Net-RawIP/Net-RawIP-0.2.ebuild
+++ b/dev-perl/Net-RawIP/Net-RawIP-0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-RawIP/Net-RawIP-0.2.ebuild,v 1.10 2006/02/27 02:32:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-RawIP/Net-RawIP-0.2.ebuild,v 1.11 2006/04/03 16:58:44 halcy0n Exp $
 
-inherit perl-module
+inherit eutils perl-module
 
 IUSE=""
 DESCRIPTION="Perl Net::RawIP - Raw IP packets manipulation Module"
@@ -35,4 +35,6 @@ src_unpack() {
 	# Robert Coie <rac@gentoo.org> 2003.05.08
 
 	sed -i -e "s/D_IFLIST_'\./D_IFLIST_ '\./" ${S}/Makefile.PL || die "problem fixing makefile"
+
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 }
diff --git a/dev-perl/Net-RawIP/files/Net-RawIP-0.2-gcc4.patch b/dev-perl/Net-RawIP/files/Net-RawIP-0.2-gcc4.patch
new file mode 100644
index 000000000000..579b54563c4f
--- /dev/null
+++ b/dev-perl/Net-RawIP/files/Net-RawIP-0.2-gcc4.patch
@@ -0,0 +1,66 @@
+diff -Naur Net-RawIP-0.2.old/RawIP.xs Net-RawIP-0.2/RawIP.xs
+--- Net-RawIP-0.2.old/RawIP.xs	2006-04-02 16:18:13.000000000 -0400
++++ Net-RawIP-0.2/RawIP.xs	2006-04-02 16:20:17.000000000 -0400
+@@ -759,7 +759,7 @@
+   if(ihl > 5){
+     av_store(RETVAL,28,
+     ip_opts_parse(sv_2mortal(newSVpv((u_char*)pktr + 20,ihl*4 - 20))));  
+-    (u_char*)pktr = (u_char*)pktr + (ihl*4 - 20);  
++    pktr = (u_char*)pktr + (ihl*4 - 20);  
+     ipo = 1;
+   }
+   doff = pktr->th.doff;
+@@ -785,7 +785,7 @@
+    }
+    av_store(RETVAL,29,
+     tcp_opts_parse(sv_2mortal(newSVpv((u_char*)pktr+40,doff*4-20))));
+-           (u_char*)pktr = (u_char*)pktr + (doff*4 - 20);
++           pktr = (u_char*)pktr + (doff*4 - 20);
+   } 
+   av_store(RETVAL,27,newSVpv(((u_char*)&pktr->th.urg_ptr+2),
+   tot_len - (4*ihl + doff*4))); 
+@@ -818,7 +818,7 @@
+   if(ihl > 5){
+     av_store(RETVAL,20,
+     ip_opts_parse(sv_2mortal(newSVpv((u_char*)pktr + 20,ihl*4 - 20))));  
+-    (u_char*)pktr = (u_char*)pktr + (ihl*4 - 20);  
++    pktr = (u_char*)pktr + (ihl*4 - 20);  
+   }
+   av_store(RETVAL,11,newSViv(pktr->ich.type));
+   av_store(RETVAL,12,newSViv(pktr->ich.code));
+@@ -858,7 +858,7 @@
+   if(ihl > 5){
+     av_store(RETVAL,12,
+     ip_opts_parse(sv_2mortal(newSVpv((u_char*)pktr + 20,ihl*4 - 20))));  
+-    (u_char*)pktr = (u_char*)pktr + (ihl*4 - 20);  
++    pktr = (u_char*)pktr + (ihl*4 - 20);  
+   }
+   av_store(RETVAL,11,newSVpv(((u_char*)pktr+20),
+   tot_len - 4*ihl));
+@@ -892,7 +892,7 @@
+   if(ihl > 5){
+     av_store(RETVAL,16,
+     ip_opts_parse(sv_2mortal(newSVpv((u_char*)pktr + 20,ihl*4 - 20))));  
+-    (u_char*)pktr = (u_char*)pktr + (ihl*4 - 20);  
++    pktr = (u_char*)pktr + (ihl*4 - 20);  
+   }
+   av_store(RETVAL,11,newSViv(ntohs(pktr->uh.source)));
+   av_store(RETVAL,12,newSViv(ntohs(pktr->uh.dest)));
+@@ -1284,7 +1284,7 @@
+ CODE:
+     printer = print;
+     if(!SvROK(user) && SvOK(user)){
+-    (u_char *)user = SvIV(user); 
++    user = (u_char *)SvIV(user); 
+     ptr = &handler;
+     }
+     else {
+@@ -1306,7 +1306,7 @@
+ CODE:
+     printer = print;
+     if(!SvROK(user) && SvOK(user)){
+-    (u_char *)user = SvIV(user); 
++    user = (u_char *)SvIV(user); 
+     ptr = &handler;
+     }
+     else {