diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-04-03 20:08:41 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-04-03 20:08:41 +0000 |
| commit | 9f9ce248dcedf00ad6a66facc0be6b204bbeece8 (patch) | |
| tree | 8a21f5e38464b888e0f1c41eb781ecb78071504f /dev-java/sun-jdk | |
| parent | Package-Manager: portage-2.0.51.19 (diff) | |
| download | historical-9f9ce248dcedf00ad6a66facc0be6b204bbeece8.tar.gz historical-9f9ce248dcedf00ad6a66facc0be6b204bbeece8.tar.bz2 historical-9f9ce248dcedf00ad6a66facc0be6b204bbeece8.zip | |
close 81874
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-java/sun-jdk')
| -rw-r--r-- | dev-java/sun-jdk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild | 16 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild | 19 |
3 files changed, 11 insertions, 31 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index c210213911f9..f5d076c73009 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.106 2005/03/25 22:37:57 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.107 2005/04/03 20:08:27 axxo Exp $ + + 03 Apr 2005; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.4.2.07-r1.ebuild, + sun-jdk-1.5.0.02-r1.ebuild: + clean up kde/gnome use flags, tnx to Diego Pettenò + <dgp85@users.sourceforge.net> in 81874 *sun-jdk-1.5.0.02-r1 (25 Mar 2005) diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild index a21352626757..10d68d42134b 100644 --- a/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-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-jdk/sun-jdk-1.4.2.07-r1.ebuild,v 1.1 2005/03/25 22:37:57 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild,v 1.2 2005/04/03 20:08:27 axxo Exp $ inherit java eutils @@ -20,7 +20,7 @@ SLOT="1.4" LICENSE="sun-bcla-java-vm" KEYWORDS="x86 -*" RESTRICT="fetch" -IUSE="doc gnome kde mozilla jce" +IUSE="doc mozilla jce" DEPEND=">=dev-java/java-config-1.1.5 sys-apps/sed @@ -133,17 +133,7 @@ src_install() { ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ ${T}/sun_java.desktop - if use gnome ; then - #TODO check this on Gnome - dodir /usr/share/applications - insinto /usr/share/applications - doins ${T}/sun_java.desktop - fi - if use kde ; then - dodir /usr/share/applnk/Internet - insinto /usr/share/applnk/Internet - doins ${T}/sun_java.desktop - fi + domenu ${T}/sun_java.desktop set_java_env ${FILESDIR}/${VMHANDLE} diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild index 7f8b9f3d8470..1d9d528c5251 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.02-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-jdk/sun-jdk-1.5.0.02-r1.ebuild,v 1.1 2005/03/25 22:37:57 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild,v 1.2 2005/04/03 20:08:27 axxo Exp $ inherit java eutils @@ -151,22 +151,7 @@ src_install() { ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ ${T}/sun_java.desktop - if use x86; then - if use gnome ; then - #TODO check this on Gnome - dodir /usr/share/gnome/apps/Internet - insinto /usr/share/gnome/apps/Internet - doins ${T}/sun_java.desktop - fi - - if use kde ; then - dodir /usr/share/applnk/Internet - insinto /usr/share/applnk/Internet - doins ${T}/sun_java.desktop - fi - else - eerror "Sorry no kde, gnome support for your arch now." - fi + domenu ${T}/sun_java.desktop set_java_env ${FILESDIR}/${VMHANDLE} |