add inherit eutils

10 files changed, 50 insertions, 70 deletions

diff --git a/app-emacs/ecb/ecb-1.96.ebuild b/app-emacs/ecb/ecb-1.96.ebuild
index 569675b24272..865565d29fc7 100644
--- a/app-emacs/ecb/ecb-1.96.ebuild
+++ b/app-emacs/ecb/ecb-1.96.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-1.96.ebuild,v 1.2 2003/09/22 23:59:00 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-1.96.ebuild,v 1.3 2004/04/06 03:45:41 vapier Exp $
 
-inherit elisp
-
-IUSE="java"
+inherit elisp eutils
 
 DESCRIPTION="ECB is a source code browser for Emacs"
 HOMEPAGE="http://ecb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE="java"
 
 DEPEND="virtual/emacs
 	>=app-emacs/speedbar-0.14_beta4
@@ -19,8 +19,6 @@ DEPEND="virtual/emacs
 	>=app-emacs/eieio-0.17
 	java? ( app-emacs/jde )"
 
-S="${WORKDIR}/${P}"
-
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/ecb-help.el-${P}-gentoo.diff
@@ -30,7 +28,7 @@ src_unpack() {
 
 src_compile() {
 	local my_loadpath="${SITELISP}/semantic ${SITELISP}/eieio"
-	[ "`use java`" ] \
+	use java \
 		&& my_loadpath="${my_loadpath} ${SITELISP}/elib ${SITELISP}/jde/lisp"
 	make \
 		LOADPATH="${my_loadpath}" \
diff --git a/app-emacs/liece/liece-1.4.10-r1.ebuild b/app-emacs/liece/liece-1.4.10-r1.ebuild
index bf611cab9fe0..0474478b8aa0 100644
--- a/app-emacs/liece/liece-1.4.10-r1.ebuild
+++ b/app-emacs/liece/liece-1.4.10-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-emacs/liece/liece-1.4.10-r1.ebuild,v 1.3 2004/03/04 19:04:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/liece/liece-1.4.10-r1.ebuild,v 1.4 2004/04/06 03:46:18 vapier Exp $
 
-inherit elisp
-
-IUSE=""
+inherit elisp eutils
 
 DESCRIPTION="Liece is a client implementation of IRC (Internet Relay Chat, RFC 1459)."
 HOMEPAGE="http://www.unixuser.org/~ueno/liece/"
@@ -12,15 +10,12 @@ SRC_URI="http://www.unixuser.org/~ueno/liece/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha sparc ppc"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="virtual/emacs
 	app-emacs/apel"
 
-S="${WORKDIR}/${P}"
-
 src_unpack() {
-
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch
 }
@@ -30,10 +25,10 @@ src_compile() {
 	emake || die "emake failed"
 }
 
-src_install () {
+src_install() {
 	einstall lispdir=${D}/${SITELISP} || die "einstall failed"
-	elisp-site-file-install ${FILESDIR}/60liece-gentoo.el || \
-		die "elisp-site-file-install failed"
+	elisp-site-file-install ${FILESDIR}/60liece-gentoo.el \
+		|| die "elisp-site-file-install failed"
 
-	dodoc AUTHORS COPYING INSTALL README
+	dodoc AUTHORS INSTALL README
 }
diff --git a/app-emacs/liece/liece-1.4.7-r1.ebuild b/app-emacs/liece/liece-1.4.7-r1.ebuild
index 8a73c513a191..496df53e7d09 100644
--- a/app-emacs/liece/liece-1.4.7-r1.ebuild
+++ b/app-emacs/liece/liece-1.4.7-r1.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-emacs/liece/liece-1.4.7-r1.ebuild,v 1.2 2004/03/04 19:04:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/liece/liece-1.4.7-r1.ebuild,v 1.3 2004/04/06 03:46:34 vapier Exp $
 
-inherit elisp
+inherit elisp eutils
 
 IUSE=""
 
diff --git a/app-emacs/md5/md5-1.0-r1.ebuild b/app-emacs/md5/md5-1.0-r1.ebuild
index 9c972d720560..5e0ea7d3b133 100644
--- a/app-emacs/md5/md5-1.0-r1.ebuild
+++ b/app-emacs/md5/md5-1.0-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/md5/md5-1.0-r1.ebuild,v 1.1 2003/12/22 07:28:10 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/md5/md5-1.0-r1.ebuild,v 1.2 2004/04/06 03:47:03 vapier Exp $
 
-inherit elisp
+inherit elisp eutils
 
 DESCRIPTION="Emacs Lisp implementation of the MD5 algorithm."
 HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/WikifiedEmacsLispList"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+
 DEPEND="virtual/emacs"
 
 SITEFILE=90md5-gentoo.el
diff --git a/app-emacs/mule-ucs/mule-ucs-0.84-r1.ebuild b/app-emacs/mule-ucs/mule-ucs-0.84-r1.ebuild
index 23f85f41c151..ee918358473b 100644
--- a/app-emacs/mule-ucs/mule-ucs-0.84-r1.ebuild
+++ b/app-emacs/mule-ucs/mule-ucs-0.84-r1.ebuild
@@ -1,8 +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-emacs/mule-ucs/mule-ucs-0.84-r1.ebuild,v 1.1 2003/12/14 18:27:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mule-ucs/mule-ucs-0.84-r1.ebuild,v 1.2 2004/04/06 03:47:37 vapier Exp $
 
-inherit elisp-common
+inherit elisp-common eutils
 
 MY_PN="Mule-UCS"
 MY_P="${MY_PN}-${PV}"
@@ -10,26 +10,23 @@ MY_PATCH="${P}+tats20021216"
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A character code translator."
+HOMEPAGE="http://www.m17n.org/mule/ http://tats.iris.ne.jp/mule-ucs/"
 SRC_URI="ftp://ftp.m17n.org/pub/mule/Mule-UCS/${MY_P}.tar.gz
 	http://tats.iris.ne.jp/mule-ucs/${MY_PATCH}.diff.gz"
-HOMEPAGE="http://www.m17n.org/mule/
-	http://tats.iris.ne.jp/mule-ucs/"
 
-DEPEND="virtual/emacs"
-SLOT="0"
 LICENSE="GPL-2"
-
+SLOT="0"
 KEYWORDS="x86 alpha sparc ppc"
 
-src_unpack() {
+DEPEND="virtual/emacs"
 
+src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${S}
 	epatch ${DISTDIR}/${MY_PATCH}.diff.gz
 }
 
 src_compile() {
-
 	emacs -q --no-site-file -batch -l mucs-comp.el || die
 	pushd lisp/big5conv
 	emacs -q --no-site-file -batch -l big5-comp.el || die
@@ -40,7 +37,6 @@ src_compile() {
 }
 
 src_install() {
-
 	elisp-install ${MY_PN} lisp/*.el{,c}
 	elisp-install ${MY_PN}/big5conv lisp/big5conv/*.el{,c}
 	elisp-install ${MY_PN}/jisx0213 lisp/jisx0213/*.el{,c}
diff --git a/app-emacs/nxml-mode/nxml-mode-20031031.ebuild b/app-emacs/nxml-mode/nxml-mode-20031031.ebuild
index 4a92cf39faae..989f56b2d563 100644
--- a/app-emacs/nxml-mode/nxml-mode-20031031.ebuild
+++ b/app-emacs/nxml-mode/nxml-mode-20031031.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20031031.ebuild,v 1.2 2004/03/14 12:53:07 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20031031.ebuild,v 1.3 2004/04/06 03:47:54 vapier Exp $
 
-inherit elisp
+inherit elisp eutils
 
 DESCRIPTION="A new major mode for GNU Emacs for editing XML documents."
 HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/NxmlMode"
 SRC_URI="http://thaiopensource.com/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/emacs"
 
-S=${WORKDIR}/${P}
-
 SITEFILE=80nxml-mode-gentoo.el
 
 src_unpack() {
@@ -22,6 +21,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-info-gentoo.patch
 }
+
 src_compile() {
 	emacs -batch -l rng-auto.el -f rng-byte-compile-load
 }
diff --git a/app-emacs/regress/regress-1.5.0.ebuild b/app-emacs/regress/regress-1.5.0.ebuild
index 341e332f7cea..e727731bede1 100644
--- a/app-emacs/regress/regress-1.5.0.ebuild
+++ b/app-emacs/regress/regress-1.5.0.ebuild
@@ -1,18 +1,18 @@
-# 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-emacs/regress/regress-1.5.0.ebuild,v 1.1 2003/11/25 17:28:02 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/regress/regress-1.5.0.ebuild,v 1.2 2004/04/06 03:48:08 vapier Exp $
 
-inherit elisp
+inherit elisp eutils
 
 DESCRIPTION="Regression test harness for Emacs Lisp code"
 HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/WikifiedEmacsLispList"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+
 DEPEND="virtual/emacs"
-S=${WORKDIR}/${P}
 
 SITEFILE=50regress-gentoo.el
 
diff --git a/app-emacs/tamago/tamago-4.0.6-r1.ebuild b/app-emacs/tamago/tamago-4.0.6-r1.ebuild
index ac3abc8fda7c..715bfa4cc868 100644
--- a/app-emacs/tamago/tamago-4.0.6-r1.ebuild
+++ b/app-emacs/tamago/tamago-4.0.6-r1.ebuild
@@ -1,19 +1,18 @@
-# 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-emacs/tamago/tamago-4.0.6-r1.ebuild,v 1.4 2003/11/14 21:23:15 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tamago/tamago-4.0.6-r1.ebuild,v 1.5 2004/04/06 03:48:55 vapier Exp $
 
-inherit elisp
-
-IUSE="canna"
+inherit elisp eutils
 
 DESCRIPTION="Emacs Backend for Sj3 Ver.2, FreeWnn, Wnn6 and Canna"
+HOMEPAGE="http://www.m17n.org/tamago/"
 SRC_URI="ftp://ftp.m17n.org/pub/tamago/${P}.tar.gz
 	http://cgi18.plala.or.jp/nyy/canna/canna-20011204.diff.gz"
-HOMEPAGE="http://www.m17n.org/tamago/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
+IUSE="canna"
 
 DEPEND="virtual/emacs
 	app-arch/gzip
@@ -21,11 +20,9 @@ DEPEND="virtual/emacs
 RDEPEND="virtual/emacs
 	canna? ( app-i18n/canna )"
 
-S="${WORKDIR}/${P}"
 SITEFILE=50tamago-gentoo.el
 
 src_unpack() {
-
 	unpack ${A}
 
 	epatch ${FILESDIR}/${P}-canna-gentoo.patch
@@ -33,13 +30,11 @@ src_unpack() {
 }
 
 src_compile() {
-
 	./configure --prefix=/usr || die
 	emake || die
 }
 
 src_install() {
-
 	dodir ${SITELISP}/${PN}
 	emake prefix=${D}/usr \
 		infodir=${D}/usr/share/info \
@@ -48,7 +43,7 @@ src_install() {
 
 
 	cp ${FILESDIR}/${SITEFILE} ${SITEFILE}
-	if [ -n "`use canna`" ] ; then
+	if use canna ; then
 		cat >>${SITEFILE}<<-EOF
 		(set-language-info "Japanese" 'input-method "japanese-egg-canna")
 
@@ -57,16 +52,15 @@ src_install() {
 
 	elisp-site-file-install ${SITEFILE} || die
 
-	dodoc README.ja.txt COPYING AUTHORS PROBLEMS TODO ChangeLog
+	dodoc README.ja.txt AUTHORS PROBLEMS TODO ChangeLog
 }
 
 pkg_postinst() {
-
 	elisp-site-regen
 
-	if ! grep -q inet /etc/conf.d/canna ; then
+	if ! grep -q inet ${ROOT}/etc/conf.d/canna ; then
 		sed -i -e '/CANNASERVER_OPTS/s/"\(.*\)"/"\1 -inet"/' \
-			/etc/conf.d/canna
+			${ROOT}/etc/conf.d/canna
 
 		einfo
 		einfo "Enabled inet domain socket for tamago."
diff --git a/app-emacs/thumbs/thumbs-1.8.ebuild b/app-emacs/thumbs/thumbs-1.8.ebuild
index a03e0c5ef50a..6d8796385ab6 100644
--- a/app-emacs/thumbs/thumbs-1.8.ebuild
+++ b/app-emacs/thumbs/thumbs-1.8.ebuild
@@ -1,14 +1,13 @@
-# 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-emacs/thumbs/thumbs-1.8.ebuild,v 1.1 2003/09/25 04:51:05 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/thumbs/thumbs-1.8.ebuild,v 1.2 2004/04/06 03:49:10 vapier Exp $
 
-inherit elisp
-
-IUSE=""
+inherit elisp eutils
 
 DESCRIPTION="Emacs thumbnail previewer for image files"
 HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki.pl?ThumbsMode"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
@@ -16,8 +15,6 @@ KEYWORDS="x86"
 DEPEND="virtual/emacs
 	media-gfx/imagemagick"
 
-S=${WORKDIR}/${P}
-
 SITEFILE=50thumbs-gentoo.el
 
 src_unpack() {
@@ -33,4 +30,3 @@ src_install() {
 	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install ${FILESDIR}/${SITEFILE}
 }
-
diff --git a/app-emacs/vm/vm-7.18.ebuild b/app-emacs/vm/vm-7.18.ebuild
index f80ac290aa26..f4e2410bf225 100644
--- a/app-emacs/vm/vm-7.18.ebuild
+++ b/app-emacs/vm/vm-7.18.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.18.ebuild,v 1.1 2004/03/13 18:16:07 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.18.ebuild,v 1.2 2004/04/06 03:49:26 vapier Exp $
 
-inherit elisp
-
-IUSE=""
+inherit elisp eutils
 
 DESCRIPTION="An emacs major mode for reading and writing e-mail with support for GPG and MIME."
 SRC_URI="ftp://ftp.uni-mainz.de/pub/software/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.wonderworks.com/vm"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"