gentoo resync : 14.07.2018

8 files changed, 284 insertions, 0 deletions

diff --git a/dev-libs/wnn7sdk/Manifest b/dev-libs/wnn7sdk/Manifest
new file mode 100644
index 000000000000..ec9efd6e2359
--- /dev/null
+++ b/dev-libs/wnn7sdk/Manifest
@@ -0,0 +1,8 @@
+AUX wnn7sdk-gcc4.patch 810 BLAKE2B 652cb2c3de591199a519adcc1b5a6c01dafd8fdf4ad9e6092c1dd787145ad15d86f92c65b154027297490d266ed7f24aa97cfb45d85831faefeb89ceb9394475 SHA512 b0134c1393a98eff49eaf5f31a0cb9d99e4e40675f1c6abddfc7f790c70ac0ae1d0c79397beb46bd665e8da8cdae3cffb76200b447d16dca94de4db1b2722809
+AUX wnn7sdk-gentoo.patch 2120 BLAKE2B 1fd66badbc4e55478bed5c456da4b4945a49b1b37db253d47d3aa9162f9541b298feccd5b534c730ce1b245753d5d0211953405c32755e3b10a89a893aa27b6b SHA512 554c189689d5028eca6ea61f41dcf51e5bbbbdf724974c17fe94c8dfa4177d56dea50ab609c2736cf142ed2bf6edcc6f00fabd5ca930973ad7467fe22696f04e
+AUX wnn7sdk-malloc.patch 366 BLAKE2B 3bfdbf3e4ee8eed98f2e54364d29a533793acf5ff54d04986d614387daaa005653313bb1db6336fb70b3f7f786a5e4ba36b559eaf95c6f763f1d953920719a13 SHA512 cdc2142a1bdd16158b765fda01983cd530dc8271383177b4bb7e534ba192e07dcccd042c234f4160d346ce69ed1b0eacf366ee86fe7209b4d54fe91befbc3b89
+AUX wnn7sdk-qa.patch 1459 BLAKE2B eb56155148fc9c8f75afe719d217f14626e5468056c0f4ff499e3e04a440beac9705248db4d1cbc701e1bf5e5d8c779a62aff9bf4096c7c41dba12194cad95e7 SHA512 0f29f0e3b26b0038473f9601cd9179095422882dfbc62c371e17055d9a9143b8b35f5d7ad2165301f935bfabe2b90768591789a8a5cbbcc931e65c16441b681e
+DIST Wnn7SDK.tgz 178403 BLAKE2B 9dfccd0bcbe38cd1d782fd2b331c6349a1e1788c328dc121eb91ed362028c18661dc08d761b31722cd19fd3c76970a2566c2641488cd4b968f898f6d1e76ea76 SHA512 d6e24357c0071eb29e3a91cd3484c8fe7901a5e1537bff6632fa04eef21d0e56d7a5f3d7d899599401f607eee259cab36026321f09eea45590d00425d1963f52
+EBUILD wnn7sdk-20011017-r1.ebuild 1259 BLAKE2B 193177010fdeb274b6bd597bb739e8b6250a12c9d5af1832d9b3c5138b2f9e25c4a40a4dbaf4ca8b94716943dd9a5e726ace98de2a6b418585732b9591bc6622 SHA512 5e58fdc927f306839eff8c571e6a4e3192f66ef7a01a50bb233b8f417fe05f6b88a9937c5ca4da862289de474a3be830e42f65fb9452b8839f61f6cad38794d1
+EBUILD wnn7sdk-20011017.ebuild 870 BLAKE2B dbd30567852a26fe4d8f9d09e5db5ec752133456df925fd957ba8714e099352393a678ac855e7dff491886e263f7f70eaf5651f1423b54b5e4af7ffd8ae0c350 SHA512 4dff59f1b82a45959eb9a2d7907683c533f60c19eb9612f5ee81611dbd595940128062fe0773ddf7cfffbb2b900cbb904a1422fd3b46b3261012bde8a70e5cfe
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch
new file mode 100644
index 000000000000..f97845f449f1
--- /dev/null
+++ b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch
@@ -0,0 +1,30 @@
+diff -urN Wnn/etc/bdic.c Wnn-gcc4/etc/bdic.c
+--- Wnn/etc/bdic.c	2001-10-17 10:37:17.000000000 +0900
++++ Wnn-gcc4/etc/bdic.c	2006-11-06 01:31:31.000000000 +0900
+@@ -177,6 +177,14 @@
+ #define max(a, b) ((a < b)? b:a)
+ #endif
+ 
++#ifdef WNN_CHECK_INODE
++static int change_file_uniq1();
++#else
++#ifdef JS
++static int change_file_uniq1();
++#endif
++#endif
++
+ /*:::DOC_START
+  *
+  *    Function Name: dic_fopen
+diff -urN Wnn/jlib/jl.c Wnn-gcc4/jlib/jl.c
+--- Wnn/jlib/jl.c	2001-10-17 10:37:17.000000000 +0900
++++ Wnn-gcc4/jlib/jl.c	2006-11-06 01:33:13.000000000 +0900
+@@ -297,6 +297,8 @@
+ static int insert_dai_or_ikeiji();
+ static int jl_dic_save_all_e_body();
+ 
++static void jl_disconnect_if_server_dead_body_by_jsid();
++
+ static struct wnn_buf *jl_open_lang_core();
+ static struct wnn_env *jl_connect_lang_core();
+ 
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch
new file mode 100644
index 000000000000..e203c8b5fa83
--- /dev/null
+++ b/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch
@@ -0,0 +1,67 @@
+--- work/src/Wnn/jlib/Imakefile	Wed Oct 17 10:37:17 2001
++++ Wnn/jlib/Imakefile	Sat Oct 19 17:15:25 2002
+@@ -60,9 +60,9 @@
+ 
+ LibraryObjectRule()
+ #if DoSharedLib
+-AllTarget($(OBJS) libwnn.a libwnn.so.$(SOWNN7LIBREV))
++AllTarget($(OBJS) libwnn7.a libwnn7.so.$(SOWNN7LIBREV))
+ #else
+-AllTarget($(OBJS) libwnn.a)
++AllTarget($(OBJS) libwnn7.a)
+ #endif
+ 
+ 
+@@ -75,23 +75,23 @@
+ SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),)
+ 
+ #if DoSharedLib
+-SharedLibraryTarget(wnn,$(SOWNN7LIBREV),$(OBJS),.,.)
++SharedLibraryTarget(wnn7,$(SOWNN7LIBREV),$(OBJS),.,.)
+ #endif
+-UnsharedLibraryTarget(wnn,$(UNSHAREDOBJS),unshared,..)
+-LintLibraryTarget(wnn,$(SRCS))
++UnsharedLibraryTarget(wnn7,$(UNSHAREDOBJS),unshared,..)
++LintLibraryTarget(wnn7,$(SRCS))
+ 
+ 
+ 
+ instlib:: install
+ 
+ #if DoSharedLib
+-InstallSharedLibrary(wnn,$(SOWNN7LIBREV),$(WNNLIBDIR))
++InstallSharedLibrary(wnn7,$(SOWNN7LIBREV),$(WNNLIBDIR))
+ #endif
+-InstallLibrary(wnn,$(WNNLIBDIR))
++InstallLibrary(wnn7,$(WNNLIBDIR))
+ 
+ #if ProfileLibJlib
+-ProfiledLibraryTarget(wnn,$(OBJS))
+-InstallLibrary(wnn_p,$(WNNLIBDIR))
++ProfiledLibraryTarget(wnn7,$(OBJS))
++InstallLibrary(wnn7_p,$(WNNLIBDIR))
+ #endif
+ 
+ #if DoSharedLib
+--- work/src/config/Project.tmpl.orig	Wed Oct 17 10:37:18 2001
++++ config/Project.tmpl	Sat Oct 19 18:04:30 2002
+@@ -599,7 +599,7 @@
+      XWNMOJDSRC = $(XWNMOTOP)/jd
+ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
+   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
+-      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
++      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
+  XWNMOLIBRARIES = $(XWNMOJLIB)
+       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
+      XCOMMONDIR = $(IMTOP)/XClient/Common/src
+--- work/src/config/X11.tmpl~	Wed Oct 17 10:37:18 2001
++++ config/X11.tmpl	Sat Oct 19 18:08:32 2002
+@@ -599,7 +599,7 @@
+      XWNMOJDSRC = $(XWNMOTOP)/jd
+ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
+   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
+-      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
++      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
+  XWNMOLIBRARIES = $(XWNMOJLIB)
+       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
+      XCOMMONDIR = $(IMTOP)/XClient/Common/src
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch b/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch
new file mode 100644
index 000000000000..0a0ce4337080
--- /dev/null
+++ b/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch
@@ -0,0 +1,20 @@
+--- Wnn/jlib/js.c.bak	2005-01-20 12:33:10.000000000 +0900
++++ Wnn/jlib/js.c	2005-01-20 12:33:10.000000000 +0900
+@@ -159,7 +159,7 @@
+ */
+ 
+ 
+-extern	char	*malloc();
++extern	void	*malloc();
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+@@ -199,7 +199,7 @@
+ #include "../etc/pwd.c"
+ 
+ 
+-char *malloc();
++void *malloc();
+ 
+ typedef struct _host_address {
+ 	int address_len;
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/metadata.xml b/dev-libs/wnn7sdk/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/dev-libs/wnn7sdk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
new file mode 100644
index 000000000000..192f5277277d
--- /dev/null
+++ b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+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"
+
+	# Fix path to point to Xorg directory
+	sed -e "s:X11R6/::g" -i config/X11.tmpl || sed "sed 1 failed"
+
+	sed -i -e "/CONFIGSRC =/s:=.*:= /usr/$(get_libdir)/X11/config:" Makefile.ini || die "sed 2 failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+			SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+			World -f Makefile.ini || die "make World failed"
+}
+
+src_install() {
+	dolib.so Wnn/jlib/*.so* || die "dolib.so failed"
+	dolib.a  Wnn/jlib/*.a   || die "dolib.a failed"
+
+	insinto /usr/include/${PN}/wnn
+	doins Wnn/include/*.h || die "doins failed"
+
+	dodoc README
+}
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
new file mode 100644
index 000000000000..e9c8516d8c5a
--- /dev/null
+++ b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="Library and headers for Wnn7 client"
+HOMEPAGE="http://www.omronsoft.co.jp/SP/download/pcunix/sdk.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"
+}
+
+src_compile() {
+	make World -f Makefile.ini || die "make World failed"
+}
+
+src_install() {
+	cd ${S}/Wnn/jlib
+	dolib.so *.so* || die
+	dolib.a  *.a   || die
+
+	cd ${S}/Wnn/include
+	insinto /usr/include/${PN}/wnn
+	doins *.h || die
+
+	dodoc ${S}/README
+}