add inherit eutils

8 files changed, 71 insertions, 123 deletions

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
-
 }