touchups

8 files changed, 35 insertions, 122 deletions

diff --git a/dev-util/cook/cook-2.20.ebuild b/dev-util/cook/cook-2.20.ebuild
index 9be6a6a19974..75c9c1c354e1 100644
--- a/dev-util/cook/cook-2.20.ebuild
+++ b/dev-util/cook/cook-2.20.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cook/cook-2.20.ebuild,v 1.7 2003/02/13 11:48:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cook/cook-2.20.ebuild,v 1.8 2003/04/23 16:11:57 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Cook is a tool for constructing files. It is a replacement for make."
+DESCRIPTION="tool for constructing files; a drop in replacement for make"
 SRC_URI="http://www.canb.auug.org.au/~millerp/cook/${P}.tar.gz"
 HOMEPAGE="http://www.canb.auug.org.au/~millerp/cook/cook.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 DEPEND="sys-devel/bison"
 
-src_compile()
-{
+src_compile() {
 	econf || die "./configure failed"
-
-	# doesn't seem to like emake
-	make || die
+	make || die	# doesn't seem to like emake
 }
 
-
-src_install ()
-{
-
+src_install() {
 	# we'll hijack the RPM_BUILD_ROOT variable which is intended for a 
 	# similiar purpose anyway
 	make RPM_BUILD_ROOT=${D} install || die
diff --git a/dev-util/ddd/ddd-3.3.1-r1.ebuild b/dev-util/ddd/ddd-3.3.1-r1.ebuild
index f50680a1c5b1..dc06126c9ea5 100644
--- a/dev-util/ddd/ddd-3.3.1-r1.ebuild
+++ b/dev-util/ddd/ddd-3.3.1-r1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r1.ebuild,v 1.8 2003/03/30 00:36:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r1.ebuild,v 1.9 2003/04/23 16:13:27 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU DDD is a graphical front-end for command-line debuggers"
+DESCRIPTION="graphical front-end for command-line debuggers"
 HOMEPAGE="http://www.gnu.org/software/ddd"
 SRC_URI="ftp://ftp.easynet.be/gnu/ddd/${P}.tar.gz
 	ftp://ftp.easynet.be/gnu/ddd/${P}-html-manual.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 DEPEND="virtual/x11
 	>=sys-devel/gdb-4.16
@@ -21,9 +20,9 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-	
+
 	mv ${S}/doc/README ${S}/doc/README-DOC
 	dodoc ANNOUNCE AUTHORS BUGS COPYING* CREDITS INSTALL NEWS* NICKNAMES \
 		OPENBUGS PROBLEMS README* TIPS TODO
diff --git a/dev-util/ddd/ddd-3.3.1-r2.ebuild b/dev-util/ddd/ddd-3.3.1-r2.ebuild
index 4c004777ec9f..9b370dac170c 100644
--- a/dev-util/ddd/ddd-3.3.1-r2.ebuild
+++ b/dev-util/ddd/ddd-3.3.1-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r2.ebuild,v 1.9 2003/03/30 00:36:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r2.ebuild,v 1.10 2003/04/23 16:13:27 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU DDD is a graphical front-end for command-line debuggers"
+DESCRIPTION="graphical front-end for command-line debuggers"
 HOMEPAGE="http://www.gnu.org/software/ddd"
 SRC_URI="ftp://ftp.easynet.be/gnu/ddd/${P}.tar.gz
 	ftp://ftp.easynet.be/gnu/ddd/${P}-html-manual.tar.gz"
@@ -16,7 +15,6 @@ DEPEND="virtual/x11
 	>=sys-devel/gdb-4.16
 	virtual/motif"
 
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/ddd
@@ -29,7 +27,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr/lib
 	einstall || die
 	
diff --git a/dev-util/ddd/ddd-3.3.1-r3.ebuild b/dev-util/ddd/ddd-3.3.1-r3.ebuild
index d56c4fc4fec6..c5efdc2d60e8 100644
--- a/dev-util/ddd/ddd-3.3.1-r3.ebuild
+++ b/dev-util/ddd/ddd-3.3.1-r3.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r3.ebuild,v 1.6 2003/03/30 00:36:40 liquidx Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r3.ebuild,v 1.7 2003/04/23 16:13:27 vapier Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="GNU DDD is a graphical front-end for command-line debuggers"
+DESCRIPTION="graphical front-end for command-line debuggers"
 HOMEPAGE="http://www.gnu.org/software/ddd"
 SRC_URI="ftp://ftp.easynet.be/gnu/ddd/${P}.tar.gz
 	ftp://ftp.easynet.be/gnu/ddd/${P}-html-manual.tar.gz"
@@ -20,7 +17,6 @@ DEPEND="virtual/x11
 	>=sys-devel/gdb-4.16
 	virtual/motif"
 
-
 src_unpack() {
 	unpack ${A}
 	
@@ -41,7 +37,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr/lib
 	# If using internal libiberty.a, need to pass
 	# $tooldir to 'make install', else we get
@@ -50,17 +46,13 @@ src_install () {
 	einstall tooldir=${D}/usr || die
 
 	# This one is from binutils
-	if [ -f ${D}/usr/lib/libiberty.a ]
-	then
-		rm -f ${D}/usr/lib/libiberty.a
-	fi
+	[ -f ${D}/usr/lib/libiberty.a ] && rm -f ${D}/usr/lib/libiberty.a
 	# Remove empty dir ...
 	rmdir ${D}/usr/lib || :
-	
+
 	mv ${S}/doc/README ${S}/doc/README-DOC
 	dodoc ANNOUNCE AUTHORS BUGS COPYING* CREDITS INSTALL NEWS* NICKNAMES \
 		OPENBUGS PROBLEMS README* TIPS TODO
-	
+
 	mv ${S}/doc/* ${D}/usr/share/doc/${PF}
 }
-
diff --git a/dev-util/glade/files/digest-glade-2.0.0 b/dev-util/glade/files/digest-glade-2.0.0
deleted file mode 100644
index b70f5107867c..000000000000
--- a/dev-util/glade/files/digest-glade-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16b685dca1064a950d9f506b669cf859 glade-2.0.0.tar.bz2 1723210
diff --git a/dev-util/glade/glade-0.6.4.ebuild b/dev-util/glade/glade-0.6.4.ebuild
index 02b122cfacaa..7493df3cfa00 100644
--- a/dev-util/glade/glade-0.6.4.ebuild
+++ b/dev-util/glade/glade-0.6.4.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.4.ebuild,v 1.11 2003/04/12 18:06:03 foser Exp $
-
-IUSE="nls gnome bonobo"
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.4.ebuild,v 1.12 2003/04/23 16:17:08 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="glade - GUI designer for GTK+/GNOME-1"
+DESCRIPTION="GUI designer for GTK+/GNOME-1"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/${P}.tar.gz"
 HOMEPAGE="http://glade.gnome.org/"
 
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc  ppc"
+KEYWORDS="x86 ppc sparc"
+IUSE="nls gnome bonobo"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
@@ -25,25 +23,14 @@ RDEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.2"
 
 src_compile() {
-	local myconf
-
 	epatch ${FILESDIR}/${P}-autogen.sh.patch
 
-	use gnome || myconf="--disable-gnome"
-
-	use bonobo \
-		&& myconf="${myconf} --with-bonobo" \
-		|| myconf="${myconf} --without-bonobo"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "$DEBUG" ]
-	then
-		myconf="${myconf} --enable-debug"
-	fi
-
 	econf \
 		--disable-gnome-db \
+		`use_enable gnome` \
+		`use_with bonobo`
+		`use_enable nls` \
+		`use_enable debug` \
 		${myconf}  || die
 
 	emake || die
@@ -51,6 +38,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-
 	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
 }
diff --git a/dev-util/glade/glade-2.0.0-r1.ebuild b/dev-util/glade/glade-2.0.0-r1.ebuild
index d8f5b4fb6c33..f31e8381dc35 100644
--- a/dev-util/glade/glade-2.0.0-r1.ebuild
+++ b/dev-util/glade/glade-2.0.0-r1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2003 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.1 2003/04/22 13:37:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.0.0-r1.ebuild,v 1.2 2003/04/23 16:17:08 vapier Exp $
 
 inherit gnome.org
 
-IUSE="gnome gnomedb"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Glade is a GUI Builder. This release is for GTK+ 2 and GNOME 2."
+DESCRIPTION="a GUI Builder.  This release is for GTK+ 2 and GNOME 2."
 HOMEPAGE="http://glade.gnome.org/"
 
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="gnome gnomedb"
 
 DEPEND="=x11-libs/gtk+-2*
 	>=dev-libs/libxml2-2.4.1
@@ -34,20 +32,13 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
-	
-	use gnome \
-		&& myconf="--enable-gnome" \
-		|| myconf="--disable-gnome"
-		
 	# note: ./configure --help and configure.in lists
 	# --disable-gnomedb, whereas the code looks for --disable-gnome-db
-	
-	use gnomedb \
-		&& myconf="${myconf} --enable-gnome-db" \
-		|| myconf="${myconf} --disable-gnome-db"
 
-	econf ${myconf}
+	econf \
+		`use_enable gnome` \
+		`use_enable gnomedb gnome-db` \
+		|| die	
 
 	emake || die "Compilation failed"
 }
diff --git a/dev-util/glade/glade-2.0.0.ebuild b/dev-util/glade/glade-2.0.0.ebuild
deleted file mode 100644
index 354c30f6a8eb..000000000000
--- a/dev-util/glade/glade-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.1 2003/04/12 18:06:03 foser Exp $
-
-# FIXME : we could probably enable gnomedb support
-inherit gnome.org
-
-IUSE="gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Glade is a GUI Builder. This release is for GTK+ 2 and GNOME 2."
-HOMEPAGE="http://glade.gnome.org/"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="=x11-libs/gtk+-2*
-	>=dev-libs/libxml2-2.4.1
-	gnome? ( >=gnome-base/libgnomeui-2.0.0
-		>=gnome-base/libgnomecanvas-2.0.0
-		>=gnome-base/libbonoboui-2.0.0 )"
-
-RDEPEND="${DEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.11
-	>=app-text/scrollkeeper-0.2"
-
-src_compile() {
-	local myconf=""
-	
-	use gnome || myconf="--disable-gnome"
-
-	econf \
-		--disable-gnome-db \
-		${myconf}  || die "./configure failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	einstall || die "Installation failed"
-	
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}