diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2012-08-02 18:03:48 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2012-08-02 18:03:48 +0000 |
commit | 23b029677ba88514c05075e58422af08fca61c24 (patch) | |
tree | f4c209dfb99f7620267de0a5a56ebda54d566e2a /dev-java/icedtea-web | |
parent | Keyword amd64-linux and x86-linux (diff) | |
download | gentoo-2-23b029677ba88514c05075e58422af08fca61c24.tar.gz gentoo-2-23b029677ba88514c05075e58422af08fca61c24.tar.bz2 gentoo-2-23b029677ba88514c05075e58422af08fca61c24.zip |
Security and bugfix release. #429522
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/icedtea-web')
-rw-r--r-- | dev-java/icedtea-web/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.2.1-r7.ebuild | 116 | ||||
-rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.2.1.ebuild | 116 |
3 files changed, 240 insertions, 1 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog index 4a3ce2279de8..abf7776e4638 100644 --- a/dev-java/icedtea-web/ChangeLog +++ b/dev-java/icedtea-web/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/icedtea-web # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.24 2012/07/21 11:47:47 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.25 2012/08/02 18:03:48 sera Exp $ + +*icedtea-web-1.2.1-r7 (02 Aug 2012) +*icedtea-web-1.2.1 (02 Aug 2012) + + 02 Aug 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.2.1.ebuild, + +icedtea-web-1.2.1-r7.ebuild: + Security and bugfix release. #429522 21 Jul 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-web-1.1.4.ebuild, -icedtea-web-1.1.4-r7.ebuild, -icedtea-web-1.1.4-r8.ebuild, diff --git a/dev-java/icedtea-web/icedtea-web-1.2.1-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.2.1-r7.ebuild new file mode 100644 index 000000000000..30bf99b297b4 --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.2.1-r7.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2012 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.2.1-r7.ebuild,v 1.1 2012/08/02 18:03:48 sera Exp $ +# Build written by Andrew John Hughes (ahughes@redhat.com) + +EAPI="4" + +inherit autotools eutils java-pkg-2 java-vm-2 + +DESCRIPTION="FOSS Java browser plugin and Web Start implementation" +HOMEPAGE="http://icedtea.classpath.org" +SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" + +LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" +SLOT="7" +KEYWORDS="~amd64 ~ia64 ~x86" + +IUSE="build doc javascript +nsplugin test" + +RDEPEND="dev-java/icedtea:${SLOT}" +# Need system junit 4.8+. Bug #389795 +DEPEND="${RDEPEND} + javascript? ( dev-java/rhino:1.6 ) + nsplugin? ( net-misc/npapi-sdk ) + test? ( >=dev-java/junit-4.8:4 )" + +pkg_setup() { + JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea7" + JAVA_PKG_WANT_SOURCE="1.6" + JAVA_PKG_WANT_TARGET="1.6" + + java-vm-2_pkg_setup + java-pkg-2_pkg_setup +} + +unset_vars() { + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS +} + +src_prepare() { + # bug #356645 + epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch + eautoreconf +} + +src_configure() { + local vmhome=$(java-config -O) + + if use build; then + icedteadir="${ICEDTEA_BIN_DIR}" + [[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled" + installdir="/opt/icedtea-web-bin-${SLOT}" + 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) \ + $(use_with javascript rhino) +} + +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 + dodoc AUTHORS README NEWS + + if use nsplugin; then + 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" + 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.2.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.2.1.ebuild new file mode 100644 index 000000000000..63e8538a44d9 --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.2.1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2012 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.2.1.ebuild,v 1.1 2012/08/02 18:03:48 sera Exp $ +# Build written by Andrew John Hughes (ahughes@redhat.com) + +EAPI="4" + +inherit autotools eutils java-pkg-2 java-vm-2 + +DESCRIPTION="FOSS Java browser plugin and Web Start implementation" +HOMEPAGE="http://icedtea.classpath.org" +SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" + +LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" +SLOT="6" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" + +IUSE="build doc javascript +nsplugin test" + +RDEPEND="dev-java/icedtea:${SLOT}" +# Need system junit 4.8+. Bug #389795 +DEPEND="${RDEPEND} + javascript? ( dev-java/rhino:1.6 ) + nsplugin? ( net-misc/npapi-sdk ) + test? ( >=dev-java/junit-4.8:4 )" + +pkg_setup() { + JAVA_PKG_WANT_BUILD_VM="icedtea-6 icedtea6" + JAVA_PKG_WANT_SOURCE="1.6" + JAVA_PKG_WANT_TARGET="1.6" + + java-vm-2_pkg_setup + java-pkg-2_pkg_setup +} + +unset_vars() { + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS +} + +src_prepare() { + # bug #356645 + epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch + eautoreconf +} + +src_configure() { + local vmhome=$(java-config -O) + + if use build; then + icedteadir="${ICEDTEA_BIN_DIR}" + [[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled" + installdir="/opt/icedtea-web-bin-${SLOT}" + 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) \ + $(use_with javascript rhino) +} + +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 + dodoc AUTHORS README NEWS + + if use nsplugin; then + 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" + fi +} + +pkg_prerm() { + # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here + :; +} |