add inherit eutils

5 files changed, 31 insertions, 42 deletions

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
 }