Fix building with GCC 4. Thanks to eastx7g02 sneakermail com, bug #151049.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/www-servers/aolserver/ChangeLog b/www-servers/aolserver/ChangeLog
index 6cb29ba6216beb84d1f33aa3ffb366d5d95a8b90..7d0f0ac6af35809aa81d4cf4b96d33ba79bcb950 100644 (file)
--- a/www-servers/aolserver/ChangeLog
+++ b/www-servers/aolserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/aolserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.11 2006/08/17 04:20:24 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.12 2006/12/27 04:19:48 dirtyepic Exp $
+
+  27 Dec 2006; Ryan Hill <dirtyepic@gentoo.org>
+  -files/4.0.9/Makefile.global, -files/4.0.9/aolserver.init,
+  -files/4.0.9/aolserver-4.0.9-nptl.patch, -files/4.0.9/config.tcl,
+  +files/4.0.10/aolserver-4.0.10-gcc41.patch, aolserver-4.0.10.ebuild:
+  Fix building with GCC 4.  Thanks to eastx7g02 sneakermail com, bug #151049.
 
   16 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   aolserver-4.0.10.ebuild:

diff --git a/www-servers/aolserver/aolserver-4.0.10.ebuild b/www-servers/aolserver/aolserver-4.0.10.ebuild
index a2c82da736868c3b8e435cdc74e539121f071092..4c0e3099fbc8bd35f65c420ad047b55a480e6dd3 100644 (file)
--- a/www-servers/aolserver/aolserver-4.0.10.ebuild
+++ b/www-servers/aolserver/aolserver-4.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/aolserver-4.0.10.ebuild,v 1.6 2006/08/17 04:20:24 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/aolserver-4.0.10.ebuild,v 1.7 2006/12/27 04:19:48 dirtyepic Exp $
 
 inherit eutils
 
@@ -77,8 +77,10 @@ src_unpack() {
        find ${S} -type d -name CVS -prune | xargs rm -rf
 
        if use nptl; then
-               epatch ${FILESDIR}/${PV}/aolserver-${PV}-nptl.patch
+               epatch "${FILESDIR}"/${PV}/aolserver-${PV}-nptl.patch
        fi
+
+       epatch "${FILESDIR}"/${PV}/aolserver-${PV}-gcc41.patch
 }
 
 src_compile() {

diff --git a/www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch b/www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch
new file mode 100644 (file)
index 0000000..ee1bfbc
--- /dev/null
+++ b/www-servers/aolserver/files/4.0.10/aolserver-4.0.10-gcc41.patch
@@ -0,0 +1,12 @@
+diff -Naur aolserver-4.0.10-orig/nsd/conn.c aolserver-4.0.10/nsd/conn.c
+--- aolserver-4.0.10-orig/nsd/conn.c   2006-12-26 21:54:45.000000000 -0600
++++ aolserver-4.0.10/nsd/conn.c        2006-12-26 21:56:31.000000000 -0600
+@@ -840,7 +840,7 @@
+     }
+ 
+     result  = Tcl_GetObjResult(interp);
+-    connPtr = (Conn *) conn = itPtr->conn;
++    connPtr = conn = (Conn *) itPtr->conn;
+ 
+     /*
+      * Only the "isconnected" option operates without a conn.