Cleanup distfile handling.

(Portage version: 2.1.2.3)

2 files changed, 24 insertions, 21 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 7cdc758f80b9..0f5f7c96d5b4 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.190 2007/04/06 09:30:08 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.191 2007/04/07 19:23:55 betelgeuse Exp $
+
+  07 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  sun-jdk-1.6.0-r1.ebuild:
+  Cleanup distfile handling.
 
   06 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   sun-jdk-1.5.0.11.ebuild:
@@ -197,6 +201,8 @@
   sun-jdk-1.3.1.17-r10.ebuild:
   Removed useless dependencies on virtual/libc.
 
+*sun-jdk-1.3.1.17-r10 (02 Jul 2006)
+
   02 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +sun-jdk-1.3.1.17-r10.ebuild:
   Updated sun-jdk-1.3 to generation-2
@@ -408,6 +414,7 @@
   <dgp85@users.sourceforge.net> in 81874
 
 *sun-jdk-1.5.0.02-r1 (25 Mar 2005)
+*sun-jdk-1.4.2.07-r1 (25 Mar 2005)
 
   25 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/sun-jdk-1.4.2.05,
   -files/sun-jdk-1.4.2.06, -files/sun-jdk-1.5.0, -files/sun-jdk-1.5.0.01,
@@ -536,7 +543,7 @@
   16 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/sun-jdk-1.2.2.017,
   +sun-jdk-1.2.2.017.ebuild:
   Adding ebuild for 1.2 closes 20117
-  Thanks too larry schuler <larryas2@fastmail.us> 
+  Thanks too larry schuler <larryas2@fastmail.us>
   and  Douglas Pollock <douglas.pollock@magma.ca>
 
   15 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/sun-jdk-1.3.1.12,
@@ -563,12 +570,12 @@
 
 *sun-jdk-1.5.0_beta2-r1 (21 Jun 2004)
 
-  21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
   Added 'jce' flag, fixes #52375, thanks to Thomas Matthijs <axxo@keanu.be>.
 
 *sun-jdk-1.4.2.04-r2 (21 Jun 2004)
 
-  21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
   sun-jdk-1.4.2.04-r2.ebuild: Renamed 'ssl' useflag to 'jce', fixes
   #54676, thanks to Thomas Matthijs <axxo@keanu.be>.
 
@@ -715,7 +722,7 @@
   Version Bump. Thanks to Carsten Frewert <gentoo@frewert.de>. Fixes bug #23701.
 
 *sun-jdk-1.4.1.03 (16 Jun 2003)
- 
+
   11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Added missing changelog entry.
 
@@ -734,11 +741,11 @@
   sun-jdk-1.4.1.02-r1.ebuild, sun-jdk-1.4.1.02.ebuild, files/sun-jdk-1.3.1.07,
   files/sun-jdk-1.3.1.08:
   Version bump -- 1.3.1.08 maintenance release: significant bug fixes.
-  
+
   Release notes:
   http://java.sun.com/j2se/1.3/ReleaseNotes.html
-  
-  Additionally, license corrections were made for compliance to close out 
+
+  Additionally, license corrections were made for compliance to close out
   bug #19944.
 
   15 Dec 2002; Adrian Almenar <strider@gentoo.org>: Correct formating for all
@@ -796,7 +803,7 @@
 *sun-jdk-1.3.1.06 (03 Nov 2002)
 
   15 Dec 2002; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.06-r1.ebuild:
-  Fixes #11116.    
+  Fixes #11116.
 
   03 Dec 2002; Adrian Almenar <strider@gentoo.org> files/sun-jdk-1.3.1.06
   Fixes Bug #11555
@@ -873,7 +880,7 @@
 
   New version. Cleaned up ChangeLog a bit.
 
-*sun-jdk-1.4.1_beta (19 August 2002)
+*sun-jdk-1.4.1_beta (19 Aug 2002)
 
   26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_beta.ebuild:
   SLOT is now 1.4. If no VM is installed, it becomes default system VM. Added
@@ -928,7 +935,7 @@
 
   Also updated the symlink that all browsers use to use the Java
   Plugin from here because it was broke.
-  
+
   Also updated the ebuild to conform to lintool.
 
 *sun-jdk-1.3.1-r3 (15 Jun 2002)
@@ -954,7 +961,7 @@
 *sun-jdk-1.4.0-r2 (18 Apr 2002)
 
   18 Apr 2002; Ryan Phillips <rphillips@gentoo.org> files/sun-jdk-1.4.0:
-  Fixed CLASSPATH; pointing to wrong directory. (#1927) 
+  Fixed CLASSPATH; pointing to wrong directory. (#1927)
 
   09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r2.ebuild
   files/digest-sun-jdk-1.4.0-r2: Fixed missing ROOTPATH.
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
index bc63f1dbd0e2..a3b9638642f6 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.7 2007/02/11 20:41:17 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.8 2007/04/07 19:23:55 betelgeuse Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -10,11 +10,7 @@ S="${WORKDIR}/jdk${PV}"
 
 X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
 AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-if use x86; then
-	At=${X86_AT}
-elif use amd64; then
-	At=${AMD64_AT}
-fi
+
 DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
 HOMEPAGE="http://java.sun.com/javase/6/"
 SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
@@ -53,11 +49,11 @@ JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
 
 src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
+	if [ ! -r ${DISTDIR}/${A} ]; then
+		die "cannot read ${A}. Please check the permission and try again."
 	fi
 
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+	sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
 }
 
 src_install() {