diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2010-01-11 16:06:20 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2010-01-11 16:06:20 +0000 |
| commit | c4cf302264e360979ef5d8149a9a0f7c5a5f6b51 (patch) | |
| tree | 4629713881c9a47650a84082cc0d14d3982e1930 /dev-java/hp-jdk-bin | |
| parent | Marking eselect-ruby-20091225 ppc64 and ppc for bug 300468 (diff) | |
| download | gentoo-2-c4cf302264e360979ef5d8149a9a0f7c5a5f6b51.tar.gz gentoo-2-c4cf302264e360979ef5d8149a9a0f7c5a5f6b51.tar.bz2 gentoo-2-c4cf302264e360979ef5d8149a9a0f7c5a5f6b51.zip | |
Various fixes to make it useable actually.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/hp-jdk-bin')
| -rw-r--r-- | dev-java/hp-jdk-bin/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild | 18 |
2 files changed, 16 insertions, 10 deletions
diff --git a/dev-java/hp-jdk-bin/ChangeLog b/dev-java/hp-jdk-bin/ChangeLog index 68ee04ddbd68..506311290ffe 100644 --- a/dev-java/hp-jdk-bin/ChangeLog +++ b/dev-java/hp-jdk-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/hp-jdk-bin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/hp-jdk-bin/ChangeLog,v 1.1 2009/12/16 14:46:22 haubi Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/hp-jdk-bin/ChangeLog,v 1.2 2010/01/11 16:06:20 haubi Exp $ + + 11 Jan 2010; Michael Haubenwallner <haubi@gentoo.org> + hp-jdk-bin-1.6.0.05.ebuild: + Various fixes to make it useable actually. *hp-jdk-bin-1.6.0.05 (16 Dec 2009) diff --git a/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild b/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild index 208e28e71ed9..ca844128ede4 100644 --- a/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild +++ b/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild,v 1.1 2009/12/16 14:46:22 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild,v 1.2 2010/01/11 16:06:20 haubi Exp $ EAPI="2" @@ -113,10 +113,12 @@ depot-arch() { } src_install() { - doins -r Jre*/JRE*-{COM,$(depot-arch){,-HS}}/opt || die - doins -r Jdk*/JDK*-{COM,$(depot-arch)}/opt || die - ! use doc || doins -r Jre*/JRE*-COM-DOC/opt || die - ! use examples || doins -r Jdk*/JDK*-DEMO/opt || die + use prefix || local EPREFIX= ED=${D} + dodir / || die + cp -pR Jre*/JRE*-{COM,$(depot-arch){,-HS}}/opt "${ED}" || die + cp -pR Jdk*/JDK*-{COM,$(depot-arch)}/opt "${ED}" || die + ! use doc || cp -pR Jre*/JRE*-COM-DOC/opt "${ED}" || die + ! use examples || cp -pR Jdk*/JDK*-DEMO/opt "${ED}" || die mv "${ED}"/opt/java$(get_version_component_range 2) "${ED}"/opt/${P} || die "rename failed" @@ -127,9 +129,9 @@ src_install() { local desktop_in="${ED}/opt/${P}/jre/plugin/desktop/sun_java.desktop" if [[ -f "${desktop_in}" ]]; then - local desktop_out="${T}/hp_jdk-${SLOT}.desktop" + local desktop_out="${T}/ibm_jdk-${SLOT}.desktop" # install control panel for Gnome/KDE - sed -e "s,\(Name=\)Java,\1Java Control Panel for HP JDK/JRE ${SLOT}," \ + sed -e "s#\(Name=\)Java#\1Java Control Panel for HP JDK/JRE ${SLOT}#" \ -e "s#Exec=.*#Exec=${EPREFIX}/opt/${P}/jre/bin/jcontrol#" \ -e "s#Icon=.*#Icon=${EPREFIX}/opt/${P}/jre/plugin/desktop/sun_java.png#" \ "${desktop_in}" > \ |