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

17 files changed, 62 insertions, 169 deletions

diff --git a/dev-python/4Suite/4Suite-0.11.1_beta3.ebuild b/dev-python/4Suite/4Suite-0.11.1_beta3.ebuild
index 92de00e60d6c..253739659b0b 100644
--- a/dev-python/4Suite/4Suite-0.11.1_beta3.ebuild
+++ b/dev-python/4Suite/4Suite-0.11.1_beta3.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Ollie Rutherfurd <oliver@rutherfurd.net>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/4Suite/4Suite-0.11.1_beta3.ebuild,v 1.1 2001/08/05 03:13:23 kabau Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4Suite/4Suite-0.11.1_beta3.ebuild,v 1.2 2001/11/10 12:14:29 hallski Exp $
 
-A="4Suite-0.11.1b3.tar.gz"
 S=${WORKDIR}"/4Suite-0.11.1b3"
 DESCRIPTION="Python tools for XML processing and object-databases."
-SRC_URI="ftp://ftp.fourthought.com/pub/4Suite/"${A}
+SRC_URI="ftp://ftp.fourthought.com/pub/4Suite/4Suite-0.11.1b3.tar.gz"
 HOMEPAGE="http://www.4suite.org/"
 
 DEPEND="virtual/python
-		=dev-python/PyXML-0.6.5"
+	=dev-python/PyXML-0.6.5"
 
 src_compile() {
-	cd ${S}
-	try python setup.py build
+	python setup.py build || die
 }
 
 src_install() {
-	cd ${S}
-	try python setup.py install --prefix=${D}/usr
-	dodoc README*
-	dodoc ReleaseNotes
+	python setup.py install --prefix=${D}/usr || die
+	dodoc README* ReleaseNotes
 }
diff --git a/dev-python/Numeric/Numeric-19.0.0.ebuild b/dev-python/Numeric/Numeric-19.0.0.ebuild
index 30d919b42e79..26a86d065dd7 100644
--- a/dev-python/Numeric/Numeric-19.0.0.ebuild
+++ b/dev-python/Numeric/Numeric-19.0.0.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 Tod M. Neidt <tneidt@fidnet.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Numeric/Numeric-19.0.0.ebuild,v 1.3 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Numeric/Numeric-19.0.0.ebuild,v 1.4 2001/11/10 12:14:29 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="numerical python module"
-SRC_URI="http://prdownloads.sourceforge.net/numpy/"${A}
+SRC_URI="http://prdownloads.sourceforge.net/numpy/${P}.tar.gz"
 HOMEPAGE="http://www.pfdubois.com/numpy/"
 
 DEPEND="virtual/python"
 
 PYTHON_VERSION=
+
 src_compile() {
-  cd ${S}
-  try python setup_all.py build    
+	python setup_all.py build || die
 }
 
 src_install() {
-  cd ${S}
-  try python setup_all.py install --prefix=${D}/usr 
-  dodoc MANIFEST
-  dodoc PKG-INFO
-  dodoc README*
-#need to automate the python version in the path
-  mv Demo/NumTut ${D}/usr/lib/python2.0/site-packages/
-}
-
-
+	python setup_all.py install --prefix=${D}/usr  || die
 
+	dodoc MANIFEST PKG-INFO README*
 
+	#need to automate the python version in the path
+	mv Demo/NumTut ${D}/usr/lib/python2.0/site-packages/
+}
diff --git a/dev-python/PyQt/PyQt-2.4.ebuild b/dev-python/PyQt/PyQt-2.4.ebuild
index 28ef49db1c61..bc7ef1e39b8e 100644
--- a/dev-python/PyQt/PyQt-2.4.ebuild
+++ b/dev-python/PyQt/PyQt-2.4.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: tools@cvs.gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-2.4.ebuild,v 1.3 2001/08/11 23:23:04 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-2.4.ebuild,v 1.4 2001/11/10 12:14:29 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="PyQt is a set of Python bindings for the Qt Toolkit."
-SRC_URI="http://www.river-bank.demon.co.uk/software/"${A}
+SRC_URI="http://www.river-bank.demon.co.uk/software/${P}.tar.gz"
 HOMEPAGE="http://www.thekompany.com/projects/pykde/"
 
 DEPEND=">=x11-libs/qt-x11-1.4.2
@@ -14,12 +13,16 @@ DEPEND=">=x11-libs/qt-x11-1.4.2
         virtual/python"
 
 src_compile() {
-    try ./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man --with-doc-install=/usr/share/doc
-    try make
+	./configure --prefix=/usr					\
+		    --infodir=/usr/share/info				\
+		    --mandir=/usr/share/man				\
+		    --with-doc-install=/usr/share/doc
+	assert
+
+	make || die
 }
 
 src_install() {
-    try make DESTDIR=${D} install
-    try make DESTDIR=${D} install-doc
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install-doc || die
 }
-
diff --git a/dev-python/PyXML/PyXML-0.6.5.ebuild b/dev-python/PyXML/PyXML-0.6.5.ebuild
deleted file mode 100644
index 42a74654e4ef..000000000000
--- a/dev-python/PyXML/PyXML-0.6.5.ebuild
+++ /dev/null
diff --git a/dev-python/PyXML/PyXML-0.6.6.ebuild b/dev-python/PyXML/PyXML-0.6.6.ebuild
index c19ca6e44cb5..0a28e6ef7b01 100644
--- a/dev-python/PyXML/PyXML-0.6.6.ebuild
+++ b/dev-python/PyXML/PyXML-0.6.6.ebuild
@@ -1,28 +1,22 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ollie Rutherfurd <oliver@rutherfurd.net>
-# :mode=shellscript:noTabs=true:
-# /home/cvsroot/gentoo-x86/dev-python/PyXML/PyXML-0.6.5.ebuild,v 1.1 2001/08/03 17:34:18 kabau Exp
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyXML/PyXML-0.6.6.ebuild,v 1.3 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyXML/PyXML-0.6.6.ebuild,v 1.4 2001/11/10 12:14:29 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A collection of libraries to process XML with Python."
-SRC_URI="http://prdownloads.sourceforge.net/pyxml/"${A}
+SRC_URI="http://prdownloads.sourceforge.net/pyxml/${P}.tar.gz"
 HOMEPAGE="http://pyxml.sourceforge.net/"
 
 DEPEND="virtual/python"
 
 src_compile() {
-    cd ${S}
-    try python setup.py build
+	python setup.py build || die
 }
 
 src_install() {
-    cd ${S}
-    try python setup.py install --prefix=${D}/usr
-    dodoc MANIFEST
-    dodoc README*
-}
+	python setup.py install --prefix=${D}/usr || die
 
+	dodoc MANIFEST README *
+}
diff --git a/dev-python/PyXML/files/digest-PyXML-0.6.5 b/dev-python/PyXML/files/digest-PyXML-0.6.5
deleted file mode 100644
index e18d06532fbf..000000000000
--- a/dev-python/PyXML/files/digest-PyXML-0.6.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 366c2405b1427f7997b2bd25a00ecbfe PyXML-0.6.5.tar.gz 499712
diff --git a/dev-python/ScientificPython/ScientificPython-2.2.ebuild b/dev-python/ScientificPython/ScientificPython-2.2.ebuild
index 482a0fe7db3a..90c9237a7de1 100644
--- a/dev-python/ScientificPython/ScientificPython-2.2.ebuild
+++ b/dev-python/ScientificPython/ScientificPython-2.2.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Tod M. Neidt <tneidt@fidnet.com>
 # /home/cvsroot/gentoo-x86/dev-python/scientific--python/ScientificPython-2.2.ebuild,v 1.4 2001/06/04 21:57:52 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ScientificPython/ScientificPython-2.2.ebuild,v 1.3 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ScientificPython/ScientificPython-2.2.ebuild,v 1.4 2001/11/10 12:14:29 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="scientific python module"
-SRC_URI="http://starship.python.net/crew/hinsen/"${A}
+SRC_URI="http://starship.python.net/crew/hinsen/${P}.tar.gz"
 HOMEPAGE="http://starship.python.net/crew/hinsen/scientific.html"
 
 DEPEND=">=dev-lang/python-2.0-r4
@@ -16,12 +15,10 @@ DEPEND=">=dev-lang/python-2.0-r4
         >=app-misc/netcdf-3.0"
 	
 src_compile() {
-  try python setup.py build    
+	python setup.py build || die
 }
 
 src_install() {
-  try python setup.py install --prefix=${D}/usr 
-  dodoc MANIFEST.in
-  dodoc COPYRIGHT
-  dodoc README*
+	python setup.py install --prefix=${D}/usr || die
+	dodoc MANIFEST.in COPYRIGHT README*
 }
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-2.0.2.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-2.0.2.ebuild
index f2c42386f6c6..41d90433155f 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-2.0.2.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-2.0.2.ebuild
@@ -2,23 +2,20 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ulrich Eck <ueck@net-labs.de>
 # §Header$
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-2.0.2.ebuild,v 1.3 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-2.0.2.ebuild,v 1.4 2001/11/10 12:14:29 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="egenix utils for Python."
-SRC_URI="http://www.lemburg.com/files/python/"${A}
+SRC_URI="http://www.lemburg.com/files/python/${P}.tar.gz"
 HOMEPAGE="http://www.egenix.com/"
 
 DEPEND="virtual/python"
 
 src_compile() {
-    cd ${S}
-    try python setup.py build
+	python setup.py build || die
 }
 
 src_install() {
-    cd ${S}
-    try python setup.py install --prefix=${D}/usr
+	python setup.py install --prefix=${D}/usr || die
 }
diff --git a/dev-python/pychecker/files/digest-pychecker-0.7.5 b/dev-python/pychecker/files/digest-pychecker-0.7.5
deleted file mode 100644
index b99a249b945c..000000000000
--- a/dev-python/pychecker/files/digest-pychecker-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a810aac04be8a6f95d9b62b6df57c3de pychecker-0.7.5.tar.gz 40960
diff --git a/dev-python/pychecker/files/digest-pychecker-0.8 b/dev-python/pychecker/files/digest-pychecker-0.8
deleted file mode 100644
index 4331e3767e2d..000000000000
--- a/dev-python/pychecker/files/digest-pychecker-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9301ea9ba767b05e9954fc309ec9ab5a pychecker-0.8.tar.gz 73728
diff --git a/dev-python/pychecker/files/digest-pychecker-0.8.2 b/dev-python/pychecker/files/digest-pychecker-0.8.2
deleted file mode 100644
index 241d90d3a5e3..000000000000
--- a/dev-python/pychecker/files/digest-pychecker-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0922ef1d455bf3edbaa066a6cc654779 pychecker-0.8.2.tar.gz 77824
diff --git a/dev-python/pychecker/pychecker-0.7.5.ebuild b/dev-python/pychecker/pychecker-0.7.5.ebuild
deleted file mode 100644
index 3f57f7a1e4f9..000000000000
--- a/dev-python/pychecker/pychecker-0.7.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: tools@cvs.gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.7.5.ebuild,v 1.3 2001/08/16 04:07:59 chadh Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="PyChecker is a tool for finding common bugs in python source code."
-SRC_URI="http://prdownloads.sourceforge.net/pychecker"/${A}
-HOMEPAGE="http://pychecker.sourceforge.net/"
-
-DEPEND="virtual/python"
-
-src_install(){
-    try python setup.py install --prefix=${D}/usr
-    dodoc CHANGELOG
-    dodoc COPYRIGHT
-    dodoc KNOWN_BUGS
-    dodoc MAINTAINERS
-    dodoc README
-    dodoc TODO
-    dodoc VERSION
-}
diff --git a/dev-python/pychecker/pychecker-0.8.2.ebuild b/dev-python/pychecker/pychecker-0.8.2.ebuild
deleted file mode 100644
index d9386ce4ab61..000000000000
--- a/dev-python/pychecker/pychecker-0.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: tools@cvs.gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.2.ebuild,v 1.1 2001/08/16 04:09:28 chadh Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="PyChecker is a tool for finding common bugs in python source code."
-SRC_URI="http://prdownloads.sourceforge.net/pychecker"/${A}
-HOMEPAGE="http://pychecker.sourceforge.net/"
-
-DEPEND="virtual/python"
-
-src_install(){
-    try python setup.py install --prefix=${D}/usr
-    dodoc CHANGELOG
-    dodoc COPYRIGHT
-    dodoc KNOWN_BUGS
-    dodoc MAINTAINERS
-    dodoc README
-    dodoc TODO
-    dodoc VERSION
-}
diff --git a/dev-python/pychecker/pychecker-0.8.3.ebuild b/dev-python/pychecker/pychecker-0.8.3.ebuild
index cb6cbefd8533..5c0ae3e99a6f 100644
--- a/dev-python/pychecker/pychecker-0.8.3.ebuild
+++ b/dev-python/pychecker/pychecker-0.8.3.ebuild
@@ -1,24 +1,18 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ollie Rutherfurd <oliver@rutherfurd.net>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.3.ebuild,v 1.1 2001/08/22 05:14:57 kabau Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.3.ebuild,v 1.2 2001/11/10 12:14:29 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="PyChecker is a tool for finding common bugs in python source code."
-SRC_URI="http://prdownloads.sourceforge.net/pychecker"/${A}
+SRC_URI="http://prdownloads.sourceforge.net/pychecker/${P}.tar.gz
 HOMEPAGE="http://pychecker.sourceforge.net/"
 
 DEPEND="virtual/python"
 
 src_install(){
-    cd ${S}
-    try python setup.py install --prefix=${D}/usr
-    dodoc CHANGELOG
-    dodoc COPYRIGHT
-    dodoc KNOWN_BUGS
-    dodoc MAINTAINERS
-    dodoc README
-    dodoc TODO
-    dodoc VERSION
+	python setup.py install --prefix=${D}/usr || die
+
+	dodoc CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS
+	dodoc README TODO VERSION
 }
diff --git a/dev-python/pychecker/pychecker-0.8.ebuild b/dev-python/pychecker/pychecker-0.8.ebuild
deleted file mode 100644
index 696542ea9c8a..000000000000
--- a/dev-python/pychecker/pychecker-0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: tools@cvs.gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.ebuild,v 1.1 2001/08/16 04:09:28 chadh Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="PyChecker is a tool for finding common bugs in python source code."
-SRC_URI="http://prdownloads.sourceforge.net/pychecker"/${A}
-HOMEPAGE="http://pychecker.sourceforge.net/"
-
-DEPEND="virtual/python"
-
-src_install(){
-    try python setup.py install --prefix=${D}/usr
-    dodoc CHANGELOG
-    dodoc COPYRIGHT
-    dodoc KNOWN_BUGS
-    dodoc MAINTAINERS
-    dodoc README
-    dodoc TODO
-    dodoc VERSION
-}
-
diff --git a/dev-python/python-docs/python-docs-2.0.1.ebuild b/dev-python/python-docs/python-docs-2.0.1.ebuild
index 10b347df01b7..e04a0c77be28 100644
--- a/dev-python/python-docs/python-docs-2.0.1.ebuild
+++ b/dev-python/python-docs/python-docs-2.0.1.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@prosalg.no>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.0.1.ebuild,v 1.1 2001/08/07 01:39:54 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.0.1.ebuild,v 1.2 2001/11/10 12:14:29 hallski Exp $
 
-A=html-2.0.1.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="HTML documentation for Python"
 SRC_URI="http://www.python.org/ftp/python/doc/2.0.1/html-2.0.1.tar.bz2"
 HOMEPAGE="http://www.python.org/doc/2.0.1/"
 
 src_unpack() {
-  mkdir ${S}
-  cd ${S} 
-  unpack ${A} 
+	mkdir ${S}
+	cd ${S} 
+	unpack ${A} 
 }
 
 src_install() {
-  docinto html
-  cp -R ${S}/* ${D}/usr/share/doc/${P}/html
-  chown -R root.root ${D}/usr/share/doc/${P}/html
-  find ${D}/usr/share/doc/${P}/html -type d -exec chmod 0755 \{\} \;
-  find ${D}/usr/share/doc/${P}/html -type f -exec chmod 0644 \{\} \;
+	docinto html
+	cp -R ${S}/* ${D}/usr/share/doc/${P}/html
+	chown -R root.root ${D}/usr/share/doc/${P}/html
+	find ${D}/usr/share/doc/${P}/html -type d -exec chmod 0755 \{\} \;
+	find ${D}/usr/share/doc/${P}/html -type f -exec chmod 0644 \{\} \;
 }
-
diff --git a/dev-python/sip/sip-2.4.ebuild b/dev-python/sip/sip-2.4.ebuild
index ae62bac580be..cbd6db6886c1 100644
--- a/dev-python/sip/sip-2.4.ebuild
+++ b/dev-python/sip/sip-2.4.ebuild
@@ -1,27 +1,21 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: tools@cvs.gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-2.4.ebuild,v 1.2 2001/08/11 20:35:57 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-2.4.ebuild,v 1.3 2001/11/10 12:14:29 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
-SRC_URI="http://www.river-bank.demon.co.uk/software/"${A}
+SRC_URI="http://www.river-bank.demon.co.uk/software/${P}.tar.gz"
 HOMEPAGE="http://www.thekompany.com/projects/pykde/"
 
 DEPEND="virtual/python"
 
 src_compile(){
-    try ./configure --prefix=/usr
-    try emake
+	./configure --prefix=/usr || die
+	emake || die
 }
 
 src_install() {
-    try emake DESTDIR=${D} install
-    dodoc AUTHORS
-    dodoc COPYING
-    dodoc NEWS
-    dodoc README
-    dodoc THANKS
-    dodoc TODO
+	emake DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING NEWS README THANKS TODO
 }