add inherit eutils

8 files changed, 43 insertions, 63 deletions

diff --git a/dev-util/glade/glade-2.0.0-r1.ebuild b/dev-util/glade/glade-2.0.0-r1.ebuild
index 5d5c0168f1bc..8daf4ac7aee7 100644
--- a/dev-util/glade/glade-2.0.0-r1.ebuild
+++ b/dev-util/glade/glade-2.0.0-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.0.0-r1.ebuild,v 1.6 2003/12/05 13:54:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.0.0-r1.ebuild,v 1.7 2004/04/25 21:43:19 vapier Exp $
 
-inherit gnome.org
+inherit gnome.org eutils
 
 DESCRIPTION="a GUI Builder.  This release is for GTK+ 2 and GNOME 2."
 HOMEPAGE="http://glade.gnome.org/"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="x86 ~ppc sparc"
 IUSE="gnome gnomedb"
 
@@ -19,7 +19,6 @@ RDEPEND="=x11-libs/gtk+-2*
 		>=gnome-base/libgnomecanvas-2.0.0
 		>=gnome-base/libbonoboui-2.0.0 )
 	gnomedb? ( >=gnome-extra/libgnomedb-0.11 )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext
diff --git a/dev-util/glade/glade-2.0.1.ebuild b/dev-util/glade/glade-2.0.1.ebuild
index 6856857b7c8f..6a8839399004 100644
--- a/dev-util/glade/glade-2.0.1.ebuild
+++ b/dev-util/glade/glade-2.0.1.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/dev-util/glade/glade-2.0.1.ebuild,v 1.4 2004/02/21 03:41:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.0.1.ebuild,v 1.5 2004/04/25 21:45:04 vapier Exp $
 
-inherit gnome.org
+inherit gnome.org eutils
 
 DESCRIPTION="a GUI Builder.  This release is for GTK+ 2 and GNOME 2."
 HOMEPAGE="http://glade.gnome.org/"
diff --git a/dev-util/glademm/glademm-0.6.4.ebuild b/dev-util/glademm/glademm-0.6.4.ebuild
index 891bdb1a78e0..2e0a16df02fc 100644
--- a/dev-util/glademm/glademm-0.6.4.ebuild
+++ b/dev-util/glademm/glademm-0.6.4.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/dev-util/glademm/glademm-0.6.4.ebuild,v 1.9 2004/02/20 17:19:56 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-0.6.4.ebuild,v 1.10 2004/04/25 21:45:35 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A C++ backend for glade, the GUI designer for Gtk."
 HOMEPAGE="http://home.wtal.de/petig/Gtk/"
 SRC_URI="http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/${P}b.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 
 DEPEND="=dev-util/glade-0.6*
@@ -28,7 +30,7 @@ src_unpack() {
 	then
 		cd ${WORKDIR}
 		# Fix supplied by "Nicholas Wourms" <nwourms@netscape.net> 
-		patch -p0 < ${FILESDIR}/glademm-0.6.4b-gcc3.patch || die
+		epatch ${FILESDIR}/glademm-0.6.4b-gcc3.patch
 	fi
 
 	# fixes gcc3 missing includes #40283
@@ -37,14 +39,9 @@ src_unpack() {
 
 }
 
-src_compile() {
-	econf
-	emake || die
-}
-
 src_install() {
-	einstall
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
 	dodoc docs/*.txt docs/glade.wishlist
 	dohtml -r docs
 }
diff --git a/dev-util/glademm/glademm-2.0.0.ebuild b/dev-util/glademm/glademm-2.0.0.ebuild
index 45c30cc12ef9..04ffa2119318 100644
--- a/dev-util/glademm/glademm-2.0.0.ebuild
+++ b/dev-util/glademm/glademm-2.0.0.ebuild
@@ -1,31 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.0.0.ebuild,v 1.7 2004/02/20 17:19:56 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.0.0.ebuild,v 1.8 2004/04/25 21:48:16 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A C++ code generating backend for glade"
-SRC_URI="http://home.wtal.de/petig/Gtk/${P}.tar.gz"
 HOMEPAGE="http://home.wtal.de/petig/Gtk/"
+SRC_URI="http://home.wtal.de/petig/Gtk/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
-DOCS="AUTHORS BUGS COPYING ChangeLog NEWS README TODO docs/*"
-
-src_unpack() {
-	unpack ${A}
-
-	# Patch that fixes a missing <cassert> include in the source
-	# Closes Bug #29654
-#	epatch ${FILESDIR}/${P}-gcc33-missing-includes-fix.patch
-}
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO docs/*"
 
 pkg_postinst() {
 	einfo "glademm generated sources have dependencies on packages not required by this ebuild."
diff --git a/dev-util/guile/guile-1.6.4-r1.ebuild b/dev-util/guile/guile-1.6.4-r1.ebuild
index adb3551bd6e8..989d73a386ba 100644
--- a/dev-util/guile/guile-1.6.4-r1.ebuild
+++ b/dev-util/guile/guile-1.6.4-r1.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/dev-util/guile/guile-1.6.4-r1.ebuild,v 1.10 2004/03/25 08:26:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.4-r1.ebuild,v 1.11 2004/04/25 21:48:49 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 DESCRIPTION="Scheme interpreter"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
-IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc alpha hppa ia64 ~amd64 sparc mips"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/readline-4.1"
@@ -24,9 +24,6 @@ DEPEND=">=sys-libs/ncurses-5.1
 SLOT="12"
 MAJOR="1.6"
 
-# Problems with parallel builds (#34029), so I'm taking the safer route
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_compile() {
 	# Fix for bug 26484: This package fails to build when built with
 	# -g3, at least on some architectures.  (19 Aug 2003 agriffis)
@@ -39,7 +36,8 @@ src_compile() {
 	econf \
 		--with-threads \
 		--with-modules || die
-	emake || die
+	# Problems with parallel builds (#34029), so I'm taking the safer route
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/dev-util/leaktracer/leaktracer-2.4.ebuild b/dev-util/leaktracer/leaktracer-2.4.ebuild
index 92798c0d9b96..83ebce2613e2 100644
--- a/dev-util/leaktracer/leaktracer-2.4.ebuild
+++ b/dev-util/leaktracer/leaktracer-2.4.ebuild
@@ -1,32 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/leaktracer/leaktracer-2.4.ebuild,v 1.1 2004/01/06 10:17:57 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/leaktracer/leaktracer-2.4.ebuild,v 1.2 2004/04/25 21:49:26 vapier Exp $
 
-DESCRIPTION="LeakTracer - trace and analyze memory leaks in C++ programs."
+inherit eutils
 
-S=${WORKDIR}/${P}
+DESCRIPTION="trace and analyze memory leaks in C++ programs"
 HOMEPAGE="http://www.andreasen.org/LeakTracer/"
 SRC_URI="mirror://gentoo/${P}.tbz2"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86"
-
 IUSE=""
 
 DEPEND="virtual/glibc
-		>=dev-lang/perl-5
-		sys-devel/gdb"
+	>=dev-lang/perl-5
+	sys-devel/gdb"
 
 src_compile() {
 	epatch ${FILESDIR}/LeakCheck-gentoo.patch
-	make
+	make || die
 }
 
 src_install() {
-	dobin LeakCheck
-	dobin leak-analyze
-	dolib.so LeakTracer.so
+	dobin LeakCheck leak-analyze || die "dobin failed"
+	dolib.so LeakTracer.so || die "dolib.so failed"
 	dohtml README.html
 	dodoc README VERSION
 }
diff --git a/dev-util/lincvs/lincvs-1.2.0.ebuild b/dev-util/lincvs/lincvs-1.2.0.ebuild
index 03d67dfc9844..df59de865d92 100644
--- a/dev-util/lincvs/lincvs-1.2.0.ebuild
+++ b/dev-util/lincvs/lincvs-1.2.0.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-1.2.0.ebuild,v 1.5 2004/03/19 09:55:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-1.2.0.ebuild,v 1.6 2004/04/25 21:49:49 vapier Exp $
 
-IUSE="kde"
+inherit eutils
 
 DESCRIPTION="A Graphical CVS Client"
+HOMEPAGE="http://www.lincvs.org/"
 SRC_URI="http://ppprs1.phy.tu-dresden.de/~trogisch/${PN}/download/LinCVS/${P}/${P}-0-generic-src.tgz"
-HOMEPAGE="http://www.lincvs.org"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc"
-LICENSE="GPL-2"
+IUSE="kde"
 
 DEPEND="kde? ( >=kde-base/kdelibs-2 )
 	>=x11-libs/qt-3.0.5
 	>=dev-util/cvs-1.9"
-
 RDEPEND="${DEPEND}
 	dev-util/cvs"
 
diff --git a/dev-util/lincvs/lincvs-1.3.0_rc2.ebuild b/dev-util/lincvs/lincvs-1.3.0_rc2.ebuild
index 84592ca0e63a..a7f151439585 100644
--- a/dev-util/lincvs/lincvs-1.3.0_rc2.ebuild
+++ b/dev-util/lincvs/lincvs-1.3.0_rc2.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-1.3.0_rc2.ebuild,v 1.5 2004/04/03 23:04:29 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-1.3.0_rc2.ebuild,v 1.6 2004/04/25 21:50:44 vapier Exp $
 
-IUSE="kde"
+inherit eutils
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A Graphical CVS Client"
+HOMEPAGE="http://www.lincvs.org/"
 SRC_URI="http://ppprs1.phy.tu-dresden.de/~trogisch/${PN}/download/20_LinCVS/hr_${P/_/}/${MY_P}-generic-src.tgz"
 
-HOMEPAGE="http://www.lincvs.org"
-
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ppc ~amd64"
-LICENSE="GPL-2"
-RESTRICT="nomirror"
+IUSE="kde"
 
 DEPEND="kde? ( >=kde-base/kdelibs-3 )
 	>=x11-libs/qt-3.0.5
 	>=dev-util/cvs-1.11.10"
-
 RDEPEND="${DEPEND}
 	dev-util/cvs"