cleanup

5 files changed, 43 insertions, 58 deletions

diff --git a/app-admin/hpasm/hpasm-6.30.0.12-r1.ebuild b/app-admin/hpasm/hpasm-6.30.0.12-r1.ebuild
index c639611c9ce8..64151b7b7a7d 100644
--- a/app-admin/hpasm/hpasm-6.30.0.12-r1.ebuild
+++ b/app-admin/hpasm/hpasm-6.30.0.12-r1.ebuild
@@ -1,40 +1,36 @@
-DESCRIPTION="hp Server Management Drivers and Agents."
-HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
-LICENSE="hp-value"
-RDEPEND="snmp? ( net-analyzer/net-snmp )"
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	mailx
-	rpm2targz"
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hpasm/hpasm-6.30.0.12-r1.ebuild,v 1.3 2003/08/06 06:34:33 vapier Exp $
 
+DESCRIPTION="hp Server Management Drivers and Agents"
+HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
 SRC_URI="ftp://ftp.compaq.com/pub/products/servers/supportsoftware/linux/RedHat/hpasm-6.30.0-12.Redhat8_0.i386.rpm"
 
-IUSE=""
+LICENSE="hp-value"
 SLOT="0"
 KEYWORDS="~x86"
-S="${WORKDIR}"
 
+RDEPEND="snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	net-mail/mailx
+	app-arch/rpm2targz"
+
+S=${WORKDIR}
 
 src_unpack() {
-	cd ${S}
-	rpm2targz ${DISTDIR}/hpasm-6.30.0-12.Redhat8_0.i386.rpm
-	tar zxf ${S}/hpasm-6.30.0-12.Redhat8_0.i386.tar.gz 
-	rm ${S}/opt/compaq/hpasm/addon/libcpqci.so
-	rm ${S}/opt/compaq/hpasm/addon/libcpqci.so.1
+	rpm2targz ${DISTDIR}/hpasm-6.30.0-12.Redhat8_0.i386.rpm || die
+	tar zxf ${S}/hpasm-6.30.0-12.Redhat8_0.i386.tar.gz || die
+	rm ${S}/opt/compaq/hpasm/addon/libcpqci.so || die
+	rm ${S}/opt/compaq/hpasm/addon/libcpqci.so.1 || die
 }
 
 src_install() {
-
-	
-
 	HPASM_HOME="/opt/compaq"
 	
 	dodir ${HPASM_HOME}
 
-    cp -Rdp \
-        opt/compaq/* \
-		${D}${HPASM_HOME}
+	cp -Rdp opt/compaq/* ${D}${HPASM_HOME}
 
 	into /
 	dosbin sbin/bootcfg 
@@ -61,19 +57,16 @@ src_install() {
 
 	dodir /usr/lib
 
-	if [ ! -f /usr/lib/libcrypto.so.2 ]
-    		then
+	if [ ! -f /usr/lib/libcrypto.so.2 ] ; then
 		dosym /usr/lib/libcrypto.so.0.9.6 /usr/lib/libcrypto.so.2
 	fi
 
-	if [ ! -f /usr/lib/libssl.so.2 ]
-    		then
+	if [ ! -f /usr/lib/libssl.so.2 ] ; then
 		dosym /usr/lib/libssl.so.0.9.6 /usr/lib/libssl.so.2
 	fi
 
 	dodir /var/spool/compaq
 
-
 	exeinto /etc/init.d
 	doexe etc/init.d/hpasm
 
@@ -93,6 +86,3 @@ pkg_postinst() {
 	einfo "modules will automatically build for you."
 	einfo ""
 }
-
-
-
diff --git a/app-admin/usermin/usermin-1.000.ebuild b/app-admin/usermin/usermin-1.000.ebuild
index c85d7bed1d8f..b5ce054241e6 100644
--- a/app-admin/usermin/usermin-1.000.ebuild
+++ b/app-admin/usermin/usermin-1.000.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/app-admin/usermin/usermin-1.000.ebuild,v 1.3 2003/03/11 21:11:44 seemant Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.000.ebuild,v 1.4 2003/08/06 06:39:27 vapier Exp $
 
-IUSE="ssl"
-
-DESCRIPTION="Usermin, a web-based user administration interface"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
+DESCRIPTION="a web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
+SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="x86 sparc alpha ppc"
+IUSE="ssl"
 
 DEPEND="dev-lang/perl
 	sys-apps/lsof
diff --git a/app-admin/usermin/usermin-1.020.ebuild b/app-admin/usermin/usermin-1.020.ebuild
index 574d4cd6b5fc..8480d0613fc2 100644
--- a/app-admin/usermin/usermin-1.020.ebuild
+++ b/app-admin/usermin/usermin-1.020.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/app-admin/usermin/usermin-1.020.ebuild,v 1.4 2003/06/29 15:24:08 aliz Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.020.ebuild,v 1.5 2003/08/06 06:39:27 vapier Exp $
 
-IUSE="ssl"
-
-DESCRIPTION="Usermin, a web-based user administration interface"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
+DESCRIPTION="a web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
+SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="x86 ~sparc ~alpha ~ppc"
+IUSE="ssl"
 
 DEPEND="dev-lang/perl
 	sys-apps/lsof
diff --git a/app-admin/usermin/usermin-1.030.ebuild b/app-admin/usermin/usermin-1.030.ebuild
index 549f6b46921f..4bdb2284dc55 100644
--- a/app-admin/usermin/usermin-1.030.ebuild
+++ b/app-admin/usermin/usermin-1.030.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/app-admin/usermin/usermin-1.030.ebuild,v 1.1 2003/07/11 22:41:58 mholzer Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.030.ebuild,v 1.2 2003/08/06 06:39:27 vapier Exp $
 
-IUSE="ssl"
-
-DESCRIPTION="Usermin, a web-based user administration interface"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
+DESCRIPTION="a web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
+SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+IUSE="ssl"
 
 DEPEND="dev-lang/perl
 	sys-apps/lsof
diff --git a/app-admin/zope-config/zope-config-0.1-r1.ebuild b/app-admin/zope-config/zope-config-0.1-r1.ebuild
index 0c0387617537..738469ed193b 100644
--- a/app-admin/zope-config/zope-config-0.1-r1.ebuild
+++ b/app-admin/zope-config/zope-config-0.1-r1.ebuild
@@ -1,21 +1,19 @@
-
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/zope-config-0.1-r1.ebuild,v 1.4 2003/04/24 17:08:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/zope-config-0.1-r1.ebuild,v 1.5 2003/08/06 06:41:04 vapier Exp $
 
-DESCRIPTION="A Gentoo Zope multi-Instance configure tool."
+DESCRIPTION="A Gentoo Zope multi-Instance configure tool"
 SRC_URI=""
 HOMEPAGE=""
-IUSE=""
  
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
  
 DEPEND=""
 RDEPEND=">=dev-util/dialog-0.7
-    sys-apps/grep
-    sys-apps/sed
+	sys-apps/grep
+	sys-apps/sed
 	>=net-zope/zope-2.6.0-r2"
  
 src_install() {