style fix

(Portage version: 2.0.51.22-r1)

6 files changed, 11 insertions, 102 deletions

diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild
deleted file mode 100644
index 54f4fc14e1cc..000000000000
--- a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild,v 1.6 2005/05/18 15:42:10 axxo Exp $
-
-inherit java
-
-S=${WORKDIR}/jdk1.3.1
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jdk-1.3.1-1-linux-alpha.rpm"
-HOMEPAGE="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/"
-DESCRIPTION="Compaq Java Development Kit 1.3.1 for Alpha/Linux/GNU"
-DEPEND="virtual/libc
-	app-arch/rpm2targz
-	dev-libs/libots
-	dev-libs/libcpml
-	>=dev-java/java-config-0.2.5
-	>=x11-libs/openmotif-2.1.30-r1
-	doc? ( ~dev-java/java-sdk-docs-1.3.1 )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre
-	virtual/jdk"
-LICENSE="compaq-sdla"
-SLOT="1.3"
-KEYWORDS="-* alpha"
-IUSE="doc"
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/jdk-1.3.1-1-linux-alpha.rpm
-	tar xzf jdk-1.3.1-1-linux-alpha.tar.gz >& /dev/null
-	mv usr/java/jdk1.3.1 .
-}
-
-src_install () {
-	dodir /opt/${P}
-	cp -a bin include include-old jre lib ${D}/opt/${P}
-
-	dodoc COPYRIGHT README LICENSE
-	dohtml README.html
-	doman man/man1/*.1
-
-	dodir /opt/${P}/share
-	cp -a demo src.jar ${D}/opt/${P}/share
-
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild
deleted file mode 100644
index 319f775c3720..000000000000
--- a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild,v 1.6 2005/05/18 15:42:10 axxo Exp $
-
-inherit java fixheadtails
-
-S=${WORKDIR}/jdk${PV}
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jdk-${PV}-1-linux-alpha.rpm"
-HOMEPAGE="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/"
-DESCRIPTION="Compaq Java Development Kit ${PV} for Alpha/Linux/GNU"
-DEPEND="virtual/libc
-	app-arch/rpm2targz
-	dev-libs/libots
-	dev-libs/libcpml
-	>=dev-java/java-config-0.2.5
-	>=x11-libs/openmotif-2.1.30-r1
-	doc? ( ~dev-java/java-sdk-docs-${PV} )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre
-	virtual/jdk"
-LICENSE="compaq-sdla"
-SLOT="1.3"
-KEYWORDS="-* alpha"
-IUSE="doc"
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/jdk-${PV}-1-linux-alpha.rpm
-	tar xzf jdk-${PV}-1-linux-alpha.tar.gz >& /dev/null
-	mv usr/java/jdk${PV} .
-	ht_fix_file jdk${PV}/bin/.java_wrapper jdk${PV}/jre/bin/.java_wrapper
-}
-
-src_install () {
-	dodir /opt/${P}
-	cp -a bin include include-old jre lib ${D}/opt/${P}
-
-	dodoc COPYRIGHT README LICENSE
-	dohtml README.html
-	doman man/man1/*.1
-
-	dodir /opt/${P}/share
-	cp -a demo src.jar ${D}/opt/${P}/share
-
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
index 448ddd894f9c..f96916249325 100644
--- a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
+++ b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild,v 1.6 2005/05/18 15:42:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild,v 1.7 2005/07/19 15:10:00 axxo Exp $
 
 inherit java fixheadtails
 
@@ -24,22 +24,22 @@ KEYWORDS="-* alpha"
 IUSE="doc"
 
 src_unpack() {
-	rpm2targz ${DISTDIR}/jdk-${PV}-1-linux-alpha.rpm
-	tar xzf jdk-${PV}-1-linux-alpha.tar.gz >& /dev/null
+	rpm2targz ${DISTDIR}/jdk-${PV}-1-linux-alpha.rpm || die
+	tar xzf jdk-${PV}-1-linux-alpha.tar.gz >& /dev/null || die
 	mv usr/java/jdk${PV} .
 	ht_fix_file jdk${PV}/bin/.java_wrapper jdk${PV}/jre/bin/.java_wrapper
 }
 
-src_install () {
+src_install() {
 	dodir /opt/${P}
-	cp -a bin include include-old jre lib ${D}/opt/${P}
+	cp -a bin include include-old jre lib ${D}/opt/${P} || die
 
 	dodoc COPYRIGHT README LICENSE
 	dohtml README.html
 	doman man/man1/*.1
 
 	dodir /opt/${P}/share
-	cp -a demo src.jar ${D}/opt/${P}/share
+	cp -a demo src.jar ${D}/opt/${P}/share || die
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
diff --git a/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r1 b/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r1
deleted file mode 100644
index b53708a161b3..000000000000
--- a/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ffba433b84e5c818445cc83ada05b99 jdk-1.3.1-1-linux-alpha.rpm 23450390
diff --git a/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r2 b/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r2
deleted file mode 100644
index b53708a161b3..000000000000
--- a/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ffba433b84e5c818445cc83ada05b99 jdk-1.3.1-1-linux-alpha.rpm 23450390
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
index 99947e782fe1..654b80457196 100644
--- a/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
+++ b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild,v 1.7 2005/05/18 15:42:46 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild,v 1.8 2005/07/19 15:11:38 axxo Exp $
 
 IUSE="doc"
 
@@ -24,15 +24,15 @@ SLOT="1.3"
 KEYWORDS="-* alpha"
 
 src_unpack() {
-	rpm2targz ${DISTDIR}/jre-${PV}-1-linux-alpha.rpm
-	tar zxf jre-${PV}-1-linux-alpha.tar.gz >& /dev/null
+	rpm2targz ${DISTDIR}/jre-${PV}-1-linux-alpha.rpm || die
+	tar zxf jre-${PV}-1-linux-alpha.tar.gz >& /dev/null || die
 	mv usr/java/jre${PV} .
 	ht_fix_file jre${PV}/bin/.java_wrapper
 }
 
-src_install () {
+src_install() {
 	dodir /opt/${P}
-	cp -a bin lib ${D}/opt/${P}
+	cp -a bin lib ${D}/opt/${P} || die
 
 	dodoc COPYRIGHT CHANGES LICENSE
 	dohtml readme.html Welcome.html