Addressed bug #166397. Only will sed .desktop file and install it if the .desktop...

Package-Manager: portage-2.1.2-r9

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 7ff0fa606550f008bf5437e737fe2c7bb9b20121..683cc37ab3a27cd1e97af2dbf39a742df056f41a 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.186 2007/02/11 11:52:31 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.187 2007/02/11 20:01:43 nichoj Exp $
+
+  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
+  .desktop file exists.
 
   11 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   sun-jdk-1.4.2.13.ebuild, sun-jdk-1.5.0.10.ebuild, sun-jdk-1.5.0.11.ebuild,

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 3280f38a569653c6c54159b1c6aafd6fdbd9d9ad..2daf2352d8f4e4ee5e8cdfe19a0e15a993d35ec0 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 MD5 494118498b85e238421b123a4ba16347 files/fontconfig.Gentoo.properties 10932
 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 files/fontconfig.Gentoo.properties 10932
@@ -33,18 +30,18 @@ EBUILD sun-jdk-1.5.0.10.ebuild 4603 RMD160 53d5ec9888ab703a3e747dc5572eaccf5dfa9
 MD5 aea4f559a38fe9c5d5b5f470386d779a sun-jdk-1.5.0.10.ebuild 4603
 RMD160 53d5ec9888ab703a3e747dc5572eaccf5dfa9373 sun-jdk-1.5.0.10.ebuild 4603
 SHA256 54f252579d64c2ae35b0601a4806c598932a93465949f07974cb819a2f5d49a8 sun-jdk-1.5.0.10.ebuild 4603
-EBUILD sun-jdk-1.5.0.11.ebuild 4581 RMD160 ff9164c2b18e21c14d932cc906a7aeb7c905b5f8 SHA1 abe8838b94fcd065182a4b89d8f2db5270f20ffe SHA256 7304d461166058b39ac1ee4e6569fcb432e3fe450b64a83a73e3782da7ff0659
-MD5 e8bf2993056950cc6c8256b192e1cb28 sun-jdk-1.5.0.11.ebuild 4581
-RMD160 ff9164c2b18e21c14d932cc906a7aeb7c905b5f8 sun-jdk-1.5.0.11.ebuild 4581
-SHA256 7304d461166058b39ac1ee4e6569fcb432e3fe450b64a83a73e3782da7ff0659 sun-jdk-1.5.0.11.ebuild 4581
+EBUILD sun-jdk-1.5.0.11.ebuild 4656 RMD160 7e751492c49e0b54670f2322f8bc677a813d6ae0 SHA1 8b760879bb014e20d4c107ccfa2c309b17f9b78e SHA256 6436f4e777f531e9d32b4f0bc9620bd5e4afe5c724fc930e011f3577ea058bc3
+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 36670 RMD160 fc0214825da37cf9a63f442f523a5e817eb1377a SHA1 b77b5a77cc5d30da98521e43e0ca5d00d6f27eef SHA256 bd506c6f1b317d3b567a9d6f21f408e5f1516561d3680a138ca8405cfb5d0c54
-MD5 02691a3b347dff5fde4e6798e9188663 ChangeLog 36670
-RMD160 fc0214825da37cf9a63f442f523a5e817eb1377a ChangeLog 36670
-SHA256 bd506c6f1b317d3b567a9d6f21f408e5f1516561d3680a138ca8405cfb5d0c54 ChangeLog 36670
+MISC ChangeLog 36841 RMD160 03a9488626643789a7a542796dbaa6a9ac08147e SHA1 eca652cc663bdaa9307d2a70d0cf28a0abfdb247 SHA256 a5a4f351e7805c15dd0d5f38019a30599d410625dc97fdb7eaa1989a5801047f
+MD5 ae6b9ea7d764ca88a4fadfe5405a34ea ChangeLog 36841
+RMD160 03a9488626643789a7a542796dbaa6a9ac08147e ChangeLog 36841
+SHA256 a5a4f351e7805c15dd0d5f38019a30599d410625dc97fdb7eaa1989a5801047f ChangeLog 36841
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -61,10 +58,3 @@ SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/di
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzwOQcxLzpIGCsLQRAoKRAJ9bIyKKwLUQ214/TeK5F1KJ+z281gCcDnra
-ymaz2XM+n3ppZ0e3/sY02cw=
-=MIB/
------END PGP SIGNATURE-----

diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
index 160bcd4badcfa99fddd2f0298620dc2aa535cf14..a6413df914b2a681fcea54c0fd2709550cf686cc 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.11.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.5.0.11.ebuild,v 1.2 2007/02/11 11:52:31 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.3 2007/02/11 20:01:43 nichoj Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -112,13 +112,15 @@ src_install() {
        chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
 
        # install control panel for Gnome/KDE
-       sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-               -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-               ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-               ${T}/sun_java-${SLOT}.desktop \
-               || die "Failed to sed .desktop file"
-
-       domenu ${T}/sun_java-${SLOT}.desktop
+       if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+               sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+                       -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+                       ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+                       ${T}/sun_java-${SLOT}.desktop \
+                       || die "Failed to sed .desktop file"
+
+               domenu ${T}/sun_java-${SLOT}.desktop
+       fi
 
        # bug #56444
        insinto /opt/${P}/jre/lib/