Version bump. Contains new IcedTeaNPPlugin compatible with xulrunner 1.9.1 and 1.9.2, Firefox 3.5+, Chromium. Also compatible with both jpeg-7 and jpeg-8 - the ebuild detects the installed version in src_unpack().

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 144 insertions, 2 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 23996171bf13..dfd5e23b1be2 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.13 2010/01/22 10:25:17 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.14 2010/02/01 09:13:41 caster Exp $
+
+*icedtea6-bin-1.7 (01 Feb 2010)
+
+  01 Feb 2010; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.7.ebuild:
+  Version bump. Contains new IcedTeaNPPlugin compatible with xulrunner 1.9.1
+  and 1.9.2, Firefox 3.5+, Chromium. Also compatible with both jpeg-7 and
+  jpeg-8 - the ebuild detects the installed version in src_unpack().
 
 *icedtea6-bin-1.6.2-r2 (22 Jan 2010)
 
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index f3254a720267..b8114b2d6247 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -3,20 +3,31 @@ DIST icedtea6-bin-core-1.6.2-amd64.tar.bz2 35029460 RMD160 9ba62e6fa84e25c759cf6
 DIST icedtea6-bin-core-1.6.2-r2-amd64.tar.bz2 35017403 RMD160 63a96e552f965958b7363d2981d644ce53c0d06e SHA1 f0eb52a7931a8d5ccd52e66215de3161be4ca878 SHA256 592dab401eeb917d318654d415dc2f0d67072e2c580d55dd9effafc5d216dae1
 DIST icedtea6-bin-core-1.6.2-r2-x86.tar.bz2 36159131 RMD160 ae9dfa92b901dbfec7d8328b51a64902190ecc4c SHA1 1b8cd20efd9f68dd7a5a785676f95accdf5dcf12 SHA256 2f54786a29f30c241cce0b70ab1f248058fe78c3c98d0de1f0bd16483b888d9c
 DIST icedtea6-bin-core-1.6.2-x86.tar.bz2 36166740 RMD160 f83f860d204dc543e47c713d72d24f6f37f3edce SHA1 069daba7dc5a5555b19c87ca2c8f35cb50f97970 SHA256 008f0f06e9b0f2932a374b9d2adc4df1557235016e0a440ccbac24b4eb9884ab
+DIST icedtea6-bin-core-1.7-amd64.tar.bz2 35428341 RMD160 b932d85ad400db9ef05c514ac56a2c30405d80fd SHA1 28acd5fe03402903ff71f65d47c100a9c11f684f SHA256 3e9e9a78aaba865745a471f1e0dccb686f7bec451318d4cf7244c1deff6224d3
+DIST icedtea6-bin-core-1.7-x86.tar.bz2 36488033 RMD160 b46c7b28aeec743a2e207838bc9948b47d8407fc SHA1 33193b2a9b21501f261bb07b57ef11558b8b3107 SHA256 e2d0fe6e700c933cab9e2860c33d42580e72accb63afe9780be2177c040899b3
 DIST icedtea6-bin-doc-1.6.2-r2.tar.bz2 11510147 RMD160 b86886925754856cf08c785fdd8a80dd59811966 SHA1 1a96565f44d635fcb23bdebc8af88ca9cf737754 SHA256 024ac62c13e8fbcf0830c1e360c85b295289df1fdba65bd674928d3f8904e605
 DIST icedtea6-bin-doc-1.6.2.tar.bz2 11510649 RMD160 1952385ce072084e2da8edc9c2a126085efb2408 SHA1 b31b5879203ae71b774310d07a1f6383d7b543df SHA256 f55babb856330d4b428f234d9e5e390573b628b3f5addbe6ef255f867cb94230
+DIST icedtea6-bin-doc-1.7.tar.bz2 11507604 RMD160 3032a79ab6d68aba3c702030a362e9bcbb493cd3 SHA1 fc0a0bfdfee604c4130d5e988085cff29cf17b25 SHA256 a8a879f2de4e51f0f0be88595370776ea966cdee6452bc1f8250accdbbfe8ef7
 DIST icedtea6-bin-examples-1.6.2-amd64.tar.bz2 2175076 RMD160 18942ecba633702ac045261010f41e1907808529 SHA1 93e7f5efa4e06225b1dba40139c9c8c72bfc7471 SHA256 7d31e154f7e919ce9e5422d74906659e9df17153a7531b0faae8d31140423fb5
 DIST icedtea6-bin-examples-1.6.2-r2-amd64.tar.bz2 2175800 RMD160 d0a46694e41d93db51a6935727dd39b8c3239b1f SHA1 08eb009e0d7cd5bb82b28d14ee87416db6e214cd SHA256 ff8fdcdcf9d2b89b4f29e63e27ce8aedde1175593ccbe0367a46c9c4ec1d10d9
 DIST icedtea6-bin-examples-1.6.2-r2-x86.tar.bz2 2139371 RMD160 8cd334021b118de0b3b3313a88a9f4b9bf54886b SHA1 0c44c070f0f612ee0e7361545fa14ed048ee9afb SHA256 2725142d2b6c3f965d173d23357b610bae0f88ad3c75b88d6ad30494619ecc31
 DIST icedtea6-bin-examples-1.6.2-x86.tar.bz2 2139766 RMD160 046e2f24c8a68e8c1370f0e6a84b6daf1642f381 SHA1 71ce6083172e7c367efc940c76c36b4b42a5541f SHA256 ad7271047d3aa1d149bf32e40e360330433ce5a17cf1ca09262163e1ff9eddfc
+DIST icedtea6-bin-examples-1.7-amd64.tar.bz2 2173934 RMD160 2671b45506102beb8d700ad27012a0fb474bec8b SHA1 b397154a91497ea05cd79958e9e09e5b8c3d10de SHA256 34eaf7b4245d46277e799ee3c4a82f5ff2a969ff474c428799594e11fe91c23c
+DIST icedtea6-bin-examples-1.7-x86.tar.bz2 2139591 RMD160 2795f2c3dca722088c54cda31d8e32f5f4648ec9 SHA1 9165ae86c8b0d56f924e5f569aeb67b53597c26d SHA256 24cc102012129ad694c837ca059de40c9f6efdad175e6d2c1cf29975501d4419
+DIST icedtea6-bin-jpeg8-1.7-amd64.tar.bz2 34588 RMD160 0a0805d8e9090e6550e0f4d18f9a1d943c409623 SHA1 8c6a7b27aeea5f7126c6e7311b8d773ca1651c22 SHA256 3842ec3e9153bcbadd69e522ca76c2c4f6fe7405b7466ab1bfcd83a3a44e72ba
+DIST icedtea6-bin-jpeg8-1.7-x86.tar.bz2 30690 RMD160 ccab1fc9c341fae86e31c56400df23c44e53bd5c SHA1 9dc2961fbad0e890888440c03d0c807328fb013a SHA256 264e0fa8cdad71118c1841b330a588032738d8cccdd73696d5d79bd95e93959c
 DIST icedtea6-bin-nsplugin-1.6.2-amd64.tar.bz2 87978 RMD160 1ec55b39b0772b745d8935e77772dbc3621627ac SHA1 777ee6ab4602985a0a2a4b74a0c1a8a636543d52 SHA256 df7e6278e833576a5ed8d516796742d0265f1b7d04ca8c9b4f9f2404f7553f86
 DIST icedtea6-bin-nsplugin-1.6.2-r2-amd64.tar.bz2 87974 RMD160 6db9830f6c59524513bdd200b8f645677f8764d2 SHA1 511392dcce3b56a97222488927ee4f66db969303 SHA256 4c8a5cb3c0d71cf14f464e4a99fd94515de8755f9d318a6d03959f710c0909ad
 DIST icedtea6-bin-nsplugin-1.6.2-r2-x86.tar.bz2 75695 RMD160 6ec9b559386334da68eb464b847bd082b60886e7 SHA1 37c0ab74ad64b5cea1aca01747599f0fa1201519 SHA256 3b3b31cd004700cc68d3def11df9e0cef9c679bb2ae867256570a185d483538d
 DIST icedtea6-bin-nsplugin-1.6.2-x86.tar.bz2 75643 RMD160 d09aefb774640f072ee114febf7ddf2aabe7604c SHA1 a64ef399d7dce2c44438120d075bde383f7a3a86 SHA256 35fe44b3f707d4f9febb7e3f072941bc410edb9ad5ceb65fab18567e5bc7ff21
+DIST icedtea6-bin-nsplugin-1.7-amd64.tar.bz2 78597 RMD160 500fd235600ef1a30c12585f472d6a1a8b9549d4 SHA1 1d42ef7ea996f0ffa84800237837717c28f8b9b7 SHA256 139c6ea8fbcf7c9437da73aaf5071d082c5b1a87ea622dc6af17d7b8ce743282
+DIST icedtea6-bin-nsplugin-1.7-x86.tar.bz2 73035 RMD160 cd6da3ad69d09ae6adb66195e0a4397c5b0c305f SHA1 d8780f0f48fcd5525baa752f61342767c17b26b3 SHA256 98d2cb976e557f3da650caa97e3470d4f35402ca6347f3b8aa70e7d4a7911af5
 DIST icedtea6-bin-src-1.6.2-r2.tar.bz2 26607726 RMD160 8ae63a6e69b42b3745014ef0ba43d1f494c07997 SHA1 ad3631199b021024245c181c86c2d400512ffdf1 SHA256 afad5f25f8ef7aa58bee06094316da26256e1a3c48a950ed27371a9fc5270865
 DIST icedtea6-bin-src-1.6.2.tar.bz2 26607503 RMD160 1815dfb667c20920922da3a0b51a73ed190339ff SHA1 ed25f999ac75ca804962a58a36203ab8ae64611d SHA256 1fa1ab94c7eccfaee1e6cf3a78da64281beab8634df0f436ee94d5f04d9b3d79
+DIST icedtea6-bin-src-1.7.tar.bz2 26615529 RMD160 8b8ed52e0943cf539c31b57235eabe8a6755877c SHA1 a798af258df0e0d1bfd0293066649d808385a7a4 SHA256 2dc853236a898d4163bf514f1a7f090e47249164746a22f121e9081de606dc21
 EBUILD icedtea6-bin-1.6.2-r1.ebuild 2977 RMD160 f77e0a1c33f8c1359ef79d82f76c51ae8741f820 SHA1 63693028fb295e4c91847915047f2c4bd2223be8 SHA256 754d8986375caed1b8a1cce9dcd538edffe012e870f0015a3e95cc603b9617e3
 EBUILD icedtea6-bin-1.6.2-r2.ebuild 2928 RMD160 9ca0bd820f9c069f969fe8a321c9f36d2807bca1 SHA1 a1d9a56b38e4ee0190e2e2df2eb259d7c98f62d6 SHA256 2b668cec0b0e60c68419c44259101bfffa5a246a8ffb0b1f69c29d666b98e508
 EBUILD icedtea6-bin-1.6.2.ebuild 2816 RMD160 eb18ce92271ced347183b1db04e8a49f0a108e05 SHA1 be02c7fb8ff5971fec3561f2c0a4139fd5cf64e5 SHA256 c1e93a82e2c0bfac7b93cecc2aa059237219b125e593090769523062b25f9387
-MISC ChangeLog 2562 RMD160 05d6a086d18a5376dfde996de92d859c8d67daab SHA1 b0c81bc57b542a9bf8073da5e7a199ea45639c2c SHA256 d682a1b2e490bc3bed20848bad567159577d12dd6b6eda10c83d782743c68daa
+EBUILD icedtea6-bin-1.7.ebuild 3479 RMD160 a825712cbfd20033fe74afa4937f484a27b3cb40 SHA1 16a408e91feec414b611bbc574f6f12b2b442a29 SHA256 de2c7fea3eb70a93699e29443f418ad53e5a45deea27ab45fdde1929c27f5672
+MISC ChangeLog 2893 RMD160 40eb8eef7ef697404dc280efd982a5553615069e SHA1 c63e2f6a0568f579155f67cdb4633dbeaab38943 SHA256 640c329dd853865c20c7309deab534f3aab5edcd053b7bf91afbee1852c84b2c
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.7.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.7.ebuild
new file mode 100644
index 000000000000..8d1dccddbf22
--- /dev/null
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2010 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.7.ebuild,v 1.1 2010/02/01 09:13:41 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
+		${dist}/${PN}-jpeg8-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
+		${dist}/${PN}-jpeg8-${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.9
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/jpeg-7
+	>=media-libs/libpng-1.2.38
+	>=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.0.5
+		>=x11-libs/libXi-1.2.1
+		>=x11-libs/libXtst-1.0.3
+		>=x11-libs/libX11-1.2.2
+		x11-libs/libXt
+	)
+	nsplugin? (
+		>=dev-libs/atk-1.26.0
+		>=dev-libs/glib-2.20.5:2
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/gtk+-2.16.6:2
+		>=x11-libs/pango-1.24.5
+	)"
+DEPEND=""
+
+QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/server/libjvm.so"
+QA_EXECSTACK_x86="opt/${P}/jre/lib/i386/server/libjvm.so
+	opt/${P}/jre/lib/i386/client/libjvm.so"
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=media-libs/jpeg-8'; then
+		einfo "Installing jpeg-8 ABI version"
+		local arch=${ARCH}
+		use x86 && arch=i386
+		mv -v ${PN}-jpeg8/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
+	else
+		elog "Installing jpeg-7 ABI version"
+		elog "You will have to remerge icedtea6-bin after upgrading to jpeg-8"
+		elog "Note that revdep-rebuild will not do it automatically due to the mask file."
+	fi
+}
+
+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}/IcedTeaNPPlugin.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 "We now install the new IcedTeaNPPlugin, note that it's alpha quality."
+		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
+}