A=-fix, try->die, tab-fixes, stylefixes, ...

author: Mikael Hallendal <hallski@gentoo.org> 2001-11-10 12:45:09 +0000
committer: Mikael Hallendal <hallski@gentoo.org> 2001-11-10 12:45:09 +0000
commit: e27c43913c049681679b773f3dbb34ab43f6e209 (patch)
tree: 6667392b7a863994137178138537c6472535fa94
parent: new version .. no RC5, sorry (diff)
download: gentoo-2-e27c43913c049681679b773f3dbb34ab43f6e209.tar.gz
gentoo-2-e27c43913c049681679b773f3dbb34ab43f6e209.tar.bz2
gentoo-2-e27c43913c049681679b773f3dbb34ab43f6e209.zip
29 files changed, 251 insertions, 460 deletions
diff --git a/dev-util/cervisia/cervisia-1.3.ebuild b/dev-util/cervisia/cervisia-1.3.ebuild
index e2f96ec5405c..15466e6d556c 100644
--- a/dev-util/cervisia/cervisia-1.3.ebuild
+++ b/dev-util/cervisia/cervisia-1.3.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cervisia/cervisia-1.3.ebuild,v 1.5 2001/09/29 21:03:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cervisia/cervisia-1.3.ebuild,v 1.6 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A CVS Client for KDE"
-SRC_URI="http://ftp1.sourceforge.net/cervisia/${A}"
+SRC_URI="http://ftp1.sourceforge.net/cervisia/${P}.tar.gz"
 HOMEPAGE="http://cervisia.sourceforge.net"
 
 DEPEND=">=kde-base/kdelibs-2.0"
diff --git a/dev-util/cscope/cscope-15.1.ebuild b/dev-util/cscope/cscope-15.1.ebuild
index 6c98216f4d54..6f74770026b6 100644
--- a/dev-util/cscope/cscope-15.1.ebuild
+++ b/dev-util/cscope/cscope-15.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author AJ Lewis <lewis@sistina.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.1.ebuild,v 1.5 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.1.ebuild,v 1.6 2001/11/10 12:45:09 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="CScope - interactively examine a C program"
-SRC_URI="http://download.sourceforge.net/cscope/${A}"
+SRC_URI="http://download.sourceforge.net/cscope/${P}.tar.gz"
 HOMEPAGE="http://cscope.sourceforge.net"
 
 RDEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
 DEPEND="$RDEPEND sys-devel/flex"
+
 src_compile() {                           
    try ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
    try make clean
diff --git a/dev-util/cscope/cscope-15.3.ebuild b/dev-util/cscope/cscope-15.3.ebuild
index 9824ea91ecf2..9b23accc8531 100644
--- a/dev-util/cscope/cscope-15.3.ebuild
+++ b/dev-util/cscope/cscope-15.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author AJ Lewis <lewis@sistina.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.3.ebuild,v 1.4 2001/10/08 01:47:55 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.3.ebuild,v 1.5 2001/11/10 12:45:09 hallski Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="CScope - interactively examine a C program"
@@ -10,19 +10,26 @@ HOMEPAGE="http://cscope.sourceforge.net"
 
 RDEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
-DEPEND="$RDEPEND sys-devel/flex"
 
-src_compile() {                           
-   try ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
-   try make clean
-   try make ${MAKEOPTS}
-}
+DEPEND="$RDEPEND
+	sys-devel/flex"
 
-src_install() {                               
-    try make prefix=${D}/usr/ mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-    dodoc NEWS AUTHORS TODO COPYING Changelog INSTALL README*
-}
+src_compile() {                           
 
+	./configure --prefix=/usr/					\
+		    --mandir=/usr/share/man				\
+		    --infodir=/usr/share/info
+	assert
 
+	make clean || die
+	emake || die
+}
 
+src_install() {                               
+	make prefix=${D}/usr						\
+	     mandir=${D}/usr/share/man					\
+	     infodir=${D}/usr/share/info				\
+	     install || die
 
+	dodoc NEWS AUTHORS TODO COPYING Changelog INSTALL README*
+}
diff --git a/dev-util/cvs/cvs-1.11-r1.ebuild b/dev-util/cvs/cvs-1.11-r1.ebuild
index 49f18abd5237..bcc1539cfaba 100644
--- a/dev-util/cvs/cvs-1.11-r1.ebuild
+++ b/dev-util/cvs/cvs-1.11-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11-r1.ebuild,v 1.2 2001/05/08 23:39:35 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11-r1.ebuild,v 1.3 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 SRC_URI="ftp://ftp.cvshome.org/pub/${P}/${P}.tar.gz"
@@ -11,19 +10,23 @@ HOMEPAGE="http://www.cvshome.org/"
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.1"
 
 src_compile() {                           
-    try ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-    try make
-}
+	./configure --prefix=/usr					\
+		    --mandir=/usr/share/man				\
+		    --infodir=/usr/share/info
+	assert
 
-src_install() {                               
-    into /usr
-    try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-    dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING 
-    dodoc MINOR* NEWS PROJECTS README* TESTS TODO
-    mv ${D}/usr/lib/cvs/contrib ${D}/usr/doc/${P}/contrib
-    insinto /usr/share/emacs/site-lisp
-    doins cvs-format.el
+	make || die
 }
 
+src_install() {                               
+	make prefix=${D}/usr						\
+	     mandir=${D}/usr/share/man					\
+	     infodir=${D}/usr/share/info				\
+	     install || die
 
-
+	dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING 
+	dodoc MINOR* NEWS PROJECTS README* TESTS TODO
+	mv ${D}/usr/lib/cvs/contrib ${D}/usr/doc/${P}/contrib
+	insinto /usr/share/emacs/site-lisp
+	doins cvs-format.el
+}
diff --git a/dev-util/dialog/dialog-0.7.ebuild b/dev-util/dialog/dialog-0.7.ebuild
index 60a0e47a1922..c7e22ee672f5 100644
--- a/dev-util/dialog/dialog-0.7.ebuild
+++ b/dev-util/dialog/dialog-0.7.ebuild
@@ -1,22 +1,18 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Prakash Shetty (Crux) <ps@gnuos.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.7.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.7.ebuild,v 1.5 2001/11/10 12:45:09 hallski Exp $
 
-
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A Tool to display Dialog boxes from Shell"
-SRC_URI="http://www.advancedresearch.org/dialog/${A}"
+SRC_URI="http://www.advancedresearch.org/dialog/${P}.tar.gz"
 HOMEPAGE="http://www.advancedresearch.org/dialog/"
 
 DEPEND=">=sys-apps/bash-2.04-r3
 	>=sys-libs/ncurses-5.2"
 
 src_install () {
+	make DESTDIR=${D} install || die
 
-    cd ${S}
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog README 
+	dodoc AUTHORS COPYING ChangeLog README 
 }
-
diff --git a/dev-util/efence/efence-2.2.2.ebuild b/dev-util/efence/efence-2.2.2.ebuild
index 8c81ed91e61c..aea9638992c9 100644
--- a/dev-util/efence/efence-2.2.2.ebuild
+++ b/dev-util/efence/efence-2.2.2.ebuild
@@ -1,37 +1,29 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/efence-2.2.2.ebuild,v 1.1 2001/08/25 23:55:02 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/efence/efence-2.2.2.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
 
-A=ElectricFence-${PV}.tar.gz
 S=${WORKDIR}/ElectricFence-${PV}
 DESCRIPTION="malloc() debugger for Linux and Unix."
-SRC_URI="ftp://ftp.perens.com/pub/ElectricFence/Beta/${A}"
+SRC_URI="ftp://ftp.perens.com/pub/ElectricFence/Beta/ElectricFence-${PV}.tar.gz"
 HOMEPAGE="http://perens.com/FreeSoftware/"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
-    emake || die
+	emake || die
 }
 
 src_install () {
-    
-    dodir /usr/bin
-    dodir /usr/lib
-    dodir /usr/share/man/man3
+	dodir /usr/bin
+	dodir /usr/lib
+	dodir /usr/share/man/man3
 
-    make BIN_INSTALL_DIR=${D}/usr/bin			\
-	 LIB_INSTALL_DIR=${D}/usr/lib			\
-	 MAN_INSTALL_DIR=${D}/usr/share/man/man3	\
-	 install
-    
-    assert "Installation of package failed."
+	make BIN_INSTALL_DIR=${D}/usr/bin				\
+	     LIB_INSTALL_DIR=${D}/usr/lib				\
+	     MAN_INSTALL_DIR=${D}/usr/share/man/man3			\
+	     install
+	assert "Installation of package failed."
 
-    dodoc CHANGES COPYING README
+	dodoc CHANGES COPYING README
 }
-
-
-
-
-
diff --git a/dev-util/glade/glade-0.6.2.ebuild b/dev-util/glade/glade-0.6.2.ebuild
index 12569beb5b48..966e0ca02f74 100644
--- a/dev-util/glade/glade-0.6.2.ebuild
+++ b/dev-util/glade/glade-0.6.2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.2.ebuild,v 1.7 2001/10/22 10:05:15 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.2.ebuild,v 1.8 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="glade"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/"${A}
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
 RDEPEND=">=x11-libs/gtk+-1.2.10-r4
@@ -18,7 +17,6 @@ DEPEND="${RDEPEND}
         >=dev-util/intltool-0.11
         >=app-text/scrollkeeper-0.2"
 
-
 src_compile() {
 	local myopts
 
@@ -54,7 +52,9 @@ src_compile() {
 }
 
 src_install() {
-	try make prefix=${D}/usr sysconfdir=${D}/etc install
+	make prefix=${D}/usr 						\
+	     sysconfdir=${D}/etc 					\
+	     install || die
 
 	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
 }
diff --git a/dev-util/glimmer/glimmer-1.1.9.1.ebuild b/dev-util/glimmer/glimmer-1.1.9.1.ebuild
deleted file mode 100644
index d9f5304c04de..000000000000
--- a/dev-util/glimmer/glimmer-1.1.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Tod M. Neidt <tneidt@fidnet.com>
-# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
-
-A=glimmer-1.1.9-1.tar.gz
-S=${WORKDIR}/glimmer-1.1.9-1
-DESCRIPTION="All-purpose gnome code editor."
-SRC_URI="http://prdownloads.sourceforge.net/glimmer/${A}"
-HOMEPAGE="http://glimmer.sourceforge.net"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=gnome-base/ORBit-0.5.10-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gnome-print-0.30"
-
-# These are requirements when build with --enable-python.
-# We should update this to build with --enable-python if USE=python,
-# some work might have to be done to make play with Python 2.X
-
-#	>=dev-lang/python-1.5.2
-#	>=dev-python/gnome-python-1.4.1"
-
-src_compile() {
-
-#--disable-python disable python scripting, needed to build with python-2.x
-# see homepage
-
-	./configure --host=${CHOST}					\
-	  	    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    --infodir=/usr/share/info				\
-		    --mandir=/usr/share/man				\
-		    --disable-python || die
-	
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/varlib					\
-	     infodir=${D}/usr/share/info				\
-	     mandir=${D}/usr/share/man					\
-	     install || die
-
-	dodoc AUTHORS ABOUT-NLS ChangeLog NEWS PROPS TODO README
-	dodoc INSTALL COPYING
-}
diff --git a/dev-util/gob/gob-1.0.9.ebuild b/dev-util/gob/gob-1.0.9.ebuild
index 5d1047a02776..980dc8116f1b 100644
--- a/dev-util/gob/gob-1.0.9.ebuild
+++ b/dev-util/gob/gob-1.0.9.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gob/gob-1.0.9.ebuild,v 1.2 2001/06/24 02:20:30 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gob/gob-1.0.9.ebuild,v 1.3 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GOB is a preprocessor for making GTK+ objects with inline C code"
-SRC_URI="http://ftp.5z.com/pub/gob/${A}"
+SRC_URI="http://ftp.5z.com/pub/gob/${P}.tar.gz"
 HOMEPAGE="http://www.5z.com/jirka/gob.html"
 
-DEPEND=">=dev-libs/glib-1.2.10 sys-devel/flex"
 RDEPEND=">=dev-libs/glib-1.2.10"
-src_compile() {
 
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST}
-    try make
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+src_compile() {
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --mandir=/usr/share/man 
+	assert
 
+	make || die
 }
 
 src_install () {
+	make DESTDIR=${D} install || die
 
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-
+	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
-
diff --git a/dev-util/guile/guile-1.4-r3.ebuild b/dev-util/guile/guile-1.4-r3.ebuild
index a52984f319d7..0bda548b737f 100644
--- a/dev-util/guile/guile-1.4-r3.ebuild
+++ b/dev-util/guile/guile-1.4-r3.ebuild
@@ -1,41 +1,41 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.4-r3.ebuild,v 1.1 2001/03/06 06:05:34 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.4-r3.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
 
-P=guile-1.4
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Guile is an interpreter for Scheme"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/guile/${A}
-	 ftp://prep.ai.mit.edu/gnu/guile/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/guile/${P}.tar.gz
+	 ftp://prep.ai.mit.edu/gnu/guile/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/guile/"
 
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1
         >=sys-libs/readline-4.1"
 
-
 src_unpack() {
-
-  unpack ${A}
-  cd ${S}
-  cp  ${FILESDIR}/net_db.c libguile/
-
+	unpack ${A}
+	cd ${S}
+	cp  ${FILESDIR}/net_db.c libguile/
 }
 
 src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/usr --infodir=/usr/share/info --with-threads --with-modules
-  try make
+	cd ${S}
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --infodir=/usr/share/info				\
+		    --with-threads					\
+		    --with-modules
+	assert
+
+	make || die
 }
 
 src_install() {
-  cd ${S}
-  try make prefix=${D}/usr infodir=${D}/usr/share/info install 
-  dodoc AUTHORS COPYING ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS
-}
-
-
-
+	make prefix=${D}/usr						\
+	     infodir=${D}/usr/share/info				\
+	     install || die
 
+	dodoc AUTHORS COPYING ChangeLog GUILE-VERSION HACKING NEWS 
+	dodoc README SNAPSHOTS THANKS
+}
diff --git a/dev-util/kdbg/kdbg-1.2.1.ebuild b/dev-util/kdbg/kdbg-1.2.1.ebuild
index 4b6714a571df..4136b060f404 100644
--- a/dev-util/kdbg/kdbg-1.2.1.ebuild
+++ b/dev-util/kdbg/kdbg-1.2.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.1.ebuild,v 1.3 2001/09/29 21:03:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.1.ebuild,v 1.4 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A Graphical Debugger Interface to gdb"
-SRC_URI="ftp://ftp.eudaptics.com/pub/people/jsixt/${A}"
+SRC_URI="ftp://ftp.eudaptics.com/pub/people/jsixt/${P}.tar.gz"
 HOMEPAGE="http://members.nextra.at/johsixt/kdbg.html"
 
 DEPEND=">=kde-base/kdelibs-2.0.1"
diff --git a/dev-util/kdbg/kdbg-1.2.2.ebuild b/dev-util/kdbg/kdbg-1.2.2.ebuild
index 8034607cd1ba..f1f163b19198 100644
--- a/dev-util/kdbg/kdbg-1.2.2.ebuild
+++ b/dev-util/kdbg/kdbg-1.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.2.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.2.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
  . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
@@ -15,9 +15,6 @@ RDEPEND="$RDEPEND >=kde-base/kdelibs-2.0.1"
 src_compile() {
 
 	kde_src_compile myconf
-    myconf="$myconf --with-kde-version=2"
-    kde_src_compile configure make
-
+	myconf="$myconf --with-kde-version=2"
+	kde_src_compile configure make
 }
-
-
diff --git a/dev-util/kdevelop/kdevelop-1.4.1.ebuild b/dev-util/kdevelop/kdevelop-1.4.1.ebuild
index 59740ca81cea..28bb8de3f6aa 100644
--- a/dev-util/kdevelop/kdevelop-1.4.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-1.4.1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-1.4.1.ebuild,v 1.6 2001/09/29 21:03:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-1.4.1.ebuild,v 1.7 2001/11/10 12:45:09 hallski Exp $
 
 
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - SDK"
-SRC_PATH="kde/stable/2.1.1/distribution/tar/generic/src/${A}"
+SRC_PATH="kde/stable/2.1.1/distribution/tar/generic/src/${P}.tar.bz2"
 SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	 ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH"
 HOMEPAGE="http://www.kde.org/"
diff --git a/dev-util/memprof/memprof-0.4.1.ebuild b/dev-util/memprof/memprof-0.4.1.ebuild
index cbbcb821b22a..66fc88b4b1d3 100644
--- a/dev-util/memprof/memprof-0.4.1.ebuild
+++ b/dev-util/memprof/memprof-0.4.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/memprof/memprof-0.4.1.ebuild,v 1.2 2001/10/06 23:03:02 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/memprof/memprof-0.4.1.ebuild,v 1.3 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="MemProf - Profiling and leak detection"
-SRC_URI="http://people.redhat.com/otaylor/memprof/${A}"
+SRC_URI="http://people.redhat.com/otaylor/memprof/${P}.tar.gz"
 HOMEPAGE="http://people.redhat.com/otaylor/memprof/"
 
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/dev-util/mergetrees/mergetrees-0.9.3.ebuild b/dev-util/mergetrees/mergetrees-0.9.3.ebuild
index 67f451e5d3d7..d8cc8a25a63b 100644
--- a/dev-util/mergetrees/mergetrees-0.9.3.ebuild
+++ b/dev-util/mergetrees/mergetrees-0.9.3.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mergetrees/mergetrees-0.9.3.ebuild,v 1.1 2001/06/05 15:33:15 aj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mergetrees/mergetrees-0.9.3.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A three-way directory merge tool"
-SRC_URI="http://cvs.bofh.asn.au/mergetrees/${A}"
+SRC_URI="http://cvs.bofh.asn.au/mergetrees/${P}.tar.gz"
 HOMEPAGE="http://cvs.bofh.asn.au/mergetrees/"
 
 RDEPEND="virtual/glibc
@@ -14,13 +13,20 @@ RDEPEND="virtual/glibc
 	>=sys-apps/diffutils-2"
 
 src_compile() {                           
-   try ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
-   try make clean
-   try make ${MAKEOPTS}
+	./configure --prefix=/usr					\
+		    --mandir=/usr/share/man				\
+		    --infodir=/usr/share/info
+	assert
+
+	make clean || die
+	emake || die
 }
 
 src_install() {                               
-    try make prefix=${D}/usr/ mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-    dodoc AUTHORS COPYING Changelog NEWS README* TODO
+	make prefix=${D}/usr						\
+	     mandir=${D}/usr/share/man					\
+	     infodir=${D}/usr/share/info				\
+	     install || die
+	
+	dodoc AUTHORS COPYING Changelog NEWS README* TODO
 }
-
diff --git a/dev-util/pccts/files/digest-pccts-1.33.24 b/dev-util/pccts/files/digest-pccts-1.33.24
deleted file mode 100644
index 05e48e2aacc2..000000000000
--- a/dev-util/pccts/files/digest-pccts-1.33.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2b9f48b029fdc636c1dd7b1df716478 pccts133mr24.zip 741376
diff --git a/dev-util/pccts/files/digest-pccts-1.33.24-r1 b/dev-util/pccts/files/digest-pccts-1.33.24-r1
deleted file mode 100644
index 05e48e2aacc2..000000000000
--- a/dev-util/pccts/files/digest-pccts-1.33.24-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2b9f48b029fdc636c1dd7b1df716478 pccts133mr24.zip 741376
diff --git a/dev-util/pccts/pccts-1.33.24-r1.ebuild b/dev-util/pccts/pccts-1.33.24-r1.ebuild
deleted file mode 100644
index cc92699b990a..000000000000
--- a/dev-util/pccts/pccts-1.33.24-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# pccts-1.33.24-r2.ebuild
-# Distributed under the terms of the GNU General Public License, v2 or later
-# based on pccts-1.33.24.ebuild, written by:
-# Fr�d�ric Brin <duckx@libertysurf.fr>, Jonas Berlin <jonas@berlin.vg>
-# Author: Peter Kadau <peter.kadau@web.de>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pccts/pccts-1.33.24-r1.ebuild,v 1.3 2001/08/08 13:16:21 hallski Exp $
-
-A="pccts133mr24.zip"
-S=${WORKDIR}/pccts
-DESCRIPTION="An embedded C/C++ parser generator"
-SRC_URI="http://www.polhode.com/${A}"
-HOMEPAGE="http://www.polhode.com/"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	patch -p0 <${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-        try emake COPT="$CFLAGS"
-}
-
-src_install() {
-
-
-
-	# main binaries
-	exeinto /usr/bin
-	doexe bin/{antlr,dlg,genmk,sor}
-
-	# .c and .cpp files go into /usr/include/pccts also, 
-	# because genmk looks for them for being included in output-files
-	# (which are c/c++) generated from grammar-files
-	# right now i include _everything_ just to make sure
-	# it doesn't break pccts-based projects
-	# 
-	# if i dive further into the details of genmk.c
-	# it should be possible to put that stuff into /usr/share/pccts
-	#
-	# the M$ and MAC specific stuff gets _not_ included
-	#
-	# main includes
-	insinto /usr/include/pccts
-	doins h/*.{h,c,cpp}
-
-	# sorcerer includes
-	insinto /usr/include/pccts/sorcerer/include
-	doins sorcerer/h/*.h
-
-	# sorcerer libraries
-	insinto /usr/include/pccts/sorcerer/lib
-	doins sorcerer/lib/*.{h,c,cpp}
-
-	# documentation
-	# leaving out the M$ and MAC stuff
-	dodoc CHANGES* KNOWN_PROBLEMS* README RIGHTS history.txt history.ps
-	dodoc sorcerer/README sorcerer/UPDATES	
-
-	# manual pages
-	doman dlg/dlg.1 antlr/antlr.1
-}
diff --git a/dev-util/pccts/pccts-1.33.24-r2.ebuild b/dev-util/pccts/pccts-1.33.24-r2.ebuild
index bc542fe1a740..42321a6aa18a 100644
--- a/dev-util/pccts/pccts-1.33.24-r2.ebuild
+++ b/dev-util/pccts/pccts-1.33.24-r2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Peter Kadau <peter.kadau@web.de>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pccts/pccts-1.33.24-r2.ebuild,v 1.2 2001/08/22 04:58:59 kabau Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pccts/pccts-1.33.24-r2.ebuild,v 1.3 2001/11/10 12:45:09 hallski Exp $
 
-A="pccts133mr24.zip"
 S=${WORKDIR}/pccts
 DESCRIPTION="An embedded C/C++ parser generator"
-SRC_URI="http://www.polhode.com/${A}"
+SRC_URI="http://www.polhode.com/pccts133mr24.zip"
 HOMEPAGE="http://www.polhode.com/"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-util/pccts/pccts-1.33.24.ebuild b/dev-util/pccts/pccts-1.33.24.ebuild
deleted file mode 100644
index 0c60ec46609a..000000000000
--- a/dev-util/pccts/pccts-1.33.24.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Fr�d�ric Brin <duckx@libertysurf.fr>, Jonas Berlin <jonas@berlin.vg>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pccts/pccts-1.33.24.ebuild,v 1.3 2001/08/08 13:16:21 hallski Exp $
-
-A="pccts133mr24.zip"
-S=${WORKDIR}/pccts
-DESCRIPTION="An embedded C++ parser generator"
-SRC_URI="http://www.polhode.com/${A}"
-HOMEPAGE="http://www.polhode.com/"
-
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-
-	echo Patching support/genmk/genmk.c..
-	cp ${S}/support/genmk/genmk.c ${T}/genmk.c
-	sed 's,/usr/local/pccts,/usr/lib/pccts,' ${T}/genmk.c > ${S}/support/genmk/genmk.c
-}
-
-src_compile() {
-	try emake COPT="$CFLAGS"
-}
-
-src_install() {
-
-	# The reason why stuff goes to /usr/lib is that there are
-	# platform-dependent binaries being installed.
-
-	# The reason why I put everything else (source code templates
-	# etc) into /usr/lib too is to avoid breaking makefiles
-	# generated by the "genmk" tool (which is included and already
-	# patched a bit).
-
-	# main binaries
-	exeinto /usr/lib/pccts/bin
-	doexe bin/{antlr,dlg,genmk,sor}
-
-	# main includes
-	insinto /usr/lib/pccts/include
-	doins h/*
-
-	# sorcerer includes
-	insinto /usr/lib/pccts/sorcerer/include
-	doins sorcerer/h/*
-
-	# sorcerer libraries
-	insinto /usr/lib/pccts/sorcerer/lib
-	doins sorcerer/lib/*
-
-	# documentation
-	dodoc CHANGES* KNOWN_PROBLEMS* MPW_Read_Me README RIGHTS history.txt
-	newdoc sorcerer/UPDATES sorcerer-UPDATES
-	newdoc sorcerer/README sorcerer-README
-
-	# manual pages
-	doman dlg/dlg.1 antlr/antlr.1
-}
diff --git a/dev-util/pharmacy/pharmacy-0.3-r1.ebuild b/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
index 30dcea0521d0..e66dae6340c2 100644
--- a/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
+++ b/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
@@ -1,30 +1,27 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3-r1.ebuild,v 1.1 2001/10/06 20:33:30 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3-r1.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
 
-#P=
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Front-End to CVS"
-SRC_URI="http://prdownloads.sourceforge.net/pharmacy/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/pharmacy/${P}.tar.gz"
 HOMEPAGE="http://pharmacy.sourceforge.net"
 
 DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1"
 
 src_compile() {
+	./configure --prefix=/usr --host=${CHOST} || die
 
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-
+	make || die
 }
 
 src_install () {
+	make DESTDIR=${D} install || die
 
-    try make DESTDIR=${D} install
-    dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-    insinto /usr/share/doc/pharmacy/index
-    doins docs/index/* 
-    insinto /usr/share/doc/pharmacy  docs/index.sgml
-}
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
+	insinto /usr/share/doc/pharmacy/index
+	doins docs/index/* 
+	insinto /usr/share/doc/pharmacy docs/index.sgml
+}
diff --git a/dev-util/pkgconfig/files/digest-pkgconfig-0.7.0 b/dev-util/pkgconfig/files/digest-pkgconfig-0.7.0
deleted file mode 100644
index 76651cdc1048..000000000000
--- a/dev-util/pkgconfig/files/digest-pkgconfig-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d4cb8bc535f21e99f9ca640ec087193 pkgconfig-0.7.0.tar.gz 585728
diff --git a/dev-util/pkgconfig/pkgconfig-0.7.0.ebuild b/dev-util/pkgconfig/pkgconfig-0.7.0.ebuild
deleted file mode 100644
index c1d90e99ebbe..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.7.0.ebuild,v 1.1 2001/06/21 17:49:28 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Package Config utility used by DirectFB"
-SRC_URI="http://www.directfb.org/download/contrib/${A}"
-HOMEPAGE="http://"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog NEWS README 
-}
-
diff --git a/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild b/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild
index 5dacdbbbff01..402c7bbf1f2e 100644
--- a/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild,v 1.1 2001/07/30 14:58:41 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Package Config system that manages compile/link flags for libraries"
-SRC_URI="http://www.freedesktop.org/software/pkgconfig/releases/${A}"
+SRC_URI="http://www.freedesktop.org/software/pkgconfig/releases/${P}.tar.gz"
 HOMEPAGE="http://www.freedesktop.org/software/pkgconfig/"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --mandir=/usr/share/man
+	assert
 
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST}
-    try pmake
-
+	emake || die
 }
 
 src_install () {
+	make DESTDIR=${D} install || die
 
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog NEWS README 
+	dodoc AUTHORS COPYING ChangeLog NEWS README 
 }
-
diff --git a/dev-util/sel/sel-0.08.2.ebuild b/dev-util/sel/sel-0.08.2.ebuild
index 5d7c20b3b772..4bdb5e73678f 100644
--- a/dev-util/sel/sel-0.08.2.ebuild
+++ b/dev-util/sel/sel-0.08.2.ebuild
@@ -1,43 +1,36 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.2.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.2.ebuild,v 1.4 2001/11/10 12:45:09 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A filemanager for shell scripts"
-SRC_URI="http://www.rhein-neckar.de/~darkstar/files/${A}"
+SRC_URI="http://www.rhein-neckar.de/~darkstar/files/${P}.tar.gz"
 HOMEPAGE="http://www.rhein-neckar.de/~darkstar/sel.html"
+
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1"
 
 src_unpack () {
+	unpack ${A}
+	cd ${S}
 
-    unpack ${A}
-    cd ${S}
-    cp Makefile Makefile.orig
-    sed -e "s:-m486:${CFLAGS}:" -e "s:-O3::" Makefile.orig > Makefile
-    cp sel.c sel.c.orig
-    sed -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
-       sel.c.orig > sel.c
-
+	cp Makefile Makefile.orig
+	sed -e "s:-m486:${CFLAGS}:" -e "s:-O3::" Makefile.orig > Makefile
 
+	cp sel.c sel.c.orig
+	sed -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
+       	    sel.c.orig > sel.c
 }
 
 src_compile() {
-
-
-    make
-
+	make || die
 }
 
 src_install () {
-
-    cd ${S}
-    dobin sel
-    doman sel.1
-    insinto /usr/share/sel
-    doins help.txt
-    dodoc Changelog LICENSE
+	dobin sel
+	doman sel.1
+	insinto /usr/share/sel
+	doins help.txt
+	dodoc Changelog LICENSE
 }
-
diff --git a/dev-util/tkcvs/tkcvs-6.4-r1.ebuild b/dev-util/tkcvs/tkcvs-6.4-r1.ebuild
index 612194acb150..7fee6f4174ee 100644
--- a/dev-util/tkcvs/tkcvs-6.4-r1.ebuild
+++ b/dev-util/tkcvs/tkcvs-6.4-r1.ebuild
@@ -1,63 +1,74 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-6.4-r1.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-6.4-r1.ebuild,v 1.6 2001/11/10 12:45:09 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="TkCVS"
-SRC_URI="http://www.twobarleycorns.net/${A}"
+SRC_URI="http://www.twobarleycorns.net/${P}.tar.gz"
 HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html" 
+
 RDEPEND="virtual/glibc
 	>=dev-lang/tcl-tk-8.1.1"
 
 src_compile() {                           
-   echo "It's tcl, you don't need to compile.  ;)"
+	echo "It's tcl, you don't need to compile.  ;)"
 }
 
 src_install() {
+	dodir /usr/lib /usr/bin /usr/lib/tkcvs/ /usr/lib/tkcvs/bitmaps
+
+	# We need to do this 'cause the tcl install requires X to be running
+	# and the user that runs emerge to have DISPLAY set and working
+	cat tkcvs/tkcvs.blank | sed -e {s/_TCDIR_/"\/usr\/lib"/} \
+       	    > ${D}/usr/bin/tkcvs
+	chmod 755 ${D}/usr/bin/tkcvs
+	chmod 755 ${S}/tkdiff/tkdiff
+	dobin tkdiff/tkdiff
+
+	insinto /usr/lib/tkcvs
+	doins 	tkcvs/modtree.tcl tkcvs/cvs.tcl tkcvs/reports.tcl 	\
+              	tkcvs/tooltips.tcl tkcvs/tkcvs_def.tcl 			\
+		tkcvs/gen_log.tcl tkcvs/logcanvas.tcl tkcvs/dialog.tcl 	\
+		tkcvs/import.tcl tkcvs/merge.tcl tkcvs/errors.tcl 	\
+		tkcvs/static.tcl tkcvs/search.tcl tkcvs/filebrowse.tcl 	\
+		tkcvs/modules.tcl tkcvs/commit.tcl tkcvs/modbrowse.tcl 	\
+		tkcvs/workdir.tcl tkcvs/help.tcl tkcvs/tclIndex
+
+	insinto /usr/lib/tkcvs/bitmaps
+	doins 	bitmaps/edit.gif bitmaps/files.gif 			\
+		bitmaps/loop-glasses.gif bitmaps/clean.gif 		\
+		bitmaps/clear.gif bitmaps/tclfish.gif bitmaps/diff.gif 	\
+		bitmaps/fileview.gif bitmaps/dir.gif 			\
+		bitmaps/loop-half.gif bitmaps/conflict.gif 		\
+		bitmaps/patches.gif bitmaps/fileedit.gif 		\
+		bitmaps/arrow_hl_up.gif bitmaps/branchtag.gif 		\
+		bitmaps/branch.gif bitmaps/checkin.gif bitmaps/tag.gif 	\
+		bitmaps/logfile.gif bitmaps/refresh.gif 		\
+		bitmaps/arrow_dn.gif bitmaps/remove.gif bitmaps/mod.gif	\
+		bitmaps/import.gif bitmaps/patchfile.gif 		\
+		bitmaps/checkout.gif bitmaps/add.gif 			\
+		bitmaps/mergebranch.gif bitmaps/tags.gif 		\
+		bitmaps/adir.gif bitmaps/arrow_up.gif bitmaps/arrow.gif	\
+		bitmaps/unedit.gif bitmaps/delete.gif bitmaps/mdir.gif	\
+		bitmaps/modules.gif bitmaps/ball.gif bitmaps/who.gif	\
+		bitmaps/export.gif bitmaps/loop.gif 			\
+		bitmaps/modbrowse.gif bitmaps/mergediff.gif		\
+		bitmaps/arrow_hl_dn.gif bitmaps/amod.gif 		\
+		bitmaps/tclfish.xbm bitmaps/tkcvs32.xbm 		\
+		bitmaps/tkcvs48.xbm bitmaps/tkcvs32_mask.xbm 		\
+		bitmaps/tclfish_fly.xbm bitmaps/modbrowse.xbm		\
+		bitmaps/trace.xbm 
+
+	newman tkcvs/tkcvs.n tkcvs.1
+
+	# Add docs...this is important
+	dodoc CHANGELOG COPYING FAQ README.tkcvs README.windows
+
+	docinto tkdiff
+	dodoc tkdiff/PATCHES tkdiff/COPYING
 
-   dodir /usr/lib /usr/bin /usr/lib/tkcvs/ /usr/lib/tkcvs/bitmaps
-
-   # We need to do this 'cause the tcl install requires X to be running
-   # and the user that runs emerge to have DISPLAY set and working
-   cat tkcvs/tkcvs.blank | sed -e {s/_TCDIR_/"\/usr\/lib"/} \
-       > ${D}/usr/bin/tkcvs
-   chmod 755 ${D}/usr/bin/tkcvs
-   chmod 755 ${S}/tkdiff/tkdiff
-   dobin tkdiff/tkdiff
-   insinto /usr/lib/tkcvs
-   doins tkcvs/modtree.tcl tkcvs/cvs.tcl tkcvs/reports.tcl \
-         tkcvs/tooltips.tcl tkcvs/tkcvs_def.tcl tkcvs/gen_log.tcl \
-         tkcvs/logcanvas.tcl tkcvs/dialog.tcl tkcvs/import.tcl \
-         tkcvs/merge.tcl tkcvs/errors.tcl tkcvs/static.tcl tkcvs/search.tcl \
-         tkcvs/filebrowse.tcl tkcvs/modules.tcl tkcvs/commit.tcl \
-         tkcvs/modbrowse.tcl tkcvs/workdir.tcl tkcvs/help.tcl tkcvs/tclIndex
-   insinto /usr/lib/tkcvs/bitmaps
-   doins bitmaps/edit.gif bitmaps/files.gif bitmaps/loop-glasses.gif \
-         bitmaps/clean.gif bitmaps/clear.gif bitmaps/tclfish.gif \
-	 bitmaps/diff.gif bitmaps/fileview.gif bitmaps/dir.gif \
-	 bitmaps/loop-half.gif bitmaps/conflict.gif bitmaps/patches.gif \
-	 bitmaps/fileedit.gif bitmaps/arrow_hl_up.gif bitmaps/branchtag.gif \
-	 bitmaps/branch.gif bitmaps/checkin.gif bitmaps/tag.gif \
-	 bitmaps/logfile.gif bitmaps/refresh.gif bitmaps/arrow_dn.gif \
-	 bitmaps/remove.gif bitmaps/mod.gif bitmaps/import.gif \
-	 bitmaps/patchfile.gif bitmaps/checkout.gif bitmaps/add.gif \
-	 bitmaps/mergebranch.gif bitmaps/tags.gif bitmaps/adir.gif \
-	 bitmaps/arrow_up.gif bitmaps/arrow.gif bitmaps/unedit.gif \
-	 bitmaps/delete.gif bitmaps/mdir.gif bitmaps/modules.gif \
-	 bitmaps/ball.gif bitmaps/who.gif bitmaps/export.gif bitmaps/loop.gif \
-	 bitmaps/modbrowse.gif bitmaps/mergediff.gif bitmaps/arrow_hl_dn.gif \
-	 bitmaps/amod.gif bitmaps/tclfish.xbm bitmaps/tkcvs32.xbm \
-	 bitmaps/tkcvs48.xbm bitmaps/tkcvs32_mask.xbm bitmaps/tclfish_fly.xbm \
-	 bitmaps/modbrowse.xbm bitmaps/trace.xbm 
-   newman tkcvs/tkcvs.n tkcvs.1
-
-   # Add docs...this is important
-   dodoc CHANGELOG COPYING FAQ README.tkcvs README.windows
-   docinto tkdiff
-   dodoc tkdiff/PATCHES tkdiff/COPYING
-   docinto tkcvs
-   dodoc tkcvs/vendor.readme
+	docinto tkcvs
+	dodoc tkcvs/vendor.readme
 }
diff --git a/dev-util/uml/uml-1.0.1.ebuild b/dev-util/uml/uml-1.0.1.ebuild
index 726aff7edbe4..0c2da47c2cd1 100644
--- a/dev-util/uml/uml-1.0.1.ebuild
+++ b/dev-util/uml/uml-1.0.1.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Holger Brueckner <darks@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/uml/uml-1.0.1.ebuild,v 1.1 2001/09/14 13:47:22 darks Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/uml/uml-1.0.1.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
  
- A=${P}.tar.gz
- S=${WORKDIR}/${P}
- DESCRIPTION="KDE 2.2 UML Drawing Utility"
- SRC_URI="http://prdownloads.sourceforge.net/uml/${A}"
- HOMEPAGE="http://uml.sourceforge.net"
+S=${WORKDIR}/${P}
+DESCRIPTION="KDE 2.2 UML Drawing Utility"
+SRC_URI="http://prdownloads.sourceforge.net/uml/${P}.tar.gz"
+HOMEPAGE="http://uml.sourceforge.net"
 
- DEPEND="virtual/glibc
-         >=kde-base/kdebase-2.2"
-	
- RDEPEND=">=kde-base/kdebase-2.2"
+RDEPEND=">=kde-base/kdebase-2.2"
 
- src_compile() {
-     ./configure --disable-debug --mandir=${D}/usr/share/man || die
-     emake || die
- }
+DEPEND="${RDEPEND}
+	virtual/glibc"
 
- src_install() {
-     make DESTDIR=${D} install
- }
+src_compile() {
+	./configure --disable-debug --mandir=${D}/usr/share/man || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}
diff --git a/dev-util/xxdiff/xxdiff-1.9.ebuild b/dev-util/xxdiff/xxdiff-1.9.ebuild
index 4a6c1cbfe95f..a347316a7ff1 100644
--- a/dev-util/xxdiff/xxdiff-1.9.ebuild
+++ b/dev-util/xxdiff/xxdiff-1.9.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-1.9.ebuild,v 1.1 2001/06/05 16:31:49 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-1.9.ebuild,v 1.2 2001/11/10 12:45:09 hallski Exp $
 
-#P=
-A=${P}.src.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A graphical file comparator and merge tool simular to xdiff."
-SRC_URI="http://prdownloads.sourceforge.net/xxdiff/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/xxdiff/${P}.src.tar.gz"
 HOMEPAGE="http://xxdiff.sourceforge.net/"
 
 DEPEND="virtual/glibc
@@ -17,14 +15,16 @@ DEPEND="virtual/glibc
 RDEPEND="sys-apps/diffutils"
 
 src_compile() {
-    try ./configure --prefix=/usr --mandir=/usr/share/man
-    try make
+	./configure --prefix=/usr --mandir=/usr/share/man || die
+
+	make || die
 }
 
 src_install () {
-    dobin src/xxdiff
-    newman src/xxdiff.man xxdiff.1
-    dodoc README COPYING CHANGES ChangeLog copyright.txt doc/xxdiff-doc.sgml
+	dobin src/xxdiff
+	newman src/xxdiff.man xxdiff.1
+	dodoc README COPYING CHANGES ChangeLog 
+	dodoc copyright.txt doc/xxdiff-doc.sgml
 }
 
 # vim: ai et sw=4 ts=4
diff --git a/dev-util/yacc/yacc-1.9.1-r1.ebuild b/dev-util/yacc/yacc-1.9.1-r1.ebuild
index 901644f16f89..9451fa77a047 100644
--- a/dev-util/yacc/yacc-1.9.1-r1.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r1.ebuild
@@ -1,33 +1,27 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r1.ebuild,v 1.5 2000/11/01 04:44:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r1.ebuild,v 1.6 2001/11/10 12:45:09 hallski Exp $
 
-P=yacc-1.9.1
-A=${P}.tar.Z
 S=${WORKDIR}/${P}
 DESCRIPTION="Yacc"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${A}"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
 DEPEND=">=sys-libs/glibc-2.1.3"
 
 src_unpack () {
-  unpack ${A}
-  cd ${S}
-  cp Makefile Makefile.orig
-  sed -e "s:-O:${CFLAGS}:" Makefile.orig > Makefile
+	unpack ${A}
+	cd ${S}
+	cp Makefile Makefile.orig
+	sed -e "s:-O:${CFLAGS}:" Makefile.orig > Makefile
 }
 src_compile() {                           
-   try make clean
-   try make
+	make clean || die
+	make || die
 }
 
 src_install() {                               
-    into /usr
-    dobin yacc
-    doman yacc.1
-    dodoc 00README* ACKNOWLEDGEMENTS NEW_FEATURES NO_WARRANTY NOTES README*
+	into /usr
+	dobin yacc
+	doman yacc.1
+	dodoc 00README* ACKNOWLEDGEMENTS NEW_FEATURES NO_WARRANTY NOTES README*
 }
-
-
-
-
author	Mikael Hallendal <hallski@gentoo.org>	2001-11-10 12:45:09 +0000
committer	Mikael Hallendal <hallski@gentoo.org>	2001-11-10 12:45:09 +0000
commit	e27c43913c049681679b773f3dbb34ab43f6e209 (patch)
tree	6667392b7a863994137178138537c6472535fa94
parent	new version .. no RC5, sorry (diff)
download	gentoo-2-e27c43913c049681679b773f3dbb34ab43f6e209.tar.gz gentoo-2-e27c43913c049681679b773f3dbb34ab43f6e209.tar.bz2 gentoo-2-e27c43913c049681679b773f3dbb34ab43f6e209.zip