diff options
Diffstat (limited to 'dev-java/icedtea-web')
| -rw-r--r-- | dev-java/icedtea-web/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/icedtea-web/Manifest | 19 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild | 137 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.2.ebuild | 137 |
4 files changed, 300 insertions, 2 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog index 78938ea1a93c..6d0c6b672a90 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.18 2012/03/03 21:51:25 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.19 2012/03/06 09:24:22 sera Exp $ + +*icedtea-web-1.2-r7 (06 Mar 2012) +*icedtea-web-1.2 (06 Mar 2012) + + 06 Mar 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.2.ebuild, + +icedtea-web-1.2-r7.ebuild: + Version bump 03 Mar 2012; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.4-r8.ebuild, files/fix-plugin-in-icedtea-7.patch: diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest index 507459dad55d..392ce215cd67 100644 --- a/dev-java/icedtea-web/Manifest +++ b/dev-java/icedtea-web/Manifest @@ -1,8 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 AUX fix-plugin-in-icedtea-7.patch 13618 RMD160 39bde96adc1715f7010944bcf9455ebec93d08f9 SHA1 a3c68c9fcfc120eadb03ffaff3657399180e86ac SHA256 0dea03343ecea371004baa508ff20e87fb020652cdb47a7bef80deb1ba17c653 DIST icedtea-web-1.1.4.tar.gz 812273 RMD160 2aac06c05d4513694968f86861225b5329307781 SHA1 9389030878d7c3aee17f641e3095830fe722fb60 SHA256 b17a742af0153b7887cf667a160f8519afad125bc515b0f4783c66e7ee1a7f26 +DIST icedtea-web-1.2.tar.gz 885793 RMD160 3686b66531088050934ba25c8ac5be3fc23ff899 SHA1 4b7e38b13101ac1f18dc276f17be37a0ed2b28df SHA256 3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d EBUILD icedtea-web-1.1.4-r7.ebuild 3949 RMD160 8f1fea7e178161fd388bc000b30d70c3c6f1954f SHA1 cc4aa774b5a83f4abd642a46d50a9232a0efed00 SHA256 300f7e5e2c9d3474d23b50064da182ec99b39071ef818a583aab00d392e6e2a2 EBUILD icedtea-web-1.1.4-r8.ebuild 4141 RMD160 7ae64b852d10bc9004691d8a4e43ae14138e6a71 SHA1 243a7ce0d99176072cc2b62f58bdeaddbf0e5801 SHA256 86fc970887ca8cf0d9fb7e8dc58cecb19ec09c1fba42732e4659d3cf58094add EBUILD icedtea-web-1.1.4.ebuild 3958 RMD160 faf4add9b4ee9e55f7faf4334e4db67687ad2fbe SHA1 703d9b569ccd02f1676525eaa34060b86a2308e6 SHA256 706e4c0419a3707d5618899b2c62cd6e2636e3def77b8ad7c072c3d6b968c860 -MISC ChangeLog 3730 RMD160 c73fe912986ea37b0bbd818c78a56ed377f56011 SHA1 06ae7340271a73f81dd87824294e3c1f313182f3 SHA256 cfcce461570dcadf5c0767d9c7fe93690aa1564879a1b2fd406c5069f0107385 +EBUILD icedtea-web-1.2-r7.ebuild 3945 RMD160 d93b593541937aca5854203e4c343ffb50c81a40 SHA1 77f54dc1e5e4fbc98c571ac8709dec1c56afe7f1 SHA256 36bc583cb09cc007baac0665d628d2351af744796fc1817661ad619323e0399e +EBUILD icedtea-web-1.2.ebuild 3954 RMD160 7010375b66f890dd0b83a021b6d2cd33064bf562 SHA1 6f34e2a38ced11853275fc064256a12766162aec SHA256 80995d488557e330ee2f7649743350fdedd937caecbeb18893f59300b3d117a0 +MISC ChangeLog 3915 RMD160 4f21e9c88e6c03cf3d33c0522fdeb02087d29f56 SHA1 34b3b6d460bf65f5739976cd2b758e16da73894a SHA256 67c85a7a72eeefc95dfcf4e4d94a6dcdbf2e7317194e38c8e41ca3e1a52f154f MISC metadata.xml 755 RMD160 a76b269fe8cf35dcacf9bc3dcd9714ef764d9bfb SHA1 517488bae5fe80e69a3fb6af061b813816b47364 SHA256 0589029d53503bd941089cf26f3a6eafe4b0bfe9c727e6c4a44cdc8ec03d5abc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQEcBAEBAgAGBQJPVdfUAAoJEIUJ+svaV163uBYIAKlC5zjXnFvW2X5JegctELem +JXblWz2hovGjY6bqqrPRx6TN+jHXx5T+z0vqVkCGRvCWT4n+cRPBRVCVtoutxKzb +uqKkCEDVJ94ZEM/YO3BhlnICFMSJX5SU1sJqEWPwTrny2PT3GbhRu4rGzDZlW2mV +J8+R28t0OZzt5bJKZeBGkXOc4dQSP5G2XDTNBWMZC6+z5ReL1bK0OkFLUeDKijop +e/NKQEzGw4Gg0M0Qz1JO8Kr9jIKnBH5CFJAxbXSlYzMqYy0FBVVrHIeghqsdmIa5 +8ZgrxC30LcI9bfstjdFeOu4vfpYyfVRLhSYsJjW04yBxzY1dj3b1ET/I1qN9uEQ= +=nR6V +-----END PGP SIGNATURE----- diff --git a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild new file mode 100644 index 000000000000..5ef2bff1df70 --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild @@ -0,0 +1,137 @@ +# 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-r7.ebuild,v 1.1 2012/03/06 09:24:22 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}" + [[ -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" + 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.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.2.ebuild new file mode 100644 index 000000000000..614615ad12b5 --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.2.ebuild @@ -0,0 +1,137 @@ +# 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.ebuild,v 1.1 2012/03/06 09:24:22 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}" + [[ -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" + 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 + :; +} |