diff options
Diffstat (limited to 'dev-java/icedtea-web')
| -rw-r--r-- | dev-java/icedtea-web/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.1.ebuild | 136 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild | 145 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.2.ebuild | 143 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.3.ebuild | 9 |
5 files changed, 13 insertions, 427 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog index 42fe60d5c1ce..169c19237ea9 100644 --- a/dev-java/icedtea-web/ChangeLog +++ b/dev-java/icedtea-web/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/icedtea-web # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.11 2011/09/29 13:06:23 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.12 2011/11/04 09:39:42 caster Exp $ + + 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.1.1.ebuild, + -icedtea-web-1.1.2.ebuild, -icedtea-web-1.1.2-r1.ebuild, + icedtea-web-1.1.3.ebuild: + Prepare for icedtea VMHANDLE change. Remove old. *icedtea-web-1.1.3 (29 Sep 2011) diff --git a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild deleted file mode 100644 index e68dac07c5e6..000000000000 --- a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild,v 1.2 2011/09/06 09:57:09 caster Exp $ -# Build written by Andrew John Hughes (ahughes@redhat.com) - -EAPI="2" - -inherit eutils java-pkg-2 java-vm-2 - -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" -HOMEPAGE="http://icedtea.classpath.org" - -IUSE="build doc +nsplugin" - -RDEPEND="dev-java/icedtea:${SLOT}" -DEPEND="${RDEPEND} - nsplugin? ( >=net-libs/xulrunner-1.9.1 )" - -# a bit of hack so the VM switching is triggered without causing dependency troubles -JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" -JAVA_PKG_WANT_SOURCE="1.6" -JAVA_PKG_WANT_TARGET="1.6" - -pkg_setup() { - # quite a hack since java-config does not provide a way for a package - # to limit supported VM's for building and their preferred order - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Honoring user-set JAVA_PKG_FORCE_VM" - elif has_version dev-java/icedtea:${SLOT}; then - JAVA_PKG_FORCE_VM="icedtea${SLOT}" - else - JAVA_PKG_FORCE_VM="" - # don't die just yet if merging a binpkg - bug #258423 - DIE_IF_NOT_BINPKG=true - fi - - # if the previous failed, don't even run java eclasses pkg_setup - # as it might also die when no VM is present - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Forced vm ${JAVA_PKG_FORCE_VM}" - java-vm-2_pkg_setup - java-pkg-2_pkg_setup - fi -} - -unset_vars() { - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS -} - -src_unpack() { - if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then - die "Unable to find a supported VM for building" - fi - - default -} - -src_configure() { - local vmhome=$(java-config -O) - - if use build; then - icedteadir="${ICEDTEA_BIN_DIR}" - installdir="/opt/icedtea${SLOT}-web-bin" - else - icedteadir="/usr/$(get_libdir)/icedtea${SLOT}" - installdir="/usr/$(get_libdir)/icedtea${SLOT}-web" - fi - - unset_vars - - if use build || [[ ${vmhome} == ${icedteadir} ]] ; then - VMHANDLE="icedtea${SLOT}" - else - die "Unexpected install location of IcedTea${SLOT}" - fi - - einfo "Installing IcedTea-Web in ${installdir}" - einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}" - if [ ! -e ${vmhome} ] ; then - eerror "Could not find JDK install directory ${vmhome}." - die - fi - - # we need to override all *dir variables that econf sets - # man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know - # the suffix the man page will end up compressed with, anyway - econf \ - --prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \ - --with-jdk-home=${icedteadir} \ - $(use_enable doc docs) \ - $(use_enable nsplugin plugin) \ - || die "configure failed" -} - -src_compile() { - # we need this to override the src_compile from java-pkg-2 - default -} - -src_install() { - # parallel make problem bug #372235 - emake -j1 DESTDIR="${D}" install || die "Install failed" - dodoc AUTHORS README NEWS || die - - if use nsplugin; then - local arch=${ARCH}; - use x86 && arch=i386; - install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so"; - fi - - for binary in javaws itweb-settings; do - dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary} - dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary} - done -} - -pkg_postinst() { - java-vm_check-nsplugin - java_mozilla_clean_ - - if use nsplugin; then - elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" - elog "such as Firefox 3.5+, Chromium and perhaps some others too." - fi -} - -pkg_prerm() { - # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here - :; -} diff --git a/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild deleted file mode 100644 index 761bc26c4512..000000000000 --- a/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild,v 1.1 2011/09/18 21:53:18 caster Exp $ -# Build written by Andrew John Hughes (ahughes@redhat.com) - -EAPI="2" - -inherit autotools eutils java-pkg-2 java-vm-2 - -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" -HOMEPAGE="http://icedtea.classpath.org" - -IUSE="build doc +nsplugin" - -RDEPEND="dev-java/icedtea:${SLOT}" -DEPEND="${RDEPEND} - nsplugin? ( - || ( net-misc/npapi-sdk - >=net-libs/xulrunner-1.9.1 ) )" - -# a bit of hack so the VM switching is triggered without causing dependency troubles -JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" -JAVA_PKG_WANT_SOURCE="1.6" -JAVA_PKG_WANT_TARGET="1.6" - -pkg_setup() { - # quite a hack since java-config does not provide a way for a package - # to limit supported VM's for building and their preferred order - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Honoring user-set JAVA_PKG_FORCE_VM" - elif has_version dev-java/icedtea:${SLOT}; then - JAVA_PKG_FORCE_VM="icedtea${SLOT}" - else - JAVA_PKG_FORCE_VM="" - # don't die just yet if merging a binpkg - bug #258423 - DIE_IF_NOT_BINPKG=true - fi - - # if the previous failed, don't even run java eclasses pkg_setup - # as it might also die when no VM is present - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Forced vm ${JAVA_PKG_FORCE_VM}" - java-vm-2_pkg_setup - java-pkg-2_pkg_setup - fi -} - -unset_vars() { - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS -} - -src_unpack() { - if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then - die "Unable to find a supported VM for building" - fi - - default -} - -src_prepare() { - epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch - # bug #356645 - epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch - eautoreconf -} - -src_configure() { - local vmhome=$(java-config -O) - - if use build; then - icedteadir="${ICEDTEA_BIN_DIR}" - installdir="/opt/icedtea${SLOT}-web-bin" - else - icedteadir="/usr/$(get_libdir)/icedtea${SLOT}" - installdir="/usr/$(get_libdir)/icedtea${SLOT}-web" - fi - - unset_vars - - if use build || [[ ${vmhome} == ${icedteadir} ]] ; then - VMHANDLE="icedtea${SLOT}" - else - die "Unexpected install location of IcedTea${SLOT}" - fi - - einfo "Installing IcedTea-Web in ${installdir}" - einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}" - if [ ! -e ${vmhome} ] ; then - eerror "Could not find JDK install directory ${vmhome}." - die - fi - - # we need to override all *dir variables that econf sets - # man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know - # the suffix the man page will end up compressed with, anyway - econf \ - --prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \ - --with-jdk-home=${icedteadir} \ - $(use_enable doc docs) \ - $(use_enable nsplugin plugin) \ - || die "configure failed" -} - -src_compile() { - # we need this to override the src_compile from java-pkg-2 - default -} - -src_install() { - # parallel make problem bug #372235 - emake -j1 DESTDIR="${D}" install || die "Install failed" - dodoc AUTHORS README NEWS || die - - if use nsplugin; then - local arch=${ARCH}; - use x86 && arch=i386; - install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so"; - fi - - for binary in javaws itweb-settings; do - dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary} - dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary} - done -} - -pkg_postinst() { - java-vm_check-nsplugin - java_mozilla_clean_ - - if use nsplugin; then - elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" - elog "such as Firefox 3.5+, Chromium and perhaps some others too." - fi -} - -pkg_prerm() { - # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here - :; -} diff --git a/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild deleted file mode 100644 index 3b54b93cd9ed..000000000000 --- a/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild,v 1.1 2011/09/06 09:57:09 caster Exp $ -# Build written by Andrew John Hughes (ahughes@redhat.com) - -EAPI="2" - -inherit autotools eutils java-pkg-2 java-vm-2 - -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" -HOMEPAGE="http://icedtea.classpath.org" - -IUSE="build doc +nsplugin" - -RDEPEND="dev-java/icedtea:${SLOT}" -DEPEND="${RDEPEND} - nsplugin? ( - || ( net-misc/npapi-sdk - >=net-libs/xulrunner-1.9.1 ) )" - -# a bit of hack so the VM switching is triggered without causing dependency troubles -JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" -JAVA_PKG_WANT_SOURCE="1.6" -JAVA_PKG_WANT_TARGET="1.6" - -pkg_setup() { - # quite a hack since java-config does not provide a way for a package - # to limit supported VM's for building and their preferred order - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Honoring user-set JAVA_PKG_FORCE_VM" - elif has_version dev-java/icedtea:${SLOT}; then - JAVA_PKG_FORCE_VM="icedtea${SLOT}" - else - JAVA_PKG_FORCE_VM="" - # don't die just yet if merging a binpkg - bug #258423 - DIE_IF_NOT_BINPKG=true - fi - - # if the previous failed, don't even run java eclasses pkg_setup - # as it might also die when no VM is present - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Forced vm ${JAVA_PKG_FORCE_VM}" - java-vm-2_pkg_setup - java-pkg-2_pkg_setup - fi -} - -unset_vars() { - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS -} - -src_unpack() { - if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then - die "Unable to find a supported VM for building" - fi - - default -} - -src_prepare() { - epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch - eautoreconf -} - -src_configure() { - local vmhome=$(java-config -O) - - if use build; then - icedteadir="${ICEDTEA_BIN_DIR}" - installdir="/opt/icedtea${SLOT}-web-bin" - else - icedteadir="/usr/$(get_libdir)/icedtea${SLOT}" - installdir="/usr/$(get_libdir)/icedtea${SLOT}-web" - fi - - unset_vars - - if use build || [[ ${vmhome} == ${icedteadir} ]] ; then - VMHANDLE="icedtea${SLOT}" - else - die "Unexpected install location of IcedTea${SLOT}" - fi - - einfo "Installing IcedTea-Web in ${installdir}" - einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}" - if [ ! -e ${vmhome} ] ; then - eerror "Could not find JDK install directory ${vmhome}." - die - fi - - # we need to override all *dir variables that econf sets - # man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know - # the suffix the man page will end up compressed with, anyway - econf \ - --prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \ - --with-jdk-home=${icedteadir} \ - $(use_enable doc docs) \ - $(use_enable nsplugin plugin) \ - || die "configure failed" -} - -src_compile() { - # we need this to override the src_compile from java-pkg-2 - default -} - -src_install() { - # parallel make problem bug #372235 - emake -j1 DESTDIR="${D}" install || die "Install failed" - dodoc AUTHORS README NEWS || die - - if use nsplugin; then - local arch=${ARCH}; - use x86 && arch=i386; - install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so"; - fi - - for binary in javaws itweb-settings; do - dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary} - dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary} - done -} - -pkg_postinst() { - java-vm_check-nsplugin - java_mozilla_clean_ - - if use nsplugin; then - elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" - elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" - elog "such as Firefox 3.5+, Chromium and perhaps some others too." - fi -} - -pkg_prerm() { - # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here - :; -} diff --git a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild index 63998f207507..a2551ea24118 100644 --- a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild,v 1.1 2011/09/29 13:06:23 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild,v 1.2 2011/11/04 09:39:42 caster Exp $ # Build written by Andrew John Hughes (ahughes@redhat.com) EAPI="2" @@ -34,7 +34,12 @@ pkg_setup() { if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then einfo "Honoring user-set JAVA_PKG_FORCE_VM" elif has_version dev-java/icedtea:${SLOT}; then - JAVA_PKG_FORCE_VM="icedtea${SLOT}" + # migration logic + if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then + JAVA_PKG_FORCE_VM="icedtea${SLOT}" + else + JAVA_PKG_FORCE_VM="icedtea-${SLOT}" + fi else JAVA_PKG_FORCE_VM="" # don't die just yet if merging a binpkg - bug #258423 |