Add virtual/libstdc++-3.3 dependency needed on x86 for plugin and java web start and don't try to dodoc CHANGES when it doesn't exist. Reported in bug #177842.

(Portage version: 2.1.2.7)

2 files changed, 25 insertions, 23 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 93b92eff8e64..b42695babf59 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.86 2007/05/11 15:13:23 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.87 2007/05/13 16:22:44 betelgeuse Exp $
+
+  13 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  sun-jre-bin-1.6.0-r1.ebuild:
+  Add virtual/libstdc++-3.3 dependency needed on x86 for plugin and java web
+  start and don't try to dodoc CHANGES when it doesn't exist. Reported in bug
+  #177842.
 
   11 May 2007; Steve Dibb <beandog@gentoo.org> sun-jre-bin-1.5.0.11.ebuild:
   amd64 stable, security bug 176675
@@ -342,6 +348,7 @@
   new upstream version, fixes #86826
 
 *sun-jre-bin-1.5.0.01-r1 (25 Mar 2005)
+*sun-jre-bin-1.4.2.07-r1 (25 Mar 2005)
 
   25 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
   -files/sun-jre-bin-1.4.2.05, -files/sun-jre-bin-1.4.2.06,
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild
index b9c7f067f8c8..4ea80e439b3b 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild,v 1.2 2006/12/17 13:58:09 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild,v 1.3 2007/05/13 16:22:44 betelgeuse Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -10,11 +10,7 @@ MY_PVA=6
 
 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} )
@@ -27,17 +23,16 @@ IUSE="X alsa nsplugin"
 
 RDEPEND="
 	sys-libs/glibc
+	x86? ( =virtual/libstdc++-3.3 )
 	alsa? ( media-libs/alsa-lib )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
 
 DEPEND=""
 
@@ -51,13 +46,13 @@ QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
 	opt/${P}/lib/i386/server/libjvm.so"
 
 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
 
 	mkdir bundled-jdk
 	cd bundled-jdk
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+	sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
 
 	cd ..
 	bash ${FILESDIR}/construct-1.6.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
@@ -77,8 +72,8 @@ src_install() {
 	for i in $dirs ; do
 		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
 	done
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html
+	dodoc README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
 	dodir /opt/${P}/share/
 
 	if use nsplugin; then