summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-09-29 21:01:53 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-09-29 21:01:53 +0000
commit04acfca21e62e113bcda0c364e4f40d766f08b79 (patch)
tree9d47ba6c0d9dfe72ec36f12cbf54a5c143c9f97e /dev-java/sun-jdk
parentThe directory needs to exist for older clients to prune the directory. (diff)
downloadhistorical-04acfca21e62e113bcda0c364e4f40d766f08b79.tar.gz
historical-04acfca21e62e113bcda0c364e4f40d766f08b79.tar.bz2
historical-04acfca21e62e113bcda0c364e4f40d766f08b79.zip
Cleaned up plugin instalation, Moved some messages to the eclass, see #22395 for more information
Diffstat (limited to 'dev-java/sun-jdk')
-rw-r--r--dev-java/sun-jdk/ChangeLog8
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild14
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild27
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild51
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild50
5 files changed, 51 insertions, 99 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index ad96aaa33a6e..ea7b0dc8830c 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/sun-jdk
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.90 2004/09/28 00:33:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.91 2004/09/29 20:59:31 axxo Exp $
+
+ 29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.2.2.017.ebuild,
+ sun-jdk-1.3.1.13.ebuild, sun-jdk-1.4.2.05.ebuild,
+ sun-jdk-1.5.0_rc1.ebuild:
+ Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+ for more information
28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/sun-jdk-1.2.2.017,
files/sun-jdk-1.3.1.13, files/sun-jdk-1.4.2.05:
diff --git a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
index e73ee407b116..9d5dd20f3552 100644
--- a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
@@ -1,8 +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-jdk/sun-jdk-1.2.2.017.ebuild,v 1.2 2004/07/23 16:07:40 squinky86 Exp $
-
-IUSE="doc mozilla X"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild,v 1.3 2004/09/29 20:59:31 axxo Exp $
inherit java
@@ -18,7 +16,7 @@ LICENSE="sun-bcla-java-vm-1.2"
SLOT="1.2"
KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
RESTRICT="fetch"
-
+IUSE="doc mozilla X"
# NOTE: Sun's JDK also requires the XFree86 be installed to use the graphical
# libraries. Even some non-graphical libraries (such as JavaMail) have bizarre
# dependencies on windowing toolkits.
@@ -50,7 +48,7 @@ pkg_setup() {
echo
}
-src_install () {
+src_install() {
# Make the root directory for the installation.
dodir /opt/${P}
@@ -80,21 +78,21 @@ src_install () {
set_java_env ${FILESDIR}/${VMHANDLE} || die
}
-pkg_postinst () {
+pkg_postinst() {
# Set as default VM if none exists
java_pkg_postinst
# Again, this will not work as a Mozilla plugin.
if use mozilla ; then
+ echo
einfo "JDK 1.2.2 does not work with Mozilla. A more recent JDK is"
einfo "required."
- echo
fi
# Warn the user if they don't appear to have XFree86 installed.
if ! use X ; then
+ echo
ewarn "Some parts of Sun's JDK require XFree86 to be installed."
ewarn "Be careful which Java libraries you attempt to use."
- echo
fi
}
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
index c4ac133d57b6..369e06a8f25b 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.13.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-jdk/sun-jdk-1.3.1.13.ebuild,v 1.1 2004/09/23 16:51:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.2 2004/09/29 20:59:31 axxo Exp $
-IUSE="doc mozilla"
-
-inherit java nsplugins eutils
+inherit java eutils
MY_PV=${PV%.*}_${PV##*.}
MY_P=jdk${MY_PV}
@@ -27,6 +25,7 @@ SLOT="1.3"
KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
RESTRICT="fetch"
+IUSE="doc mozilla"
# this is needed for proper operating under a PaX kernel without activated grsecurity acl
CHPAX_CONSERVATIVE_FLAGS="pemsv"
@@ -90,8 +89,7 @@ src_install () {
cp -a demo src.jar ${D}/opt/${P}/share/
if use mozilla ; then
- dodir /usr/lib/mozilla/plugins
- dosym /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
+ install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
fi
set_java_env ${FILESDIR}/${VMHANDLE} || die
@@ -100,13 +98,13 @@ src_install () {
pkg_postinst () {
# Set as default VM if none exists
java_pkg_postinst
- inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so
# if chpax is on the target system, set the appropriate PaX flags
# this will not hurt the binary, it modifies only unused ELF bits
# but may confuse things like AV scanners and automatic tripwire
if has_version "sys-apps/chpax"
then
+ echo
einfo "setting up conservative PaX flags for jar, javac and java"
for paxkills in "jar" "javac" "java"
@@ -124,22 +122,9 @@ pkg_postinst () {
ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
fi
- #Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
- #comment found on the sun-jdk 1.2.2 ebuild that he sent.
- einfo "********************************************************"
+ echo
eerror "Some parts of Sun's JDK require XFree86 to be installed."
eerror "Be careful which Java libraries you attempt to use."
- einfo "********************************************************"
- echo
-
- einfo "******************************************************"
- einfo " After installing ${P} this"
- einfo " was set as the default JVM to run."
- einfo " When finished please run the following so your"
- einfo " enviroment gets updated."
- eerror " /usr/sbin/env-update && source /etc/profile"
- einfo " Or use java-config program to set your preferred VM"
- einfo "******************************************************"
ebeep 5
epause 8
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
index 23f2b8bd6774..c269b85f0c68 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.05.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-jdk/sun-jdk-1.4.2.05.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild,v 1.4 2004/09/29 20:59:31 axxo Exp $
-IUSE="doc gnome kde mozilla jce"
-
-inherit java nsplugins eutils
+inherit java eutils
MY_PV=${PV%.*}_${PV##*.}
MY_P=j2sdk${MY_PV}
@@ -22,6 +20,7 @@ SLOT="1.4"
LICENSE="sun-bcla-java-vm"
KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
RESTRICT="fetch"
+IUSE="doc gnome kde mozilla jce"
DEPEND=">=dev-java/java-config-1.1.5
sys-apps/sed
@@ -59,13 +58,11 @@ pkg_nofetch() {
src_unpack() {
if [ ! -r ${DISTDIR}/${At} ]; then
- eerror "cannot read ${MY_PV}.bin. Please check the permission and try again."
- die
+ die "cannot read ${MY_PV}.bin. Please check the permission and try again."
fi
if use jce; then
if [ ! -r ${DISTDIR}/${jce_policy} ]; then
- eerror "cannot read ${jce_policy}. Please check the permission and try again."
- die
+ die "cannot read ${jce_policy}. Please check the permission and try again."
fi
fi
#Search for the ELF Header
@@ -90,7 +87,7 @@ src_unpack() {
fi
}
-src_install () {
+src_install() {
local dirs="bin include jre lib man"
dodir /opt/${P}
@@ -117,14 +114,14 @@ src_install () {
dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
fi
- local plugin_dir="ns610"
- if has_version '>=gcc-3.2*' ; then
- plugin_dir="ns610-gcc32"
- fi
- if use mozilla ; then
- install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+ if use mozilla; then
+ local plugin_dir="ns610"
+ if has_version '>=gcc-3.2*' ; then
+ plugin_dir="ns610-gcc32"
+ fi
+
+ install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
fi
- inst_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
# create dir for system preferences
dodir /opt/${P}/.systemPrefs
@@ -154,7 +151,7 @@ src_install () {
# is a directory and will not be gzipped ;)
}
-pkg_postinst () {
+pkg_postinst() {
# Create files used as storage for system preferences.
touch /opt/${P}/.systemPrefs/.system.lock
chmod 644 /opt/${P}/.systemPrefs/.system.lock
@@ -166,13 +163,11 @@ pkg_postinst () {
#Show info about netscape
if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
- einfo "********************************************************"
+ echo
einfo "If you want to install the plugin for Netscape 4.x, type"
einfo
einfo " cd /usr/lib/nsbrowser/plugins/"
einfo " ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
- einfo "********************************************************"
- echo
fi
# if chpax is on the target system, set the appropriate PaX flags
@@ -180,6 +175,7 @@ pkg_postinst () {
# but may confuse things like AV scanners and automatic tripwire
if has_version "sys-apps/chpax"
then
+ echo
einfo "setting up conservative PaX flags for jar, javac and java"
for paxkills in "jar" "javac" "java"
@@ -197,22 +193,9 @@ pkg_postinst () {
ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
fi
- #Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
- #comment found on the sun-jdk 1.2.2 ebuild that he sent.
- einfo "*********************************************************"
+ echo
eerror "Some parts of Sun's JDK require XFree86 to be installed."
eerror "Be careful which Java libraries you attempt to use."
- einfo "*********************************************************"
- echo
-
- einfo "******************************************************"
- einfo " After installing ${P} this"
- einfo " was set as the default JVM to run."
- einfo " When finished please run the following so your"
- einfo " enviroment gets updated."
- eerror " /usr/sbin/env-update && source /etc/profile"
- einfo " Or use java-config program to set your preferred VM"
- einfo "******************************************************"
ebeep 5
epause 8
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
index 72bc086b376f..a296b882bf23 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
@@ -1,8 +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-jdk/sun-jdk-1.5.0_rc1.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
-
-IUSE="doc gnome kde mozilla jce"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild,v 1.4 2004/09/29 20:59:31 axxo Exp $
inherit java eutils
@@ -26,6 +24,7 @@ SLOT="1.5"
LICENSE="sun-bcla-java-vm"
KEYWORDS="~x86 ~amd64"
RESTRICT="fetch"
+IUSE="doc gnome kde mozilla jce"
#
DEPEND=">=dev-java/java-config-1.2
@@ -66,13 +65,11 @@ pkg_nofetch() {
src_unpack() {
if [ ! -r ${DISTDIR}/${At} ]; then
- eerror "cannot read ${At}. Please check the permission and try again."
- die
+ die "cannot read ${At}. Please check the permission and try again."
fi
if use jce; then
if [ ! -r ${DISTDIR}/${jcefile} ]; then
- eerror "cannot read ${jcefile}. Please check the permission and try again."
- die
+ die "cannot read ${jcefile}. Please check the permission and try again."
fi
fi
@@ -102,7 +99,7 @@ src_unpack() {
${S}/bin/java -client -Xshare:dump
}
-src_install () {
+src_install() {
local dirs="bin include jre lib man"
dodir /opt/${P}
@@ -128,13 +125,12 @@ src_install () {
dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
fi
+ if use mozilla; then
+ local plugin_dir="ns7-gcc29"
+ if has_version '>=gcc-3*' ; then
+ plugin_dir="ns7"
+ fi
- local plugin_dir="ns7-gcc29"
- if has_version '>=gcc-3*' ; then
- plugin_dir="ns7"
- fi
-
- if use mozilla ; then
if use x86 ; then
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
else
@@ -175,7 +171,7 @@ src_install () {
# is a directory and will not be gzipped ;)
}
-pkg_postinst () {
+pkg_postinst() {
# Create files used as storage for system preferences.
PREFS_LOCATION=/opt/${P}/jre
mkdir -p ${PREFS_LOCATION}/.systemPrefs
@@ -193,13 +189,11 @@ pkg_postinst () {
#Show info about netscape
if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
- einfo "********************************************************"
+ echo
einfo "If you want to install the plugin for Netscape 4.x, type"
einfo
einfo " cd /usr/lib/nsbrowser/plugins/"
einfo " ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
- einfo "********************************************************"
- echo
fi
# if chpax is on the target system, set the appropriate PaX flags
@@ -207,6 +201,7 @@ pkg_postinst () {
# but may confuse things like AV scanners and automatic tripwire
if has_version "sys-apps/chpax"
then
+ echo
einfo "setting up conservative PaX flags for jar, javac and java"
for paxkills in "jar" "javac" "java"
@@ -224,30 +219,15 @@ pkg_postinst () {
ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
fi
- #Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
- #comment found on the sun-jdk 1.2.2 ebuild that he sent.
- einfo "*********************************************************"
+ echo
eerror "Some parts of Sun's JDK require XFree86 to be installed."
eerror "Be careful which Java libraries you attempt to use."
- einfo "*********************************************************"
- echo
- einfo "*********************************************************"
- einfo " After installing ${P} this"
- einfo " was set as the default JVM to run."
- einfo " When finished please run the following so your"
- einfo " enviroment gets updated."
- eerror " /usr/sbin/env-update && source /etc/profile"
- einfo " Or use java-config program to set your preferred VM"
- einfo "*********************************************************"
-
- # warn about a default setting in Java 1.5.0 rc
- einfo "*********************************************************"
+ echo
einfo " Be careful: ${P}'s Java compiler uses"
einfo " '-source 1.5' as default. Some keywords such as 'enum'"
einfo " are not valid identifiers any more in that mode,"
einfo " which can cause incompatibility with certain sources."
- einfo "*********************************************************"
ebeep 5
epause 8