diff options
| -rw-r--r-- | dev-java/icedtea6-bin/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-java/icedtea6-bin/Manifest | 15 | ||||
| -rw-r--r-- | dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/icedtea6-bin/icedtea6-bin-1.9.4.ebuild | 102 |
5 files changed, 129 insertions, 11 deletions
diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog index cac9a2a50db7..230a902241b3 100644 --- a/dev-java/icedtea6-bin/ChangeLog +++ b/dev-java/icedtea6-bin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/icedtea6-bin -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.42 2010/11/27 12:57:33 caster Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.43 2011/01/21 23:32:52 caster Exp $ + +*icedtea6-bin-1.9.4 (21 Jan 2011) + + 21 Jan 2011; Vlastimil Babka <caster@gentoo.org> icedtea6-bin-1.9.1.ebuild, + icedtea6-bin-1.9.2.ebuild, +icedtea6-bin-1.9.4.ebuild: + Version bump, security bug #352035 (JNLP security manager bypass - + (CVE-2010-4351). Also convert deps to virtual/jpeg, bug #347953. *icedtea6-bin-1.9.2 (27 Nov 2010) diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest index a509f2f9cc1c..3a4703bf6f6a 100644 --- a/dev-java/icedtea6-bin/Manifest +++ b/dev-java/icedtea6-bin/Manifest @@ -3,19 +3,28 @@ DIST icedtea6-bin-core-1.9.1-amd64.tar.bz2 35783717 RMD160 01072eba378ffcf02b87e DIST icedtea6-bin-core-1.9.1-x86.tar.bz2 36924988 RMD160 d3fbf606cc43a412cf2044d64f3434ef9f1ecbcf SHA1 9e4254ce22b470b687adf965d360f7c4dbd85aa4 SHA256 82ad4775eee2c2ecffb9ad870342221cc4f38eb3a5522de64b1d26f9fe8d62c2 DIST icedtea6-bin-core-1.9.2-amd64.tar.bz2 35838514 RMD160 abc0bd3403d927d07757ebf70540a553c22c0579 SHA1 7c3f084b79d3d262f3d9dc712b8dd6c6c4281f37 SHA256 767d43101859c89e4d7034c18f9b038bf48ec2c320f3c6e592bd882f4fa36d89 DIST icedtea6-bin-core-1.9.2-x86.tar.bz2 36960745 RMD160 990a843bfaa9a2a0c4517d3fb8d8f97e0d2ebf04 SHA1 ceaed88d09c88aec2665828d93b1060b8eb65348 SHA256 c36557baa3b9ca5f32eb6b8ee2a83000dc91ad4264acc7751f36f8087e5c8ced +DIST icedtea6-bin-core-1.9.4-amd64.tar.bz2 35871501 RMD160 67f930e55a21cca1b6fe26781e507fd167e39cc2 SHA1 3303d38f6d48a1c840b18cb2f2df15bb86a8b0de SHA256 462c2e3409de3518c4de91ba0870ef673c2732e1a7126da1cb6f189f5e7e0c60 +DIST icedtea6-bin-core-1.9.4-x86.tar.bz2 36971318 RMD160 a7ebac9e8c872cba491250a54d03c5b59151465b SHA1 1b133f22838f2860ac3af5bec01cdebb2880139f SHA256 527c18f9be83dd6ac10be2e47ad62031189e9fd0df9a5d83f18903d36c315286 DIST icedtea6-bin-doc-1.9.1.tar.bz2 11635939 RMD160 67776061228c42261b5b356a2c6634fc8a2c3872 SHA1 8eaefafe8bc3c39889f784556296d656fb5e8390 SHA256 9dcd6a8e723cc27570843df07a295453193009bd29ec28164f6e78d86b41d064 DIST icedtea6-bin-doc-1.9.2.tar.bz2 11639502 RMD160 fbae7efacfd3f8568efab7dd64d3ec8ab2d2d426 SHA1 6bb01aa593cd9575d7f756218c2c1ea76bb968cd SHA256 d6e5090478916c6c4796a10e9852fb217fc7a1a97ed8b64857b0cf89e057bb84 +DIST icedtea6-bin-doc-1.9.4.tar.bz2 11637465 RMD160 7da7ecf115cf793a241d28ae9757da8cd10a8d49 SHA1 3da0b1eacbc809ba1cec3619945293bd7fa27524 SHA256 72e5fdcb87a515d0b805a5ab08112c199b70f26e891583fba5107a9dc444f910 DIST icedtea6-bin-examples-1.9.1-amd64.tar.bz2 2192996 RMD160 d858b8aaafeedc7c00eef3b9d4e8540f92e16ccb SHA1 91b20845b6f2d98280c9191c2653d541b2b66bd7 SHA256 b7c884391e5d7225ba3583b331a8b675a48cc01fec628e1fddc95c7898f80cde DIST icedtea6-bin-examples-1.9.1-x86.tar.bz2 2162907 RMD160 cb69e633d34b455cc0fb85494ba57c76d681a376 SHA1 11b3364438ce7f0b44cfee87cbfd2dbb508b3734 SHA256 c575302fc1a84725a015516fd7a8b304b5c784d9b39c6e95f8141889424f1669 DIST icedtea6-bin-examples-1.9.2-amd64.tar.bz2 2193111 RMD160 74c0973fd1b0511ce22e0a85cb19d73e374035f3 SHA1 ca5529123e25e447edccd4472b17d3ae4c54cc32 SHA256 afc6c9bdb1e802ed5e9a7442d39abd94508d64629535f1b60d9670c9cd733211 DIST icedtea6-bin-examples-1.9.2-x86.tar.bz2 2163021 RMD160 0602948f6d253071689abd8de078aae440dd8e6c SHA1 f71e38d4b792f94086a37f3c024dbd8c90103fcf SHA256 23de330cf6aa8970fda7d61204fdcaafb31a550eb1deea1ce5f5b549120a6dc8 +DIST icedtea6-bin-examples-1.9.4-amd64.tar.bz2 2193025 RMD160 8e5e58078ff9c97536adf24dd4c0e75caab1cd63 SHA1 8a7c9b076aff55ce92322df0d625e32a9fe5c886 SHA256 0a2adffa6b184f02a8444c529075485b42f34abbfb83b1d26dde15a0570f0fb4 +DIST icedtea6-bin-examples-1.9.4-x86.tar.bz2 2162558 RMD160 abe5e138cab7a8f1b9644ac4a0f45f70d211ddb0 SHA1 ac7d18c79f1d909cd24feb0be76d287cefc73e63 SHA256 5a6fc871596b31a8408d003f128dc752132d025ce0fa383913faa0bdf96605a6 DIST icedtea6-bin-nsplugin-1.9.1-amd64.tar.bz2 79217 RMD160 90d5eb5431a7890c53c474eb5593af9f1fcffb5a SHA1 08e021a67a706dbb91d3f85bc6ed27e0764a15d5 SHA256 2e310e13ee33c2772e03804077beceed736d285077799198a0f0a2197a87445f DIST icedtea6-bin-nsplugin-1.9.1-x86.tar.bz2 73082 RMD160 2f4fadcb6f14ca744da5a64767f899121f388237 SHA1 2faf54eb38350377f8304f8450d9cad870a478ec SHA256 7349fc23682b8bd488e643636f85eeb11f0c1fe9d220596c520fa0e937c9b3ba DIST icedtea6-bin-nsplugin-1.9.2-amd64.tar.bz2 79235 RMD160 c629536ad1e07fa5c3b8b595184fa58aeadca478 SHA1 fdaf5f3632cd39219a1ce74f23de63e3281baed5 SHA256 86c2aed3dcca5b8113c6b2a964657a6493f8d8897e7e52e6e9c3be4c782485a8 DIST icedtea6-bin-nsplugin-1.9.2-x86.tar.bz2 73127 RMD160 e7086b6c3e2fe72401b20c8f8f22bdacd9742593 SHA1 ac1f41bd87c02146d32d0b446737a6551fc721f3 SHA256 a347a6fbd7f7fec05d8692e50e7066e5000b2dc711e26ff2ec6d14443c5cc959 +DIST icedtea6-bin-nsplugin-1.9.4-amd64.tar.bz2 79225 RMD160 8f4c64221722f05fd8d15e5ed2625222c3e39bf9 SHA1 9b1696fdfe4fd452b582019e2944f242c37cccf0 SHA256 ff9b0974ca57bf629af7a398d90d315549aed60ab2cf54aa80d7363fb7d6ca64 +DIST icedtea6-bin-nsplugin-1.9.4-x86.tar.bz2 73101 RMD160 b4e843841b37f6c9c7c45397ac14fab7e71951a7 SHA1 bfbf2273a6cd5a591f374617a8988b12f3ac3f52 SHA256 fd85d9399b5fb6e0316b853dcf6fdac719e7b093b40efbf95f12f25e527ca789 DIST icedtea6-bin-src-1.9.1.tar.bz2 26846492 RMD160 7eb8151445c1fc5826ece07d7999d0b46fc52314 SHA1 171e2776c43d119c8a0576269c3aad9f9461cf8c SHA256 73f8a7b99fb52fdcc96a957133c7ad69c841f28b1e3ab7ea995cc3c93003f776 DIST icedtea6-bin-src-1.9.2.tar.bz2 26851925 RMD160 28a446cbef37f955a195e8fe94fae0e8ae266482 SHA1 63cbe5e88f3a4368462c9c9a32e4c64bb9ecdbc3 SHA256 eee8728b218af2517d2e71be4ce2edbd5ca84c67289c6d1d44fffedc510cd8d2 -EBUILD icedtea6-bin-1.9.1.ebuild 2732 RMD160 05b7644097683b34b2c52d2691f4fa06ee0af7ae SHA1 77e7df7a20bcfba0bd57aada83eedb267f34a60e SHA256 9e718caa8c72c953e256c59ccf6d460b8cdd7a78c8e9a8cc7d435f10f9203961 -EBUILD icedtea6-bin-1.9.2.ebuild 2731 RMD160 5d0a829aa36db8fc700fcadef96c951642c1162a SHA1 a4d67435c15577f91946daa9c1a88417bad2b8b9 SHA256 b301b20c9abb709778ddf88eba09c8e752631091665b995fef072aca845ced1a -MISC ChangeLog 7116 RMD160 c021eee6f07c4e142ff988f63ec2e61190f2df25 SHA1 930a7f2630c098b6c644b39867d1c1e0160b45ad SHA256 b36ba2f5d82c1962ef758d3e552cb2de4de0d057a5496ed789d10afdd56e2849 +DIST icedtea6-bin-src-1.9.4.tar.bz2 26868737 RMD160 e21752e39892bb71d1ed7d34cd9f77c2d266a6e2 SHA1 c5439b14acf99c6bfbcef624ca9ee3aeeb21b0a4 SHA256 06b1abc1c77231a6c7a914d88791c0272eaa8eb006a6afd57c33223bce80d521 +EBUILD icedtea6-bin-1.9.1.ebuild 2681 RMD160 9083782cb5a48acaa88299baa86d9a7a21802230 SHA1 baf51d4ddb506c2a1f349f49d87f2ed9d433f371 SHA256 96632b47d802bf855c2f0b7473a4f8f43aac1673350cbdff1698cb313ae936e0 +EBUILD icedtea6-bin-1.9.2.ebuild 2683 RMD160 e9248c119f75cfff56c487c9ddf3c094ce16dc80 SHA1 2e8f1e71b9649df049a424f9b868e612e0af4bcd SHA256 de9e02a0bd4b98c91b1ea44e241bf7383d4badd84dfe65c049d32e3a7d3277a0 +EBUILD icedtea6-bin-1.9.4.ebuild 2683 RMD160 21df292a5bd2a107116ceec274c08c258f149bff SHA1 9cfa26bb4efda4066d532b2803d0db19e3162d82 SHA256 7bad6e0523ac677a10638881937928afd830c439bbe99b182600dfec58c767d3 +MISC ChangeLog 7423 RMD160 304a6ea77f527a317cf5ed51d9f8bfbd3c3be367 SHA1 63128707d93a4f83a70c9db689cc781d7d5c6436 SHA256 1a2a3d0f321b2b8eadd0e2ea34ba1a261a4a53db8599d5907dcced216d48ae04 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild index d72044d15347..ed734a10eacc 100644 --- a/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild +++ b/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild,v 1.4 2010/11/07 22:08:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild,v 1.5 2011/01/21 23:32:52 caster Exp $ EAPI="1" @@ -35,7 +35,7 @@ S="${WORKDIR}/${PN}-${TARBALL_VERSION}" RDEPEND=">=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=media-libs/giflib-4.1.6-r1 - || ( >=media-libs/jpeg-8 >=media-libs/libjpeg-turbo-1.0.90 ) + virtual/jpeg >=media-libs/libpng-1.4:0 >=sys-libs/zlib-1.2.3-r1 alsa? ( >=media-libs/alsa-lib-1.0.20 ) diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild index 0950d4a69a86..61b204582bf5 100644 --- a/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild +++ b/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild,v 1.1 2010/11/27 12:57:33 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild,v 1.2 2011/01/21 23:32:52 caster Exp $ EAPI="1" @@ -35,7 +35,7 @@ S="${WORKDIR}/${PN}-${TARBALL_VERSION}" RDEPEND=">=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=media-libs/giflib-4.1.6-r1 - || ( >=media-libs/jpeg-8 >=media-libs/libjpeg-turbo-1.0.90 ) + virtual/jpeg >=media-libs/libpng-1.4:0 >=sys-libs/zlib-1.2.3-r1 alsa? ( >=media-libs/alsa-lib-1.0.20 ) diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.4.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.4.ebuild new file mode 100644 index 000000000000..0ce2b0545bdb --- /dev/null +++ b/dev-java/icedtea6-bin/icedtea6-bin-1.9.4.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.4.ebuild,v 1.1 2011/01/21 23:32:53 caster Exp $ + +EAPI="1" + +inherit java-vm-2 + +dist="mirror://gentoo/" +DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK" +TARBALL_VERSION="${PVR}" +SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 ) + x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 ) + doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 ) + examples? ( + amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 ) + x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 ) + ) + nsplugin? ( + amd64? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 ) + x86? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 ) + ) + source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )" +HOMEPAGE="http://icedtea.classpath.org" + +IUSE="X alsa doc examples nsplugin source" +RESTRICT="strip" + +LICENSE="GPL-2-with-linking-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/${PN}-${TARBALL_VERSION}" + +RDEPEND=">=sys-devel/gcc-4.3 + >=sys-libs/glibc-2.11.2 + >=media-libs/giflib-4.1.6-r1 + virtual/jpeg + >=media-libs/libpng-1.4:0 + >=sys-libs/zlib-1.2.3-r1 + alsa? ( >=media-libs/alsa-lib-1.0.20 ) + X? ( + >=media-libs/freetype-2.3.9:2 + >=media-libs/fontconfig-2.6.0-r2:1.0 + >=x11-libs/libXext-1.1 + >=x11-libs/libXi-1.3 + >=x11-libs/libXtst-1.1 + >=x11-libs/libX11-1.3 + x11-libs/libXt + ) + nsplugin? ( + >=dev-libs/atk-1.30.0 + >=dev-libs/glib-2.20.5:2 + >=dev-libs/nspr-4.8 + >=x11-libs/cairo-1.8.8 + >=x11-libs/gtk+-2.20.1:2 + >=x11-libs/pango-1.24.5 + )" +DEPEND="" + +src_install() { + local dest="/opt/${P}" + local ddest="${D}/${dest}" + dodir "${dest}" || die + + local arch=${ARCH} + + # doins can't handle symlinks. + cp -pRP bin include jre lib man "${ddest}" || die "failed to copy" + + dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die + if use doc ; then + dohtml -r ../doc/html/* || die "Failed to install documentation" + fi + + if use examples; then + cp -pRP share/{demo,sample} "${ddest}" || die + fi + + if use source ; then + cp src.zip "${ddest}" || die + fi + + if use nsplugin ; then + use x86 && arch=i386 + install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so" + fi + + set_java_env + java-vm_revdep-mask +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if use nsplugin; then + elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin" + elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+" + elog "such as Firefox 3.5+ and recent Chromium versions." + fi +} |