summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-04-03 20:11:31 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-04-03 20:11:31 +0000
commit21a4131ea09b7c438eb245cc372611ab166bc7b9 (patch)
tree663d0f49b794b753159950fb5855592ecbea8bff /dev-java/sun-jre-bin
parentclose 81874 (diff)
downloadgentoo-2-21a4131ea09b7c438eb245cc372611ab166bc7b9.tar.gz
gentoo-2-21a4131ea09b7c438eb245cc372611ab166bc7b9.tar.bz2
gentoo-2-21a4131ea09b7c438eb245cc372611ab166bc7b9.zip
prevent collisions
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-java/sun-jre-bin')
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild6
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild6
2 files changed, 6 insertions, 6 deletions
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
index d84fa8954974..d4a9abfd2a94 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild,v 1.2 2005/04/03 20:08:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild,v 1.3 2005/04/03 20:11:31 axxo Exp $
inherit java eutils
@@ -94,8 +94,8 @@ src_install () {
sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-e "s/\(Name=Java\)/\1 Control Panel/" \
${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
- ${T}/sun_java.desktop
- domenu ${T}/sun_java.desktop
+ ${T}/sun_java-jre.desktop
+ domenu ${T}/sun_java-jre.desktop
set_java_env ${FILESDIR}/${VMHANDLE}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
index 0627798eb8b9..a6e6b3cc50ff 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild,v 1.2 2005/04/03 20:08:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild,v 1.3 2005/04/03 20:11:31 axxo Exp $
inherit java eutils
@@ -119,9 +119,9 @@ src_install() {
sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-e "s/\(Name=Java\)/\1 Control Panel/" \
${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
- ${T}/sun_java.desktop
+ ${T}/sun_java-jre.desktop
- domenu ${T}/sun_java.desktop
+ domenu ${T}/sun_java-jre.desktop
set_java_env ${FILESDIR}/${VMHANDLE}
}