Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 40229 Details for
Bug 22395
Java JRE/JDK upgrade, java-config & browser plugins
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
big-jre-jdk-plugin-cleanup.diff
big-jre-jdk-plugin-cleanup.diff (text/plain), 41.73 KB, created by
Thomas Matthijs (RETIRED)
on 2004-09-23 09:57:32 UTC
(
hide
)
Description:
big-jre-jdk-plugin-cleanup.diff
Filename:
MIME Type:
Creator:
Thomas Matthijs (RETIRED)
Created:
2004-09-23 09:57:32 UTC
Size:
41.73 KB
patch
obsolete
>Index: dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v >retrieving revision 1.12 >diff -u -b -B -r1.12 blackdown-jdk-1.3.1-r10.ebuild >--- dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild 14 Jul 2004 01:44:43 -0000 1.12 >+++ dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.12 2004/07/14 01:44:43 agriffis Exp $ > >-inherit java nsplugins gcc >+inherit java gcc > > S=${WORKDIR}/j2sdk1.3.1 > DESCRIPTION="Blackdown Java Development Kit 1.3.1" >@@ -12,7 +12,7 @@ > LICENSE="sun-bcla-java-vm" > SLOT="1.3" > KEYWORDS="ppc" >-IUSE="doc" >+IUSE="doc mozilla" > > DEPEND="virtual/libc > >=dev-java/java-config-0.2.5 >@@ -52,6 +52,7 @@ > dohtml README.html > > # Install ns plugin >+ if use mozilla; then > if [ "${ARCH}" == "x86" ] ; then > PLATFORM="i386" > elif [ "${ARCH}" == "ppc" ] ; then >@@ -59,8 +60,8 @@ > elif [ "${ARCH}" == "sparc" ] ; then > PLATFORM="sparc" > fi >- >- inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so >+ install_mozilla_pluing /opt/${P}/jre/plugin/${PLATFORM}/mozilla/libjavaplugin_oji.so >+ fi > > find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \; > >@@ -76,8 +77,3 @@ > # install env into /etc/env.d > set_java_env ${FILESDIR}/${VMHANDLE} || die > } >- >-pkg_postinst () { >- # Set as default system VM if none exists >- java_pkg_postinst >-} >Index: dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v >retrieving revision 1.16 >diff -u -b -B -r1.16 blackdown-jdk-1.3.1-r8.ebuild >--- dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild 21 Sep 2004 13:58:18 -0000 1.16 >+++ dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.16 2004/09/21 13:58:18 axxo Exp $ > >-inherit java nsplugins >+inherit java > > S=${WORKDIR}/j2sdk1.3.1 > DESCRIPTION="Blackdown Java Development Kit 1.3.1" >@@ -14,7 +14,7 @@ > LICENSE="sun-bcla-java-vm" > SLOT="1.3" > KEYWORDS="x86 ~ppc sparc" >-IUSE="doc" >+IUSE="doc mozilla" > > DEPEND="virtual/libc > >=dev-java/java-config-0.2.5 >@@ -23,7 +23,7 @@ > virtual/jre-1.3.1 > virtual/java-scheme-2" > >-src_unpack () { >+src_unpack() { > if use ppc || use sparc ; then > tail -n +400 ${DISTDIR}/${A} | tar jxpf - > else >@@ -37,7 +37,7 @@ > } > > >-src_install () { >+src_install() { > > dodir /opt/${P} > >@@ -58,7 +58,7 @@ > PLATFORM="sparc" > fi > >- inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so >+ use mozilla && install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so > > find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \; > >@@ -72,7 +72,13 @@ > set_java_env ${FILESDIR}/${VMHANDLE} || die > } > >-pkg_postinst () { >+pkg_postinst() { > # Set as default system VM if none exists > java_pkg_postinst >+ >+ if use mozilla; then >+ einfo "The java mozilla plugin supplied by this package does not" >+ einfo "work with newer of mozilla/firefox versions." >+ einfo "You will need >=${PN}-1.4 from them." >+ fi > } >Index: dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v >retrieving revision 1.20 >diff -u -b -B -r1.20 blackdown-jdk-1.4.1.ebuild >--- dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild 21 Sep 2004 08:14:39 -0000 1.20 >+++ dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -3,7 +3,7 @@ > # $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.20 2004/09/21 08:14:39 axxo Exp $ > > >-inherit java nsplugins >+inherit java > > JREV="01" > >@@ -21,7 +21,7 @@ > LICENSE="sun-bcla-java-vm" > SLOT="1.4.1" > KEYWORDS="x86 -ppc sparc amd64" >-IUSE="doc" >+IUSE="doc mozilla" > > DEPEND="virtual/libc > >=dev-java/java-config-0.2.6 >@@ -48,7 +48,7 @@ > eval echo $offset > } > >-src_unpack () { >+src_unpack() { > local offset="`get_offset ${DISTDIR}/${A}`" > > if [ -z "${offset}" ] ; then >@@ -61,7 +61,7 @@ > } > > >-src_install () { >+src_install() { > local PLATFORM= > > dodir /opt/${P} >@@ -87,7 +87,7 @@ > PLATFORM="sparc" > fi > >- inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so >+ use mozilla && install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so > > find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \; > >@@ -104,7 +104,7 @@ > fi > } > >-pkg_postinst () { >+pkg_postinst() { > # Set as default system VM if none exists > java_pkg_postinst > >@@ -113,6 +113,7 @@ > # 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 and javac" > > for paxkills in "jar" "javac" "java" >Index: dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild,v >retrieving revision 1.2 >diff -u -b -B -r1.2 blackdown-jdk-1.4.2_rc1-r1.ebuild >--- dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild 14 Jul 2004 01:44:43 -0000 1.2 >+++ dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -4,7 +4,7 @@ > > IUSE="doc mozilla" > >-inherit java nsplugins >+inherit java > > JREV=${PV#*_} > JV=${PV%_*} >@@ -44,7 +44,7 @@ > echo $offset > } > >-src_unpack () { >+src_unpack() { > local offset=$(get_offset ${DISTDIR}/${A}) > > if [ -z "${offset}" ] ; then >@@ -81,7 +81,7 @@ > rm -f "$UNPACK_CMD" > } > >-src_install () { >+src_install() { > typeset platform > > dodir /opt/${P} >@@ -102,7 +102,7 @@ > sparc*) platform="sparc" ;; > x86) platform="i386" ;; > esac >- inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so >+ install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so > fi > > find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \; >@@ -120,7 +120,7 @@ > unpack_jars > } > >-pkg_postinst () { >+pkg_postinst() { > # Set as default system VM if none exists > java_pkg_postinst > >@@ -129,6 +129,7 @@ > # 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 and javac" > > for paxkills in "jar" "javac" "java" >Index: dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v >retrieving revision 1.13 >diff -u -b -B -r1.13 blackdown-jdk-1.4.2_rc1.ebuild >--- dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild 14 Jul 2004 01:44:43 -0000 1.13 >+++ dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -4,7 +4,7 @@ > > IUSE="doc" > >-inherit java nsplugins >+inherit java > > JREV=${PV#*_} > JV=${PV%_*} >@@ -44,7 +44,7 @@ > echo $offset > } > >-src_unpack () { >+src_unpack() { > local offset=$(get_offset ${DISTDIR}/${A}) > > if [ -z "${offset}" ] ; then >@@ -81,7 +81,7 @@ > rm -f "$UNPACK_CMD" > } > >-src_install () { >+src_install() { > typeset platform > > dodir /opt/${P} >@@ -95,12 +95,14 @@ > dohtml README.html > > # Install mozilla plugin >+ if use mozilla; then > case ${ARCH} in > amd64|x86) platform="i386" ;; > ppc) platform="ppc" ;; > sparc*) platform="sparc" ;; > esac >- inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/javaplugin_oji.so >+ install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so >+ fi > > find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \; > >@@ -118,7 +120,7 @@ > unpack_jars > } > >-pkg_postinst () { >+pkg_postinst() { > # Set as default system VM if none exists > java_pkg_postinst > >@@ -127,6 +129,7 @@ > # 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 and javac" > > for paxkills in "jar" "javac" "java" >Index: dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v >retrieving revision 1.17 >diff -u -b -B -r1.17 blackdown-jre-1.3.1-r9.ebuild >--- dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild 14 Jul 2004 12:22:27 -0000 1.17 >+++ dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.17 2004/07/14 12:22:27 axxo Exp $ > >-inherit java nsplugins gcc >+inherit java gcc > > S=${WORKDIR}/j2re1.3.1 > DESCRIPTION="Blackdown Java Runtime Environment 1.3.1" >@@ -12,7 +12,7 @@ > LICENSE="sun-bcla-java-vm" > SLOT="0" > KEYWORDS="ppc" >-IUSE="" >+IUSE="mozilla" > > DEPEND="virtual/libc > >=dev-java/java-config-0.2.5 >@@ -21,7 +21,7 @@ > PROVIDE="virtual/jre-1.3.1 > virtual/java-scheme-2" > >-src_unpack () { >+src_unpack() { > for a in ${A}; do > if [[ ${a} == *.bin ]]; then > echo ">>> Unpacking ${a}..." >@@ -40,7 +40,7 @@ > fi > } > >-src_install () { >+src_install() { > typeset platform > > dodir /opt/${P} >@@ -52,31 +52,16 @@ > dohtml README.html > > # Install mozilla plugin >+ if use mozilla; then > case ${ARCH} in > amd64|x86) platform="i386" ;; > ppc) platform="ppc" ;; > sparc*) platform="sparc" ;; > esac >- inst_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so >+ install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so >+ fi > > sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties > > set_java_env ${FILESDIR}/${VMHANDLE} > } >- >-pkg_postinst () { >- # Only install the JRE as the system default if there's no JDK >- # installed. Installing a JRE over an existing JDK will result >- # in major breakage, see #9289. >- if [ ! -f "${JAVAC}" ] ; then >- ewarn "Found no JDK, setting ${P} as default system VM" >- java_pkg_postinst >- fi >-} >- >-pkg_prerm() { >- if java-config -J | grep -q ${P} ; then >- ewarn "It appears you are removing your default system VM!" >- ewarn "Please run java-config -L then java-config -S to set a new system VM!" >- fi >-} >Index: dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v >retrieving revision 1.15 >diff -u -b -B -r1.15 blackdown-jre-1.4.1.ebuild >--- dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild 30 Jul 2004 23:36:52 -0000 1.15 >+++ dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.15 2004/07/30 23:36:52 dragonheart Exp $ > >-inherit java nsplugins gcc >+inherit java gcc > > S=${WORKDIR}/j2re1.4.1 > DESCRIPTION="Blackdown Java Runtime Environment 1.4.1" >@@ -69,12 +69,14 @@ > dohtml README.html > > # Install mozilla plugin >+ if use mozilla; then > case ${ARCH} in > amd64|x86) platform="i386" ;; > ppc) platform="ppc" ;; > sparc*) platform="sparc" ;; > esac >- inst_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so >+ install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so >+ fi > > sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties > >@@ -87,20 +89,3 @@ > ${D}/etc/env.d/java/20blackdown-jre-1.4.1 > fi > } >- >-pkg_postinst () { >- # Only install the JRE as the system default if there's no JDK >- # installed. Installing a JRE over an existing JDK will result >- # in major breakage, see #9289. >- if [ ! -f "${JAVAC}" ] ; then >- ewarn "Found no JDK, setting ${P} as default system VM" >- java_pkg_postinst >- fi >-} >- >-pkg_postrm() { >- if java-config -J | grep -q ${P} ; then >- ewarn "It appears you are removing your default system VM!" >- ewarn "Please run java-config -L then java-config-S to set a new system VM!" >- fi >-} >Index: dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild,v >retrieving revision 1.4 >diff -u -b -B -r1.4 blackdown-jre-1.4.2_rc1-r1.ebuild >--- dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild 14 Jul 2004 01:45:28 -0000 1.4 >+++ dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild 23 Sep 2004 16:35:23 -0000 >@@ -2,9 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild,v 1.4 2004/07/14 01:45:28 agriffis Exp $ > >-IUSE="" >- >-inherit java nsplugins >+inherit java > > JREV="rc1" > >@@ -24,7 +22,7 @@ > SLOT="1.4.2" > LICENSE="sun-bcla-java-vm" > KEYWORDS="-* amd64" >- >+IUSE="" > DEPEND="virtual/libc > >=dev-java/java-config-0.2.6 > >=sys-apps/sed-4 >@@ -99,12 +97,14 @@ > dohtml README.html > > # Install mozilla plugin >+ if use mozilla; then > case ${ARCH} in > amd64|x86) platform="i386" ;; > ppc) platform="ppc" ;; > sparc*) platform="sparc" ;; > esac >- inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so >+ install_mozilla_plugins /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so >+ fi > > sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties > >@@ -121,20 +121,3 @@ > > unpack_jars > } >- >-pkg_postinst () { >- # Only install the JRE as the system default if there's no JDK >- # installed. Installing a JRE over an existing JDK will result >- # in major breakage, see #9289. >- if [ ! -f "${JAVAC}" ] ; then >- ewarn "Found no JDK, setting ${P} as default system VM" >- java_pkg_postinst >- fi >-} >- >-pkg_prerm() { >- if java-config -J | grep -q ${P} ; then >- ewarn "It appears you are removing your default system VM!" >- ewarn "Please run java-config -L then java-config-S to set a new system VM!" >- fi >-} >Index: dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild,v >retrieving revision 1.3 >diff -u -b -B -r1.3 compaq-jdk-1.3.1-r1.ebuild >--- dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild 2 Jul 2004 04:19:42 -0000 1.3 >+++ dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild 23 Sep 2004 16:35:24 -0000 >@@ -44,8 +44,3 @@ > > set_java_env ${FILESDIR}/${VMHANDLE} || die > } >- >-pkg_postinst () { >- # Set as default VM if none exists >- java_pkg_postinst >-} >Index: dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild,v >retrieving revision 1.3 >diff -u -b -B -r1.3 compaq-jdk-1.3.1-r2.ebuild >--- dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild 2 Jul 2004 04:19:42 -0000 1.3 >+++ dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild 23 Sep 2004 16:35:24 -0000 >@@ -45,8 +45,3 @@ > > set_java_env ${FILESDIR}/${VMHANDLE} || die > } >- >-pkg_postinst () { >- # Set as default VM if none exists >- java_pkg_postinst >-} >Index: dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild,v >retrieving revision 1.3 >diff -u -b -B -r1.3 compaq-jdk-1.3.1-r3.ebuild >--- dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild 2 Jul 2004 04:19:42 -0000 1.3 >+++ dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild 23 Sep 2004 16:35:24 -0000 >@@ -45,8 +45,3 @@ > > set_java_env ${FILESDIR}/${VMHANDLE} || die > } >- >-pkg_postinst () { >- # Set as default VM if none exists >- java_pkg_postinst >-} >Index: dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild,v >retrieving revision 1.4 >diff -u -b -B -r1.4 compaq-jre-1.3.1-r3.ebuild >--- dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild 2 Jul 2004 04:19:55 -0000 1.4 >+++ dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild 23 Sep 2004 16:35:24 -0000 >@@ -41,16 +41,3 @@ > > set_java_env ${FILESDIR}/${VMHANDLE} || die > } >- >-pkg_postinst () { >- if [ ! -e "${JAVAC}" ] ; then >- java_pkg_postinst >- fi >-} >- >-pkg_postrm() { >- if [ ! -z "$(java-config -J) | grep ${P}" ] ; then >- ewarn "It appears you are removing your default system VM!" >- ewarn "Please run java-config -L then java-config-S to set a new system VM!" >- fi >-} >Index: dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v >retrieving revision 1.8 >diff -u -b -B -r1.8 ibm-jdk-bin-1.4.1-r2.ebuild >--- dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild 6 Sep 2004 18:12:45 -0000 1.8 >+++ dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild 23 Sep 2004 16:35:25 -0000 >@@ -4,7 +4,7 @@ > > IUSE="X doc javacomm" > >-inherit java nsplugins eutils >+inherit java eutils > > if use ppc; then > S="${WORKDIR}/IBMJava2-ppc-141" >@@ -50,11 +50,16 @@ > if use ppc; then > dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so > dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so >- insinto ${D}/etc >+ insinto /etc > doins ${FILESDIR}/cpuinfo >- else >- # No java-plugin on ppc >- inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so >+ fi >+ >+ if use mozilla && ! use ppc; then >+ local plugin="libjavaplugin_oji.so" >+ if has_version '>=gcc-3*' ; then >+ plugin="libjavaplugin_ojigcc3.so" >+ fi >+ install_mozilla_plugin /opt/${P}/jre/bin/${plugin} > fi > > dohtml -a html,htm,HTML -r docs >@@ -67,23 +72,13 @@ > pkg_postinst() { > java_pkg_postinst > if ! use X; then >- einfo "********************************************************" >+ echo > eerror "You're not using X so its possible that you dont have" > eerror "a X server installed, please read the following warning: " > eerror "Some parts of IBM JDK require XFree86 to be installed." > eerror "Be careful which Java libraries you attempt to use." >- einfo "********************************************************" >- echo > fi > >- 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 > } >Index: dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v >retrieving revision 1.10 >diff -u -b -B -r1.10 ibm-jdk-bin-1.4.2.ebuild >--- dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild 6 Sep 2004 18:12:45 -0000 1.10 >+++ dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild 23 Sep 2004 16:35:25 -0000 >@@ -4,7 +4,7 @@ > > IUSE="X doc javacomm" > >-inherit java nsplugins eutils >+inherit java eutils > > if use ppc; then > S="${WORKDIR}/IBMJava2-ppc-142" >@@ -52,9 +52,14 @@ > dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so > insinto /etc > doins ${FILESDIR}/cpuinfo >- else >- # No java-plugin on ppc >- inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so >+ fi >+ >+ if use mozilla && ! use ppc; then >+ local plugin="libjavaplugin_oji.so" >+ if has_version '>=gcc-3*' ; then >+ plugin="libjavaplugin_ojigcc3.so" >+ fi >+ install_mozilla_plugin /opt/${P}/jre/bin/${plugin} > fi > > dohtml -a html,htm,HTML -r docs >@@ -67,23 +72,13 @@ > pkg_postinst() { > java_pkg_postinst > if ! use X; then >- einfo "********************************************************" >+ echo > eerror "You're not using X so its possible that you dont have" > eerror "a X server installed, please read the following warning: " > eerror "Some parts of IBM JDK require XFree86 to be installed." > eerror "Be careful which Java libraries you attempt to use." >- einfo "********************************************************" >- echo > fi > >- 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 > } >Index: dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v >retrieving revision 1.10 >diff -u -b -B -r1.10 ibm-jre-bin-1.4.1-r1.ebuild >--- dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild 4 Aug 2004 12:52:54 -0000 1.10 >+++ dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild 23 Sep 2004 16:35:25 -0000 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.10 2004/08/04 12:52:54 axxo Exp $ > >-inherit java nsplugins >+inherit java > > S="${WORKDIR}/j2sdk${PV}" > DESCRIPTION="IBM Java Development Kit ${PV}" >@@ -48,16 +48,13 @@ > < ${FILESDIR}/${P} \ > > ${D}/etc/env.d/java/20${P} \ > || die "unable to install environment file" >-} >- >-pkg_postinst(){ >- inst_plugin /opt/${P}/bin/javaplugin.so >- true >-} > >-pkg_prerm() { >- if [ ! -z "$(java-config -J | grep ${P})" ] ; then >- ewarn "It appears you are removing your default system VM!" >- ewarn "Please run java-config -L then java-config-S to set a new system VM!" >+ if use mozilla; then >+ local plugin="libjavaplugin_oji.so" >+ if has_version '>=gcc-3*' ; then >+ plugin="libjavaplugin_ojigcc3.so" > fi >+ install_mozilla_plugin /opt/${P}/bin/${plugin} >+ fi >+ > } >Index: dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v >retrieving revision 1.2 >diff -u -b -B -r1.2 ibm-jre-bin-1.4.2.ebuild >--- dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild 4 Aug 2004 15:25:57 -0000 1.2 >+++ dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild 23 Sep 2004 16:35:25 -0000 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.2 2004/08/04 15:25:57 sejo Exp $ > >-inherit java nsplugins >+inherit java > > S="${WORKDIR}/j2sdk${PV}" > DESCRIPTION="IBM Java Development Kit ${PV}" >@@ -48,16 +48,13 @@ > < ${FILESDIR}/${P} \ > > ${D}/etc/env.d/java/20${P} \ > || die "unable to install environment file" >-} >- >-pkg_postinst(){ >- inst_plugin /opt/${P}/bin/javaplugin.so >- true >-} > >-pkg_prerm() { >- if [ ! -z "$(java-config -J | grep ${P})" ] ; then >- ewarn "It appears you are removing your default system VM!" >- ewarn "Please run java-config -L then java-config-S to set a new system VM!" >+ if use mozilla; then >+ local plugin="libjavaplugin_oji.so" >+ if has_version '>=gcc-3*' ; then >+ plugin="libjavaplugin_ojigcc3.so" > fi >+ install_mozilla_plugin /opt/${P}/jre/bin/${plugin} >+ fi >+ > } >Index: dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v >retrieving revision 1.13 >diff -u -b -B -r1.13 sun-j2sdk-1.4.1-r1.ebuild >--- dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild 28 Jul 2004 10:58:57 -0000 1.13 >+++ dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild 23 Sep 2004 16:35:28 -0000 >@@ -8,9 +8,8 @@ > # 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 +50,8 @@ > virtual/jdk-1.4.1 > virtual/java-scheme-2" > >+IUSE="nptl doc" >+ > pkg_nofetch() { > einfo "Please download" > einfo " - ${SRC_MOZHEADERS}" >@@ -152,7 +153,7 @@ > > chown -R root:root ${D}/opt/${P} > >- inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so >+ install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so > set_java_env ${FILESDIR}/${VMHANDLE} > } > >Index: dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v >retrieving revision 1.12 >diff -u -b -B -r1.12 sun-j2sdk-1.4.2.ebuild >--- dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild 21 Sep 2004 14:08:30 -0000 1.12 >+++ dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild 23 Sep 2004 16:35:28 -0000 >@@ -2,9 +2,7 @@ > # 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 $ > >-IUSE="nptl doc" >- >-inherit java nsplugins >+inherit java > > JAVA_PATCHES=" > remove-fixed-paths >@@ -27,6 +25,7 @@ > SLOT="0" > KEYWORDS="x86 -ppc -alpha -sparc" > LICENSE="sun-csl" >+IUSE="nptl doc" > > RDEPEND="virtual/libc > virtual/x11 >@@ -149,7 +148,7 @@ > > chown -R root:root ${D}/opt/${P} > >- inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so >+ install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so > set_java_env ${FILESDIR}/${VMHANDLE} > } > >Index: dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild,v >retrieving revision 1.2 >diff -u -b -B -r1.2 sun-jdk-1.2.2.017.ebuild >--- dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild 23 Jul 2004 16:07:40 -0000 1.2 >+++ dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild 23 Sep 2004 16:35:29 -0000 >@@ -50,7 +50,7 @@ > echo > } > >-src_install () { >+src_install() { > # Make the root directory for the installation. > dodir /opt/${P} > >@@ -80,21 +80,21 @@ > 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 > } >Index: dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild,v >retrieving revision 1.3 >diff -u -b -B -r1.3 sun-jdk-1.4.2.05.ebuild >--- dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild 6 Sep 2004 18:44:20 -0000 1.3 >+++ dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild 23 Sep 2004 16:35:29 -0000 >@@ -2,9 +2,8 @@ > # 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 $ > >-IUSE="doc gnome kde mozilla jce" > >-inherit java nsplugins eutils >+inherit java eutils > > MY_PV=${PV%.*}_${PV##*.} > MY_P=j2sdk${MY_PV} >@@ -22,6 +21,7 @@ > 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 +59,11 @@ > > 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 +88,7 @@ > fi > } > >-src_install () { >+src_install() { > local dirs="bin include jre lib man" > dodir /opt/${P} > >@@ -117,14 +115,13 @@ > dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ > fi > >+ if use mozilla; then > 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 >+ 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 @@ > # 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 @@ > > #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 @@ > # 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 @@ > 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 >Index: dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild,v >retrieving revision 1.3 >diff -u -b -B -r1.3 sun-jdk-1.5.0_rc1.ebuild >--- dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild 6 Sep 2004 18:44:20 -0000 1.3 >+++ dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild 23 Sep 2004 16:35:29 -0000 >@@ -2,8 +2,6 @@ > # 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" >- > inherit java eutils > > amd64file="jdk-1_5_0-rc-linux-amd64.bin" >@@ -26,6 +24,7 @@ > 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 @@ > > 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 @@ > ${S}/bin/java -client -Xshare:dump > } > >-src_install () { >+src_install() { > local dirs="bin include jre lib man" > dodir /opt/${P} > >@@ -128,13 +125,12 @@ > 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 > >- 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 @@ > # 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 @@ > > #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 @@ > # 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 @@ > 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 >Index: dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild,v >retrieving revision 1.1 >diff -u -b -B -r1.1 sun-jre-bin-1.4.2.05-r1.ebuild >--- dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild 10 Sep 2004 21:43:17 -0000 1.1 >+++ dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild 23 Sep 2004 16:35:30 -0000 >@@ -2,9 +2,8 @@ > # 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.05-r1.ebuild,v 1.1 2004/09/10 21:43:17 axxo Exp $ > >-IUSE="gnome kde mozilla" > >-inherit java nsplugins eutils >+inherit java eutils > > At="j2re-1_4_2_05-linux-i586.bin" > S="${WORKDIR}/j2re1.4.2_05" >@@ -15,6 +14,7 @@ > LICENSE="sun-bcla-java-vm" > KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa" > RESTRICT="fetch" >+IUSE="gnome kde mozilla" > > DEPEND=">=dev-java/java-config-1.1.5 > sys-apps/sed" >@@ -77,14 +77,13 @@ > dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt > dohtml Welcome.html ControlPanel.html > >+ if use mozilla ; then > 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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so > fi >- inst_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so > > # create dir for system preferences > dodir /opt/${P}/.systemPrefs >@@ -121,15 +120,15 @@ > touch /opt/${P}/.systemPrefs/.systemRootModFile > chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile > >+ java_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 >@@ -137,6 +136,7 @@ > # 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 "java" >@@ -154,36 +154,10 @@ > 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-jre 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 >- >- # Set as default VM if none exists >- if [ ! -f "${JAVAC}" ] ; then >- java_pkg_postinst >- >- 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 "******************************************************" >- fi > > ebeep 5 > epause 8 > } >- >-pkg_prerm() { >- if [ ! -z "$(java-config -J | grep ${P})" ] ; then >- java-config -J >- ewarn "It appears you are removing your default system VM!" >- ewarn "Please run java-config -L then java-config-S to set a new system VM!" >- fi >-} >Index: eclass/java.eclass >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/eclass/java.eclass,v >retrieving revision 1.19 >diff -u -b -B -r1.19 java.eclass >--- eclass/java.eclass 22 Sep 2004 11:04:22 -0000 1.19 >+++ eclass/java.eclass 23 Sep 2004 16:36:14 -0000 >@@ -12,50 +12,43 @@ > > VMHANDLE=${PN}-${PV} > >-function sed2() { >- unset filename >- unset arglist >- local filename="" >- local arglist >- declare -a arglist >- while test $# -gt 0 ; do >- case $1 in >- -e) >- shift >- arglist[${#arglist[@]}]="-e" >- arglist[${#arglist[@]}]="$1" >- ;; >- *) >- if [ -e "$1" ] ; then >- filename=$1 >- fi >- ;; >- esac >- shift >- done >+EXPORT_FUNCTIONS pkg_postinst pkg_prerm > >- if [ ! -z $filename ] ; then >- mv "${filename}" "${filename}.orig" >- sed "${arglist[@]}" < ${filename}.orig > ${filename} >- return 0 >+java_pkg_postinst() { >+ local jdk=${PN#*-} >+ if [ ${jdk:0:3} == "jdk" ]; then >+ java_set_default_vm_ > else >- return 1 >+ # Only install the JRE as the system default if there's no JDK >+ # installed. Installing a JRE over an existing JDK will result >+ # in major breakage, see #9289. >+ if [ ! -f "${JAVAC}" ]; then >+ ewarn "Found no JDK, setting ${VMHANDLE} as default system VM" >+ java_set_default_vm_ > fi >+ fi >+ java_mozilla_clean_ > } > >-java_pkg_postinst() { >-# if [ -z `java-config --java 2> /dev/null` ] ; then >-# einfo "No default VM found, setting ${VMHANDLE} as default" >- einfo "Setting ${VMHANDLE} as default" >- einfo "Use java-config to reassign your VM." >+java_pkg_prerm() { >+ if java-config -J | grep -q ${P} ; then >+ ewarn "It appears you are removing your default system VM!" >+ ewarn "Please run java-config -L then java-config-S to set a new system VM!" >+ fi >+} >+ >+java_set_default_vm_() { > java-config --set-system-vm=${VMHANDLE} > /usr/sbin/env-update > source /etc/profile >-# fi >-} > >-pkg_postinst() { >- java_pkg_postinst >+ echo >+ 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" > } > > system_arch() { >@@ -82,12 +75,31 @@ > > ${D}/etc/env.d/java/20`basename $1` || die > } > >-install_mozilla_plugin() { >- local bn >- bn=`basename $1` > >- if use mozilla ; then >- dodir /usr/$(get_libdir)/mozilla/plugins >- dosym $1 /usr/$(get_libdir)/mozilla/plugins/${bn} >+java_get_plugin_dir_() { >+ echo /usr/$(get_libdir)/nsbrowser/plugins >+} >+ >+install_mozilla_plugin() { >+ if [ ! -f ${D}/$1 ] ; then >+ die "Cannot find ${1}" > fi >+ >+ local plugin_dir=$(java_get_plugin_dir_) >+ dodir ${plugin_dir} >+ dosym ${1} ${plugin_dir}/javaplugin.so > } >+ >+java_mozilla_clean_() { >+ #Because previously some ebuilds installed symlinks outside of pkg_install >+ #and are left behind, which forces you to manualy remove them to select the >+ #jdk/jre you want to use for java >+ local plugin_dir=$(java_get_plugin_dir_) >+ for file in ${plugin_dir}/javaplugin_*; do >+ rm -f ${file} >+ done >+ for file in ${plugin_dir}/libjavaplugin*; do >+ rm -f ${file} >+ done >+} >+
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=40229">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 22395
: 40229
