gentoo resync : 14.07.2018

6 files changed, 177 insertions, 0 deletions

diff --git a/app-i18n/skkfep/Manifest b/app-i18n/skkfep/Manifest
new file mode 100644
index 000000000000..155fb50fd51d
--- /dev/null
+++ b/app-i18n/skkfep/Manifest
@@ -0,0 +1,6 @@
+AUX skkfep-annotation.patch 540 BLAKE2B af0332372b17175124477c494a2f09d0bb688a635d4cf137abf026eb2229466b1424ffe9a0422aafcaeefa02cf944253f4de2ebcf910916bfd51813f9e25aa75 SHA512 a92f0d90af2ac7c9a6b2349b60401aa2cc45a6b9a997c63cb8fc9fbd5355281db9b630e98db08205b9d944a603152661928bca02cd0e4d75aa3de32b8e7ff55a
+AUX skkfep-gentoo.patch 1836 BLAKE2B f8430c997bbdd192446e952ebbbb141b7de2b12b10ce6f6e63c7ede577719033b7969e6fde4a685717ea78a6f5e02be3c1f51a3ad058a6f31b6cb60e590822ee SHA512 7af2a73f36277fd99d9ab42e928183be4db00de665d3d4b51b6735ca7cdb9259aa1ecb6572b87732b6af865c7f04122fa3341543d9feea89081a1b53b3e58298
+AUX skkfep-system-dic.patch 325 BLAKE2B 2b13ae10b3be26a5674d69ec558351aed6ee4c56a22141d1220f9840e384b22c65583439e913ac9fddd128cd88fc1695eeb202b495558d0e89b283f1253d000a SHA512 af149e67e9b8fc727404bc67e50eeaf3ba37effccd73cd9416279631bd1c000685c129ddcdbd909ef1d1dbd4e84ac4efb0d3236b988c9c9b9416342edb005254
+DIST skkfep-0.87.tar.gz 45711 BLAKE2B ed2d9a7f779ba09fe71b023de395a37a84be81a7e70de7dcd0b04494c44319f067d19182e762b9a48395c08587b353457ffa8bdb84b5e0526880d6c735ffef53 SHA512 3dc842559640b56b967679042c31bfa889e66cd6b7d0347ec17ddc606b85f2a4bb49dc995b3b38c30e71f500031714e2083bfc028ad4ff76ac4f07476a3f2469
+EBUILD skkfep-0.87-r1.ebuild 904 BLAKE2B 8de72221ca38069420d478006dc4f91b27d4025aff69840ff1830df8327f59c766d3fade0521b393c8a84a4a90dda0510541e617642c480c44508fdd871daf75 SHA512 7694564505e70933e52700e45b75dd2d0b320d6e33b7d44c68d4a83eaa67ab19c0d1a8b9bab472c85771773a0411f67166eb8f1f7389dc810720dbd6e3c81881
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skkfep/files/skkfep-annotation.patch b/app-i18n/skkfep/files/skkfep-annotation.patch
new file mode 100644
index 000000000000..8145c2b069e0
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-annotation.patch
@@ -0,0 +1,29 @@
+--- a/kkconv.c
++++ b/kkconv.c
+@@ -645,6 +645,7 @@
+ char c;
+ {
+ 	int l;
++	char *p;
+ 	DicList dlist;
+ 
+ 	kanjiSelectionEffect(0);
+@@ -653,7 +654,17 @@
+ 		if (OkuriInput)
+ 			l += strlen(OkuriBuf);
+ 		csrLeft(l);
+-		writeShells(CurrentCand->candword);
++		p= strrchr(CurrentCand->candword,';');
++		if (p != NULL) {
++			erase(l);
++			csrLeft(l);
++			l -= strlen(p);
++			*p = '\0';
++			writeShells(CurrentCand->candword);
++			*p = ';';
++		} else {
++			writeShells(CurrentCand->candword);
++		}
+ 		if (OkuriInput) {
+ 			writeShells(OkuriBuf);
+ 		}
diff --git a/app-i18n/skkfep/files/skkfep-gentoo.patch b/app-i18n/skkfep/files/skkfep-gentoo.patch
new file mode 100644
index 000000000000..2afe3537361e
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-gentoo.patch
@@ -0,0 +1,75 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,16 +2,16 @@
+ # Makefile for skkfep
+ #
+ all: genMakefile
+-	make -f genMakefile all
++	$(MAKE) -f genMakefile all
+ 
+ skkfep: genMakefile
+-	make -f genMakefile skkfep
++	$(MAKE) -f genMakefile skkfep
+ 
+ simpledic: genMakefile
+-	make -f genMakefile simpledic
++	$(MAKE) -f genMakefile simpledic
+ 
+ clean: genMakefile
+-	make -f genMakefile clean
++	$(MAKE) -f genMakefile clean
+ 	rm -f genMakefile
+ 
+ genMakefile: protoMakefile config.h
+--- a/config.h
++++ b/config.h
+@@ -14,7 +14,7 @@
+ #define DEFAULT_KANAKEY "^j"
+ 
+ /* By Y. Kaneko */
+-/*#define KUTOUTEN        /* "."->maru, ","->ten */
++#define KUTOUTEN        /* "."->maru, ","->ten */
+ 
+ #define KANJIBS			/* do/don't shuft-out BS code in JIS mode */
+ #define KANJIBS_DEFAULT	0	/* 0 -> shift out / 1 -> don't shift out  */
+@@ -28,4 +28,4 @@
+ 
+ #define NATIVECODE	euc	/* EUC Kanji code */
+ 
+-#define SKK_SERVER_HOST	"ei5nazha"	/* SKK server host */
++#define SKK_SERVER_HOST	"localhost"	/* SKK server host */
+--- a/configs/linux.h
++++ b/configs/linux.h
+@@ -10,3 +10,12 @@
+ #define NO_VFORK
+ 
+ #define HAVE_SETREUID
++#define HAVE_BSD_OPENPTY
++
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++#if makefile_parameter
++SYSLIBS=-lutil
++#endif
+--- a/protoMakefile
++++ b/protoMakefile
+@@ -1,5 +1,5 @@
+ CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
+-LIBS  =$(SYSLIBS) $(EXTRALIBS) -ltermcap
++LIBS  =$(SYSLIBS) $(EXTRALIBS) $(LDFLAGS) -lncurses
+ 
+ OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
+ 	kkconv.o keymap.o version.o
+--- a/stty.c
++++ b/stty.c
+@@ -306,7 +306,7 @@
+ {
+ 	int cpid;
+ /* #ifdef _AIX */
+-#if defined(_AIX) || defined(NECEWS) || defined(SOLARIS2)
++#if defined(_AIX) || defined(NECEWS) || defined(SOLARIS2) || defined(LINUX)
+ 	int statusp;
+ 	reset_tty_without_close();
+ 	cpid = wait(&statusp);
diff --git a/app-i18n/skkfep/files/skkfep-system-dic.patch b/app-i18n/skkfep/files/skkfep-system-dic.patch
new file mode 100644
index 000000000000..ba57a2a41f0b
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-system-dic.patch
@@ -0,0 +1,13 @@
+--- a/kkconv.c
++++ b/kkconv.c
+@@ -660,7 +660,9 @@
+ 		flushOut(l);
+ #ifdef USE_SERVER
+ 		if (!CandFromServer) {
+-			selectCand(FirstCandEntry,CurrentCand);
++			if (FirstCandEntry != NULL) {
++				selectCand(FirstCandEntry,CurrentCand);
++			}
+ 		}
+ 		else if (NetLearnMode != LearnOff) {
+ 			if (CurrentCand->dicitem == NULL) {
diff --git a/app-i18n/skkfep/metadata.xml b/app-i18n/skkfep/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/skkfep/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/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
new file mode 100644
index 000000000000..a74c53e6af37
--- /dev/null
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A SKK-like Japanese input method for console"
+HOMEPAGE="http://aitoweb.world.coocan.jp/soft.html"
+SRC_URI="http://aitoweb.world.coocan.jp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND="sys-apps/sed
+	sys-libs/ncurses:=
+	virtual/awk"
+RDEPEND="sys-libs/ncurses:=
+	app-i18n/skk-jisyo"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-system-dic.patch
+	"${FILESDIR}"/${PN}-annotation.patch
+)
+DOCS=( README HISTORY TODO )
+
+src_prepare() {
+	sed -i "/SYSTEM_DIC_NAME/a#define SYSTEM_DIC_NAME \"${EPREFIX}/usr/share/skk/SKK-JISYO.L\"" config.h
+
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		OPTIMIZE="${CFLAGS}"
+}
+
+src_install() {
+	dobin skkfep escmode
+	doman skkfep.1
+	einstalldocs
+}