diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2011-11-24 20:57:04 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2011-11-24 20:57:04 +0000 |
commit | 18f43e8dba317cc469b17d210653e4d13ad4d3fe (patch) | |
tree | a89652c4e9474aa2889b1aa872c5590a08f2eda3 /dev-java | |
parent | Use relative symlinks, and ED insead of D. (diff) | |
download | historical-18f43e8dba317cc469b17d210653e4d13ad4d3fe.tar.gz historical-18f43e8dba317cc469b17d210653e4d13ad4d3fe.tar.bz2 historical-18f43e8dba317cc469b17d210653e4d13ad4d3fe.zip |
Version and EAPI bump.
Finish VMHANDLE migration.
Add missing dependencies. Bug #389795
Package-Manager: portage-2.1.10.37/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/icedtea-web/ChangeLog | 11 | ||||
-rw-r--r-- | dev-java/icedtea-web/Manifest | 7 | ||||
-rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild | 136 | ||||
-rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.4.ebuild | 136 | ||||
-rw-r--r-- | dev-java/icedtea-web/metadata.xml | 1 |
5 files changed, 288 insertions, 3 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog index 5352a02625cf..631fc5e4812f 100644 --- a/dev-java/icedtea-web/ChangeLog +++ b/dev-java/icedtea-web/ChangeLog @@ -1,6 +1,15 @@ # 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.14 2011/11/04 14:59:22 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.15 2011/11/24 20:57:04 sera Exp $ + +*icedtea-web-1.1.4-r7 (24 Nov 2011) +*icedtea-web-1.1.4 (24 Nov 2011) + + 24 Nov 2011; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.1.4.ebuild, + +icedtea-web-1.1.4-r7.ebuild, metadata.xml: + Version and EAPI bump. + Finish VMHANDLE migration. + Add missing dependencies. Bug #389795 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.3-r7.ebuild: Add ~x86 keyword. diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest index ac9da511a053..6dfa45ab0c40 100644 --- a/dev-java/icedtea-web/Manifest +++ b/dev-java/icedtea-web/Manifest @@ -1,7 +1,10 @@ AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160 d151ee610070429d73d676e07a4bc9b876f1b5b0 SHA1 3a9983dabe0387e9bc396326d937e98830fdaf34 SHA256 90ad27ff80dc42159aef9f4950511328f4ed78941911ce1f89608c08632808c7 AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 DIST icedtea-web-1.1.3.tar.gz 810141 RMD160 7f3c7063e538d15730337e1991fe9f1038cf83fe SHA1 5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37 SHA256 012390dfa8bb9a4b17b30640dfc21011c848f5017d2a21d945e933f5d514edb3 +DIST icedtea-web-1.1.4.tar.gz 812273 RMD160 2aac06c05d4513694968f86861225b5329307781 SHA1 9389030878d7c3aee17f641e3095830fe722fb60 SHA256 b17a742af0153b7887cf667a160f8519afad125bc515b0f4783c66e7ee1a7f26 EBUILD icedtea-web-1.1.3-r7.ebuild 4186 RMD160 edcff98471a712239ac40debd322e71a66376271 SHA1 5e54ca65b1c9fed5e9b031a99491c77a908d9da0 SHA256 f1f191dfb54ea637a04b26fa88b49110561798e727c2d8c4a485622483675719 EBUILD icedtea-web-1.1.3.ebuild 4195 RMD160 1d61450b58ec4fec85f91f990373754d0f7723da SHA1 6f6ccc4c3e3639583672f52931fbec4be4bd0a82 SHA256 e704b48597cdf1a6538cc1a37f7b938e60de88a6cf435adec9dd2cffba195df4 -MISC ChangeLog 2745 RMD160 991a4e924e740b5e5351018c14dcb41c29945ed8 SHA1 09df678628ffcb179c7cf26a2f4b7092e32990e7 SHA256 f145aca71c15f291310bb4e2762b27da5492d29f7fc4720ea5f67af0659761ba -MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6 +EBUILD icedtea-web-1.1.4-r7.ebuild 3856 RMD160 05aeafd2750b529432308dcac3890a3473b2e4b3 SHA1 b74a3448d8df7baec643dca8e17712c0b1416edc SHA256 a2313638ec4278f8f2ac5a02f11bc286b1d73d7817bf823ead88b2d7e60a94c0 +EBUILD icedtea-web-1.1.4.ebuild 3865 RMD160 629c9d82a0c8b24bae9ac67f6e603852b663d998 SHA1 0f807ddeff4a656ea8c05df4224c6ee277ed33cf SHA256 e7f41fb85fd94f40a45cffb40424ee641d34608c1824440bc2d06cb9b8d73264 +MISC ChangeLog 3031 RMD160 2560ed98f6efb4343ee187781beea5bf37ac9175 SHA1 c48568002aa26e617d14d2a006c9be2abdb7cd85 SHA256 db01997da54461d8ecabace70c8843c2428f6bb90d9ca8bbfe64fbc93f528197 +MISC metadata.xml 755 RMD160 a76b269fe8cf35dcacf9bc3dcd9714ef764d9bfb SHA1 517488bae5fe80e69a3fb6af061b813816b47364 SHA256 0589029d53503bd941089cf26f3a6eafe4b0bfe9c727e6c4a44cdc8ec03d5abc diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild new file mode 100644 index 000000000000..b8a05bc171d0 --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild @@ -0,0 +1,136 @@ +# 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.4-r7.ebuild,v 1.1 2011/11/24 20:57:04 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 ~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 + >=net-libs/xulrunner-1.9.1 ) ) + test? ( >=dev-java/junit-4.8:4 )" + +# 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() { + [[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423 + + # 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" + else + # migration logic + if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then + JAVA_PKG_FORCE_VM="icedtea${SLOT}" + else + JAVA_PKG_FORCE_VM="icedtea-${SLOT}" + fi + fi + + einfo "Forced vm ${JAVA_PKG_FORCE_VM}" + 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}" + 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) \ + $(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" + 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.4.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild new file mode 100644 index 000000000000..8ffd50d1bbc4 --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild @@ -0,0 +1,136 @@ +# 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.4.ebuild,v 1.1 2011/11/24 20:57:04 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 ~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 + >=net-libs/xulrunner-1.9.1 ) ) + test? ( >=dev-java/junit-4.8:4 )" + +# 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() { + [[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423 + + # 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" + else + # migration logic + if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then + JAVA_PKG_FORCE_VM="icedtea${SLOT}" + else + JAVA_PKG_FORCE_VM="icedtea-${SLOT}" + fi + fi + + einfo "Forced vm ${JAVA_PKG_FORCE_VM}" + 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}" + 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) \ + $(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" + 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/metadata.xml b/dev-java/icedtea-web/metadata.xml index 08e12862b469..9d62ac412162 100644 --- a/dev-java/icedtea-web/metadata.xml +++ b/dev-java/icedtea-web/metadata.xml @@ -14,6 +14,7 @@ </maintainer> <longdescription>FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.</longdescription> <use> + <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag> <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag> </use> </pkgmetadata> |