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 | 0ff45d75ae84e8d16b9e7424e07fd96e0f527f2d (patch) | |
| tree | 147d524b4c0385d905aaf2f14121bfc6af78515b /dev-java/hp-jdk-bin | |
| parent | Marking eselect-ruby-20091225 ppc64 and ppc for bug 300468 (diff) | |
| download | historical-0ff45d75ae84e8d16b9e7424e07fd96e0f527f2d.tar.gz historical-0ff45d75ae84e8d16b9e7424e07fd96e0f527f2d.tar.bz2 historical-0ff45d75ae84e8d16b9e7424e07fd96e0f527f2d.zip | |
Various fixes to make it useable actually.
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild | 18 |
3 files changed, 18 insertions, 12 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/Manifest b/dev-java/hp-jdk-bin/Manifest index 1917fd35ffde..351cb5a38f4b 100644 --- a/dev-java/hp-jdk-bin/Manifest +++ b/dev-java/hp-jdk-bin/Manifest @@ -1,6 +1,6 @@ AUX hp-jdk-bin-1.6.env 674 RMD160 1c711930432974277000e3b1f84e17a9f2bd37a6 SHA1 41aea53db4d910fb715113e3455c80268b95cccb SHA256 2baa6cbd5f9ad9d35045f8e2aca0d76ebafffd5cef945872d8173eb908dc8ded DIST jdk6_16005_ia.depot 138004480 RMD160 bec50792609af4dfe7b186cea1425dfab1fb7943 SHA1 caae778144c346801a0705a087018faaa17161fe SHA256 2ce897f22aa9db11ff1cdda14475f36b5b761e0c024cbbd9313e5f2da44e067f DIST jdk6_16005_pa.depot 99102720 RMD160 9047d0845915189af57f3f4a2f207c8a6659952b SHA1 70d7a5c9a59b95d4d5d67f28be565dce8b0aaa26 SHA256 4ed271f34d28194f83ca7271d91ca1731502c93811c9fb052aa102539c3da7f5 -EBUILD hp-jdk-bin-1.6.0.05.ebuild 4585 RMD160 0e77827c4f873ef56d6f16dec08ebea558e5673d SHA1 2ebf934b92d0c4b625b3d42338df699559b3435d SHA256 9a06ee2254af1325b93578b749cab69a614ecdd8a9667727588135da97d3df1a -MISC ChangeLog 421 RMD160 74f781e0be58099ea1655043452df893eccc16c9 SHA1 e2200a1c44cd6185fb3b5fcf2ac949f074121e96 SHA256 935dc3a18f88ebe6775fcb1b90d503b823cb872194fa7abef6cb8d3b732aabe7 +EBUILD hp-jdk-bin-1.6.0.05.ebuild 4664 RMD160 d176a533d5c1bb81638bf140fe2d25d946be004c SHA1 2a17a6f923d9ee56453abe27b382a23039bfd2c5 SHA256 0f328afd9ddb62fb3a09d483d577afde9220882c9ae63c2449ec662918214e9f +MISC ChangeLog 553 RMD160 3d934763c76c70c07dcabc91dab78c3b0a6911dc SHA1 29a7cf75b587be6c749db16fc500f27e0dc8d189 SHA256 e5f3e039f42845f1efa385d86d6870b1ee005d446db724f317eec039c6efb3f8 MISC metadata.xml 311 RMD160 f35fd069b3f7efb023d47f37681a478410ce7d30 SHA1 37ce4665278f0fcd908a66b523f6d08f92873e47 SHA256 771c3ab5bffa31e871899f5dea2b0252700e03171c01aeb4bd74b5098c325589 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}" > \ |