Removed old revisions.

Package-Manager: portage-2.1_pre5-r4

diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 3716a7ce3a0954931076de47b47384652d405a0d..bf1dfd50b8546d0e989d2de147ae57f42c4aef86 100644 (file)
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,6 +1,6 @@
-MD5 c3457a8a5957af67441f9d2a1be08641 ChangeLog 4086
-RMD160 1b2db3690defda6ed8a3cb61bd1e6d81f090b8b5 ChangeLog 4086
-SHA256 19063528a118d13e26d768331692878f48e0201609d8fa8e667b1fc2d90b27bb ChangeLog 4086
+MD5 66b566286f20e867d363cd3282113c2d ChangeLog 4276
+RMD160 972217ab62c748e186007cfac5e539ea51d8c9c3 ChangeLog 4276
+SHA256 1e4bae0ab14f8e297d2a90fe9a7ca299cb1ec33d7b9b4fd2db2f093fdb56226e ChangeLog 4276
 MD5 2e39286179863d6cfd0686f84e4907f6 files/digest-ibm-jre-bin-1.4.2 211
 RMD160 fa4e9aa4a2fca49896a14b9b58e350248ba982c2 files/digest-ibm-jre-bin-1.4.2 211
 SHA256 42ec24d0c42d41b382808683d88a767625bb197156600a2b8238db04a620bb6c files/digest-ibm-jre-bin-1.4.2 211
@@ -19,12 +19,12 @@ SHA256 461205a91a985669cea68c9f70831efa7d4a374643b9eea6faf2c3280663167b files/ib
 MD5 604e0cb00821eea1e0df819690b26d69 files/ibm-jre-bin-1.4.2.04 688
 RMD160 51761a0bfac1f4fe76757ee02a1ad45d9ad2f521 files/ibm-jre-bin-1.4.2.04 688
 SHA256 b6ecd746847aa399ceddf32b81461ace49cbcd66c2670659f6c85e6e3b85ea89 files/ibm-jre-bin-1.4.2.04 688
-MD5 6f8a5150144c4306390ff4d4b1c59fca ibm-jre-bin-1.4.2.03.ebuild 3145
-RMD160 b36c2b05df4c828238af21aff566575c2b07f154 ibm-jre-bin-1.4.2.03.ebuild 3145
-SHA256 86947dc3c166ae89e27e8e5a2a82aacb5bcd06f9124f590e0ef57d6149d34ac6 ibm-jre-bin-1.4.2.03.ebuild 3145
-MD5 136ae9b741a367c7b37e1ebc99f38737 ibm-jre-bin-1.4.2.04.ebuild 2941
-RMD160 2091b3b24d66d4c88426427afade56e3376e37fe ibm-jre-bin-1.4.2.04.ebuild 2941
-SHA256 6a169982039e7857f9cf2e6eb9f6c660fa665e78102bce3e02ea9985f5ef39c1 ibm-jre-bin-1.4.2.04.ebuild 2941
+MD5 648ac3295c21675e1965ef5d8695adb8 ibm-jre-bin-1.4.2.03.ebuild 3140
+RMD160 2312dded54691c1141a28cee8802ec3d0d8e67c5 ibm-jre-bin-1.4.2.03.ebuild 3140
+SHA256 3f4d2c049580a789e7ccd57ec011b5dec1caac132ecef4adfac0186412a150bc ibm-jre-bin-1.4.2.03.ebuild 3140
+MD5 8c5ddb5d9df25bf3334447b6c7581a50 ibm-jre-bin-1.4.2.04.ebuild 2936
+RMD160 4286561e97f04b8834f01164ebf5a9d5dbcadaee ibm-jre-bin-1.4.2.04.ebuild 2936
+SHA256 148ab17436b03b1ad923441cbcdade3dc17f9c97fb9a5e098cfc792f1a84444c ibm-jre-bin-1.4.2.04.ebuild 2936
 MD5 cb942fcb638c92d375eb91869a8454b9 ibm-jre-bin-1.4.2.ebuild 2177
 RMD160 f0b690a5383d6cf20f6041380f59cbc7db26edc7 ibm-jre-bin-1.4.2.ebuild 2177
 SHA256 30ab1217eb8ea9de8be4fca96b332231b85511431f07c6328d310a1f05523fd6 ibm-jre-bin-1.4.2.ebuild 2177

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild
index 5d116941faceee1159bbb37bf3ffb3ec05053a44..60447471faeeeb9ba670ff6660c73938dc823f5a 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-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-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild,v 1.1 2006/01/20 01:17:43 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild,v 1.2 2006/03/12 13:32:34 betelgeuse Exp $
 
 inherit java eutils
 
@@ -168,7 +168,9 @@ 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
 }

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild
index 3fc30f8a7ba86a213be486bd13f088218c9d3ba2..f6013007a5119d3eafa215deb25373aa147a0d1e 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.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-jre-bin/sun-jre-bin-1.4.2.10.ebuild,v 1.6 2006/01/14 23:16:35 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild,v 1.7 2006/03/12 13:32:34 betelgeuse Exp $
 
 inherit java eutils
 
@@ -165,7 +165,9 @@ 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
 }

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild
index 9829782de8a54f1f3a25b0a13b617d9da511397d..48f38d8b3574a7bb40328245e11abf8cf8fcb7c3 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-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-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild,v 1.1 2006/01/20 01:17:43 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild,v 1.2 2006/03/12 13:32:34 betelgeuse Exp $
 
 inherit java eutils
 
@@ -203,7 +203,11 @@ 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 JRE require virtual/x11 and virtual/lpr to be installed."
-       eerror "Be careful which Java libraries you attempt to use."
+       ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
+       ewarn "Be careful which Java libraries you attempt to use."
 }

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild
index befc06d830353e517fa78a004ee83adf2d85e0bf..507e7a831b73501c105b839256446ac28d0156ec 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.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-jre-bin/sun-jre-bin-1.5.0.06.ebuild,v 1.6 2006/01/14 23:16:35 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild,v 1.7 2006/03/12 13:32:34 betelgeuse Exp $
 
 inherit java eutils
 
@@ -200,7 +200,11 @@ 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 JRE require virtual/x11 and virtual/lpr to be installed."
-       eerror "Be careful which Java libraries you attempt to use."
+       ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
+       ewarn "Be careful which Java libraries you attempt to use."
 }