Completed the work to support building with a C++ compiler; Resolves Bug #122236.

(Portage version: 2.1_pre4-r1)

4 files changed, 107 insertions, 20 deletions

diff --git a/dev-lisp/ecls/ChangeLog b/dev-lisp/ecls/ChangeLog
index 42d1dc2ccc8c..81c0ec685058 100644
--- a/dev-lisp/ecls/ChangeLog
+++ b/dev-lisp/ecls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/ecls
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.21 2006/02/13 19:52:59 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.22 2006/02/14 23:15:02 mkennedy Exp $
+
+  14 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.9h-sockets-c++-gentoo.patch, ecls-0.9h-r1.ebuild:
+  Completed the work to support building with a C++ compiler; Resolves Bug
+  #122236.
 
 *ecls-0.9h-r1 (13 Feb 2006)
 
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 94fc9bde46e7..8fa39c677674 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4eee11e4a08d690351e4639cfa42633e ChangeLog 4032
-RMD160 eaac1a841479edb2c87b75ee2787d57329a54fd5 ChangeLog 4032
-SHA256 b1eb733e7952a61ee94e4a066c81bd904ca67a733826c8e866fa0894f93cbc61 ChangeLog 4032
+MD5 ddb67464034941a4c12eb4598196f82c ChangeLog 4233
+RMD160 dce23b77f65d772c159b864cdbcfb0a49b56fd3a ChangeLog 4233
+SHA256 74dede89c386f793bdaa2f6fb0fe7abaf72b5bc6dadde37ccc19bdb1b52a1551 ChangeLog 4233
 MD5 ee4edbec39802e991e74b027bcade2cd ecls-0.9g.ebuild 1511
 RMD160 94b1ebed646695f0b957fef461e063cc9e97b5a6 ecls-0.9g.ebuild 1511
 SHA256 48929073466dbb4b9eef24d97ff32a55b8627138f21e78ac377a13cfdbe43e3c ecls-0.9g.ebuild 1511
-MD5 0baa78b8881cbcfe0abf301b470187b6 ecls-0.9h-r1.ebuild 1579
-RMD160 dc2e79df0b5e4ba096bb364d4c141771c09a4efa ecls-0.9h-r1.ebuild 1579
-SHA256 f11b260d3bb12ca75a348138559e8196bf8bc4d54066188d5c5769716671ed9d ecls-0.9h-r1.ebuild 1579
+MD5 3c2ba084d354eb3b13e57d7741798af7 ecls-0.9h-r1.ebuild 1604
+RMD160 414ad3c2ffd6b381df30ba159e75df7ee2d7b01d ecls-0.9h-r1.ebuild 1604
+SHA256 0bb02c4947813ea9449f6faf1881c278ff91479b4c40d62d15e6bfd735cf8de1 ecls-0.9h-r1.ebuild 1604
 MD5 32f9e774d58b322424f76e0acffb281c ecls-0.9h.ebuild 1509
 RMD160 eff06fc2da39da349b984b3644b4ee2b197f0a33 ecls-0.9h.ebuild 1509
 SHA256 e9f9fbf14280eaef6d56c834682ad595dd6ab1a595cf9b3033835d954708b66f ecls-0.9h.ebuild 1509
@@ -19,6 +16,9 @@ SHA256 3e69c4e970f3a12cce9709da18ab8bf1ae147b38465a106e3c73f0beeb484a12 files/0.
 MD5 75bc0682daa901b633e87d59aec109cf files/0.9h-headers-gentoo.patch 953
 RMD160 c288753b7e88ff03e7f36ab17e46439df922879b files/0.9h-headers-gentoo.patch 953
 SHA256 19921fea0f77a87a56259610fd0b7db2aa2e4146f83c24515565b18d3a5cdd57 files/0.9h-headers-gentoo.patch 953
+MD5 12e7d3907f9cc61fd9f8aa2b7e3e05ed files/0.9h-sockets-c++-gentoo.patch 3494
+RMD160 876e7117f99ab47829c0af91208fa9c852c8fe6e files/0.9h-sockets-c++-gentoo.patch 3494
+SHA256 681066f282ba47c0183cd8187845ca6871f8f16a81a9258694020aa8f0955e3c files/0.9h-sockets-c++-gentoo.patch 3494
 MD5 6bb1331295f4578b761ddd80c21cad65 files/README.Gentoo 1541
 RMD160 273d30836f5c9a4b397e171fa82e8e19b644aff0 files/README.Gentoo 1541
 SHA256 0340275514981eb14283e838a80448d9dd6742628b248100f58456ac3e209691 files/README.Gentoo 1541
@@ -37,10 +37,3 @@ SHA256 fe8d5d65eca3c98a72e9271ac441146718b5b61adb3418e53e4c93872d284a9c files/di
 MD5 c4fffb85c7522845dc9697f7a8f4cb49 metadata.xml 459
 RMD160 6e5f517c105a091c8d2b066ee0333aea6d783283 metadata.xml 459
 SHA256 7a385182f8ffcb8bf6a6a856cb54529dd768f83751f7b4fbdfdb28594d42ef82 metadata.xml 459
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD8OOpyiNZaEAZA+ARAvxiAJ0STwDvz0CXGJTqa1OYLoI+mClijQCeMbaP
-t8TeTPiCVTtoJUpgtDw/myE=
-=+9SO
------END PGP SIGNATURE-----
diff --git a/dev-lisp/ecls/ecls-0.9h-r1.ebuild b/dev-lisp/ecls/ecls-0.9h-r1.ebuild
index 5360c894c9a7..92abca25fa5d 100644
--- a/dev-lisp/ecls/ecls-0.9h-r1.ebuild
+++ b/dev-lisp/ecls/ecls-0.9h-r1.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/dev-lisp/ecls/ecls-0.9h-r1.ebuild,v 1.1 2006/02/13 19:52:59 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9h-r1.ebuild,v 1.2 2006/02/14 23:15:02 mkennedy Exp $
 
 inherit eutils
 
@@ -9,8 +9,7 @@ SRC_URI="mirror://sourceforge/ecls/ecl-${PV}.tgz"
 HOMEPAGE="http://ecls.sourceforge.net/"
 SLOT="0"
 LICENSE="BSD LGPL-2"
-# KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-KEYWORDS="-*"					# Pending Bug #122236
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
 DEPEND="=dev-libs/gmp-4*
 	app-text/texi2html"
@@ -30,7 +29,9 @@ S=${WORKDIR}/ecl-${PV:0:4}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${PV}-headers-gentoo.patch || die
+	epatch ${FILESDIR}/${PV}-sockets-c++-gentoo.patch || die
 }
 
 src_compile() {
diff --git a/dev-lisp/ecls/files/0.9h-sockets-c++-gentoo.patch b/dev-lisp/ecls/files/0.9h-sockets-c++-gentoo.patch
new file mode 100644
index 000000000000..73de7e7cf74f
--- /dev/null
+++ b/dev-lisp/ecls/files/0.9h-sockets-c++-gentoo.patch
@@ -0,0 +1,88 @@
+diff -ur ecl-0.9h.orig/contrib/sockets/sockets.lisp ecl-0.9h/contrib/sockets/sockets.lisp
+--- ecl-0.9h.orig/contrib/sockets/sockets.lisp	2005-11-16 04:13:26.000000000 -0600
++++ ecl-0.9h/contrib/sockets/sockets.lisp	2006-02-14 12:06:10.000000000 -0600
+@@ -1,5 +1,5 @@
+ ;; -*- Mode: Lisp; Syntax: Common-Lisp -*-
+-;; $Id: 0.9h-sockets-c++-gentoo.patch,v 1.1 2006/02/14 23:15:02 mkennedy Exp $
++;; $Id: 0.9h-sockets-c++-gentoo.patch,v 1.1 2006/02/14 23:15:02 mkennedy Exp $
+ 
+ ;; This file is based on SBCL's SB-BSD-SOCKET module and has been
+ ;; heavily modified to work with ECL by Julian Stecklina.
+@@ -518,7 +518,7 @@
+ "{
+         struct sockaddr_in sockaddr;
+         int addr_len = sizeof(struct sockaddr_in);
+-        int new_fd = accept(#0, (struct sockaddr*)&sockaddr, &addr_len);
++        int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t *) &addr_len);
+ 
+ 	@(return 0) = new_fd;
+ 	@(return 1) = Cnil;
+@@ -651,10 +651,10 @@
+         sockaddr.sun_len = sizeof(struct sockaddr_un);
+ #endif
+         sockaddr.sun_family = #2;
+-        strncpy(&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
++        strncpy((char *) &sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
+ 	sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
+ 
+-        @(return) = bind(#0,&sockaddr, sizeof(struct sockaddr_un));
++        @(return) = bind(#0,(struct sockaddr *) &sockaddr, sizeof(struct sockaddr_un));
+ }"))
+ 	(socket-error "bind"))))
+ 
+@@ -664,9 +664,9 @@
+ "{
+         struct sockaddr_un sockaddr;
+         int addr_len = sizeof(struct sockaddr_un);
+-        int new_fd = accept(#0, &sockaddr, &addr_len);
++        int new_fd = accept(#0, (struct sockaddr *) &sockaddr, (socklen_t *) &addr_len);
+ 	@(return 0) = new_fd;
+-	@(return 1) = (new_fd == -1) ? Cnil : make_string_copy(&sockaddr.sun_path);
++	@(return 1) = (new_fd == -1) ? Cnil : make_string_copy((char *) &sockaddr.sun_path);
+ }")
+     (cond
+       ((= fd -1)
+@@ -694,10 +694,10 @@
+         sockaddr.sun_len = sizeof(struct sockaddr_un);
+ #endif
+         sockaddr.sun_family = #1;
+-        strncpy(&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
++        strncpy((char *) &sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
+ 	sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
+ 
+-        @(return) = connect(#0,&sockaddr, sizeof(struct sockaddr_un));
++        @(return) = connect(#0,(struct sockaddr *) &sockaddr, sizeof(struct sockaddr_un));
+ }"))
+ 	(socket-error "connect"))))
+ 
+@@ -708,10 +708,10 @@
+ {
+         struct sockaddr_un name;
+         socklen_t len = sizeof(struct sockaddr_un);
+-        int ret = getpeername(#0,&name,&len);
++        int ret = getpeername(#0,(struct sockaddr *) &name,&len);
+ 
+         if (ret == 0) {
+-                @(return) = make_string_copy(&name.sun_path);
++                @(return) = make_string_copy((char *) &name.sun_path);
+         } else {
+                 @(return) = Cnil;
+         }
+@@ -985,7 +985,7 @@
+ 		       ))
+ 	    (t :int :int)
+ 	    t
+-	    "ecl_make_stream_from_fd(#0,#1,#2)"
++	    "ecl_make_stream_from_fd(#0,#1,(enum ecl_smmode) #2)"
+ 	    :one-liner t))
+ 
+ (defgeneric socket-make-stream (socket  &rest args)
+@@ -1017,7 +1017,7 @@
+ 	cl_object in_strm, out_strm;
+ 	in_strm = ecl_make_stream_from_fd(make_simple_string(\"FD-STREAM\"), #0, smm_input);
+ 	out_strm = ecl_make_stream_from_fd(make_simple_string(\"FD-STREAM\"), #0, smm_output);
+-	@(return) = make_two_way_stream(in_strm, out_strm);
++	@(return) = cl_make_two_way_stream(in_strm, out_strm);
+ }"
+                                :one-liner nil)))
+       (setf (slot-value socket 'stream) stream)