Removed RDEPEND=${DEPEND}

diff --git a/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild b/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild
index 8da087a22e72ed75ef6501405a57fc8cec7c7ea0..f6a597b8f3eb4ca527ae601e4b31356fc887ac86 100644 (file)
--- a/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild
@@ -1,40 +1,28 @@
 # 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
-
-IUSE="canna freewnn"
-
-KEYWORDS="x86"
-
-A="kinput2-v3.1-beta4.tar.gz"
-
-S="${WORKDIR}/kinput2-v3.1-beta4"
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1_beta4-r1.ebuild,v 1.5 2002/11/06 16:03:45 vapier Exp $
 
+MY_P="kinput2-v3.1-beta4.tar.gz"
 DESCRIPTION="A Japanese input server which supports the XIM protocol"
-
-SRC_URI="ftp://ftp.sra.co.jp/pub/x11/kinput2/${A}"
-
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/kinput2/${MY_P}.tar.gz"
 HOMEPAGE="http://www.nec.co.jp/canna/"
 
+SLOT="0"
 LICENSE="as-is"
+KEYWORDS="x86"
+IUSE="canna freewnn"
 
 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
+if [ -z "`use freewnn``use canna`" ] ; then
        DEPEND="${DEPEND}
                >=app-i18n/canna-3.5_beta2-r1"
 fi
-
-RDEPEND=${DEPEND}
-
-SLOT=0
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-
        # unpack the archive
        unpack ${A}
 
@@ -50,23 +38,21 @@ src_unpack() {
        # 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"
+       xmkmf || die "xmkmf failed"
        make Makefiles || die "Makefile creation failed"
 
        # build Kinput2
-       make depend ; make
+       make depend || die "make depend failed"
+       make || die "make failed"
 }
 
-src_install () {
-
+src_install() {
        # install libs, executables, dictionaries
-       make DESTDIR=${D} install     || die "installation failed"
+       make DESTDIR=${D} install || die "installation failed"
 
        # install docs
        dodoc README NEWS