1 Jul 2002; Stuart Bouyer <stubear@gentoo.org> added freewnn and changed

kinput2 to use both Canna and FreeWnn

4 files changed, 107 insertions, 15 deletions

diff --git a/app-i18n/kinput2/ChangeLog b/app-i18n/kinput2/ChangeLog
index cb94b1254b23..6fa937c9215c 100644
--- a/app-i18n/kinput2/ChangeLog
+++ b/app-i18n/kinput2/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for <CATEGORY>/<PACKAGE_NAME>
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.1 2002/06/25 16:01:22 stubear Exp $
+# /space/gentoo/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.1 2002/06/25 16:01:22 stubear Exp
 
-* kinput2-3.1_beta4 (26 June 2002)
+*kinput2-3.1_beta4-r1 (1 July 2002)
+
+  1 July 2002; Stuart Bouyer <stubear@gentoo.org> kinput2-3.1_beta4-r1.ebuild :
+  Added support for Canna and FreeWnn with new useflages canna and freewnn
+
+
+*kinput2-3.1_beta4 (26 June 2002)
 
   26 June 2002; Stuart Bouyer <stubear@gentoo.org> kinput2-3.1_beta4.ebuild :
   Added Kinput2 3.1 beta4
diff --git a/app-i18n/kinput2/files/digest-kinput2-3.1_beta4-r1 b/app-i18n/kinput2/files/digest-kinput2-3.1_beta4-r1
new file mode 100644
index 000000000000..07441ea5c695
--- /dev/null
+++ b/app-i18n/kinput2/files/digest-kinput2-3.1_beta4-r1
@@ -0,0 +1 @@
+MD5 3cf13144a7079bb781bb63cfb57c4d88 kinput2-v3.1-beta4.tar.gz 512832
diff --git a/app-i18n/kinput2/files/kinput2-3.1_beta4/gentoo.diff b/app-i18n/kinput2/files/kinput2-3.1_beta4/gentoo.diff
index 1745f1f8646e..5b3a1de633a2 100644
--- a/app-i18n/kinput2/files/kinput2-3.1_beta4/gentoo.diff
+++ b/app-i18n/kinput2/files/kinput2-3.1_beta4/gentoo.diff
@@ -1,20 +1,36 @@
-Index: Kinput2.conf
-===================================================================
-RCS file: /var/lib/cvs/kinput2/Kinput2.conf,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 Kinput2.conf
---- Kinput2.conf	18 May 2002 03:23:46 -0000	1.1.1.1
-+++ Kinput2.conf	18 May 2002 03:27:57 -0000
-@@ -18,7 +18,7 @@
+--- Kinput2.conf.orig	Sun Jun 30 01:28:48 2002
++++ Kinput2.conf	Sun Jun 30 17:26:40 2002
+@@ -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 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 */
  
  
-@@ -60,9 +60,9 @@
+@@ -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
@@ -27,13 +43,15 @@ diff -u -r1.1.1.1 Kinput2.conf
  
  
  XCOMM Canna configuration
-@@ -79,16 +79,16 @@
+@@ -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 CANNAINSTDIR = /usr/local/canna
 -XCOMM CANNASRC = $(CANNAINSTDIR)/include
 -XCOMM CANNALIB = -lcanna16
-+CANNASRC = /usr/include
++CANNAINSTDIR = /usr
++CANNASRC = $(CANNAINSTDIR)/include
 +CANNALIB = -lcanna16
  
  /*
diff --git a/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild b/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild
new file mode 100644
index 000000000000..9d1768df3cb2
--- /dev/null
+++ b/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.6 2002/05/07 03:58:19 drobbins Exp
+
+A="kinput2-v3.1-beta4.tar.gz"
+
+S="${WORKDIR}/kinput2-v3.1-beta4"
+
+DESCRIPTION="A Japanese input server which supports the XIM protocol"
+
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/kinput2/${A}"
+
+LICENSE="as-is"
+
+DEPEND="virtual/glibc
+	canna? >=app-i18n/canna-3.5_beta2-r1
+	freewnn? >=app-i18n/freewnn-1.1.1_alpha19"
+
+# Hack to default to canna if the user doesn't chose either canna or freewnn
+if [ -z "`use freewnn`" ]
+then
+	DEPEND="${DEPEND}
+		>=app-i18n/canna-3.5_beta2-r1"
+fi
+
+RDEPEND=${DEPEND}
+
+SLOT=0
+
+src_unpack() {
+
+	# unpack the archive
+	unpack ${A}
+
+	# patch Kinput2.conf to ensure that files are installed into image dir
+	cd ${S}
+	patch -p0 < ${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 ; make
+}
+
+src_install () {
+
+	# install libs, executables, dictionaries
+	make DESTDIR=${D} install     || die "installation failed"
+
+	# install docs
+	dodoc README NEWS
+}