add inherit eutils

11 files changed, 63 insertions, 71 deletions

diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
index 426b0078edf8..8b78f069c150 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild,v 1.9 2004/03/14 18:05:08 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild,v 1.10 2004/04/08 22:57:08 vapier Exp $
 
-IUSE="nls"
-
-inherit libtool
+inherit libtool eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="ScrollKeeper is a cataloging system for documentation on open systems."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://scrollkeeper.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="FDL-1.1 LGPL-2.1"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64 ~mips"
+IUSE="nls"
 
 RDEPEND=">=dev-libs/libxml2-2.4.19
 	>=dev-libs/libxslt-1.0.14
 	>=sys-libs/zlib-1.1.3
 	=app-text/docbook-xml-dtd-4.1.2*
 	>=app-text/docbook-sgml-utils-0.6.6"
-
 DEPEND="${RDEPEND}
 	 >=dev-util/intltool-0.29
 	nls? ( sys-devel/gettext )"
@@ -29,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	patch -p0< ${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 }
 
diff --git a/app-text/tetex/tetex-1.0.7-r13.ebuild b/app-text/tetex/tetex-1.0.7-r13.ebuild
index 4b414d7b6071..a0f47225a739 100644
--- a/app-text/tetex/tetex-1.0.7-r13.ebuild
+++ b/app-text/tetex/tetex-1.0.7-r13.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/tetex/tetex-1.0.7-r13.ebuild,v 1.8 2004/02/21 12:17:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r13.ebuild,v 1.9 2004/04/08 22:58:31 vapier Exp $
+
+inherit eutils flag-o-matic
 
 TEXMFSRC="teTeX-texmf-gg-1.0.3.tar.bz2"
 S=${WORKDIR}/teTeX-1.0
 
 DESCRIPTION="a complete TeX distribution"
+HOMEPAGE="http://tug.org/teTeX/"
 SRC_URI="ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/1.0/distrib/sources/teTeX-src-${PV}.tar.gz
 	 ftp://ftp.dante.de/pub/tex/systems/unix/teTeX/1.0/contrib/ghibo/${TEXMFSRC}
 	 mirror://gentoo/ec-ready-mf-tfm.tar.gz
 	 mirror://teTeX-french.tar.gz"
-HOMEPAGE="http://tug.org/teTeX/"
 
 KEYWORDS="x86 ppc sparc alpha hppa"
 SLOT="0"
@@ -81,8 +83,7 @@ src_unpack() {
 }
 
 src_compile() {
-
-	filter-flags "-fstack-protector"
+	filter-flags -fstack-protector
 
 	local myconf=""
 	use X \
@@ -113,7 +114,6 @@ src_compile() {
 }
 
 src_install() {
-
 	dodir /usr/share/
 	# Install texmf files
 	einfo "Installing texmf..."
@@ -163,7 +163,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	if [ $ROOT = "/" ]
 	then
 		einfo "Configuring teTeX..."
@@ -186,4 +185,3 @@ pkg_postinst() {
 		echo
 	fi
 }
-
diff --git a/app-text/tetex/tetex-2.0.2-r3.ebuild b/app-text/tetex/tetex-2.0.2-r3.ebuild
index 40c4b2661f94..4d6d285f1234 100644
--- a/app-text/tetex/tetex-2.0.2-r3.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r3.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-text/tetex/tetex-2.0.2-r3.ebuild,v 1.10 2004/04/06 02:59:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r3.ebuild,v 1.11 2004/04/08 22:58:41 vapier Exp $
 
-inherit tetex
+inherit tetex eutils
 
 DESCRIPTION="a complete TeX distribution"
 HOMEPAGE="http://tug.org/teTeX/"
diff --git a/app-text/tkman/tkman-2.1-r1.ebuild b/app-text/tkman/tkman-2.1-r1.ebuild
index 190fdcb20d76..54e0681be6f5 100644
--- a/app-text/tkman/tkman-2.1-r1.ebuild
+++ b/app-text/tkman/tkman-2.1-r1.ebuild
@@ -1,13 +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/tkman/tkman-2.1-r1.ebuild,v 1.8 2004/03/12 08:50:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/tkman-2.1-r1.ebuild,v 1.9 2004/04/08 22:59:09 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="TkMan man and info page browser"
-SRC_URI="http://tkman.sourceforge.net/${PN}.tar.gz"
 HOMEPAGE="http://tkman.sourceforge.net/"
-KEYWORDS="x86 ppc sparc"
-SLOT="0"
+SRC_URI="http://tkman.sourceforge.net/${PN}.tar.gz"
+
 LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND=">=app-text/rman-3.0.9
 	>=dev-lang/tcl-8.3.3
@@ -22,14 +25,13 @@ src_unpack() {
 	has_version '>=sys-apps/groff-1.18' \
 		has_version '<app-text/rman-3.1' \
 		&& sed -i -e "s:groff -te -Tlatin1:groff -P -c -te -Tlatin1:" ${S}/Makefile
-
 }
 
 src_compile() {
 	emake || die
 }
 
-src_install () {
-	dobin ${PN}
+src_install() {
+	dobin ${PN} || die
 	dobin re${PN}
 }
diff --git a/app-text/tkman/tkman-2.2.ebuild b/app-text/tkman/tkman-2.2.ebuild
index 776249fcaa24..612ea22ffef0 100644
--- a/app-text/tkman/tkman-2.2.ebuild
+++ b/app-text/tkman/tkman-2.2.ebuild
@@ -1,13 +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/tkman/tkman-2.2.ebuild,v 1.4 2004/03/12 08:50:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/tkman-2.2.ebuild,v 1.5 2004/04/08 22:59:32 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="TkMan man and info page browser"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://tkman.sourceforge.net/"
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
 IUSE=""
 
 DEPEND=">=app-text/rman-3.1
@@ -24,9 +27,8 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
-	mkdir -p ${D}/usr/bin
-
+src_install() {
+	dodir /usr/bin
 	make DESTDIR=${D} install || die
 
 	dodoc ANNOUNCE-tkman.txt CHANGES README-tkman manual.html
diff --git a/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild b/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild
index 2f894aae83b1..27a31a87eaf0 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.3.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-text/ttf2pt1/ttf2pt1-3.3.3.ebuild,v 1.17 2004/03/12 09:18:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild,v 1.18 2004/04/08 22:59:57 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Converts True Type to Type 1 fonts"
 HOMEPAGE="http://ttf2pt1.sourceforge.net/"
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild
index 34ebffb54373..425d7264cd07 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.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-text/ttf2pt1/ttf2pt1-3.4.0.ebuild,v 1.15 2004/03/12 09:18:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild,v 1.16 2004/04/08 23:00:07 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Converts True Type to Type 1 fonts"
 HOMEPAGE="http://ttf2pt1.sourceforge.net/"
diff --git a/app-text/unix2dos/unix2dos-2.2.ebuild b/app-text/unix2dos/unix2dos-2.2.ebuild
index c5d70a70f861..8ab6f57213de 100644
--- a/app-text/unix2dos/unix2dos-2.2.ebuild
+++ b/app-text/unix2dos/unix2dos-2.2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unix2dos/unix2dos-2.2.ebuild,v 1.8 2004/03/10 20:18:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unix2dos/unix2dos-2.2.ebuild,v 1.9 2004/04/08 23:00:32 vapier Exp $
 
-DESCRIPTION="unix2dos - UNIX to DOS text file format converter"
+inherit gcc eutils
+
+DESCRIPTION="UNIX to DOS text file format converter"
 HOMEPAGE=""
 SRC_URI="mirror://gentoo/${P}.src.tar.gz"
 
@@ -23,10 +25,10 @@ src_unpack() {
 }
 
 src_compile() {
-	gcc ${CFLAGS} -o unix2dos unix2dos.c || die
+	$(gcc-getCC) ${CFLAGS} -o unix2dos unix2dos.c || die
 }
 
 src_install() {
-	dobin unix2dos
+	dobin unix2dos || die
 	doman unix2dos.1
 }
diff --git a/app-text/xmlto/xmlto-0.0.15.ebuild b/app-text/xmlto/xmlto-0.0.15.ebuild
index 05bc55004868..36493bb66ece 100644
--- a/app-text/xmlto/xmlto-0.0.15.ebuild
+++ b/app-text/xmlto/xmlto-0.0.15.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-text/xmlto/xmlto-0.0.15.ebuild,v 1.15 2004/01/14 20:45:44 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.15.ebuild,v 1.16 2004/04/08 23:00:58 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
 HOMEPAGE="http://cyberelk.net/tim/xmlto/"
 SRC_URI="http://cyberelk.net/tim/data/${PN}/stable/${P}.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86 ~ppc sparc alpha ia64 hppa"
+IUSE=""
 
 DEPEND="app-shells/bash
 	dev-libs/libxslt
@@ -19,30 +21,20 @@ DEPEND="app-shells/bash
 # Passivetex/xmltex need some sorting out, we'll include pdf/dvi/tex 
 # support in the first revision to xmlto <obz@gentoo.org>
 
-# not parrallel safe, thanks <agriffis@gentoo.org>, bug #33151
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-head-fix.patch
-
 }
 
 src_compile() {
-
 	econf || die
-	emake || die
-
+	emake -j1 || die
 }
 
 src_install() {
-
 	make DESTDIR=${D} prefix="/usr" install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 	insinto /usr/share/doc/${P}/xml
 	doins doc/*.xml
-
 }
-
diff --git a/app-text/xmlto/xmlto-0.0.17.ebuild b/app-text/xmlto/xmlto-0.0.17.ebuild
index 6a32673beec8..f14285f20bb4 100644
--- a/app-text/xmlto/xmlto-0.0.17.ebuild
+++ b/app-text/xmlto/xmlto-0.0.17.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-text/xmlto/xmlto-0.0.17.ebuild,v 1.5 2004/03/16 04:47:56 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.17.ebuild,v 1.6 2004/04/08 23:01:23 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
 HOMEPAGE="http://cyberelk.net/tim/xmlto/"
 SRC_URI="http://cyberelk.net/tim/data/${PN}/stable/${P}.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="~x86 ppc ~sparc ~alpha ~ia64 amd64 ~mips"
+IUSE=""
 
 DEPEND="app-shells/bash
 	dev-libs/libxslt
@@ -18,29 +20,20 @@ DEPEND="app-shells/bash
 #	tetex? ( >=app-text/passivetex-1.4 )"
 # Passivetex/xmltex need some sorting out <obz@gentoo.org>
 
-# not parrallel safe, thanks <agriffis@gentoo.org>, bug #33151
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_unpack() {
-
-	unpack ${A}; cd ${S}
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${PN}-head-fix.patch
-
 }
 
 src_compile() {
-
 	econf || die
-	emake || die
-
+	emake -j1 || die
 }
 
 src_install() {
-
 	make DESTDIR=${D} prefix="/usr" install || die
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README
+	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README
 	insinto /usr/share/doc/${P}/xml
 	doins doc/*.xml
-
 }
-
diff --git a/app-text/xpdf/xpdf-3.00-r1.ebuild b/app-text/xpdf/xpdf-3.00-r1.ebuild
index 032d32908b04..9b53a8321d09 100644
--- a/app-text/xpdf/xpdf-3.00-r1.ebuild
+++ b/app-text/xpdf/xpdf-3.00-r1.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/xpdf/xpdf-3.00-r1.ebuild,v 1.1 2004/03/14 13:30:41 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.00-r1.ebuild,v 1.2 2004/04/08 23:01:40 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="An X Viewer for PDF Files"
 HOMEPAGE="http://www.foolabs.com/xpdf/"
@@ -30,7 +32,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	prepallman
-	dodoc README ANNOUNCE CHANGES COPYING
+	dodoc README ANNOUNCE CHANGES
 	insinto /etc
 	doins ${FILESDIR}/xpdfrc
 }