diff options
17 files changed, 168 insertions, 70 deletions
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog index 531f7ad0b74b..1b877fb6f34e 100644 --- a/dev-java/blackdown-jdk/ChangeLog +++ b/dev-java/blackdown-jdk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/blackdown-jdk # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.85 2005/06/16 18:32:36 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.86 2005/07/11 13:24:41 axxo Exp $ + + 11 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + blackdown-jdk-1.3.1-r8.ebuild, blackdown-jdk-1.3.1-r10.ebuild, + blackdown-jdk-1.4.1-r1.ebuild, blackdown-jdk-1.4.2.01-r2.ebuild, + blackdown-jdk-1.4.2.02.ebuild: + bug 94056: useflag rename mozilla -> browserplugin 16 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> blackdown-jdk-1.4.2.02.ebuild: diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild index 3b3147435e21..4e874471be44 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.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/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.17 2005/05/18 15:35:22 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.18 2005/07/11 13:24:41 axxo Exp $ inherit java toolchain-funcs @@ -11,8 +11,8 @@ SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/soft LICENSE="sun-bcla-java-vm" SLOT="1.3" -KEYWORDS="ppc" -IUSE="doc mozilla" +KEYWORDS="ppc -*" +IUSE="doc browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -51,7 +51,7 @@ src_install() { dohtml README.html # Install ns plugin - if use mozilla; then + if use browserplugin || use mozilla; then if [ "${ARCH}" == "x86" ] ; then PLATFORM="i386" elif [ "${ARCH}" == "ppc" ] ; then @@ -77,3 +77,12 @@ src_install() { # install env into /etc/env.d set_java_env ${FILESDIR}/${VMHANDLE} || die } + +pkg_postinst() { + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi +} + diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild index 82c9dbe01a21..b437ff6eb0bf 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.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/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.21 2005/06/06 18:37:22 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.22 2005/07/11 13:24:41 axxo Exp $ inherit java @@ -13,8 +13,8 @@ SRC_URI="x86? ( mirror://blackdown.org/JDK-${PV}/i386/FCS/j2sdk-${PV}-FCS-linux- LICENSE="sun-bcla-java-vm" SLOT="1.3" -KEYWORDS="x86 ~ppc sparc" -IUSE="doc mozilla" +KEYWORDS="x86 ~ppc sparc -*" +IUSE="doc browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -49,7 +49,7 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.html - if use mozilla; then + if use browserplugin || use mozilla; then if [ "${ARCH}" == "x86" ] ; then PLATFORM="i386" elif [ "${ARCH}" == "ppc" ] ; then @@ -77,9 +77,15 @@ pkg_postinst() { # Set as default system VM if none exists java_pkg_postinst - if use mozilla; then + if use browserplugin || use mozilla; then einfo "The java mozilla plugin supplied by this package does not" einfo "work with newer version mozilla/firefox." einfo "You need >=${PN}-1.4 for them." fi + + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild index 94b2dbcc921e..aa3ec59ad564 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-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/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.10 2005/06/06 18:37:22 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.11 2005/07/11 13:24:41 axxo Exp $ inherit java @@ -21,7 +21,7 @@ CHPAX_CONSERVATIVE_FLAGS="pemsv" LICENSE="sun-bcla-java-vm" SLOT="1.4.1" KEYWORDS="-* x86 sparc amd64" -IUSE="doc emul-linux-x86 mozilla" +IUSE="doc emul-linux-x86 browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.6 @@ -77,7 +77,7 @@ src_install() { # do not install plugins, security vulnerability #72221 rm -rf ${D}/opt/${P}/jre/plugin/ - #if use mozilla; then + #if use browserplugin || use mozilla; then # if [ "${ARCH}" = "x86" ] ; then # PLATFORM="i386" # fi @@ -111,9 +111,9 @@ pkg_postinst() { # Set as default system VM if none exists java_pkg_postinst - if use mozilla; then + if use browserplugin || use mozilla; then echo - einfo "mozilla plugin NOT installed" + einfo "browserplugin plugin NOT installed" einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt" fi # if chpax is on the target system, set the appropriate PaX flags @@ -126,11 +126,11 @@ pkg_postinst() { for paxkills in "jar" "javac" "java" "javah" "javadoc" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done # /opt/blackdown-jdk-1.4.1/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -138,4 +138,10 @@ pkg_postinst() { ewarn "on the physical files - help for PaX and grsecurity" ewarn "can be given by #gentoo-hardened + pappy@gentoo.org" fi + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi + } diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild index f80007749348..e6d67da94fca 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.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/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild,v 1.8 2005/06/06 18:37:22 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild,v 1.9 2005/07/11 13:24:41 axxo Exp $ inherit java versionator @@ -18,7 +18,7 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.2" LICENSE="sun-bcla-java-vm" KEYWORDS="-* x86 amd64" -IUSE="doc mozilla" +IUSE="doc browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 @@ -94,8 +94,7 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.html - # Install mozilla plugin if mozilla use flag is set - if use mozilla; then + if use browserplugin || use mozilla; then case ${ARCH} in amd64) platform="amd64" ;; x86) platform="i386" ;; @@ -139,11 +138,11 @@ pkg_postinst() { for paxkills in "jar" "javac" "java" "javah" "javadoc" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done # /opt/blackdown-jdk-1.4.1/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -151,4 +150,10 @@ pkg_postinst() { ewarn "on the physical files - help for PaX and grsecurity" ewarn "can be given by #gentoo-hardened + pappy@gentoo.org" fi + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi + } diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild index 42585b305695..8948e0ee3ae7 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.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/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild,v 1.2 2005/06/16 18:32:36 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild,v 1.3 2005/07/11 13:24:41 axxo Exp $ inherit java versionator @@ -18,7 +18,7 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.2" LICENSE="sun-bcla-java-vm" KEYWORDS="-* x86 amd64" -IUSE="doc mozilla" +IUSE="doc browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 @@ -94,8 +94,7 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.html - # Install mozilla plugin if mozilla use flag is set - if use mozilla; then + if use browserplugin || use mozilla; then case ${ARCH} in amd64) platform="amd64" ;; x86) platform="i386" ;; @@ -139,11 +138,11 @@ pkg_postinst() { for paxkills in "jar" "javac" "java" "javah" "javadoc" do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills done # /opt/blackdown-jdk-1.4.1/jre/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm einfo "you should have seen lots of chpax output above now" ewarn "make sure the grsec ACL contains those entries also" @@ -151,4 +150,10 @@ pkg_postinst() { ewarn "on the physical files - help for PaX and grsecurity" ewarn "can be given by #gentoo-hardened + pappy@gentoo.org" fi + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi + } diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog index 72dc3579b25d..69f12596d80c 100644 --- a/dev-java/blackdown-jre/ChangeLog +++ b/dev-java/blackdown-jre/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/blackdown-jre # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.63 2005/06/20 12:55:45 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.64 2005/07/11 13:23:11 axxo Exp $ + + 11 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild, + blackdown-jre-1.4.2.01-r1.ebuild, blackdown-jre-1.4.2.02.ebuild: + bug 94056: useflag rename mozilla -> browserplugin 20 Jun 2005; Thomas Matthijs <axxo@gentoo.org> blackdown-jre-1.4.2.02.ebuild: diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild index 400134befb0c..6a0b9c6d7215 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.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/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.21 2005/05/18 15:41:26 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.22 2005/07/11 13:23:11 axxo Exp $ inherit java toolchain-funcs @@ -11,8 +11,8 @@ SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/soft LICENSE="sun-bcla-java-vm" SLOT="0" -KEYWORDS="ppc" -IUSE="mozilla" +KEYWORDS="ppc -*" +IUSE="browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -50,8 +50,7 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.html - # Install mozilla plugin - if use mozilla; then + if use browserplugin || use mozilla; then case ${ARCH} in amd64|x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -63,4 +62,10 @@ src_install() { sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties set_java_env ${FILESDIR}/${VMHANDLE} + + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild index 8e47739b85de..f012cd82201d 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-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/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.9 2005/06/06 18:34:38 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.10 2005/07/11 13:23:11 axxo Exp $ inherit java toolchain-funcs @@ -29,8 +29,8 @@ RDEPEND="${DEPEND} PROVIDE="virtual/jre" SLOT="0" LICENSE="sun-bcla-java-vm" -KEYWORDS="x86 sparc amd64" -IUSE="emul-linux-x86 mozilla" +KEYWORDS="x86 sparc amd64 -*" +IUSE="emul-linux-x86 browserplugin mozilla" src_unpack () { typeset a want_gcc_ver @@ -69,7 +69,7 @@ src_install () { # Install mozilla plugin # do not install plugins, security vulnerability #72221 rm -rf ${D}/opt/${P}/plugin/ - #if use mozilla; then + #if use browserplugin || use mozilla; then # case ${ARCH} in # amd64|x86) platform="i386" ;; # ppc) platform="ppc" ;; @@ -90,9 +90,15 @@ src_install () { } pkg_postinst() { - if use mozilla; then + if use browserplugin || use mozilla; then echo einfo "mozilla plugin NOT installed" einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt" fi + + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi } diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild index 410a80225b2a..48e76c3d22aa 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-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/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.4 2005/06/06 18:34:38 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.5 2005/07/11 13:23:11 axxo Exp $ inherit java versionator @@ -20,7 +20,7 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.2" LICENSE="sun-bcla-java-vm" KEYWORDS="-* amd64 x86" -IUSE="mozilla" +IUSE="browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" @@ -94,7 +94,7 @@ src_install () { dohtml README.html # Install mozilla plugin - if use mozilla; then + if use browserplugin || use mozilla; then case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -118,3 +118,11 @@ src_install () { unpack_jars } + +pkg_postinst() { + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi +} diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild index 378db3f1b6df..f20d24e49778 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.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/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.2 2005/06/20 12:55:45 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.3 2005/07/11 13:23:11 axxo Exp $ inherit java versionator @@ -20,7 +20,7 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.2" LICENSE="sun-bcla-java-vm" KEYWORDS="-* amd64 x86" -IUSE="mozilla" +IUSE="browserplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" @@ -94,7 +94,7 @@ src_install () { dohtml README.html # Install mozilla plugin - if use mozilla; then + if use browserplugin || use mozilla; then case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -118,3 +118,11 @@ src_install () { unpack_jars } + +pkg_postinst() { + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi +} diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog index 211078541ba3..24ceb2196dfb 100644 --- a/dev-java/ibm-jdk-bin/ChangeLog +++ b/dev-java/ibm-jdk-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ibm-jdk-bin # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.28 2005/05/18 15:45:53 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.29 2005/07/11 13:25:54 axxo Exp $ + + 11 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.2.ebuild: + bug 94056: useflag rename mozilla -> browserplugin 18 May 2005; Thomas Matthijs <axxo@gentoo.org> ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.2.ebuild: diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild index e6604cce3a5c..d20342cbad0e 100644 --- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild +++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.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/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.11 2005/05/18 15:45:53 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.12 2005/07/11 13:25:54 axxo Exp $ inherit java eutils @@ -17,7 +17,7 @@ PROVIDE="virtual/jdk virtual/jre" SLOT="1.4" LICENSE="IBM-J1.4" -KEYWORDS="ppc ~x86 ppc64" +KEYWORDS="ppc ~x86 ppc64 -*" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -26,7 +26,7 @@ DEPEND="virtual/libc RDEPEND="${DEPEND} !ppc64? ( sys-libs/lib-compat )" -IUSE="X doc javacomm mozilla" +IUSE="X doc javacomm browserplugin mozilla" if use ppc; then S="${WORKDIR}/IBMJava2-ppc-141" @@ -53,7 +53,7 @@ src_install() { insinto /etc doins ${FILESDIR}/cpuinfo fi - if use mozilla && ! use ppc; then + if ( use browserplugin || use mozilla ) && ! use ppc; then local plugin="libjavaplugin_oji.so" if has_version '>=gcc-3*' ; then plugin="libjavaplugin_ojigcc3.so" @@ -77,7 +77,10 @@ pkg_postinst() { eerror "Some parts of IBM JDK require XFree86 to be installed." eerror "Be careful which Java libraries you attempt to use." fi + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi - ebeep 5 - epause 8 } diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild index fe55694aa46e..ae9638005549 100644 --- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild +++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.23 2005/05/22 15:53:38 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.24 2005/07/11 13:25:54 axxo Exp $ inherit java eutils @@ -19,7 +19,7 @@ PROVIDE="virtual/jdk virtual/jre" SLOT="1.4" LICENSE="IBM-J1.4" -KEYWORDS="ppc ~x86 ppc64 amd64" +KEYWORDS="ppc ~x86 ppc64 amd64 -*" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -28,7 +28,7 @@ DEPEND="virtual/libc RDEPEND="${DEPEND} !ppc64? ( !amd64? ( sys-libs/lib-compat ) )" -IUSE="X doc javacomm mozilla" +IUSE="X doc javacomm browserplugin mozilla" if use ppc; then S="${WORKDIR}/IBMJava2-ppc-142" @@ -51,14 +51,14 @@ src_install() { cp -a ${S}/{demo,src.jar} ${D}opt/${P}/share/ # setting the ppc stuff - if useq ppc; then + 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 /etc doins ${FILESDIR}/cpuinfo fi - if useq mozilla && ! useq ppc && ! useq amd64 && ! useq ppc64; then + if ( use browserplugin || use mozilla ) && ! use ppc && ! use amd64 && ! use ppc64; then local plugin="libjavaplugin_oji.so" if has_version '>=gcc-3*' ; then plugin="libjavaplugin_ojigcc3.so" @@ -75,14 +75,17 @@ src_install() { pkg_postinst() { java_pkg_postinst - if ! useq X; then + if ! use X; then 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." fi + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi - ebeep 5 - epause 8 } diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog index 7c7e22dcc428..81a6dea0a525 100644 --- a/dev-java/ibm-jre-bin/ChangeLog +++ b/dev-java/ibm-jre-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ibm-jre-bin # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.17 2005/05/18 15:45:12 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.18 2005/07/11 13:27:01 axxo Exp $ + + 11 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + ibm-jre-bin-1.4.1-r1.ebuild, ibm-jre-bin-1.4.2.ebuild: + bug 94056: useflag rename mozilla -> browserplugin 18 May 2005; Thomas Matthijs <axxo@gentoo.org> ibm-jre-bin-1.4.1-r1.ebuild, ibm-jre-bin-1.4.2.ebuild: diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild index 27a18c79c619..3f68ea2de839 100644 --- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-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/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.15 2005/05/22 15:52:08 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.16 2005/07/11 13:27:01 axxo Exp $ inherit java @@ -11,10 +11,10 @@ SRC_URI="ppc? ( mirror://gentoo/IBMJava2-JRE-141.ppc.tgz ) ppc64? ( mirror://gentoo/IBMJava2-JRE-141.ppc64.tgz ) x86? ( mirror://gentoo/IBMJava2-JRE-141.tgz )" PROVIDE="virtual/jre" -IUSE="mozilla" +IUSE="browserplugin mozilla" SLOT="1.4" LICENSE="IBM-J1.4" -KEYWORDS="ppc ~x86 ppc64" +KEYWORDS="ppc ~x86 ppc64 -*" DEPEND="virtual/libc >=dev-java/java-config-0.2.5" RDEPEND="" @@ -48,7 +48,7 @@ src_install() { > ${D}/etc/env.d/java/20${P} \ || die "unable to install environment file" - if use mozilla; then + if use browserplugin || use mozilla; then local plugin="libjavaplugin_oji.so" if has_version '>=gcc-3*' ; then plugin="libjavaplugin_ojigcc3.so" @@ -57,3 +57,11 @@ src_install() { fi } + +pkg_postinst() { + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi +} diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild index d3652041aa58..8fef30798042 100644 --- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.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/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.9 2005/05/22 15:52:08 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.10 2005/07/11 13:27:01 axxo Exp $ inherit java @@ -11,10 +11,10 @@ SRC_URI="ppc? ( mirror://gentoo/IBMJava2-JRE-142.ppc.tgz ) ppc64? ( mirror://gentoo/IBMJava2-JRE-142.ppc64.tgz ) x86? ( mirror://gentoo/IBMJava2-JRE-142.tgz )" PROVIDE="virtual/jre" -IUSE="mozilla" +IUSE="browserplugin mozilla" SLOT="1.4" LICENSE="IBM-J1.4" -KEYWORDS="ppc ~x86 ppc64" +KEYWORDS="ppc ~x86 ppc64 -*" DEPEND="virtual/libc >=dev-java/java-config-0.2.5" RDEPEND="" @@ -48,7 +48,7 @@ src_install() { > ${D}/etc/env.d/java/20${P} \ || die "unable to install environment file" - if useq mozilla && ! ( useq ppc || useq ppc64 ); then + if ( use browserplugin || use mozilla ) && ! ( use ppc || use ppc64 ); then local plugin="libjavaplugin_oji.so" if has_version '>=gcc-3*' ; then plugin="libjavaplugin_ojigcc3.so" @@ -57,3 +57,10 @@ src_install() { fi } +pkg_postinst() { + if ! use browserplugin && use mozilla; then + ewarn + ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" + ewarn "has been renamed to 'browserplugin' please update your USE" + fi +} |