diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-09-29 21:01:53 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-09-29 21:01:53 +0000 |
| commit | b348ede4735eb41feb695a3998d5633a772bcef2 (patch) | |
| tree | 4f3ae85f1bce9f0276925e4aa3c5b4fe4cf3d1f1 /dev-java/sun-j2sdk | |
| parent | The directory needs to exist for older clients to prune the directory. (diff) | |
| download | gentoo-2-b348ede4735eb41feb695a3998d5633a772bcef2.tar.gz gentoo-2-b348ede4735eb41feb695a3998d5633a772bcef2.tar.bz2 gentoo-2-b348ede4735eb41feb695a3998d5633a772bcef2.zip | |
Cleaned up plugin instalation, Moved some messages to the eclass, see #22395 for more information
Diffstat (limited to 'dev-java/sun-j2sdk')
| -rw-r--r-- | dev-java/sun-j2sdk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild | 10 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild | 9 |
3 files changed, 15 insertions, 11 deletions
diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog index 6a3d1637c2f3..7e69dfc624a9 100644 --- a/dev-java/sun-j2sdk/ChangeLog +++ b/dev-java/sun-j2sdk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/sun-j2sdk # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.31 2004/09/21 14:08:30 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.32 2004/09/29 21:01:53 axxo Exp $ + + 29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.1-r1.ebuild, + sun-j2sdk-1.4.2.ebuild: + Cleaned up plugin instalation, Moved some messages to the eclass, see #22395 + for more information 21 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.2.ebuild: x86 diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild index d11972fbb3ab..3009bb98bc9b 100644 --- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild +++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.13 2004/07/28 10:58:57 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.14 2004/09/29 21:01:53 axxo Exp $ # Maintainer: Stefan Jones <cretin@gentoo.org> # Author: Stefan Jones <cretin@gentoo.org> @@ -8,9 +8,7 @@ # Based on http://www.linuxfromscratch.org/~tushar/hints/javafromscratch.txt (LFS) # By Tushar Teredesai <Tush@Yahoo.Com> -IUSE="nptl doc" - -inherit java nsplugins +inherit java JAVA_PATCHES="disable-sanity-check fix-intl-files @@ -51,6 +49,8 @@ PROVIDE="virtual/jre-1.4.1 virtual/jdk-1.4.1 virtual/java-scheme-2" +IUSE="nptl doc mozilla" + pkg_nofetch() { einfo "Please download" einfo " - ${SRC_MOZHEADERS}" @@ -152,7 +152,7 @@ src_install () { chown -R root:root ${D}/opt/${P} - inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so + use mozilla && install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so set_java_env ${FILESDIR}/${VMHANDLE} } diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild index 60a4becfce24..d173d05ad208 100644 --- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild +++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild @@ -1,10 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.12 2004/09/21 14:08:30 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.13 2004/09/29 21:01:53 axxo Exp $ -IUSE="nptl doc" - -inherit java nsplugins +inherit java JAVA_PATCHES=" remove-fixed-paths @@ -27,6 +25,7 @@ HOMEPAGE="http://wwws.sun.com/software/java2/download.html" SLOT="0" KEYWORDS="x86 -ppc -alpha -sparc" LICENSE="sun-csl" +IUSE="nptl doc mozilla" RDEPEND="virtual/libc virtual/x11 @@ -149,7 +148,7 @@ src_install () { chown -R root:root ${D}/opt/${P} - inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so + use mozilla && install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so set_java_env ${FILESDIR}/${VMHANDLE} } |