diff options
| -rw-r--r-- | app-i18n/kinput2/ChangeLog | 12 | ||||
| -rw-r--r-- | app-i18n/kinput2/files/digest-kinput2-3.1 | 1 | ||||
| -rw-r--r-- | app-i18n/kinput2/files/kinput2-3.1-gentoo.diff | 112 | ||||
| -rw-r--r-- | app-i18n/kinput2/kinput2-3.1.ebuild | 54 |
4 files changed, 177 insertions, 2 deletions
diff --git a/app-i18n/kinput2/ChangeLog b/app-i18n/kinput2/ChangeLog index 7e80c88832fa..23a434d0fa87 100644 --- a/app-i18n/kinput2/ChangeLog +++ b/app-i18n/kinput2/ChangeLog @@ -1,10 +1,18 @@ # ChangeLog for app-i18n/kinput2 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# /space/gentoo/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.1 2002/06/25 16:01:22 stubear Exp +# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.7 2002/11/25 13:41:35 nakano Exp $ + +*kinput2-3.1 (25 Nov 2002) + 25 Nov 2002; Masatomo Nakano <nakano@gentoo.org> : kinput2-3.1.ebuild + files/digest-kinput2-3.1 files/kinput2-3.1-gentoo.diff ChangeLogs + + New Version. + Thanks to matsuu@7501.net (MATSUU Takuto) *kinput2-3.1_beta4-r2 (2 July 2002) - 7 Nov 2002; Masatomo Nakano <nakano@gentoo.org> : + 7 Nov 2002; Masatomo Nakano <nakano@gentoo.org> : kinput2-3.1_beta4-r1.ebuild + ChangeLogs fixed bug about MY_P. 19 Sept 2002; Mike Frysinger <vapier@gentoo.org> : diff --git a/app-i18n/kinput2/files/digest-kinput2-3.1 b/app-i18n/kinput2/files/digest-kinput2-3.1 new file mode 100644 index 000000000000..4894c0b9614b --- /dev/null +++ b/app-i18n/kinput2/files/digest-kinput2-3.1 @@ -0,0 +1 @@ +MD5 2de20576f150248d1fdfe66d7cc4e510 kinput2-v3.1.tar.gz 512177 diff --git a/app-i18n/kinput2/files/kinput2-3.1-gentoo.diff b/app-i18n/kinput2/files/kinput2-3.1-gentoo.diff new file mode 100644 index 000000000000..a81a6c16baa0 --- /dev/null +++ b/app-i18n/kinput2/files/kinput2-3.1-gentoo.diff @@ -0,0 +1,112 @@ +diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf +--- kinput2-v3.1.orig/Kinput2.conf 2002-10-03 18:35:26.000000000 +0900 ++++ kinput2-v3.1/Kinput2.conf 2002-11-19 19:59:49.000000000 +0900 +@@ -17,8 +17,8 @@ + + /* #define UseWnn */ /* define if you are going to use Wnn (v4, v6 or v7) */ + /* #define UseWnn6 */ /* define if you are going to use Wnn6 or above */ +-#define UseCanna /* define if you are going to use Canna */ +-#define UseSj3 /* define if you are going to use Sj3 */ ++/* #define UseCanna */ /* define if you are going to use Canna */ ++/* #define UseSj3 */ /* define if you are going to use Sj3 */ + /* #define UseAtok */ /* define if you are going to use Atok */ + + +@@ -34,7 +34,7 @@ + * You have to define WnnLibDir if Wnn4 configuration files + * are not installed in /usr/local/lib/wnn (which is the default). + */ +-/* #define WnnLibDir /some/peculiar/directory/wnn */ ++#define WnnLibDir /usr/lib/wnn + + /* for convenience.. */ + #if defined(UseWnn6) && !defined(UseWnn) +@@ -52,17 +52,17 @@ + * WnnLibDir above. + */ + XCOMM use installed header files +-XCOMM WNNINCDIR = /usr/X11R6/include/wnn ++WNNINCDIR = /usr/include/wnn + XCOMM use installed library +-XCOMM WNNLIB = -lwnn ++WNNLIB = -lwnn + + /* + * Or, use library in the source tree.. + */ + XCOMM use library in the source tree +-WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn +-WNNINCDIR = $(WNNSRC)/include +-WNNLIB = $(WNNSRC)/jlib/libwnn.a ++XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn ++XCOMM WNNINCDIR = $(WNNSRC)/include ++XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a + + + XCOMM Canna configuration +@@ -78,17 +78,17 @@ + * If you have already installed Canna header files and libraries.. + */ + XCOMM use installed headers/libraries +-XCOMM CANNAINSTDIR = /usr/local/canna +-XCOMM CANNASRC = $(CANNAINSTDIR)/include +-XCOMM CANNALIB = -lcanna16 ++CANNAINSTDIR = /usr ++CANNASRC = $(CANNAINSTDIR)/include ++CANNALIB = -lcanna16 + + /* + * If you have compiled Canna that came with X11R6 (contrib/programs/Canna), + * but not installed yet.. + */ + XCOMM use headers/libraries in the source tree +-CANNASRC = $(CONTRIBSRC)/programs/Canna32 +-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16 ++XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32 ++XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16 + + + XCOMM SJ3 configuration +@@ -100,7 +100,7 @@ + * definition files are to be installed + */ + +-SJ3DEF_DIR = $(LIBDIR)/sj3def ++XCOMM SJ3DEF_DIR = $(LIBDIR)/sj3def + + /* + * If you have installed SJ3 library and header file, +@@ -117,8 +117,8 @@ + * Use compiled library in the source tree.. + */ + XCOMM use library in the source tree +-SJ3SRC = $(CONTRIBSRC)/programs/sj3 +-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a ++XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3 ++XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a + + + XCOMM Atok configuration +@@ -133,8 +133,8 @@ + */ + XCOMM use installed headers/libraries + XCOMM ATOKINCDIR = /usr/include/atok +-XCOMM ATOKLIBDIR = /usr/jp/lib +-ATOKLIB = -latok12n -latok12util ++XCOMM ATOKLIBDIR = /var/lib/atok ++XCOMM ATOKLIB = -latok12n -latok12util + + + /** +diff -Naur kinput2-v3.1.orig/cmd/kinput2.c kinput2-v3.1/cmd/kinput2.c +--- kinput2-v3.1.orig/cmd/kinput2.c 2002-10-03 18:35:26.000000000 +0900 ++++ kinput2-v3.1/cmd/kinput2.c 2002-11-22 13:31:00.000000000 +0900 +@@ -644,3 +644,8 @@ + return n; + } + #endif ++ ++#if defined(linux) && defined(PPC) ++/* avoid nusty gcc bug */ ++void _XtInherit() {} ++#endif diff --git a/app-i18n/kinput2/kinput2-3.1.ebuild b/app-i18n/kinput2/kinput2-3.1.ebuild new file mode 100644 index 000000000000..3d674157d2c4 --- /dev/null +++ b/app-i18n/kinput2/kinput2-3.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1.ebuild,v 1.1 2002/11/25 13:41:35 nakano Exp $ + +MY_P="${PN}-v${PV}" +DESCRIPTION="A Japanese input server which supports the XIM protocol" +SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz" +HOMEPAGE="http://www.nec.co.jp/canna/" + +SLOT="0" +LICENSE="as-is" +KEYWORDS="~x86 ~ppc" +IUSE="canna freewnn" + +DEPEND="virtual/glibc + canna? >=app-i18n/canna-3.5_beta2-r1 + freewnn? >=app-i18n/freewnn-1.1.1_alpha19 : >=app-i18n/canna-3.5_beta2-r1" +S="${WORKDIR}/${MY_P}" + +src_unpack() { + # unpack the archive + unpack ${A} + + # patch Kinput2.conf to ensure that files are installed into image dir + cd ${S} + patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die + + # hack to set define UseCanna, define UseWnn or both + cp Kinput2.conf Kinput2.tmp + use canna && sed -e "s:\/\* \#define UseCanna \*\/:\#define UseCanna:" Kinput2.tmp > Kinput2.conf + cp Kinput2.conf Kinput2.tmp + use freewnn && sed -e "s:\/\* \#define UseWnn \*\/:\#define UseWnn:" Kinput2.tmp > Kinput2.conf + # default to UseCanna if we don't have freewnn in useflags + cp Kinput2.conf Kinput2.tmp + use freewnn || sed -e "s:\/\* \#define UseCanna \*\/:\#define UseCanna:" Kinput2.tmp > Kinput2.conf || die +} + +src_compile() { + # create a Makefile from Kinput2.conf + xmkmf || die "xmkmf failed" + make Makefiles || die "Makefile creation failed" + + # build Kinput2 + make depend || die "make depend failed" + make || die "make failed" +} + +src_install() { + # install libs, executables, dictionaries + make DESTDIR=${D} install || die "installation failed" + + # install docs + dodoc README NEWS +} |