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

Package-Manager: portage-2.1_pre5-r4

diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index a29e95a58020460786292b9f9e5ef1a7361f2050..4d1746d14d3a1b002f12b34d722665b30a69f3e3 100644 (file)
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 22b0eab318fc9f2ff33b633e3ccd307a ChangeLog 6805
-RMD160 5aa5901341717dcd3bee83bfc24ae27187908dc1 ChangeLog 6805
-SHA256 82fe56ef08fc3c993fe4240a3e9b256fb2ae29b09ff355d4264d4156369c78bd ChangeLog 6805
+MD5 9082bb5e330bd7188eba0cb8c550f59d ChangeLog 7051
+RMD160 fcc6255f500b2c934cc8f3702d24c25d2924dd8e ChangeLog 7051
+SHA256 949e25fb366687070123ed3be2d5c21ca1ea1450d916b9c3f7d247eb5812ce5b ChangeLog 7051
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d files/cpuinfo 12
 SHA256 b90ea3549103fa261cd711ecb3d11158c984bc20a020630aa3ebc3f8b402ec11 files/cpuinfo 12
@@ -28,22 +25,15 @@ SHA256 8804f419bbb9e1ccf8ff4f7684116d9e5bc6c3da94957201a1c32b7877b9da2e files/ib
 MD5 82fe1e3d7bdd38cf0c0a1e3ceed4b29f files/ibm-jdk-bin-1.5.0 474
 RMD160 5ee7d05ce258e4a4e3cdffaebe5c6dcd28ac5439 files/ibm-jdk-bin-1.5.0 474
 SHA256 87403cfbbe8ee41c0ff3622a0f20e34fec024f12dcafad158bcbce1a36168634 files/ibm-jdk-bin-1.5.0 474
-MD5 ed0a35656aeaadd78b998559dffd503f ibm-jdk-bin-1.4.2.03.ebuild 4371
-RMD160 fb74a5f6c1d1dc145dba9278500de58e1a237fc5 ibm-jdk-bin-1.4.2.03.ebuild 4371
-SHA256 8fc2b7cfbf4c473075af44ba94a698e5051eb642e24b15fdc5a0b9d8bcaab0a1 ibm-jdk-bin-1.4.2.03.ebuild 4371
-MD5 076762dc6b28e4684d0fdf843a42b2f4 ibm-jdk-bin-1.4.2.04.ebuild 4171
-RMD160 f73f03573f17bed35128df40b10528af5f06422d ibm-jdk-bin-1.4.2.04.ebuild 4171
-SHA256 3eb526267069e032c5028a892ee8d255f0059534db12be8fb1df7b1db02f4d76 ibm-jdk-bin-1.4.2.04.ebuild 4171
-MD5 f6dcd37d71ec836a8e56f111ce0e2321 ibm-jdk-bin-1.5.0.ebuild 3074
-RMD160 b31ffe89c99719a19d197b0e143db04e3e186eed ibm-jdk-bin-1.5.0.ebuild 3074
-SHA256 820bbba1581b40dd59613fcc8467381325713b64a955d6e06f9a5c080e33accf ibm-jdk-bin-1.5.0.ebuild 3074
+MD5 35fdedbd13de2d8beacdcaa0e76e05c9 ibm-jdk-bin-1.4.2.03.ebuild 4368
+RMD160 6db792dcc12999a236a319c16e44929efe180953 ibm-jdk-bin-1.4.2.03.ebuild 4368
+SHA256 9e9ee8d2ce6a43360dbce48729455624248e6d3907d9acfa8ca5f0f9580a269b ibm-jdk-bin-1.4.2.03.ebuild 4368
+MD5 d8464422f3fa0d47bcaa0af79aaf9442 ibm-jdk-bin-1.4.2.04.ebuild 4166
+RMD160 f48afdd7e976738f8cfbcf562060a623de63f094 ibm-jdk-bin-1.4.2.04.ebuild 4166
+SHA256 af9491e311b984a14a6bf809f4a99d49afc1c9923856a6c62589290447d10b45 ibm-jdk-bin-1.4.2.04.ebuild 4166
+MD5 84be2e1702d40b2b997f30ae5f0d5235 ibm-jdk-bin-1.5.0.ebuild 3072
+RMD160 cf6c79013735369a21f6310fc66e56685b5a3eb3 ibm-jdk-bin-1.5.0.ebuild 3072
+SHA256 7e066fb82c61ff0bfce91a5f2e0b21485efd7526c36ef295183330995d0c69ea ibm-jdk-bin-1.5.0.ebuild 3072
 MD5 2f88465cd5ad6adb1c76759ff3078666 metadata.xml 348
 RMD160 2c018b6bb7a6e6751096600b2a06e485c0a692f8 metadata.xml 348
 SHA256 1e5bc3ab0655be8a83c3ec76e8574ff2575e9c8e46060f3bc0ad4cf7576bc1a7 metadata.xml 348
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6nQeV3J2n04EauwRAkBOAJ9p85oiyT2cLZneqlL/r2f9MRcy5gCgirzW
-l04cidavRYbPp2MQrYMD28c=
-=7avC
------END PGP SIGNATURE-----

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 8a410148ae8f310f5c5479b0be746f4ee3aedafc..c4baf3fd11e9763d109327ad8a66af56db37a6e3 100644 (file)
--- 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 cf951c4d76b33cf6d130a931736bd7d5ffb4e326..7b5e41a31e0890347fb5adf0d3b537ea6bd2217b 100644 (file)
--- 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 293de2ae926dcce29a0658f966667456 ChangeLog 29382
+RMD160 5003282a6410b2bedb1fa3020e3ba769978657ef ChangeLog 29382
+SHA256 e804d9dd56e45c0cc9ff14c4a8384a5b51386e1003b8515ceaeb5527dbe6e21d 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 190f7761b4c840c3ffd01edefbea6102 sun-jdk-1.3.1.17.ebuild 4737
+RMD160 801704ec599b1420c76ab839947f827e4556b400 sun-jdk-1.3.1.17.ebuild 4737
+SHA256 3511324d763e30403c0d670aac56c910a5a70c420f082b7bdcb9943b32ebe6bd sun-jdk-1.3.1.17.ebuild 4737
+MD5 da0343c5ce3331def57558df5fcdea50 sun-jdk-1.4.2.10-r2.ebuild 6874
+RMD160 e466a6d2df18ba24cf5d2de7c4db87f0b72e55e2 sun-jdk-1.4.2.10-r2.ebuild 6874
+SHA256 1fa4049032afb6d4d0b4f079839ceadcf7b616e1238fe8076142983de37e8d35 sun-jdk-1.4.2.10-r2.ebuild 6874
+MD5 64a3e4c9d9269ad8ca9858d943e8c9cd sun-jdk-1.5.0.06-r2.ebuild 7720
+RMD160 49abb9326fec384cbedeeb84ff3232c7977a47c9 sun-jdk-1.5.0.06-r2.ebuild 7720
+SHA256 c41e6b5447fa73bc28bb19dc2fdb42c550751f8fe039abe43499555501fb556c sun-jdk-1.5.0.06-r2.ebuild 7720

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 (file)
index 1a9f7e0..0000000
--- 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 7d046923dc8e2a04fc1fc1d1070cb82ba9bdf6ea..a0a0c3362da389ffb878dd18ef96aa6922bc36e2 100644 (file)
--- 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 cc8729d7286f0176c8ee3482ea1ef417bbcf6bf2..510d92499b5aa02219a2bad96f600d6b6952d6ab 100644 (file)
--- 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 34ecbeeb6a4fff1c86e0ddce5cbfdcd22c9cd431..bcb9ebaebf0d75de466815c98b1c2dacdfb4c81c 100644 (file)
--- 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"

diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 52d4f773849517b1e9547f39e01a92998a412e40..dd33c7cfa4a07d098c73e788af9aa8902892e2d6 100644 (file)
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -22,15 +22,15 @@ SHA256 e1dd895137bf35d584c492ed2ff1217ade59819b698fe06dc44c37d1e5a2ae2e files/su
 MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
 RMD160 b334d6a9cb5f410f7b422482586264e8ca3d7d0f metadata.xml 242
 SHA256 8a5ff51f49458f906fc5b494530b268982044b68bbbd85ff646757b88c9e350d metadata.xml 242
-MD5 e3597e11f5c44c139a1713bbb950c2a1 sun-jre-bin-1.4.2.10-r2.ebuild 5323
-RMD160 46cb18a27d25d9453dd61b66e64834268c8f23f2 sun-jre-bin-1.4.2.10-r2.ebuild 5323
-SHA256 0521f8c800a31e2f68c5ce7eab735bef3e4bd574178f95e5a661f6ea6768de15 sun-jre-bin-1.4.2.10-r2.ebuild 5323
-MD5 197d0be23fcb408ecbf22a51f797f1ef sun-jre-bin-1.4.2.10.ebuild 5235
-RMD160 0e9c4a1e46754f5192a556a1a329a9ffa121dc7e sun-jre-bin-1.4.2.10.ebuild 5235
-SHA256 293d19c3161262f73c7be12551faa527dcde2a88bf44d091f9d698270f31eeed sun-jre-bin-1.4.2.10.ebuild 5235
-MD5 4285f86d44f6bf2c8b381130d60c6168 sun-jre-bin-1.5.0.06-r2.ebuild 5792
-RMD160 fb9a8e1cfa8da1a5a540456cf058d46b5955b63a sun-jre-bin-1.5.0.06-r2.ebuild 5792
-SHA256 6a2f62df83114d988b3d6de73bfb9f61c6cc028aa5269f757ec8405b87e13c96 sun-jre-bin-1.5.0.06-r2.ebuild 5792
-MD5 48ed4c9fe144dd750ab534366635b761 sun-jre-bin-1.5.0.06.ebuild 5703
-RMD160 218fd40a270661af81525fce51abfa6622c68ccd sun-jre-bin-1.5.0.06.ebuild 5703
-SHA256 3dc26a8f16f3bc4ef5b2f2487471b3007684d92fa582d769b1c7e838b0fa2a57 sun-jre-bin-1.5.0.06.ebuild 5703
+MD5 cff0ac1a90bedff782c9e3cb68467e5a sun-jre-bin-1.4.2.10-r2.ebuild 5350
+RMD160 10a80f43a6d30338bd84480d3706cd6ea4b267c0 sun-jre-bin-1.4.2.10-r2.ebuild 5350
+SHA256 0075e1e5b25936014d3b1dc91cdc9ea9340aa0cf319b0d2211b5dfb1c56b3d41 sun-jre-bin-1.4.2.10-r2.ebuild 5350
+MD5 a201f4f4ec4ef1a5f5df759698b267b2 sun-jre-bin-1.4.2.10.ebuild 5262
+RMD160 4124c627f0ff2d89c5a3418c2cf71f69a16f2688 sun-jre-bin-1.4.2.10.ebuild 5262
+SHA256 bed92683b6a50f8e61a4faaecb1aa4792f65215fb7b937f06206a64183b20d1f sun-jre-bin-1.4.2.10.ebuild 5262
+MD5 e0c11c560e1b79fd70be93e78aaa41e5 sun-jre-bin-1.5.0.06-r2.ebuild 5845
+RMD160 b038670576344d628f2bf741ce5e0c4f4433b592 sun-jre-bin-1.5.0.06-r2.ebuild 5845
+SHA256 fe8e2c2d7ec62579771d292d3fbc7e7ffaf54ae9e0a22b2c096af48a67f148b7 sun-jre-bin-1.5.0.06-r2.ebuild 5845
+MD5 b1407290f90b03e888fce2d91ee3499a sun-jre-bin-1.5.0.06.ebuild 5756
+RMD160 b1febc37e6321640ed3d2cd23365e0e48bde16df sun-jre-bin-1.5.0.06.ebuild 5756
+SHA256 116400d25287414f70697f6effcbbc48f06df9d8389472993c6f7719fced2fed sun-jre-bin-1.5.0.06.ebuild 5756