add inherit eutils

8 files changed, 58 insertions, 60 deletions

diff --git a/app-accessibility/speechd/speechd-0.56-r1.ebuild b/app-accessibility/speechd/speechd-0.56-r1.ebuild
index 894e9d11f502..2dcd7f53f542 100644
--- a/app-accessibility/speechd/speechd-0.56-r1.ebuild
+++ b/app-accessibility/speechd/speechd-0.56-r1.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd/speechd-0.56-r1.ebuild,v 1.2 2004/03/17 04:04:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd/speechd-0.56-r1.ebuild,v 1.3 2004/04/06 03:22:31 vapier Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Implements /dev/speech (any text written to /dev/speech will be spoken aloud)"
 HOMEPAGE="http://www.speechio.org/"
 SRC_URI="http://www.speechio.org/dl/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="esd"
 
 DEPEND="dev-lang/perl"
-
 RDEPEND="${DEPEND}
 	esd? ( media-sound/esound )
 	>=app-accessibility/festival-1.4.3-r1"
 
+S=${WORKDIR}/${PN}
+
 src_compile() {
 	emake || die
 }
diff --git a/app-admin/chkrootkit/chkrootkit-0.37.ebuild b/app-admin/chkrootkit/chkrootkit-0.37.ebuild
index aee80675c119..5cd333d5bd68 100644
--- a/app-admin/chkrootkit/chkrootkit-0.37.ebuild
+++ b/app-admin/chkrootkit/chkrootkit-0.37.ebuild
@@ -1,14 +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-admin/chkrootkit/chkrootkit-0.37.ebuild,v 1.13 2004/01/04 16:08:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chkrootkit/chkrootkit-0.37.ebuild,v 1.14 2004/04/06 03:23:57 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="a tool to locally check for signs of a rootkit"
-SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz"
 HOMEPAGE="http://www.chkrootkit.org/"
+SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc alpha"
 LICENSE="AMS"
 SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="virtual/glibc"
 
@@ -23,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	dosbin check_wtmpx chklastlog chkproc chkrootkit chkwtmp ifpromisc
-	dodoc COPYRIGHT README README.chklastlog README.chkwtmp
+	dosbin check_wtmpx chklastlog chkproc chkrootkit chkwtmp ifpromisc || die
+	dodoc README README.chklastlog README.chkwtmp
 }
diff --git a/app-admin/gkrellm/gkrellm-2.1.24.ebuild b/app-admin/gkrellm/gkrellm-2.1.24.ebuild
index 67621a8dcd96..d5ff4573c99b 100644
--- a/app-admin/gkrellm/gkrellm-2.1.24.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.24.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.24.ebuild,v 1.7 2004/02/18 14:33:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.24.ebuild,v 1.8 2004/04/06 03:24:47 vapier Exp $
 
-IUSE="X nls ssl"
+inherit eutils
 
 S=${WORKDIR}/${P/a/}
 DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="x86 ~ppc alpha sparc ~hppa ia64"
+IUSE="X nls ssl"
 
 DEPEND=">=sys-apps/sed-4
 	ssl? ( dev-libs/openssl )
 	X? (  >=x11-libs/gtk+-2.0.5 )"
-
-RDEPEND="${DEPEND} nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
@@ -28,15 +29,14 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	if [ ! "`use nls`" ]; then
+	if ! use nls ; then
 		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
 	fi
 
 	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
 
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
+	if use X ; then
+		use ssl || myconf="without-ssl=yes"
 		PREFIX=/usr emake ${myconf} || die
 	else
 		cd ${S}/server
@@ -81,6 +81,6 @@ src_install() {
 	insinto /etc
 	doins server/gkrellmd.conf
 
-	dodoc COPYRIGHT CREDITS INSTALL README Changelog
+	dodoc CREDITS INSTALL README Changelog
 	dohtml *.html
 }
diff --git a/app-admin/gkrellm/gkrellm-2.1.25.ebuild b/app-admin/gkrellm/gkrellm-2.1.25.ebuild
index 4c9f06e302e4..3413c5bd28b4 100644
--- a/app-admin/gkrellm/gkrellm-2.1.25.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.25.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-admin/gkrellm/gkrellm-2.1.25.ebuild,v 1.7 2004/03/09 23:08:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.25.ebuild,v 1.8 2004/04/06 03:25:32 vapier Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P/a/}
 DESCRIPTION="Single process stack of various system monitors"
@@ -9,7 +11,7 @@ SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="x86 ~ppc alpha sparc ~hppa amd64 ia64"
+KEYWORDS="x86 ~ppc alpha sparc hppa amd64 ia64"
 IUSE="X nls ssl"
 
 DEPEND=">=sys-apps/sed-4
@@ -26,15 +28,14 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	if [ ! "`use nls`" ]; then
+	if ! use nls ; then
 		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
 	fi
 
 	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
 
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
+	if use X ; then
+		use ssl || myconf="without-ssl=yes"
 		PREFIX=/usr emake ${myconf} || die
 	else
 		cd ${S}/server
@@ -79,6 +80,6 @@ src_install() {
 	insinto /etc
 	doins server/gkrellmd.conf
 
-	dodoc COPYRIGHT CREDITS INSTALL README Changelog
+	dodoc CREDITS INSTALL README Changelog
 	dohtml *.html
 }
diff --git a/app-admin/gkrellm/gkrellm-2.1.26.ebuild b/app-admin/gkrellm/gkrellm-2.1.26.ebuild
index 02d738e05877..0cd177b74944 100644
--- a/app-admin/gkrellm/gkrellm-2.1.26.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.26.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-admin/gkrellm/gkrellm-2.1.26.ebuild,v 1.2 2004/02/24 18:35:00 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.26.ebuild,v 1.3 2004/04/06 03:25:59 vapier Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P/a/}
 DESCRIPTION="Single process stack of various system monitors"
@@ -26,15 +28,14 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	if [ ! "`use nls`" ]; then
+	if ! use nls ; then
 		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
 	fi
 
 	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
 
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
+	if use X ; then
+		use ssl || myconf="without-ssl=yes"
 		PREFIX=/usr emake ${myconf} || die
 	else
 		cd ${S}/server
@@ -79,6 +80,6 @@ src_install() {
 	insinto /etc
 	doins server/gkrellmd.conf
 
-	dodoc COPYRIGHT CREDITS INSTALL README Changelog
+	dodoc CREDITS INSTALL README Changelog
 	dohtml *.html
 }
diff --git a/app-admin/metalog/metalog-0.6-r10.ebuild b/app-admin/metalog/metalog-0.6-r10.ebuild
index 0348e3284d32..f5bafac1b217 100644
--- a/app-admin/metalog/metalog-0.6-r10.ebuild
+++ b/app-admin/metalog/metalog-0.6-r10.ebuild
@@ -1,13 +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-admin/metalog/metalog-0.6-r10.ebuild,v 1.18 2004/03/12 10:45:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.6-r10.ebuild,v 1.19 2004/04/06 03:26:27 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
-SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
 HOMEPAGE="http://metalog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha mips hppa amd64"
 
 DEPEND=">=dev-libs/libpcre-3.4"
@@ -24,15 +26,10 @@ src_unpack() {
 		metalog.8
 }
 
-src_compile() {
-	econf
-	emake || die
-}
-
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS COPYING ChangeLog README
+	dodoc AUTHORS ChangeLog README
 	newdoc metalog.conf metalog.conf.sample
 
 	insinto /etc/metalog ; doins ${FILESDIR}/metalog.conf
diff --git a/app-admin/metalog/metalog-0.6-r11.ebuild b/app-admin/metalog/metalog-0.6-r11.ebuild
index 158aeaaf5880..a2099445c443 100644
--- a/app-admin/metalog/metalog-0.6-r11.ebuild
+++ b/app-admin/metalog/metalog-0.6-r11.ebuild
@@ -1,17 +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-admin/metalog/metalog-0.6-r11.ebuild,v 1.3 2004/03/12 10:45:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.6-r11.ebuild,v 1.4 2004/04/06 03:26:49 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
-SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
 HOMEPAGE="http://metalog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha mips hppa amd64"
 
 DEPEND=">=dev-libs/libpcre-3.4"
-
 PROVIDE="virtual/logger"
 
 src_unpack() {
@@ -26,15 +27,10 @@ src_unpack() {
 		metalog.8
 }
 
-src_compile() {
-	econf
-	emake || die
-}
-
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS COPYING ChangeLog README
+	dodoc AUTHORS ChangeLog README
 	newdoc metalog.conf metalog.conf.sample
 
 	insinto /etc/metalog ; doins ${FILESDIR}/metalog.conf
diff --git a/app-admin/paxtest/paxtest-0.9.5-r1.ebuild b/app-admin/paxtest/paxtest-0.9.5-r1.ebuild
index 7e36888628e3..82dc90818536 100644
--- a/app-admin/paxtest/paxtest-0.9.5-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.5-r1.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.5-r1.ebuild,v 1.3 2004/01/11 02:05:58 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.5-r1.ebuild,v 1.4 2004/04/06 03:27:27 vapier Exp $
+
+inherit eutils
 
 # pax flags are not strip safe.
 RESTRICT="nostrip"
 FEATURES="-distcc"
 
-S=${WORKDIR}/${P}
-
 DESCRIPTION="PaX regression test suite"
-SRC_URI="http://pageexec.virtualave.net/paxtest-${PV}.tar.gz"
 HOMEPAGE="http://pageexec.virtualave.net"
-KEYWORDS="x86"
+SRC_URI="http://pageexec.virtualave.net/paxtest-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
 
-IUSE=""
 DEPEND="virtual/glibc
 	>=sys-apps/chpax-0.5"
 
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -34,7 +33,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR=${D} BINDIR=/usr/bin RUNDIR=/usr/lib/paxtest install
-	for doc in Changelog COPYING LICENCE README ;do
+	for doc in Changelog LICENCE README ;do
 		[ -f "${doc}" ] && dodoc ${doc}
 	done
 }