diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2007-02-11 20:41:17 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2007-02-11 20:41:17 +0000 |
| commit | 4b888dd7d5ada76a4f47966c2924db459a3547be (patch) | |
| tree | c3f88f47d9e954788d62a590b8e038bfd93ef3ba /dev-java | |
| parent | Resetting all keywords which were copied from udev-104-r9 to let archs themse... (diff) | |
| download | gentoo-2-4b888dd7d5ada76a4f47966c2924db459a3547be.tar.gz gentoo-2-4b888dd7d5ada76a4f47966c2924db459a3547be.tar.bz2 gentoo-2-4b888dd7d5ada76a4f47966c2924db459a3547be.zip | |
Applied fix for bug #166397 to 1.6.0-r1.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/sun-jdk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild | 24 |
2 files changed, 17 insertions, 12 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 683cc37ab3a2..79c1764fc7dc 100644 --- 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/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild index 3f65c7d8f2db..bc63f1dbd0e2 100644 --- 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/ |