Removed old ebuild.

4 files changed, 2 insertions, 170 deletions

diff --git a/app-i18n/kinput2/files/digest-kinput2-3.1 b/app-i18n/kinput2/files/digest-kinput2-3.1
deleted file mode 100644
index 4894c0b9614b..000000000000
--- a/app-i18n/kinput2/files/digest-kinput2-3.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index a81a6c16baa0..000000000000
--- a/app-i18n/kinput2/files/kinput2-3.1-gentoo.diff
+++ /dev/null
@@ -1,112 +0,0 @@
-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-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 69456f62b38f..5753fb71bf67 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.6 2004/04/06 03:56:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1-r1.ebuild,v 1.7 2004/05/05 08:48:35 usata Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="x86 ~ppc sparc ~amd64"
 IUSE="canna freewnn"
 
 DEPEND="virtual/glibc
-	canna? >=app-i18n/canna-3.5_beta2-r1
+	canna? ( >=app-i18n/canna-3.5_beta2-r1 )
 	freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
 	!freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )"
 
diff --git a/app-i18n/kinput2/kinput2-3.1.ebuild b/app-i18n/kinput2/kinput2-3.1.ebuild
deleted file mode 100644
index 93b9b03012d7..000000000000
--- a/app-i18n/kinput2/kinput2-3.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 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.6 2004/03/25 07:28:27 mr_bones_ 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 )
-	!freewnn? ( >=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
-}