Applied fix for bug #166397 to 1.6.0-r1.

Package-Manager: portage-2.1.2-r9

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 683cc37ab3a27cd1e97af2dbf39a742df056f41a..79c1764fc7dc69ef6f50a07eb49ce4cfa69a9792 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,9 @@
 # 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.187 2007/02/11 20:01:43 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.188 2007/02/11 20:41:17 nichoj Exp $
+
+  11 Feb 2007; Joshua Nichols <nichoj@gentoo.org> sun-jdk-1.6.0-r1.ebuild:
+  Applied fix for bug #166397 to 1.6.0-r1.
 
   11 Feb 2007; Joshua Nichols <nichoj@gentoo.org> sun-jdk-1.5.0.11.ebuild:
   Addressed bug #166397. Only will sed .desktop file and install it if the

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 2daf2352d8f4e4ee5e8cdfe19a0e15a993d35ec0..0f827c1d154202ea9a4a5c366d11f05479f3bb62 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -34,14 +34,14 @@ EBUILD sun-jdk-1.5.0.11.ebuild 4656 RMD160 7e751492c49e0b54670f2322f8bc677a813d6
 MD5 f9e2b0df499c7a385102539abea3ae74 sun-jdk-1.5.0.11.ebuild 4656
 RMD160 7e751492c49e0b54670f2322f8bc677a813d6ae0 sun-jdk-1.5.0.11.ebuild 4656
 SHA256 6436f4e777f531e9d32b4f0bc9620bd5e4afe5c724fc930e011f3577ea058bc3 sun-jdk-1.5.0.11.ebuild 4656
-EBUILD sun-jdk-1.6.0-r1.ebuild 4793 RMD160 2f27c223cfb548f7229a3c11a98585ebc47ce0ec SHA1 996ecea18fb8a04e3725d750b7871c0395a38a62 SHA256 9077b88f8e27a3d4172f04d57af23e624ab65e945e73a8ae43eb39d4fa8a30aa
-MD5 bee16ebb6712252065a8da192a8ca5c1 sun-jdk-1.6.0-r1.ebuild 4793
-RMD160 2f27c223cfb548f7229a3c11a98585ebc47ce0ec sun-jdk-1.6.0-r1.ebuild 4793
-SHA256 9077b88f8e27a3d4172f04d57af23e624ab65e945e73a8ae43eb39d4fa8a30aa sun-jdk-1.6.0-r1.ebuild 4793
-MISC ChangeLog 36841 RMD160 03a9488626643789a7a542796dbaa6a9ac08147e SHA1 eca652cc663bdaa9307d2a70d0cf28a0abfdb247 SHA256 a5a4f351e7805c15dd0d5f38019a30599d410625dc97fdb7eaa1989a5801047f
-MD5 ae6b9ea7d764ca88a4fadfe5405a34ea ChangeLog 36841
-RMD160 03a9488626643789a7a542796dbaa6a9ac08147e ChangeLog 36841
-SHA256 a5a4f351e7805c15dd0d5f38019a30599d410625dc97fdb7eaa1989a5801047f ChangeLog 36841
+EBUILD sun-jdk-1.6.0-r1.ebuild 4871 RMD160 276f9d3f0ec30d01e54114221554f7f0117fbf22 SHA1 e0e2779b97e643fd705a67c6ba9d00afa570bd57 SHA256 001b4b37ae301f42a396d6b304aaf4fe93bf08893da325def1d0c6ae61aaf305
+MD5 81ad16c2173d5c0503577508f71c7cfd sun-jdk-1.6.0-r1.ebuild 4871
+RMD160 276f9d3f0ec30d01e54114221554f7f0117fbf22 sun-jdk-1.6.0-r1.ebuild 4871
+SHA256 001b4b37ae301f42a396d6b304aaf4fe93bf08893da325def1d0c6ae61aaf305 sun-jdk-1.6.0-r1.ebuild 4871
+MISC ChangeLog 36960 RMD160 29c77f6ebaa7109e0c0c9fec3e92dc854643466f SHA1 8e369da62930943c947cae34abb105c726d72d23 SHA256 713808e5f6e2de0870e5b6abafcafb71862327866d373725f1a795a67e49711e
+MD5 e910a97065a0478ff75e38249d50dc9f ChangeLog 36960
+RMD160 29c77f6ebaa7109e0c0c9fec3e92dc854643466f ChangeLog 36960
+SHA256 713808e5f6e2de0870e5b6abafcafb71862327866d373725f1a795a67e49711e ChangeLog 36960
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237

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 3f65c7d8f2db33c67fc5291338003bf111a3033a..bc63f1dbd0e20f93f7ef8b6e1e421bd7bcade9ae 100644 (file)
--- 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.6 2007/02/11 11:52:31 betelgeuse Exp $
+# $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 $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -115,16 +115,18 @@ src_install() {
        touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
        chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
 
-       # install control panel for Gnome/KDE
-       # The jre also installs these so make sure that they do not have the same
-       # Name
-       sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-               -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-               -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-               ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-               ${T}/sun_jdk-${SLOT}.desktop
-
-       domenu ${T}/sun_jdk-${SLOT}.desktop
+       if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+               # install control panel for Gnome/KDE
+               # The jre also installs these so make sure that they do not have the same
+               # Name
+               sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
+                       -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
+                       -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+                       ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+                       ${T}/sun_jdk-${SLOT}.desktop
+
+               domenu ${T}/sun_jdk-${SLOT}.desktop
+       fi
 
        # bug #56444
        insinto /opt/${P}/jre/lib/