gentoo resync : 14.07.2018

8 files changed, 300 insertions, 0 deletions

diff --git a/app-i18n/im-freewnn/Manifest b/app-i18n/im-freewnn/Manifest
new file mode 100644
index 000000000000..2131161ea5c0
--- /dev/null
+++ b/app-i18n/im-freewnn/Manifest
@@ -0,0 +1,8 @@
+AUX im-freewnn-0.0.2-as-needed.patch 905 BLAKE2B 6d3d88b57bb7b2e0fe812e69509a31537eb15f979c9e9530a73b9e5b1d599573895e6716debd2bb6032bafeabfd8afeafbeaa8b0db875c312bc07a044742b6fe SHA512 38472c17123784f2a76d25a2d3accea7aa3e7317b3581e1e86b3ba4d71abdd0fc721d14a2c9f8869ab522185357b25b82a3ebf49ca0d3eb07aa6581278aefa1f
+AUX im-freewnn-gentoo.patch 2426 BLAKE2B cf395d08d18424e182645e06fc14e9c0cf9a2f676b5a9ee67c8d740eb9c7c89eb49e969d84a8c5215318735d6e5c8c34ac377a414dfcdb6db5279b3b81168f67 SHA512 aebad875ff118a7d9b4b3ba2facafcb369527621cfc9be82bb21d07b8eb0d390d46f598f83dc49eddf9de00a9c1d8cef2fe1f550f6c1bf06219ce6be56633655
+AUX im-freewnn-headers.patch 511 BLAKE2B 13ed6574b9a6aa29db8a20c9b2deff0b0374ad298d2a6ed433bc2ad45823e03de46817f64c57c6f1ba5eb7064611e777b11b11b39444b20b23618650a5535814 SHA512 ae209226010483d0b4a4ec10888d29d6b71002bb9457519b83a56cfb958da9e47740530e23baf2f35453f60902b359443f10e331e4a5b96eff386b78f80ad856
+AUX im-freewnn-wnnenvrc.patch 367 BLAKE2B 5225eceff814d61c2f864b5f8316bb0e902eca4c5d606f724a0bf3ad12b3ce0f0a54af28c4112378a47f2fac3028d9d2fca362f40a20d62d95f656130043dc67 SHA512 0a8e506944d537084a6cd6efe7c0e7583781220e38fb17f164ba7b01290bbe59a4db04a95d2d72299dbd5bc2d9ff2af036d00101c6ced1b593a0a20b98531df7
+DIST im-freewnn-0.0.2.tar.gz 322963 BLAKE2B c089688a52c86cc8c0050987a17d294365e29ef33e70258efaad719876d079e997a7255b86a8b23b6c3bb2c779702e6dd8d6eb9825943f9a7034757ac27e5e51 SHA512 c942d320433d0b1ff15fc1566eff183f5761ce14cb0575834f4ee80504be6d286068203c22ffea81345dab3db11a873f0a559b3d38ba8505f4966f9532a06358
+EBUILD im-freewnn-0.0.2-r2.ebuild 878 BLAKE2B a3707432d6ba6a6333dc10331d644b0f33c169256f5c33be41b2d11b693de00251da6871eb716e312befbe0c78b8b533d8a3384f3be1945981bc4ec858763dcc SHA512 4e1e23279fa65a206e0c5b23aef2fe41b448651f616d6df180ed47c7cb501c73865b6e7c91516c6d7204a84652394c5a8aa88d814079b71f347f2460fc9437c2
+EBUILD im-freewnn-0.0.2-r3.ebuild 880 BLAKE2B df2099671864019b883c0e8eb795d0c295c1d407fee85256ef68e446bc22d588ab7ec0f1027eef31d97fe5a340e63b3f8e32366ee057af1efdb66a52f8587407 SHA512 e8dcfc8acd4166b14644e61a7ca5b363bc2a03b8fb1cba26eb5f3433ac8ec64baa9a96487041eab7e9a9248fc9684b3b65349f2840f918fc2ba159eb3c1590b4
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch b/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
new file mode 100644
index 000000000000..859ea779817a
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
@@ -0,0 +1,35 @@
+--- im-freewnn-0.0.2.orig/Makefile.am	2004-08-04 07:05:06.000000000 +0200
++++ im-freewnn-0.0.2/Makefile.am	2009-12-29 20:34:54.420539767 +0100
+@@ -10,8 +10,6 @@
+ 
+ DEPS =
+ 
+-LDADDS = @GTK_DEP_LIBS@ -lcrypt
+-
+ EXTRA_DIST=	\
+ 	im-freewnn.spec
+ 
+@@ -38,7 +36,7 @@
+ 		candwin.h \
+ 		candwin.c
+ 
+-im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
++im_freewnn_la_LIBADD = @LIBS@ @GTK_DEP_LIBS@ -lcrypt
+ 
+ module_LTLIBRARIES =				\
+ 	im-freewnn.la
+--- im-freewnn-0.0.2.orig/configure.in	2004-08-05 08:04:36.000000000 +0200
++++ im-freewnn-0.0.2/configure.in	2009-12-29 20:36:31.562539161 +0100
+@@ -48,11 +48,8 @@
+ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+ 
+ dnl FreeWnn check
+-ldflags_backup="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -lcrypt"
+ AC_CHECK_HEADER(wnn/jlib.h,,)
+-AC_CHECK_LIB(wnn, jl_open_lang,,)
+-LDFLAGS="$ldflags_backup"
++AC_CHECK_LIB([wnn], [jl_open_lang], , ,[-lcrypt])
+ 
+ AC_OUTPUT([
+ Makefile
diff --git a/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
new file mode 100644
index 000000000000..90e042fc4193
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
@@ -0,0 +1,112 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
++moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
+ ## Makefile.am for gtk+/modules/input 
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+@@ -6,11 +6,11 @@
+ 
+ SUBDIRS = po
+ 
+-INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/wnn -DIM_LOCALEDIR=\"${datadir}/locale\"
++INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
+ 
+ DEPS =
+ 
+-LDADDS = @GTK_DEP_LIBS@ -lcrypt
++LDADDS = @GTK_DEP_LIBS@
+ 
+ EXTRA_DIST=	\
+ 	im-freewnn.spec
+@@ -38,7 +38,7 @@
+ 		candwin.h \
+ 		candwin.c
+ 
+-im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
++im_freewnn_la_LIBADD = $(LDADDS)
+ 
+ module_LTLIBRARIES =				\
+ 	im-freewnn.la
+--- a/configure.in
++++ b/configure.in
+@@ -21,8 +21,10 @@
+ 
+ GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
+ GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
++GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+ AC_SUBST(GTK_DEP_CFLAGS)
+ AC_SUBST(GTK_DEP_LIBS)
++AC_SUBST(GTK_BINARY_VERSION)
+ 
+ LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+ LT_CURRENT=2
+@@ -48,11 +50,9 @@
+ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+ 
+ dnl FreeWnn check
+-ldflags_backup="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -lcrypt"
+ AC_CHECK_HEADER(wnn/jlib.h,,)
++AC_CHECK_LIB(crypt, crypt,,)
+ AC_CHECK_LIB(wnn, jl_open_lang,,)
+-LDFLAGS="$ldflags_backup"
+ 
+ AC_OUTPUT([
+ Makefile
+--- a/freewnn-modewin.h
++++ b/freewnn-modewin.h
+@@ -23,7 +23,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ 
+ #include "freewnn-register-win.h"
+ #include "freewnn-config.h"
+--- a/freewnn-register-win.c
++++ b/freewnn-register-win.c
+@@ -18,7 +18,7 @@
+  *
+  */
+ 
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ #include <gtk/gtk.h>
+ 
+ #include <gdk/gdkkeysyms.h>
+--- a/freewnn-register-win.h
++++ b/freewnn-register-win.h
+@@ -22,7 +22,7 @@
+ #define _FREEWNN_REGIST_WIN
+ 
+ #include <gtk/gtk.h>
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ 
+ typedef struct _FreeWnnRegisterWin FreeWnnRegisterWin;
+ 
+--- a/freewnn-utils.h
++++ b/freewnn-utils.h
+@@ -18,7 +18,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ #include <glib.h>
+ 
+ w_char* char2wchar(unsigned char* str);
+--- a/im-freewnn.h
++++ b/im-freewnn.h
+@@ -26,7 +26,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <gtk/gtkimmodule.h>
+-#include <jllib.h>
++#include <wnn/jllib.h>
+ 
+ #include "freewnn-modewin.h"
+ #include "freewnn-utils.h"
diff --git a/app-i18n/im-freewnn/files/im-freewnn-headers.patch b/app-i18n/im-freewnn/files/im-freewnn-headers.patch
new file mode 100644
index 000000000000..290aee97bd89
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-headers.patch
@@ -0,0 +1,30 @@
+--- a/freewnn-utils.c
++++ b/freewnn-utils.c
+@@ -18,6 +18,9 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "freewnn-utils.h"
+ #include "kata2hkata.h"
+ 
+--- a/im-freewnn.c
++++ b/im-freewnn.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include <string.h>
+ #include "keytable.h"
+@@ -33,6 +34,7 @@
+ #include <gdk/gdkkeysyms.h>
+ 
+ #include "im-freewnn-intl.h"
++#include "freewnn-utils-ui.h"
+ #include "convtable.h"
+ #include "im-freewnn.h"
+ 
diff --git a/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
new file mode 100644
index 000000000000..6b3c70769907
--- /dev/null
+++ b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
@@ -0,0 +1,11 @@
+--- a/im-freewnn.c
++++ b/im-freewnn.c
+@@ -236,7 +236,7 @@
+     return;
+   }
+ 
+-  jl_set_env_wnnrc(wenv, "/etc/FreeWnn/ja/wnnenvrc", printConfirm, printError);
++  jl_set_env_wnnrc(wenv, "@GENTOO_PORTAGE_EPREFIX@/usr/lib/wnn/ja_JP/wnnenvrc", printConfirm, printError);
+ 
+   cf->modewin = freewnn_modewin_new(cf->wnnbuf, &cf->functable);
+   cf->candwin = candwin_new();
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
new file mode 100644
index 000000000000..04bc5f5a3e3d
--- /dev/null
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools gnome2-utils ltprune prefix
+
+DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="app-i18n/freewnn
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-wnnenvrc.patch
+)
+
+src_prepare() {
+	default
+	eprefixify ${PN}.c
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
new file mode 100644
index 000000000000..9057c74300c3
--- /dev/null
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools gnome2-utils ltprune prefix
+
+DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/freewnn
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-wnnenvrc.patch
+)
+
+src_prepare() {
+	default
+	eprefixify ${PN}.c
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/im-freewnn/metadata.xml b/app-i18n/im-freewnn/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/im-freewnn/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>