add inherit eutils

11 files changed, 57 insertions, 74 deletions

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
 }
diff --git a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
index 943eeb2225ab..41b9ba32d268 100644
--- a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
+++ b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild,v 1.1 2004/03/08 05:52:22 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild,v 1.2 2004/04/06 04:07:02 vapier Exp $
+
+inherit eutils
 
 S=${WORKDIR}/toshutils-${PV}
 DESCRIPTION="Toshiba Laptop Utilities"
 HOMEPAGE="http://www.buzzard.org.uk/toshiba/"
 SRC_URI="http://www.buzzard.org.uk/toshiba/toshutils-${PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc"
+SLOT="0"
+KEYWORDS="x86"
 IUSE="X gtk"
 
 DEPEND="gtk? ( =x11-libs/gtk+-1* )"
@@ -28,7 +30,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf
+	econf || die
 	make depend
 	make -C src || die
 }
diff --git a/app-laptop/tpb/tpb-0.5.1.ebuild b/app-laptop/tpb/tpb-0.5.1.ebuild
index 5ba58b6c121f..825b770506f7 100644
--- a/app-laptop/tpb/tpb-0.5.1.ebuild
+++ b/app-laptop/tpb/tpb-0.5.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-laptop/tpb/tpb-0.5.1.ebuild,v 1.1 2004/03/08 05:08:54 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpb/tpb-0.5.1.ebuild,v 1.2 2004/04/06 04:07:48 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Thinkpad button utility"
 HOMEPAGE="http://savannah.nongnu.org/projects/tpb/"
diff --git a/app-laptop/tpb/tpb-0.6.0.ebuild b/app-laptop/tpb/tpb-0.6.0.ebuild
index b4c7148dd5f0..0127098eab17 100644
--- a/app-laptop/tpb/tpb-0.6.0.ebuild
+++ b/app-laptop/tpb/tpb-0.6.0.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-laptop/tpb/tpb-0.6.0.ebuild,v 1.1 2004/03/08 05:08:54 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpb/tpb-0.6.0.ebuild,v 1.2 2004/04/06 04:07:59 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Thinkpad button utility"
 HOMEPAGE="http://savannah.nongnu.org/projects/tpb/"