[gentoo-commits] gentoo-x86 commit in dev-java/hp-jdk-bin: ChangeLog hp-jdk-bin-1.6.0.05.ebuild

[gentoo-commits] gentoo-x86 commit in dev-java/hp-jdk-bin: ChangeLog hp-jdk-bin-1.6.0.05.ebuild

[Michael Haubenwallner (haubi)]

haubi       10/01/11 16:06:20

  Modified:             ChangeLog hp-jdk-bin-1.6.0.05.ebuild
  Log:
  Various fixes to make it useable actually.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-java/hp-jdk-bin/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/hp-jdk-bin/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/hp-jdk-bin/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/hp-jdk-bin/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/hp-jdk-bin/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	16 Dec 2009 14:46:22 -0000	1.1
+++ ChangeLog	11 Jan 2010 16:06:20 -0000	1.2
@@ -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)
 



1.2                  dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild?r1=1.1&r2=1.2

Index: hp-jdk-bin-1.6.0.05.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hp-jdk-bin-1.6.0.05.ebuild	16 Dec 2009 14:46:22 -0000	1.1
+++ hp-jdk-bin-1.6.0.05.ebuild	11 Jan 2010 16:06:20 -0000	1.2
@@ -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 @@
 }
 
 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 @@
 
 	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}" > \