diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2007-02-11 20:01:43 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2007-02-11 20:01:43 +0000 |
| commit | cc1ded6c5a3fa0af4500d3a8dcd9518fe2a7ee3e (patch) | |
| tree | c9cf02353dd41f65ad0570bc8bb2f0aeb0c1643e /dev-java | |
| parent | Surpress error-message of ls. (diff) | |
| download | gentoo-2-cc1ded6c5a3fa0af4500d3a8dcd9518fe2a7ee3e.tar.gz gentoo-2-cc1ded6c5a3fa0af4500d3a8dcd9518fe2a7ee3e.tar.bz2 gentoo-2-cc1ded6c5a3fa0af4500d3a8dcd9518fe2a7ee3e.zip | |
Addressed bug #166397. Only will sed .desktop file and install it if the .desktop file exists.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/sun-jdk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 7ff0fa606550..683cc37ab3a2 100644 --- 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/sun-jdk-1.5.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild index 160bcd4badcf..a6413df914b2 100644 --- 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/ |