add inherit eutils

34 files changed, 172 insertions, 230 deletions

diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index 55503b9ec70e..f05c6b1e5b5e 100644
--- a/app-i18n/canna/canna-3.6_p4.ebuild
+++ b/app-i18n/canna/canna-3.6_p4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.11 2004/03/30 06:14:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.12 2004/04/06 03:50:44 vapier Exp $
 
-inherit cannadic
+inherit cannadic eutils
 
 IUSE="doc"
 
diff --git a/app-i18n/fbiterm/fbiterm-0.5.ebuild b/app-i18n/fbiterm/fbiterm-0.5.ebuild
index 338d0879602a..adcf4261061a 100644
--- a/app-i18n/fbiterm/fbiterm-0.5.ebuild
+++ b/app-i18n/fbiterm/fbiterm-0.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5.ebuild,v 1.1 2003/11/24 14:11:10 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5.ebuild,v 1.2 2004/04/06 03:50:53 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Framebuffer internationalized terminal emulator"
 HOMEPAGE="http://www-124.ibm.com/linux/projects/iterm/"
diff --git a/app-i18n/iiimgcf/iiimgcf-11.4.1467.ebuild b/app-i18n/iiimgcf/iiimgcf-11.4.1467.ebuild
index 599dc1e35901..e24243729259 100644
--- a/app-i18n/iiimgcf/iiimgcf-11.4.1467.ebuild
+++ b/app-i18n/iiimgcf/iiimgcf-11.4.1467.ebuild
@@ -1,38 +1,33 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimgcf/iiimgcf-11.4.1467.ebuild,v 1.3 2004/03/10 20:26:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimgcf/iiimgcf-11.4.1467.ebuild,v 1.4 2004/04/06 03:52:03 vapier Exp $
 
-inherit iiimf
+inherit iiimf eutils
 
 DESCRIPTION="IIIMGCF is a GTK+ client framework for IIIMF"
 
 LICENSE="LGPL-2.1"
-
 KEYWORDS="~x86"
+
 DEPEND="dev-libs/libiiimp
 	dev-libs/libiiimcf
 	gtk? ( =x11-libs/gtk+-2* )"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
-
 	dodoc AUTHORS ChangeLog
 }
 
 pkg_postinst() {
-
-	gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
 
 pkg_postrm() {
-
-	gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
diff --git a/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild b/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild
index 821952cd522d..7afc2bd65bba 100644
--- a/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild
+++ b/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild,v 1.3 2004/03/10 20:24:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild,v 1.4 2004/04/06 03:52:17 vapier Exp $
 
-inherit iiimf
+inherit iiimf eutils
 
-DESCRIPTION="IIIMSF is a server program to provide Input Method facilities via IIIMP"
+DESCRIPTION="server program to provide Input Method facilities via IIIMP"
 
 KEYWORDS="~x86"
+
 DEPEND="dev-libs/libiiimp"
 
 src_unpack() {
-
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_install() {
-
 	exeinto /usr/lib/im
 	doexe src/htt src/htt_server
 	exeinto /etc/init.d
diff --git a/app-i18n/iiimxcf/iiimxcf-11.4.1467.ebuild b/app-i18n/iiimxcf/iiimxcf-11.4.1467.ebuild
index c9ce94bd9db3..30ddc59b3b78 100644
--- a/app-i18n/iiimxcf/iiimxcf-11.4.1467.ebuild
+++ b/app-i18n/iiimxcf/iiimxcf-11.4.1467.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimxcf/iiimxcf-11.4.1467.ebuild,v 1.2 2003/09/14 01:53:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimxcf/iiimxcf-11.4.1467.ebuild,v 1.3 2004/04/06 03:52:42 vapier Exp $
 
-inherit iiimf
+inherit iiimf eutils
 
-DESCRIPTION="IIIMXCF is an X client framework for IIIMF"
+DESCRIPTION="X client framework for IIIMF"
 
 KEYWORDS="~x86 -alpha"
 
@@ -12,14 +12,12 @@ DEPEND="dev-libs/libiiimp
 	dev-libs/libiiimcf"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}/xiiimp.so
 	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_compile() {
-
 	cd ${S}/xiiimp.so
 	iiimf_src_compile || die
 	cd ${S}/htt_xbe
@@ -27,11 +25,10 @@ src_compile() {
 }
 
 src_install() {
-
 	cd ${S}/xiiimp.so
 	make DESTDIR=${D} install || die
 	docinto xiiimp.so
-	dodoc AUTHORS NEWS README ChangeLog COPYING
+	dodoc AUTHORS NEWS README ChangeLog
 
 	cd ${S}/htt_xbe
 	make DESTDIR=${D} install || die
diff --git a/app-i18n/im-ja/im-ja-0.9-r1.ebuild b/app-i18n/im-ja/im-ja-0.9-r1.ebuild
index e44f29c26992..16c3bac441f9 100644
--- a/app-i18n/im-ja/im-ja-0.9-r1.ebuild
+++ b/app-i18n/im-ja/im-ja-0.9-r1.ebuild
@@ -1,22 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9-r1.ebuild,v 1.4 2004/03/21 21:26:13 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9-r1.ebuild,v 1.5 2004/04/06 03:53:32 vapier Exp $
 
-inherit gnome2
-
-IUSE="gnome canna freewnn debug"
+inherit gnome2 eutils
 
 DESCRIPTION="A Japanese input module for GTK2 and XIM"
 HOMEPAGE="http://im-ja.sourceforge.net/"
 SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
 	http://im-ja.sourceforge.net/old/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
 SLOT="0"
-
-S=${WORKDIR}/${P}
-
-DOCS="AUTHORS README ChangeLog TODO"
+KEYWORDS="x86 ~sparc"
+IUSE="gnome canna freewnn debug"
 
 DEPEND="dev-lang/perl
 	dev-perl/URI
@@ -32,10 +28,9 @@ RDEPEND="virtual/glibc
 	freewnn? ( app-i18n/freewnn )
 	canna? ( app-i18n/canna )"
 
-use debug && RESTRICT="nostrip"
+DOCS="AUTHORS README ChangeLog TODO"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-canna-3.7-gentoo.diff
diff --git a/app-i18n/im-ja/im-ja-0.9.ebuild b/app-i18n/im-ja/im-ja-0.9.ebuild
index 4415262d1230..bed93e97f30b 100644
--- a/app-i18n/im-ja/im-ja-0.9.ebuild
+++ b/app-i18n/im-ja/im-ja-0.9.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9.ebuild,v 1.4 2004/03/04 19:21:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9.ebuild,v 1.5 2004/04/06 03:53:42 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A Japanese input module for GTK2 and XIM"
 HOMEPAGE="http://im-ja.sourceforge.net/"
 SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
 	http://im-ja.sourceforge.net/old/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc"
 SLOT="0"
diff --git a/app-i18n/jless-iso254/jless-iso254-358.ebuild b/app-i18n/jless-iso254/jless-iso254-358.ebuild
index fbc755fa7dba..e3972c3c017b 100644
--- a/app-i18n/jless-iso254/jless-iso254-358.ebuild
+++ b/app-i18n/jless-iso254/jless-iso254-358.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/jless-iso254/jless-iso254-358.ebuild,v 1.9 2003/11/18 07:21:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jless-iso254/jless-iso254-358.ebuild,v 1.10 2004/04/06 03:55:09 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 LESS_P="less-${PV}"
 
 DESCRIPTION="Jam less is an enhancement of less which supports multibyte character"
+HOMEPAGE="http://www.flash.net/~marknu/less/ http://www.io.com/~kazushi/less/"
 SRC_URI="mirror://gnu/less/${LESS_P}.tar.gz
 	http://www.io.com/~kazushi/less/${LESS_P}-iso254.patch.gz"
-HOMEPAGE="http://www.flash.net/~marknu/less/
-	http://www.io.com/~kazushi/less/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 alpha sparc ppc"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
 
-S="${WORKDIR}/${LESS_P}"
+S=${WORKDIR}/${LESS_P}
 
 src_unpack() {
 
@@ -29,37 +28,34 @@ src_unpack() {
 }
 
 src_compile() {
-
-	local editor=$(. /etc/profile 2>/dev/null ; echo $EDITOR)
-
-	econf --without-cs-regex \
+	econf \
+		--without-cs-regex \
 		--with-regex=auto \
 		--enable-msb \
 		--enable-jisx0213 \
-		--with-editor=${editor} || die
+		--with-editor=${EDITOR} \
+		|| die
 
 	emake || die
 }
 
 src_install() {
-
 	einstall binprefix=j manprefix=j || die
 
 	newbin ${FILESDIR}/lesspipe.sh-r1 jlesspipe.sh
-	if [ ! -f /usr/bin/lesspipe.sh ] ; then
+	if [ ! -f ${ROOT}/usr/bin/lesspipe.sh ] ; then
 		dosym /usr/bin/jlesspipe.sh /usr/bin/lesspipe.sh
 	fi
 
 	insinto /etc/env.d
 	doins ${FILESDIR}/70jless
 
-	dodoc COPYING LICENSE NEWS README*
+	dodoc NEWS README*
 }
 
 pkg_postinst() {
-
 	# for backward compatibility
-	if [ ! -f /usr/bin/lesspipe.sh ] ; then
-		ln -s /usr/bin/jlesspipe.sh /usr/bin/lesspipe.sh
+	if [ ! -f ${ROOT}/usr/bin/lesspipe.sh ] ; then
+		ln -s /usr/bin/jlesspipe.sh ${ROOT}/usr/bin/lesspipe.sh
 	fi
 }
diff --git a/app-i18n/jmcce/jmcce-1.4_rc2.ebuild b/app-i18n/jmcce/jmcce-1.4_rc2.ebuild
index 2a6698faa3c3..4e4c8cbb26a6 100644
--- a/app-i18n/jmcce/jmcce-1.4_rc2.ebuild
+++ b/app-i18n/jmcce/jmcce-1.4_rc2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/jmcce/jmcce-1.4_rc2.ebuild,v 1.4 2004/01/22 06:32:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jmcce/jmcce-1.4_rc2.ebuild,v 1.5 2004/04/06 03:55:49 vapier Exp $
 
-inherit gcc
+inherit gcc eutils
 
 MY_P=${P/_rc/RC}
 S=${WORKDIR}/${MY_P}
@@ -11,18 +11,14 @@ DESCRIPTION="A Chinese Console supporting BIG5, GB and Japanese input."
 HOMEPAGE="http://jmcce.slat.org"
 SRC_URI="http://zope.slat.org/Project/Jmcce/DOWNLOAD/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
-IUSE=""
 
 DEPEND=">=media-libs/svgalib-1.4.3
 	>=sys-libs/ncurses-4.2"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	if [ `gcc-version` = "3.3" ] ; then
@@ -31,14 +27,12 @@ src_unpack() {
 }
 
 src_compile() {
-
 	./genconf.sh || die
 	econf --sysconfdir=/etc/jmcce || die "econf failed"
-	emake || die "make failed"
+	emake -j1 || die "make failed"
 }
 
 src_install() {
-
 	dodir /etc/jmcce
 
 	make DESTDIR=${D} install || die "install failed"
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index 440dc3f7dd37..4945fd460d75 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/kcc-1.0.ebuild,v 1.6 2004/01/07 09:46:07 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/kcc-1.0.ebuild,v 1.7 2004/04/06 03:56:22 vapier Exp $
 
-inherit gcc
+inherit gcc eutils
 
-IUSE=""
-
-KEYWORDS="x86"
-S="${WORKDIR}/${PN}"
 DESCRIPTION="A Kanji code converter"
-SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz"
 HOMEPAGE="" 	#There doesn't seem to be a home page for this package!
+SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
 
-SLOT="0"
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
-
-	# unpack the archive
 	unpack ${A}
 
 	cd ${S}
@@ -30,12 +27,10 @@ src_unpack() {
 }
 
 src_compile() {
-
 	emake || die
 }
 
-src_install () {
-
+src_install() {
 	dobin kcc || die
 
 	dodoc README
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index cede9c1d79d5..69456f62b38f 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,14 +1,16 @@
 # 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.5 2004/03/25 07:28:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1-r1.ebuild,v 1.6 2004/04/06 03:56:48 vapier Exp $
+
+inherit eutils
 
 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/"
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~amd64"
 IUSE="canna freewnn"
 
diff --git a/app-i18n/kon2/kon2-0.3.9b-r1.ebuild b/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
index 1f9111778c1a..d97fb7f568ad 100644
--- a/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
+++ b/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/kon2-0.3.9b-r1.ebuild,v 1.4 2003/12/28 19:48:49 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/kon2-0.3.9b-r1.ebuild,v 1.5 2004/04/06 03:57:06 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="KON Kanji ON Linux console"
-SRC_URI="ftp://ftp.linet.gr.jp/pub/KON/${P}.tar.gz"
 HOMEPAGE=""
+SRC_URI="ftp://ftp.linet.gr.jp/pub/KON/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
@@ -16,8 +16,6 @@ DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}
 	>=media-fonts/konfont-0.1"
 
-S=${WORKDIR}/${P}
-
 src_unpack(){
 	unpack ${A}
 	cd ${S}
diff --git a/app-i18n/leif/leif-11.4.1467.ebuild b/app-i18n/leif/leif-11.4.1467.ebuild
index aca1c9abba9a..2dc0e168ded5 100644
--- a/app-i18n/leif/leif-11.4.1467.ebuild
+++ b/app-i18n/leif/leif-11.4.1467.ebuild
@@ -1,29 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/leif/leif-11.4.1467.ebuild,v 1.3 2004/03/10 18:34:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/leif/leif-11.4.1467.ebuild,v 1.4 2004/04/06 03:57:37 vapier Exp $
 
-inherit iiimf
+inherit iiimf eutils
 
 DESCRIPTION="Language Engine is a component that provide actual Input Method service for IIIMF"
 
-DEPEND="dev-libs/eimil"
 KEYWORDS="~x86"
 
-src_unpack() {
+DEPEND="dev-libs/eimil"
 
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_install() {
-
 	make DESTDIR=${D} \
 		prefix=/usr \
 		install || die
 
 	dodoc ChangeLog
-	for d in canna cm newpy sampleja* ude unit template; do
+	for d in canna cm newpy sampleja* ude unit template ; do
 		docinto $d
 		dodoc ChangeLog README
 	done
diff --git a/app-i18n/libtabe/libtabe-0.2.5.ebuild b/app-i18n/libtabe/libtabe-0.2.5.ebuild
index 295e83453140..acc459c10a52 100644
--- a/app-i18n/libtabe/libtabe-0.2.5.ebuild
+++ b/app-i18n/libtabe/libtabe-0.2.5.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/libtabe-0.2.5.ebuild,v 1.7 2003/11/04 02:56:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/libtabe-0.2.5.ebuild,v 1.8 2004/04/06 03:58:00 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
 HOMEPAGE="http://libtabe.sourceforge.net/"
 SRC_URI="ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/${P}.tar.gz"
 
-IUSE=""
 LICENSE="XCIN"
 SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="=sys-libs/db-3*"
-S="${WORKDIR}/${PN}"
-MAKEOPTS="${MAKEOPTS} -j1"
+
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
@@ -21,13 +22,12 @@ src_unpack() {
 }
 
 src_compile() {
-
 	econf \
 		--with-db-inc=/usr/include/db3 \
 		--with-db-lib=/usr/lib \
 		--with-db-bin=/usr/bin \
 		--enable-shared || die "econf failed"
-	emake || die " make failed"
+	emake -j1 || die " make failed"
 }
 
 src_install() {
diff --git a/app-i18n/minichinput/minichinput-0.1.9.ebuild b/app-i18n/minichinput/minichinput-0.1.9.ebuild
index 6ad5c4c06ba7..de63d88dce2c 100644
--- a/app-i18n/minichinput/minichinput-0.1.9.ebuild
+++ b/app-i18n/minichinput/minichinput-0.1.9.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/minichinput-0.1.9.ebuild,v 1.2 2003/10/08 09:41:35 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/minichinput/minichinput-0.1.9.ebuild,v 1.3 2004/04/06 03:58:31 vapier Exp $
+
+inherit eutils
 
 MY_P=${P/minichinput/miniChinput}
 
 DESCRIPTION="Chinese Input Method. Replaces Chinput as a smaller package without the dependency on unicon."
-HOMEPAGE="http://www-scf.usc.edu/~bozhang/miniChinput/
-	http://sourceforge.net/projects/minichinput/"
+HOMEPAGE="http://www-scf.usc.edu/~bozhang/miniChinput/ http://sourceforge.net/projects/minichinput/"
 SRC_URI="mirror://sourceforge/minichinput/${MY_P}.tar.gz
 	mirror://sourceforge/minichinput/${MY_P}-rxvt.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
 
 DEPEND="virtual/x11
 	virtual/xft
@@ -23,6 +21,8 @@ DEPEND="virtual/x11
 	>=media-libs/imlib-1.9.13
 	!app-i18n/chinput"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	epatch ${DISTDIR}/${MY_P}-rxvt.patch
diff --git a/app-i18n/prime/prime-0.7a-r1.ebuild b/app-i18n/prime/prime-0.7a-r1.ebuild
index 31095e0fdc2b..c1d7f844b768 100644
--- a/app-i18n/prime/prime-0.7a-r1.ebuild
+++ b/app-i18n/prime/prime-0.7a-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/prime-0.7a-r1.ebuild,v 1.2 2004/03/29 20:40:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/prime-0.7a-r1.ebuild,v 1.3 2004/04/06 03:59:05 vapier Exp $
 
-inherit ruby
-
-IUSE="emacs"
+inherit ruby eutils
 
 MY_P="${P/_pre*/-ss1}"
 MY_P="${P/_rc/-rc}"
@@ -15,10 +13,9 @@ HOMEPAGE="http://taiyaki.org/prime/"
 SRC_URI="http://prime.sourceforge.jp/src/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
 SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="x86 ~ppc"
+IUSE="emacs"
 
 DEPEND="dev-lang/ruby
 	app-dicts/prime-dict
@@ -27,6 +24,8 @@ DEPEND="dev-lang/ruby
 	dev-ruby/ruby-progressbar"
 PDEPEND="emacs? ( app-emacs/prime-el )"
 
+S="${WORKDIR}/${MY_P}"
+
 EXTRA_ECONF="--with-prime-docdir=/usr/share/doc/${PF}/html
 	--with-rubydir=/usr/lib/ruby/site_ruby"
 
@@ -37,10 +36,8 @@ src_unpack() {
 }
 
 src_install() {
-
 	einstall || die
 	make DESTDIR=${D} install-etc || die
 
 	erubydoc
-
 }
diff --git a/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild b/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild
index 299b0bc27334..d8523f979eaa 100644
--- a/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild
+++ b/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild,v 1.2 2003/10/16 17:05:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild,v 1.3 2004/04/06 03:59:15 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="rskkserv is an alternative version of skkserv implemented by Ruby"
 HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=rskkserv"
diff --git a/app-i18n/rskkserv/rskkserv-2.94.13-r1.ebuild b/app-i18n/rskkserv/rskkserv-2.94.13-r1.ebuild
index 15fad8a22251..9b659d9a87d0 100644
--- a/app-i18n/rskkserv/rskkserv-2.94.13-r1.ebuild
+++ b/app-i18n/rskkserv/rskkserv-2.94.13-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.94.13-r1.ebuild,v 1.2 2004/03/27 16:27:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.94.13-r1.ebuild,v 1.3 2004/04/06 03:59:58 vapier Exp $
 
-IUSE=""
-
-inherit ruby
+inherit ruby eutils
 
 DESCRIPTION="rskkserv is an alternative version of skkserv implemented by Ruby"
 HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=rskkserv"
@@ -19,12 +17,12 @@ DEPEND="dev-lang/ruby
 RDEPEND="${DEPEND}
 	app-i18n/skk-jisyo"
 PROVIDE="virtual/skkserv"
+
 USE_RUBY="ruby16 ruby18 ruby19"
 
 S=${WORKDIR}/${PN}-cvs
 
 src_unpack() {
-
 	unpack ${P}.tar.gz
 
 	cd ${S}
@@ -37,18 +35,16 @@ src_unpack() {
 }
 
 src_compile() {
-
-	EXTRA_ECONF="--with-dicfile=/usr/share/skk/SKK-JISYO.L
-		--with-cachedir=/var/lib/rskkserv
-		--with-piddir=/var/run
-		--with-logdir=/var/log"
-
-	econf || die
+	econf \
+		--with-dicfile=/usr/share/skk/SKK-JISYO.L \
+		--with-cachedir=/var/lib/rskkserv \
+		--with-piddir=/var/run \
+		--with-logdir=/var/log \
+		|| die
 	emake || die
 }
 
 src_install() {
-
 	keepdir /var/lib/rskkserv
 	einstall || die
 
@@ -65,7 +61,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	einfo
 	einfo "If you want to add auxiliary dictionaries (e.g. SKK-JISYO.JIS2,"
 	einfo "SKK-JISYO.jinmei, SKK-JISYO.2ch and so on) you need to emerge"
diff --git a/app-i18n/scim/scim-0.6.1.ebuild b/app-i18n/scim/scim-0.6.1.ebuild
index 857831d5ef75..b8656c0c9acd 100644
--- a/app-i18n/scim/scim-0.6.1.ebuild
+++ b/app-i18n/scim/scim-0.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.6.1.ebuild,v 1.2 2003/09/06 22:19:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.6.1.ebuild,v 1.3 2004/04/06 04:00:26 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
 HOMEPAGE="http://www.turbolinux.com.cn/~suzhe/scim/"
@@ -22,11 +22,9 @@ RDEPEND="virtual/x11
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	>=dev-libs/glib-2"
-
-PDEPEND=">=app-i18n/scim-tables-0.2.2"
-
 DEPEND="${RDEPEND}
 	dev-lang/perl"
+PDEPEND=">=app-i18n/scim-tables-0.2.2"
 
 ELTCONF="--reverse-deps"
 G2CONF="${G2CONF} `use_enable gnome config-gconf`"
@@ -48,5 +46,3 @@ src_install() {
 	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
 	dohtml -r docs/html/*
 }
-
-
diff --git a/app-i18n/scim/scim-0.8.2.ebuild b/app-i18n/scim/scim-0.8.2.ebuild
index 1e7f5f0546da..baf41e3b2af3 100644
--- a/app-i18n/scim/scim-0.8.2.ebuild
+++ b/app-i18n/scim/scim-0.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.8.2.ebuild,v 1.2 2004/01/16 10:43:31 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.8.2.ebuild,v 1.3 2004/04/06 04:00:34 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
 HOMEPAGE="http://www.turbolinux.com.cn/~suzhe/scim/"
diff --git a/app-i18n/scim/scim-0.9.0.ebuild b/app-i18n/scim/scim-0.9.0.ebuild
index 87b2c85539bb..5aeb67f46b3e 100644
--- a/app-i18n/scim/scim-0.9.0.ebuild
+++ b/app-i18n/scim/scim-0.9.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.9.0.ebuild,v 1.1 2004/02/07 07:19:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.9.0.ebuild,v 1.2 2004/04/06 04:00:49 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
 HOMEPAGE="http://www.turbolinux.com.cn/~suzhe/scim/"
diff --git a/app-i18n/scim/scim-0.9.2.ebuild b/app-i18n/scim/scim-0.9.2.ebuild
index 5dc56cf1b5b6..bf1807df7b8f 100644
--- a/app-i18n/scim/scim-0.9.2.ebuild
+++ b/app-i18n/scim/scim-0.9.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.9.2.ebuild,v 1.2 2004/03/22 10:07:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.9.2.ebuild,v 1.3 2004/04/06 04:00:56 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
 HOMEPAGE="http://www.turbolinux.com.cn/~suzhe/scim/"
diff --git a/app-i18n/scim/scim-0.9.3.ebuild b/app-i18n/scim/scim-0.9.3.ebuild
index 2655736999e3..850538b29a16 100644
--- a/app-i18n/scim/scim-0.9.3.ebuild
+++ b/app-i18n/scim/scim-0.9.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.9.3.ebuild,v 1.1 2004/03/29 00:42:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.9.3.ebuild,v 1.2 2004/04/06 04:01:15 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
 HOMEPAGE="http://www.turbolinux.com.cn/~suzhe/scim/"
@@ -21,11 +21,9 @@ RDEPEND="virtual/x11
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	>=dev-libs/glib-2"
-
-PDEPEND=">=app-i18n/scim-tables-0.3.3"
-
 DEPEND="${RDEPEND}
 	dev-lang/perl"
+PDEPEND=">=app-i18n/scim-tables-0.3.3"
 
 ELTCONF="--reverse-deps"
 SCROLLKEEPER_UPDATE="0"
diff --git a/app-i18n/skkinput/skkinput-2.05.ebuild b/app-i18n/skkinput/skkinput-2.05.ebuild
index 103f8e37df6e..c9d023cdd17d 100644
--- a/app-i18n/skkinput/skkinput-2.05.ebuild
+++ b/app-i18n/skkinput/skkinput-2.05.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.05.ebuild,v 1.8 2004/03/14 19:47:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.05.ebuild,v 1.9 2004/04/06 04:01:26 vapier Exp $
+
+inherit eutils
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild b/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild
index 439819566f25..be173c890b98 100644
--- a/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild
+++ b/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild,v 1.5 2004/03/14 19:47:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild,v 1.6 2004/04/06 04:01:44 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A SKK-like Japanese input method for X11"
-SRC_URI="http://downloads.sourceforge.jp/skkinput2/1815/${P}.tar.gz"
 HOMEPAGE="http://skkinput2.sourceforge.jp/"
+SRC_URI="http://downloads.sourceforge.jp/skkinput2/1815/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86 ~ppc sparc alpha"
 
 DEPEND="virtual/x11"
@@ -24,7 +26,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	make DESTDIR=${D} MANPATH=/usr/share/man install.man || die
 	dodoc ChangeLog GPL *.jis
diff --git a/app-i18n/skkserv/skkserv-9.6-r2.ebuild b/app-i18n/skkserv/skkserv-9.6-r2.ebuild
index 693a5b1e2305..55183cfb8603 100644
--- a/app-i18n/skkserv/skkserv-9.6-r2.ebuild
+++ b/app-i18n/skkserv/skkserv-9.6-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/skkserv-9.6-r2.ebuild,v 1.6 2003/09/30 13:33:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/skkserv-9.6-r2.ebuild,v 1.7 2004/04/06 04:02:09 vapier Exp $
+
+inherit eutils
 
 MY_P="skk${PV}mu"
 
@@ -32,7 +34,7 @@ src_compile() {
 
 src_install() {
 	cd skkserv
-	dosbin skkserv
+	dosbin skkserv || die
 
 	# install rc script
 	exeinto /etc/init.d ; newexe ${FILESDIR}/skkserv.initd skkserv
diff --git a/app-i18n/uim-svn/uim-svn-20040124.ebuild b/app-i18n/uim-svn/uim-svn-20040124.ebuild
index 729d6af1669c..9d4a514ebd40 100644
--- a/app-i18n/uim-svn/uim-svn-20040124.ebuild
+++ b/app-i18n/uim-svn/uim-svn-20040124.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20040124.ebuild,v 1.4 2004/04/05 14:36:15 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20040124.ebuild,v 1.5 2004/04/06 04:03:08 vapier Exp $
 
-inherit subversion
+inherit subversion eutils flag-o-matic
 
-IUSE="gtk nls debug"
+ESVN_REPO_URI="http://freedesktop.org:8080/svn/uim/trunk"
+ESVN_BOOTSTRAP="autogen.sh"
+ESVN_PATCHES="*.diff"
 
 DESCRIPTION="UIM is a simple, secure and flexible input method library"
 HOMEPAGE="http://anthy.sourceforge.jp/"
 SRC_URI=""
-ESVN_REPO_URI="http://freedesktop.org:8080/svn/uim/trunk"
-ESVN_BOOTSTRAP="autogen.sh"
-ESVN_PATCHES="*.diff"
 
 LICENSE="GPL-2 | BSD"
-KEYWORDS="~x86"
 SLOT="0"
+KEYWORDS="~x86"
+IUSE="gtk nls debug"
 
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -25,12 +25,8 @@ DEPEND="${RDEPEND}
 RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	!app-i18n/uim"
 
-# for debugging use
-use debug && RESTRICT="nostrip"
-
 src_compile() {
-
-	if [ -n "`use gtk`" ] ; then
+	if use gtk ; then
 		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
 			Makefile.in `echo */Makefile.in`
 	else
@@ -39,34 +35,27 @@ src_compile() {
 		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
 	fi
 
-	use debug && export CFLAGS="${CFLAGS} -g"
+	use debug && append-flags -g
 	econf `use_enable nls` || die
 	emake || die
 
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
-
 	dodoc [A-Z][A-Z]* ChangeLog* doc/[A-Z0-9][A-Z0-9]*
-
 }
 
 pkg_postinst() {
-
-	use gtk && gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 
 	einfo
 	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
 	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
 	einfo "To use uim-prime you should emerge app-i18n/prime."
 	einfo
-
 }
 
 pkg_postrm() {
-
-	use gtk && gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
diff --git a/app-i18n/uim/uim-0.2.4.ebuild b/app-i18n/uim/uim-0.2.4.ebuild
index 4c227a392acd..3da551cd10ca 100644
--- a/app-i18n/uim/uim-0.2.4.ebuild
+++ b/app-i18n/uim/uim-0.2.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.4.ebuild,v 1.6 2004/03/20 17:55:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.4.ebuild,v 1.7 2004/04/06 04:03:21 vapier Exp $
+
+inherit eutils
 
 IUSE="gtk nls debug"
 
@@ -12,8 +14,6 @@ LICENSE="GPL-2 | BSD"
 SLOT="0"
 KEYWORDS="x86 alpha"
 
-S="${WORKDIR}/${P}"
-
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
diff --git a/app-i18n/uim/uim-0.2.8.ebuild b/app-i18n/uim/uim-0.2.8.ebuild
index ee2b5700320c..f10ecdee75d6 100644
--- a/app-i18n/uim/uim-0.2.8.ebuild
+++ b/app-i18n/uim/uim-0.2.8.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.8.ebuild,v 1.4 2004/03/20 17:55:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.8.ebuild,v 1.5 2004/04/06 04:03:27 vapier Exp $
+
+inherit eutils
 
 IUSE="gtk nls debug"
 
diff --git a/app-i18n/uim/uim-0.3.0.1.ebuild b/app-i18n/uim/uim-0.3.0.1.ebuild
index 839ac749756e..038f8988587f 100644
--- a/app-i18n/uim/uim-0.3.0.1.ebuild
+++ b/app-i18n/uim/uim-0.3.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.0.1.ebuild,v 1.4 2004/03/20 17:55:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.0.1.ebuild,v 1.5 2004/04/06 04:03:34 vapier Exp $
+
+inherit eutils
 
 IUSE="gtk nls debug"
 
diff --git a/app-i18n/uim/uim-0.3.2.ebuild b/app-i18n/uim/uim-0.3.2.ebuild
index 2fa8a32d760e..6e97e9f5e126 100644
--- a/app-i18n/uim/uim-0.3.2.ebuild
+++ b/app-i18n/uim/uim-0.3.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.2.ebuild,v 1.4 2004/03/31 20:19:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.2.ebuild,v 1.5 2004/04/06 04:03:43 vapier Exp $
+
+inherit eutils
 
 IUSE="gtk nls debug"
 
diff --git a/app-i18n/uim/uim-0.3.3.ebuild b/app-i18n/uim/uim-0.3.3.ebuild
index c0cf698aa7ba..88cb88d3c667 100644
--- a/app-i18n/uim/uim-0.3.3.ebuild
+++ b/app-i18n/uim/uim-0.3.3.ebuild
@@ -1,41 +1,34 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.3.ebuild,v 1.2 2004/03/22 06:21:16 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.3.ebuild,v 1.3 2004/04/06 04:04:57 vapier Exp $
 
-IUSE="gtk nls debug"
+inherit eutils
 
-DESCRIPTION="UIM is a simple, secure and flexible input method library"
+DESCRIPTION="a simple, secure and flexible input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
 SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
 KEYWORDS="~x86 ~alpha"
+IUSE="gtk nls debug"
 
-S="${WORKDIR}/${P}"
-
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	!app-i18n/uim-svn"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	!app-i18n/uim-svn"
-
-# for debugging use
-use debug && RESTRICT="nostrip"
 
 src_unpack() {
-
 	unpack ${A}
-
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
 }
 
 src_compile() {
-
-	if [ -n "`use gtk`" ] ; then
+	if use gtk ; then
 		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
 			Makefile.in `echo */Makefile.in`
 	else
@@ -44,20 +37,17 @@ src_compile() {
 		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
 	fi
 
-	use debug && export CFLAGS="${CFLAGS} -g"
+	use debug && append-flags -g
 	econf `use_enable nls` || die
 	emake || die
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
+	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
 }
 
 pkg_postinst() {
-
 	einfo
 	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
 	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo (uim doesn't support skkserv)."
@@ -67,14 +57,9 @@ pkg_postinst() {
 	ewarn "If you are upgrading from uim-0.3.1 and using uim-skk, please check your"
 	ewarn "~/.skk-uim-jisyo and remove katakana index entry if any."
 
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
 
 pkg_postrm() {
-
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
diff --git a/app-i18n/xcin/xcin-2.5.3_pre2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
index 482428ff8ee1..3918684ec114 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/xcin-2.5.3_pre2.ebuild,v 1.7 2003/11/04 00:32:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/xcin-2.5.3_pre2.ebuild,v 1.8 2004/04/06 04:05:44 vapier Exp $
+
+inherit eutils
 
 XCIN="${P/_/.}.tar.gz"
 CHEWING="chewing-2002Jan07-snapshot.tar.gz"
@@ -19,7 +21,6 @@ DEPEND="nls? ( sys-devel/gettext )
 	>=app-i18n/libtabe-0.2.5"
 
 S=${WORKDIR}/${PN}
-MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
 	unpack ${XCIN}
diff --git a/app-i18n/zhcon/zhcon-0.2.3.ebuild b/app-i18n/zhcon/zhcon-0.2.3.ebuild
index f2a27c9683c3..f1c4df6a0d5b 100644
--- a/app-i18n/zhcon/zhcon-0.2.3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/zhcon-0.2.3.ebuild,v 1.1 2004/03/14 11:27:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/zhcon-0.2.3.ebuild,v 1.2 2004/04/06 04:06:25 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A Fast CJK (Chinese/Japanese/Korean) Console Environment"
 HOMEPAGE="http://zhcon.sourceforge.net/"
@@ -10,26 +12,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
-IUSE=""
-
 DEPEND="virtual/glibc"
-#RDEPEND=""
 
 src_unpack() {
-
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-assert-gentoo.diff
 }
 
 src_compile() {
-
-	autoconf || die
+	autoconf || die "autoconf failed"
 	econf || die
-	emake || die
+	emake || die "make failed"
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 }