add inherit eutils

15 files changed, 110 insertions, 177 deletions

diff --git a/app-text/barcode/barcode-0.98.ebuild b/app-text/barcode/barcode-0.98.ebuild
index 525ec1adb566..f0445058adc9 100644
--- a/app-text/barcode/barcode-0.98.ebuild
+++ b/app-text/barcode/barcode-0.98.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-text/barcode/barcode-0.98.ebuild,v 1.4 2004/03/12 09:18:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/barcode/barcode-0.98.ebuild,v 1.5 2004/04/07 21:37:40 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="barcode generator"
 HOMEPAGE="http://www.gnu.org/software/barcode/"
@@ -20,11 +22,6 @@ src_unpack() {
 		Makefile.in
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	emake install prefix=${D}/usr || die
 	dodoc ChangeLog README TODO doc/barcode.{pdf,ps}
diff --git a/app-text/cedilla/cedilla-0.3.ebuild b/app-text/cedilla/cedilla-0.3.ebuild
index 8abc0f5697df..405b112c6dab 100644
--- a/app-text/cedilla/cedilla-0.3.ebuild
+++ b/app-text/cedilla/cedilla-0.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cedilla/cedilla-0.3.ebuild,v 1.4 2004/02/11 23:34:35 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cedilla/cedilla-0.3.ebuild,v 1.5 2004/04/07 21:38:04 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Utf-8 to postscript converter."
 HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
-
 SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
 
 KEYWORDS="x86"
@@ -13,10 +14,9 @@ LICENSE="GPL-2"
 IUSE=""
 
 DEPEND=">=dev-lisp/clisp-2.29
-		>=sys-apps/sed-4"
+	>=sys-apps/sed-4"
 RDEPEND=""
 
-S="${WORKDIR}/${P}"
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/cedilla-gentoo.patch
@@ -30,6 +30,5 @@ src_install() {
 	./install-cedilla || die "Install failed"
 
 	newman cedilla.man cedilla.1
-	dodoc COPYING NEWS README
-
+	dodoc NEWS README
 }
diff --git a/app-text/cmigemo/cmigemo-1.2.ebuild b/app-text/cmigemo/cmigemo-1.2.ebuild
index a7b610b5a053..0e528450e172 100644
--- a/app-text/cmigemo/cmigemo-1.2.ebuild
+++ b/app-text/cmigemo/cmigemo-1.2.ebuild
@@ -1,17 +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-text/cmigemo/cmigemo-1.2.ebuild,v 1.2 2004/03/13 08:55:11 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/cmigemo-1.2.ebuild,v 1.3 2004/04/07 21:40:05 vapier Exp $
 
-IUSE="emacs"
+inherit eutils
 
 DESCRIPTION="C/Migemo -- Migemo library implementation in C"
 HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
 SRC_URI="http://www.kaoriya.net/dist/${P}.tar.bz2"
 
 LICENSE="cmigemo"
-KEYWORDS="~x86 ~alpha"
 SLOT="0"
-S="${WORKDIR}/${P}"
+KEYWORDS="~x86 ~alpha"
+IUSE="emacs"
 
 DEPEND="virtual/glibc
 	app-i18n/qkc
@@ -21,43 +21,35 @@ RDEPEND="virtual/glibc
 	emacs? ( >=app-text/migemo-0.40-r1 )"
 
 src_unpack() {
-
 	unpack ${A}
-
 	epatch ${FILESDIR}/${P}-migemo-dict.diff
-
 	touch ${S}/dict/SKK-JISYO.L
-
 }
 
 src_compile() {
-
 	emake CFLAGS="-fPIC ${CFLAGS}" gcc || die
-
 }
 
 src_install() {
-
-	make prefix=${D}/usr \
-			docdir=${D}/usr/share/doc/${P} \
-			gcc-install || die
+	make \
+		prefix=${D}/usr \
+		docdir=${D}/usr/share/doc/${P} \
+		gcc-install || die
 
 	mv ${D}/usr/share/migemo/euc-jp/*.dat ${D}/usr/share/migemo
 	rm -rf ${D}/usr/share/migemo/{cp932,euc-jp}
 
-	if has_version 'app-editors/vim-core'; then
+	if has_version 'app-editors/vim-core' ; then
 		insinto /usr/share/vim/vimfiles/plugin
 		doins tools/migemo.vim
 	fi
 
 	dodoc tools/migemo.vim
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-
 }
 
 pkg_postinst() {
-
-	if use emacs; then
+	if use emacs ; then
 		einfo ""
 		einfo "Please add to your ~/.emacs"
 		einfo "    (setq migemo-command \"cmigemo\")"
@@ -68,5 +60,4 @@ pkg_postinst() {
 		einfo "to use cmigemo instead of migemo under emacs."
 		einfo ""
 	fi
-
 }
diff --git a/app-text/cstetex/cstetex-2.0.2.ebuild b/app-text/cstetex/cstetex-2.0.2.ebuild
index ff0bb03d1c00..30a66cc123bb 100644
--- a/app-text/cstetex/cstetex-2.0.2.ebuild
+++ b/app-text/cstetex/cstetex-2.0.2.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-text/cstetex/cstetex-2.0.2.ebuild,v 1.2 2004/02/01 15:31:07 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cstetex/cstetex-2.0.2.ebuild,v 1.3 2004/04/07 21:40:38 vapier Exp $
 
 inherit tetex
 
@@ -9,7 +9,6 @@ HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
 
 CSTEX="csfonts.tar.gz csplain.tar.gz cslatex.tar.gz cspsfonts.tar.gz csfonts-t1.tar.gz"
 ENCTEX="enctex.tar.gz"
-
 SRC_URI="${SRC_URI} ftp://math.feld.cvut.cz/pub/olsak/enctex/${ENCTEX}"
 for FILE in ${CSTEX}; do
 	SRC_URI="${SRC_URI} ftp://math.feld.cvut.cz/pub/cstex/base/${FILE}"
@@ -18,7 +17,6 @@ done
 KEYWORDS="x86"
 
 src_unpack() {
-
 	tetex_src_unpack
 
 	cd ${S}
@@ -32,7 +30,6 @@ src_unpack() {
 }
 
 src_install() {
-
 	tetex_src_install
 
 	einfo "Installing Czech files..."
@@ -42,10 +39,9 @@ src_install() {
 }
 
 pkg_postrm() {
-
-	if [ ! -f /usr/bin/tex ] ; then
+	if [ ! -f ${ROOT}/usr/bin/tex ] ; then
 		for i in cslatex csplain pdfcslatex pdfcsplain; do
-			rm /usr/bin/$i
+			rm ${ROOT}/usr/bin/$i
 		done
 	fi
 }
diff --git a/app-text/dgs/dgs-0.5.10-r1.ebuild b/app-text/dgs/dgs-0.5.10-r1.ebuild
index 5dfffae9dd8c..52e3afc296d6 100644
--- a/app-text/dgs/dgs-0.5.10-r1.ebuild
+++ b/app-text/dgs/dgs-0.5.10-r1.ebuild
@@ -1,15 +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-text/dgs/dgs-0.5.10-r1.ebuild,v 1.22 2004/04/03 14:52:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dgs/dgs-0.5.10-r1.ebuild,v 1.23 2004/04/07 21:41:17 vapier Exp $
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 DESCRIPTION="A Ghostscript based DPS server"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/old/dgs/${P}.tar.gz"
 HOMEPAGE="http://www.gyve.org/dgs/"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/old/dgs/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha amd64 hppa ~mips"
 IUSE="tcpd"
 
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
 pkg_setup() {
-	if has_version 'sys-apps/tcp-wrappers' && [ -z "`use tcpd`" ]; then
+	if has_version 'sys-apps/tcp-wrappers' && ! use tcpd ; then
 		ewarn "tcp-wrappers will be detected by the package and support will be enabled"
 		ewarn "The package presently provides no way to disable tcp-wrappers support if you don't want it"
 	fi
diff --git a/app-text/dictd/dictd-1.8.0.ebuild b/app-text/dictd/dictd-1.8.0.ebuild
index 3c148f655ebf..7925483f9b75 100644
--- a/app-text/dictd/dictd-1.8.0.ebuild
+++ b/app-text/dictd/dictd-1.8.0.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.8.0.ebuild,v 1.13 2004/03/07 14:07:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.8.0.ebuild,v 1.14 2004/04/07 21:43:54 vapier Exp $
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 DESCRIPTION="Dictionary Client/Server for the DICT protocol"
 HOMEPAGE="http://www.dict.org/"
 SRC_URI="ftp://ftp.dict.org/pub/dict/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips ia64 ppc64"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-gcc33-multiline-string-fix.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc33-multiline-string-fix.patch
 }
 
 src_compile() {
-
 	# Update config.sub and config.guess so dictd understands the sparc architecture
 	gnuconfig_update
 
@@ -44,7 +44,7 @@ src_install() {
 		install || die
 
 	# Install docs
-	dodoc README TODO COPYING ChangeLog ANNOUNCE
+	dodoc README TODO ChangeLog ANNOUNCE
 	dodoc doc/dicf.ms doc/rfc.ms doc/rfc.sh doc/rfc2229.txt
 	dodoc doc/security.doc doc/toc.ms
 
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
index ee6df757472a..d3a610023ee0 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
@@ -1,16 +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-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild,v 1.2 2004/03/13 23:30:00 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild,v 1.3 2004/04/07 21:44:18 vapier Exp $
+
+inherit eutils
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Shell scripts to manage DocBook documents"
-SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
 HOMEPAGE="http://sources.redhat.com/docbook-tools/"
-LICENSE="GPL-2"
+SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips"
 IUSE="tetex"
@@ -35,11 +37,11 @@ DEPEND=">=dev-lang/perl-5
 src_compile() {
 	epatch ${FILESDIR}/${PN}-frontend.patch
 	epatch ${FILESDIR}/${PN}-head-jw.patch
-	econf
+	econf || die
 	make || die
 }
 
 src_install() {
 	einstall htmldir=${D}/usr/share/doc/${PF}/html
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild
index 8ea738a78e20..517b6f108feb 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild
@@ -1,16 +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-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild,v 1.13 2004/01/21 13:52:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild,v 1.14 2004/04/07 21:44:45 vapier Exp $
+
+inherit eutils
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Shell scripts to manage DocBook documents"
-SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
 HOMEPAGE="http://sources.redhat.com/docbook-tools/"
+SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 IUSE="tetex"
 
@@ -30,11 +32,11 @@ DEPEND=">=dev-lang/perl-5
 src_compile() {
 	patch -p1 < ${FILESDIR}/docbook-sgml-utils-frontend.patch || die
 	epatch ${FILESDIR}/${PN}-head-jw.patch
-	econf
+	econf || die
 	make || die
 }
 
 src_install() {
 	einstall htmldir=${D}/usr/share/doc/${PF}/html
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-text/dos2unix/dos2unix-3.1.ebuild b/app-text/dos2unix/dos2unix-3.1.ebuild
index b6159db0930b..ba3011d4909d 100644
--- a/app-text/dos2unix/dos2unix-3.1.ebuild
+++ b/app-text/dos2unix/dos2unix-3.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-text/dos2unix/dos2unix-3.1.ebuild,v 1.8 2004/02/29 18:10:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-3.1.ebuild,v 1.9 2004/04/07 21:45:06 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Dos2unix converts DOS or MAC text files to UNIX format"
 HOMEPAGE=""
@@ -26,7 +28,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin dos2unix
+	dobin dos2unix || die
 	dosym dos2unix /usr/bin/mac2unix
 
 	doman dos2unix.1
diff --git a/app-text/dvipdfmx/dvipdfmx-20031009.ebuild b/app-text/dvipdfmx/dvipdfmx-20031009.ebuild
index 3aafac9e91fd..5c4d91e33fff 100644
--- a/app-text/dvipdfmx/dvipdfmx-20031009.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20031009.ebuild
@@ -1,16 +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-text/dvipdfmx/dvipdfmx-20031009.ebuild,v 1.4 2004/03/11 19:47:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20031009.ebuild,v 1.5 2004/04/07 21:46:03 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="DVI to PDF translator with multi-byte character support"
-SRC_URI="http://project.ktug.or.kr/dvipdfmx/snapshot/release/${P}.tar.gz"
 HOMEPAGE="http://project.ktug.or.kr/dvipdfmx/"
+SRC_URI="http://project.ktug.or.kr/dvipdfmx/snapshot/release/${P}.tar.gz"
 
-KEYWORDS="x86 alpha ppc sparc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 alpha ppc sparc"
 
 DEPEND="app-text/ptex
 	!app-text/tetex
@@ -27,36 +27,26 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-config-gentoo.diff
 }
 
-src_install () {
+src_install() {
 	einstall || die
-
-	dodoc BUGS COPYING ChangeLog FONTMAP INSTALL README TODO
+	dodoc BUGS ChangeLog FONTMAP INSTALL README TODO
 }
 
-pkg_postinst () {
-
-	einfo
-	einfo "Automatically adding CMAPINPUTS to /usr/share/texmf/web2c/texmf.cnf"
-	if [ ! `grep -q CMAPINPUTS /usr/share/texmf/web2c/texmf.cnf` ]; then
-		cat >>/usr/share/texmf/web2c/texmf.cnf<<-EOF
+pkg_postinst() {
+	if [ ! `grep -q CMAPINPUTS ${ROOT}/usr/share/texmf/web2c/texmf.cnf` ]; then
+		cat >>${ROOT}/usr/share/texmf/web2c/texmf.cnf<<-EOF
 		% automatically added by ${PF}.ebuild -- do not edit by hand!
 		CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/usr/share/xpdf//
 		% done
 		EOF
 	fi
-
-	sleep 3
-	einfo "Done."
-	einfo
-
 	mktexlsr
 }
 
-pkg_postrm () {
-	if [ -e /usr/share/texmf/web2c/texmf.cnf ] ; then
+pkg_postrm() {
+	if [ -e ${ROOT}/usr/share/texmf/web2c/texmf.cnf ] ; then
 		sed -i -e "/${PF}\.ebuild/,+2d" \
-			/usr/share/texmf/web2c/texmf.cnf
+			${ROOT}/usr/share/texmf/web2c/texmf.cnf
 	fi
-
 	mktexlsr
 }
diff --git a/app-text/dvipdfmx/dvipdfmx-20031110.ebuild b/app-text/dvipdfmx/dvipdfmx-20031110.ebuild
index ae1ced23412b..a7ee21c41163 100644
--- a/app-text/dvipdfmx/dvipdfmx-20031110.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20031110.ebuild
@@ -1,16 +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-text/dvipdfmx/dvipdfmx-20031110.ebuild,v 1.4 2004/03/14 21:03:23 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20031110.ebuild,v 1.5 2004/04/07 21:46:46 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="DVI to PDF translator with multi-byte character support"
-SRC_URI="http://project.ktug.or.kr/dvipdfmx/snapshot/release/${P}.tar.gz"
 HOMEPAGE="http://project.ktug.or.kr/dvipdfmx/"
+SRC_URI="http://project.ktug.or.kr/dvipdfmx/snapshot/release/${P}.tar.gz"
 
-KEYWORDS="x86 alpha ~sparc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 alpha ~sparc"
 
 DEPEND="app-text/ptex
 	!app-text/tetex
@@ -28,36 +28,26 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-config-gentoo.diff
 }
 
-src_install () {
+src_install() {
 	einstall || die
-
-	dodoc BUGS COPYING ChangeLog FONTMAP INSTALL README TODO
+	dodoc BUGS ChangeLog FONTMAP INSTALL README TODO
 }
 
-pkg_postinst () {
-
-	einfo
-	einfo "Automatically adding CMAPINPUTS to /usr/share/texmf/web2c/texmf.cnf"
-	if [ ! `grep -q CMAPINPUTS /usr/share/texmf/web2c/texmf.cnf` ]; then
-		cat >>/usr/share/texmf/web2c/texmf.cnf<<-EOF
+pkg_postinst() {
+	if [ ! `grep -q CMAPINPUTS ${ROOT}/usr/share/texmf/web2c/texmf.cnf` ]; then
+		cat >>${ROOT}/usr/share/texmf/web2c/texmf.cnf<<-EOF
 		% automatically added by ${PF}.ebuild -- do not edit by hand!
 		CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/usr/share/xpdf//
 		% done
 		EOF
 	fi
-
-	sleep 3
-	einfo "Done."
-	einfo
-
 	mktexlsr
 }
 
-pkg_postrm () {
-	if [ -e /usr/share/texmf/web2c/texmf.cnf ] ; then
+pkg_postrm() {
+	if [ -e ${ROOT}/usr/share/texmf/web2c/texmf.cnf ] ; then
 		sed -i -e "/${PF}\.ebuild/,+2d" \
-			/usr/share/texmf/web2c/texmf.cnf
+			${ROOT}/usr/share/texmf/web2c/texmf.cnf
 	fi
-
 	mktexlsr
 }
diff --git a/app-text/dvipdfmx/dvipdfmx-20031116.ebuild b/app-text/dvipdfmx/dvipdfmx-20031116.ebuild
index fa822ba6c124..6b997fbe0c98 100644
--- a/app-text/dvipdfmx/dvipdfmx-20031116.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20031116.ebuild
@@ -1,17 +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-text/dvipdfmx/dvipdfmx-20031116.ebuild,v 1.1 2004/03/11 19:47:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20031116.ebuild,v 1.2 2004/04/07 21:48:07 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="DVI to PDF translator with multi-byte character support"
+HOMEPAGE="http://project.ktug.or.kr/dvipdfmx/"
 SRC_URI="http://project.ktug.or.kr/dvipdfmx/snapshot/release/${P}.tar.gz
 	http://project.ktug.or.kr/dvipdfmx/snapshot/patch/${P}.patch"
-HOMEPAGE="http://project.ktug.or.kr/dvipdfmx/"
 
-KEYWORDS="~x86 ~alpha"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha"
 
 DEPEND="app-text/ptex
 	!app-text/tetex
@@ -21,8 +21,6 @@ DEPEND="app-text/ptex
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.6i"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -31,36 +29,26 @@ src_unpack() {
 	epatch ${DISTDIR}/${P}.patch
 }
 
-src_install () {
+src_install() {
 	einstall || die
-
-	dodoc BUGS COPYING ChangeLog FONTMAP INSTALL README TODO
+	dodoc BUGS ChangeLog FONTMAP INSTALL README TODO
 }
 
-pkg_postinst () {
-
-	einfo
-	einfo "Automatically adding CMAPINPUTS to /usr/share/texmf/web2c/texmf.cnf"
-	if [ ! `grep -q CMAPINPUTS /usr/share/texmf/web2c/texmf.cnf` ]; then
-		cat >>/usr/share/texmf/web2c/texmf.cnf<<-EOF
+pkg_postinst() {
+	if [ ! `grep -q CMAPINPUTS ${ROOT}/usr/share/texmf/web2c/texmf.cnf` ]; then
+		cat >>${ROOT}/usr/share/texmf/web2c/texmf.cnf<<-EOF
 		% automatically added by ${PF}.ebuild -- do not edit by hand!
 		CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/usr/share/xpdf//
 		% done
 		EOF
 	fi
-
-	sleep 3
-	einfo "Done."
-	einfo
-
 	mktexlsr
 }
 
-pkg_postrm () {
-	if [ -e /usr/share/texmf/web2c/texmf.cnf ] ; then
+pkg_postrm() {
+	if [ -e ${ROOT}/usr/share/texmf/web2c/texmf.cnf ] ; then
 		sed -i -e "/${PF}\.ebuild/,+2d" \
-			/usr/share/texmf/web2c/texmf.cnf
+			${ROOT}/usr/share/texmf/web2c/texmf.cnf
 	fi
-
 	mktexlsr
 }
diff --git a/app-text/dvipdfmx/dvipdfmx-20031207.ebuild b/app-text/dvipdfmx/dvipdfmx-20031207.ebuild
index 15c6ec3d37a7..64c25c3b7968 100644
--- a/app-text/dvipdfmx/dvipdfmx-20031207.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20031207.ebuild
@@ -1,16 +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-text/dvipdfmx/dvipdfmx-20031207.ebuild,v 1.1 2004/03/11 19:47:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20031207.ebuild,v 1.2 2004/04/07 21:48:21 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="DVI to PDF translator with multi-byte character support"
-SRC_URI="http://project.ktug.or.kr/dvipdfmx/snapshot/current/${P}.tar.gz"
 HOMEPAGE="http://project.ktug.or.kr/dvipdfmx/"
+SRC_URI="http://project.ktug.or.kr/dvipdfmx/snapshot/current/${P}.tar.gz"
 
-KEYWORDS="~x86 ~alpha"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha"
 
 DEPEND="app-text/ptex
 	!app-text/tetex
@@ -20,44 +20,32 @@ DEPEND="app-text/ptex
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.6i"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-config-gentoo.diff
 }
 
-src_install () {
+src_install() {
 	einstall || die
-
-	dodoc BUGS COPYING ChangeLog FONTMAP INSTALL README TODO
+	dodoc BUGS ChangeLog FONTMAP INSTALL README TODO
 }
 
-pkg_postinst () {
-
-	einfo
-	einfo "Automatically adding CMAPINPUTS to /usr/share/texmf/web2c/texmf.cnf"
-	if [ ! `grep -q CMAPINPUTS /usr/share/texmf/web2c/texmf.cnf` ]; then
-		cat >>/usr/share/texmf/web2c/texmf.cnf<<-EOF
+pkg_postinst() {
+	if [ ! `grep -q CMAPINPUTS ${ROOT}/usr/share/texmf/web2c/texmf.cnf` ]; then
+		cat >>${ROOT}/usr/share/texmf/web2c/texmf.cnf<<-EOF
 		% automatically added by ${PF}.ebuild -- do not edit by hand!
 		CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/usr/share/xpdf//
 		% done
 		EOF
 	fi
-
-	sleep 3
-	einfo "Done."
-	einfo
-
 	mktexlsr
 }
 
-pkg_postrm () {
-	if [ -e /usr/share/texmf/web2c/texmf.cnf ] ; then
+pkg_postrm() {
+	if [ -e ${ROOT}/usr/share/texmf/web2c/texmf.cnf ] ; then
 		sed -i -e "/${PF}\.ebuild/,+2d" \
-			/usr/share/texmf/web2c/texmf.cnf
+			${ROOT}/usr/share/texmf/web2c/texmf.cnf
 	fi
-
 	mktexlsr
 }
diff --git a/app-text/enchant/enchant-1.0.0.ebuild b/app-text/enchant/enchant-1.0.0.ebuild
index 7e606d2404bb..7f2eb81c18d4 100644
--- a/app-text/enchant/enchant-1.0.0.ebuild
+++ b/app-text/enchant/enchant-1.0.0.ebuild
@@ -1,26 +1,22 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enchant/enchant-1.0.0.ebuild,v 1.5 2003/11/09 18:03:04 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enchant/enchant-1.0.0.ebuild,v 1.6 2004/04/07 21:48:46 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Spellchecker wrapping library"
 HOMEPAGE="http://www.abisource.com/enchant/"
-
 SRC_URI="mirror://sourceforge/abiword/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-
 KEYWORDS="x86 ~ppc sparc ~alpha"
-
 IUSE=""
 
 # The || is meant to make sure there is a a default spell lib to work with
 # 25 Aug 2003; foser <foser@gentoo.org>
 RDEPEND=">=dev-libs/glib-2
 	|| ( app-text/aspell app-text/ispell )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -29,7 +25,5 @@ DOCS="AUTHORS BUGS COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README TODO"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/enchant-1.0.0-alpha.patch || die "epatch failed"
-	fi
+	use alpha && epatch ${FILESDIR}/enchant-1.0.0-alpha.patch
 }
diff --git a/app-text/expander/expander-2.0.5.ebuild b/app-text/expander/expander-2.0.5.ebuild
index cc1be43e4c20..bf9656c1c3f9 100644
--- a/app-text/expander/expander-2.0.5.ebuild
+++ b/app-text/expander/expander-2.0.5.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-text/expander/expander-2.0.5.ebuild,v 1.2 2004/03/12 09:18:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/expander/expander-2.0.5.ebuild,v 1.3 2004/04/07 21:49:19 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Expander is a utility that acts as a filter for text editors."
 HOMEPAGE="http://www.nedit.org"
@@ -9,7 +11,6 @@ SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-
 IUSE=""
 
 DEPEND=""
@@ -17,7 +18,6 @@ DEPEND=""
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -25,15 +25,12 @@ src_unpack() {
 }
 
 src_compile() {
-
-	cd ${S}/src
+	cd src
 	make || die "make failed"
-
 }
 
 src_install() {
-
-	cd ${S}/src
+	cd src
 	dobin expander boxcomment align_columns align_comments where_is
 	dosym /usr/bin/boxcomment /usr/bin/unboxcomment
 
@@ -49,14 +46,11 @@ src_install() {
 
 	cd ${S}
 	dodoc ChangeLog INSTALL README USAGE
-
 }
 
 pkg_postinst() {
-
 	einfo
 	einfo "Instructions for using expander with NEdit are in /usr/share/doc/${P}/INSTALL"
 	einfo "Macro, definition and template files can be found in /usr/share/${P}"
 	einfo
-
 }