Fixed compile issue, bug #205007. Fixed HOMEPAGE.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 107 insertions, 2 deletions

diff --git a/dev-libs/wnn7sdk/ChangeLog b/dev-libs/wnn7sdk/ChangeLog
index 6cf9be401c4f..1b4b3e30ea62 100644
--- a/dev-libs/wnn7sdk/ChangeLog
+++ b/dev-libs/wnn7sdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/wnn7sdk
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.5 2007/07/22 08:17:47 graaff Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.6 2008/11/22 01:53:43 matsuu Exp $
+
+*wnn7sdk-20011017-r1 (22 Nov 2008)
+
+  22 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> +files/wnn7sdk-qa.patch,
+  +wnn7sdk-20011017-r1.ebuild:
+  Fixed compile issue, bug #205007. Fixed HOMEPAGE.
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> wnn7sdk-20011017.ebuild:
   Drop virtual/x11 references.
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch b/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch
new file mode 100644
index 000000000000..a41223af8e6f
--- /dev/null
+++ b/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch
@@ -0,0 +1,52 @@
+diff -Naur src.orig/Wnn/etc/msg.c src/Wnn/etc/msg.c
+--- src.orig/Wnn/etc/msg.c	2001-10-17 10:37:17.000000000 +0900
++++ src/Wnn/etc/msg.c	2008-11-22 10:38:22.000000000 +0900
+@@ -148,6 +148,8 @@
+ 	    <message id>\t<message>
+ */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "commonhd.h"
+ #include "config.h"
+ #include "dslib.h"
+@@ -156,7 +158,7 @@
+ 
+ 
+ static char *
+-bsearch(ky, bs, nel, width, compar)
++a_bsearch(ky, bs, nel, width, compar)
+ char *ky;
+ char *bs;
+ unsigned long nel;
+@@ -244,7 +246,7 @@
+ 		return(NULL);
+ 	if (cd->msg_bd == 0 || cd->msg_cnt == 0)
+ 		return(NULL);
+-	bd = (struct msg_bd *)bsearch(id, cd->msg_bd, cd->msg_cnt,
++	bd = (struct msg_bd *)a_bsearch(id, cd->msg_bd, cd->msg_cnt,
+ 		sizeof(struct msg_bd), _search);
+ 	if (bd == NULL)
+ 		return(NULL);
+diff -Naur src.orig/Wnn/jlib/jl.c src/Wnn/jlib/jl.c
+--- src.orig/Wnn/jlib/jl.c	2001-10-17 10:37:17.000000000 +0900
++++ src/Wnn/jlib/jl.c	2008-11-22 10:18:36.000000000 +0900
+@@ -143,6 +143,7 @@
+ #include "commonhd.h"
+ #include "config.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #ifdef SYSVR2
+ #   include <string.h>
+diff -Naur src.orig/Wnn/jlib/js.c src/Wnn/jlib/js.c
+--- src.orig/Wnn/jlib/js.c	2001-10-17 10:37:17.000000000 +0900
++++ src/Wnn/jlib/js.c	2008-11-22 10:27:04.000000000 +0900
+@@ -162,6 +162,7 @@
+ extern	char	*malloc();
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #ifdef UX386
+ #include <X11/Xos.h>
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
new file mode 100644
index 000000000000..b05454f460ed
--- /dev/null
+++ b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild,v 1.1 2008/11/22 01:53:43 matsuu Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Library and headers for Wnn7 client"
+HOMEPAGE="http://www.omronsoft.co.jp/SP/pcunix/sdk/index.html"
+SRC_URI="ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/Wnn7SDK.tgz"
+
+LICENSE="freedist"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# x11 is required for imake
+DEPEND="x11-misc/imake"
+RDEPEND=""
+
+S="${WORKDIR}/src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-malloc.patch"
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/${PN}-qa.patch"
+	sed -i -e "/CONFIGSRC =/s:=.*:= /usr/$(get_libdir)/X11/config:" Makefile.ini || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		World -f Makefile.ini || die "make World failed"
+}
+
+src_install() {
+	dolib.so Wnn/jlib/*.so* || die
+	dolib.a  Wnn/jlib/*.a   || die
+
+	insinto /usr/include/${PN}/wnn
+	doins Wnn/include/*.h || die
+
+	dodoc README
+}