Changed eerrors about needing virtual/x11 to ewarns to fix bug #124258.

(Portage version: 2.1_pre5-r4)

6 files changed, 34 insertions, 38 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 8a410148ae8f..c4baf3fd11e9 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.143 2006/03/12 08:44:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.144 2006/03/12 13:31:29 betelgeuse Exp $
+
+  12 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
+  -files/sun-jdk-1.3.1.16, sun-jdk-1.3.1.17.ebuild,
+  sun-jdk-1.4.2.10-r2.ebuild, sun-jdk-1.5.0.06-r2.ebuild:
+  Changed eerrors about needing virtual/x11 to ewarns to fix bug #124258.
 
   12 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
   -sun-jdk-1.3.1.16.ebuild, -sun-jdk-1.4.2.10.ebuild,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index cf951c4d76b3..237a2918802c 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,6 @@
-MD5 ccb781752eacedb86bcf15b968cf5e72 ChangeLog 29144
-RMD160 86e9701339a7d2feb69ce3aefa707d289d90dc0e ChangeLog 29144
-SHA256 cceed42a44c479139415462047303bb3ab52567b105cd801a4cbf8c98ef68ff5 ChangeLog 29144
+MD5 8403b26f499c5da58c9c6357d8df9566 ChangeLog 29382
+RMD160 4488d44db0e0421c731adcc43abe707b0b6a3190 ChangeLog 29382
+SHA256 ce02581af0ee749478f76126398238da5338996b2a86befc7b8ea8a122ff2bae ChangeLog 29382
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
 RMD160 e3f6ac5817a4908a5d22eef2a71dbcdc8c4a6378 files/digest-sun-jdk-1.2.2.017 78
 SHA256 b3f73173a7dfbf7dc57b1b87aa7a79dd353d2273e741879a7e6a3c5624cf4f80 files/digest-sun-jdk-1.2.2.017 78
@@ -16,9 +16,6 @@ SHA256 f2abb96a6c00653b090e123c2810d509078f113711408ab98aee72ea5874513e files/di
 MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
 RMD160 04f2f2980bb5ac087db70b799a543e6c74ac626c files/sun-jdk-1.2.2.017 328
 SHA256 3ac05aa50383cafd10dfa7dce4d2a6a287f5bc6afbe8a1f1b03a4d56f5610686 files/sun-jdk-1.2.2.017 328
-MD5 0b7cc36964f2fa50ad778e865f0cc851 files/sun-jdk-1.3.1.16 471
-RMD160 7a21bc3ac1644d92a8f73a1eda489b6b9d498966 files/sun-jdk-1.3.1.16 471
-SHA256 05fa97292b318e7cbad12756ee6d0501e04f97a92ae019e90f137227d9d96dbd files/sun-jdk-1.3.1.16 471
 MD5 89f904e0a2b09062701aec14bcf95e7b files/sun-jdk-1.3.1.17 477
 RMD160 0609a3190984cfc8c0329d314dab38c001038e22 files/sun-jdk-1.3.1.17 477
 SHA256 b2ac2dde24e7a832706c8e36cff99c457dcc8d9074b71332933ccebe7df89577 files/sun-jdk-1.3.1.17 477
@@ -34,12 +31,12 @@ SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 metadata
 MD5 39452115ebdd308345906ebc969a76d1 sun-jdk-1.2.2.017.ebuild 2879
 RMD160 aa3f2076e0bd3c748b691fd9c69208a53ccb851e sun-jdk-1.2.2.017.ebuild 2879
 SHA256 f8a4ced84c08c8fafb97388c510cccfcca56489a1c1edb31fbb10243c4ec1f2d sun-jdk-1.2.2.017.ebuild 2879
-MD5 a34d788b056fd20f2e55e300ec098f90 sun-jdk-1.3.1.17.ebuild 4737
-RMD160 642569e0b08e8f74c7fb264a5e7a8983785b16b6 sun-jdk-1.3.1.17.ebuild 4737
-SHA256 49d5ddecc8f0f4aa5ed16ed27b37669b21cd7807719dcb366356e1c868e3a7d1 sun-jdk-1.3.1.17.ebuild 4737
-MD5 ef9bae43cb061f10fe8d5cb5e9ac3706 sun-jdk-1.4.2.10-r2.ebuild 6847
-RMD160 79116d8b324705112cb7a30519ba9e32cda94476 sun-jdk-1.4.2.10-r2.ebuild 6847
-SHA256 905df1b6779adfaad518559545bab73a25a5d4dccabb7fbd203a0758bbe48d57 sun-jdk-1.4.2.10-r2.ebuild 6847
-MD5 e6f4c198fdd735b6644e7211970a949f sun-jdk-1.5.0.06-r2.ebuild 7670
-RMD160 6164aee16796f405c9813bff390211d868147d0d sun-jdk-1.5.0.06-r2.ebuild 7670
-SHA256 307906b451a7a8d48fec1b184fb1cf90fb6eacc8ec5c36dfc8422b650d45d9b5 sun-jdk-1.5.0.06-r2.ebuild 7670
+MD5 229e3d13447dbdc2aca57ad2b73b0589 sun-jdk-1.3.1.17.ebuild 4735
+RMD160 4e19ee7f8a364f0d93b40a7d98246921e9358340 sun-jdk-1.3.1.17.ebuild 4735
+SHA256 7d54863f94bea5a001f04d2cd265f53319512f6f56a000706c0440d0f5468ba6 sun-jdk-1.3.1.17.ebuild 4735
+MD5 9c771f8ad33bbe609233a43f8abf9ffc sun-jdk-1.4.2.10-r2.ebuild 6870
+RMD160 d588e376375c10c8bcca06696d6f2aa7335add3b sun-jdk-1.4.2.10-r2.ebuild 6870
+SHA256 93f336b8f8d49dbd343ce766a97876c11b70595f5bc5cda331d1d687b68924ab sun-jdk-1.4.2.10-r2.ebuild 6870
+MD5 7b966cc42b169ea18ddb8222517371d8 sun-jdk-1.5.0.06-r2.ebuild 7716
+RMD160 b5204f94114ec8f58899f1693cd4f2d84185b116 sun-jdk-1.5.0.06-r2.ebuild 7716
+SHA256 3e31ba27f3f2b94ab42917b3ba2c0dce102d082481f726c2468e4f5b53235cee sun-jdk-1.5.0.06-r2.ebuild 7716
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.16 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.16
deleted file mode 100644
index 1a9f7e010924..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.16
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1.16,v 1.1 2005/10/13 09:50:50 axxo Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.17.ebuild
index 7d046923dc8e..a0a0c3362da3 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.17.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.3.1.17.ebuild,v 1.3 2006/02/08 21:43:58 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.17.ebuild,v 1.4 2006/03/12 13:31:29 betelgeuse Exp $
 
 inherit java eutils
 
@@ -156,7 +156,7 @@ pkg_postinst () {
 
 	if ! use X; then
 		echo
-		eerror "Some parts of Sun's JDK require X11 to be installed."
-		eerror "Be careful which Java libraries you attempt to use."
+		ewarn "Some parts of Sun's JDK require X11 to be installed."
+		ewarn "Be careful which Java libraries you attempt to use."
 	fi
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild
index cc8729d7286f..510d92499b5a 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4.2.10-r2.ebuild,v 1.1 2006/01/19 04:50:58 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild,v 1.2 2006/03/12 13:31:29 betelgeuse Exp $
 
 inherit java eutils
 
@@ -200,9 +200,11 @@ pkg_postinst() {
 		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
 	fi
 
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
+	if ! use X; then
+		echo
+		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+		ewarn "Be careful which Java libraries you attempt to use."
+	fi
 
 	if ! use nsplugin && ( use browserplugin || use mozilla ); then
 		echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.06-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.06-r2.ebuild
index 34ecbeeb6a4f..bcb9ebaebf0d 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.06-r2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.06-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5.0.06-r2.ebuild,v 1.1 2006/01/19 04:50:58 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.06-r2.ebuild,v 1.2 2006/03/12 13:31:29 betelgeuse Exp $
 
 inherit java eutils
 
@@ -236,9 +236,13 @@ pkg_postinst() {
 		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
 	fi
 
+	if ! use X; then
+		local xwarn="virtual/x11 and/or"
+	fi
+
 	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
+	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
 
 	echo
 	einfo " Be careful: ${P}'s Java compiler uses"