Version bump. Fixes bugs #272723 (set as default VM if none set), #273306 (empty cacerts breaking SSL), #280375 (nspr-4.8 compatibility), #283248 (jpeg-7 compatibility).

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

3 files changed, 129 insertions, 2 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 576f647cb793..c581dc0a6cde 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.4 2009/09/13 13:44:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.5 2009/10/12 19:17:49 caster Exp $
+
+*icedtea6-bin-1.6.1 (12 Oct 2009)
+
+  12 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.6.1.ebuild:
+  Version bump. Fixes bugs #272723 (set as default VM if none set), #273306
+  (empty cacerts breaking SSL), #280375 (nspr-4.8 compatibility), #283248
+  (jpeg-7 compatibility).
 
   13 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
   icedtea6-bin-1.3.1-r1.ebuild, icedtea6-bin-1.4.ebuild,
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index 6380f21b4ed2..7d7ef8f3fdbf 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -5,26 +5,35 @@ DIST icedtea6-bin-core-1.4-amd64.tbz2 34670283 RMD160 d11db708d47d1d790f56365a62
 DIST icedtea6-bin-core-1.4-x86.tbz2 35969770 RMD160 83d829dff8159bc8ea597bbb1cad8b64eaadac08 SHA1 853a3da4a3a708c2f87a4ee3a06b2b60c6d52ed3 SHA256 f869f9a8d0b0ca5a2dd9f8e6ffb53c62045d0fa820211e19dc3875a6a4f0f395
 DIST icedtea6-bin-core-1.4.1-amd64.tar.bz2 34711794 RMD160 b1b76819653ed7d4e24c0436309be567c71c4940 SHA1 0ec2abfd02ea22f12348197ef618cbe4256da302 SHA256 0ea38aaa849a315ba397fa699826b58d3f7a3bd544815ee3a610537c0bb478ea
 DIST icedtea6-bin-core-1.4.1-x86.tar.bz2 35829602 RMD160 5d528c48366d42852362c7fb462a597c0acfecbc SHA1 25a623ffcb06511d86d7e42453a3f8205a28208f SHA256 40f6c29e7fa2ff094d9d04258bb5b0e936b8d9342845cbb2b9c4b433aa2da29a
+DIST icedtea6-bin-core-1.6.1-amd64.tar.bz2 35045666 RMD160 baf55cda733edc631c440f36a8beef4a38fc4eaa SHA1 26763d3e0c18947a3bdc413ba4720deee1997fd5 SHA256 04184e56c808da06a062464e8afe1623fa98b6725fba92157e54cfed3a19767b
+DIST icedtea6-bin-core-1.6.1-x86.tar.bz2 36161709 RMD160 debede9310891d38e864896b0b61430d5316df4b SHA1 7cd87d62b693bfebfbb001480ffee86d690ebaa3 SHA256 f027038b1b1e475a0dc2a20749f3f74e984e8ca0dd90ae42b5625dec5c7b0a10
 DIST icedtea6-bin-doc-1.3.1-r1.tbz2 11653196 RMD160 f1799c66d75783d4a2d92771847582b697968651 SHA1 801bb7c49024438288ba5949d2e53f3e27e25844 SHA256 a23971d5dd542649a534e17eda52078242f9c5b747869ff7665572817a6d64d7
 DIST icedtea6-bin-doc-1.4.1.tar.bz2 11639396 RMD160 a8ee05812dbccc800d1b6478bcca568228f1960f SHA1 9fe5c5441ce8ed6635cf933616aacc47b4509e3a SHA256 35905800de74fcf5faec70cc72d3ba0a8a860e8513d4de266785daa6c72f7002
 DIST icedtea6-bin-doc-1.4.tbz2 11638848 RMD160 601697c28fbe911e8fcdb4989cf2e19c6d5f5b01 SHA1 43c8f4773c4d3df71183ea98c97db8726cf9b362 SHA256 d277344fb966620419a580c54fb0ea47f0c72149bff635211a6e1076e1f86980
+DIST icedtea6-bin-doc-1.6.1.tar.bz2 11511141 RMD160 5ca24134107a9da65c2eaedd5d44dd8dc82a8d1a SHA1 41123b5a6802e3d114664a49e2146134773195f3 SHA256 0a2642677045f130b8590fce830d2de355ce154b52ac15287f7646df4ad9ceb8
 DIST icedtea6-bin-examples-1.3.1-r1-amd64.tbz2 2173460 RMD160 29934f1389733a12c64bfbdd31f1a0a6927dbb64 SHA1 ec44c611811770a00f7f24f7732c9b8017be50f2 SHA256 a5d963ff8fef25830c36e1062900d830f1918ed9790b3926fd2a7e27f8b6821b
 DIST icedtea6-bin-examples-1.3.1-r1-x86.tbz2 2139168 RMD160 b305c278805d9bb758b2036669a966067004e0bf SHA1 01c28d0e2d17b7929c4035ac9800ed174a378edf SHA256 31c3366f514be3c478e53d7ec10d2e1a3539905ac1b114ddd7212a8da15b5274
 DIST icedtea6-bin-examples-1.4-amd64.tbz2 2173711 RMD160 ee14cef44a8e80a5f7c588b6f3b4b3a41ef4ac08 SHA1 4e71c642721f91b2c051afa6b0d394e209159fea SHA256 42f70a9983247d77b5734fa62d9d633b2a085711b032b5e9b6250c4044088130
 DIST icedtea6-bin-examples-1.4-x86.tbz2 2140292 RMD160 8f433d82b9a51593d90fb3850f785ddb5ab27789 SHA1 3d234cad9d2e4c42212cff1386f44ad50b3909eb SHA256 695c092b2bfff9bbb725f17509fd4ed06fb2c1a5c38baa406abfeb5ae961f558
 DIST icedtea6-bin-examples-1.4.1-amd64.tar.bz2 2174626 RMD160 0dac29fc74adb6cbe3abedcc4240a44ddf5b3abb SHA1 5ca7a98be556ea14149791cdb97c2acb93885169 SHA256 5aef26739f36e7a4002cdce05593406a808377c3aaf3e67c90b00b2491aea07b
 DIST icedtea6-bin-examples-1.4.1-x86.tar.bz2 2139158 RMD160 d8277ccd7ba4963c4dc8462d3d5434c49ee96c7d SHA1 cc13656f57e8be250cda2444b6e496e0b525713c SHA256 011bf7b503c362baccbb0778b5c0522e215f806a3678bbde04a65bc87a75e65c
+DIST icedtea6-bin-examples-1.6.1-amd64.tar.bz2 2176686 RMD160 e4531065eaf53b2ef6a8650c6b341a0c915837aa SHA1 0690712c0f709a68f9aa3f71cff0007f5538ac9f SHA256 998c040b61eaeecde51e430dacc65425da54bd2151703cff364ddaad6b528397
+DIST icedtea6-bin-examples-1.6.1-x86.tar.bz2 2138735 RMD160 5aa9f968ab06b2d47f4ad47defb90f39cd2e5101 SHA1 d6bcaf8baddf47a4b298089ee68e48294ad918b4 SHA256 dd580d81719ae34d5207388aa87bda9a1ec81de1eb853087ea87fe377c3101ab
 DIST icedtea6-bin-nsplugin-1.3.1-r1-amd64.tbz2 81478 RMD160 b63f67392021f745ee87a56d2474c1330f01d8ec SHA1 1d7fc507112916078a6d95e5bd1a678e5c8285a8 SHA256 df3cab2837c4f7f3ebc460dd1bb4e7544ea9c7d821fd60c3a54c71f9cd98e0f8
 DIST icedtea6-bin-nsplugin-1.3.1-r1-x86.tbz2 71863 RMD160 c4cf0265da803706aab43927dcae5b4c66d9da22 SHA1 de0d137eecf56da9c6045afb17d90c3eb3d36942 SHA256 01310d677009f4d1ca6f5311784e26eb323af68fd43e0003dd2384f98e4d42d0
 DIST icedtea6-bin-nsplugin-1.4-amd64.tbz2 85231 RMD160 5369d4c58400400ff41d839ffd3cc73aa18784f8 SHA1 03131e25f4cf6fe8270bef1b624ef259c0461971 SHA256 3495b743a75660b7c02bf58c1d7e319f3aeaf85ce79123f99037d63503291e8b
 DIST icedtea6-bin-nsplugin-1.4-x86.tbz2 73598 RMD160 3ad2ccb0d766c31aebbd327caa9ed0842b0d28f9 SHA1 f3844a9bc6d5e57b5baa8ce61c8b0d448f100281 SHA256 167d3a46e5e66478b3c66fbd78a2519d923e9337d54f2a4f30d26943b0f14364
 DIST icedtea6-bin-nsplugin-1.4.1-amd64.tar.bz2 83980 RMD160 a5ba9d7c510aafe0a889641c2e10f97bc9f5beba SHA1 40c6e56a8c6ac38a33df27f84cff2ed6f698eb54 SHA256 0b89387809666e38e531a63366bee434a2cb779bb6e64467bfe576ddc4fce72f
 DIST icedtea6-bin-nsplugin-1.4.1-x86.tar.bz2 71600 RMD160 2ca9e1060de26520e82307eee8f35954fb9dc046 SHA1 17da013355ad4dc0dda6381a7bf5c26e036dfffa SHA256 db1e868167059a678e2d185ebb45a8ff764f2f19523730b8664c2398edcbd877
+DIST icedtea6-bin-nsplugin-1.6.1-amd64.tar.bz2 134650 RMD160 d8ef7d58c8ea365714dcbaedf9d4419d9de6a2a9 SHA1 9551b8ceeb5520013bf6bf1bb84c5099c27798c7 SHA256 5adeef2b02a94c2461df81c60ceefa039201d53e0a772541365e2658814fd9ca
+DIST icedtea6-bin-nsplugin-1.6.1-x86.tar.bz2 109535 RMD160 0bc80f39e56039926822de96708effb16d41d1a1 SHA1 09a75e44ce91b4356b01ce5897b4bc2ebf6a30c3 SHA256 1dfc830cb5ff276d4b11e2b13be945034d39bc73bf91a78f769a40f653626ca2
 DIST icedtea6-bin-src-1.3.1-r1.tbz2 26571999 RMD160 072e1238fb549a2f965da01ff8b06b2e26a12ab8 SHA1 876347259f77f97514ba78dfbc17d0f877ff3d5b SHA256 6ceac841d9cd7f90f98481c98487ec269e2c65ba90fafe2ceb182865329517c1
 DIST icedtea6-bin-src-1.4.1.tar.bz2 26582403 RMD160 271562a9261434228ed398a5fde916e1afae73aa SHA1 4290e5f50189271d2adeb5f2d80bed82dc7cd83d SHA256 c303e8e71e57b246bff994627b56da54bf44cdf03e17e53c7260974e245d5f15
 DIST icedtea6-bin-src-1.4.tbz2 26581319 RMD160 84e20202b6d8f05cbea36b94f164b1343e79d347 SHA1 191c17f738e42d197829abb9302a05f4752206f9 SHA256 15377314c9d84b18688efb54c96cdbc89b7d02f3b70d6ab7c23ec793f4336d65
+DIST icedtea6-bin-src-1.6.1.tar.bz2 26603860 RMD160 ba6bd8f86e3fd54c2d3bdf01a6daba8b80b04a34 SHA1 418d9a38a5c2e65914c4d3092e25bd8db62d4b35 SHA256 2948f08a7d3c8f5274765b394e1b4f50122161e77d3a12453dfbb0cd275dfd4c
 EBUILD icedtea6-bin-1.3.1-r1.ebuild 2646 RMD160 4dfe388caf704e9bc0625d64d88e5a8957966395 SHA1 1782ad7e0df03b328e864556f15dc6ceb551977f SHA256 5aaf5c2b7296ff88acc593db28632c895e6ea91cb131155bbc5dd9de8c95912f
 EBUILD icedtea6-bin-1.4.1.ebuild 2686 RMD160 782c91f6af907ef481bd3d175e60234144065d41 SHA1 71d1417939f89ba1e663f422d5a04bc39299ddfc SHA256 b2a9d8a148c84e60f440365137a9117b234964ca99bff5842431db6cdce68654
 EBUILD icedtea6-bin-1.4.ebuild 2604 RMD160 f9e42bf0dfdf41b39a968423364a18123e29eb29 SHA1 28c7bea273717d5fa214c50854600edb01e05689 SHA256 f570b35da8a2afd079db2879208ffeeeeea7c47008603dac0648f0a3418fa41e
-MISC ChangeLog 1051 RMD160 da137542b03ba9b60179b79b35de143a992249ae SHA1 a1a9e6683944c8e1ae57e8920b8b88925a9ccaca SHA256 50f73b54f2ac305cbcbcfefd69ff8737ed754260eda526c2d57d814cc7cc33dd
+EBUILD icedtea6-bin-1.6.1.ebuild 3092 RMD160 27fec37f2aff429229cb701030cff73f2c8b379e SHA1 33c2ce29307ecb7780b824a0cc599c8f89a9af03 SHA256 b1b28641fdb8b3042c3d3b6844b058e7aabb0f8729796b08961212af362cdfea
+MISC ChangeLog 1341 RMD160 543ed10be57eb6307409c196e6e73ae87a2abde3 SHA1 b868065d108f82eede115fe9b86fb3345b295d46 SHA256 0ead1d0bb6a638ce68314f6f8eea00d62e09b2344ebf7e19fb11df6271bb4275
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.6.1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.6.1.ebuild
new file mode 100644
index 000000000000..60b9f53615d7
--- /dev/null
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.6.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 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.6.1.ebuild,v 1.1 2009/10/12 19:17:49 caster Exp $
+
+EAPI="1"
+
+inherit java-vm-2
+
+dist="mirror://gentoo/"
+DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
+SRC_URI="amd64? ( ${dist}/${PN}-core-${PVR}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${PVR}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${PVR}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${PVR}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${PVR}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PVR}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PVR}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${PVR}.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}/${PF}"
+
+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
+	)
+	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_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"
+		install_mozilla_plugin \
+			"${dest}/jre/lib/${arch}/IcedTeaPlugin-xul191-ff35.so" xul191-ff35
+	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 there are two plugins for different versions of xulrunner"
+		elog "and you have to select the right one according to your browser."
+		elog "The 'icedtea6-bin' plugin works only in browsers based on xulrunner-1.9.0"
+		elog "such as Firefox 3.0 or Epiphany 2.24 and not in older versions!"
+		elog "The 'icedtea6-bin-xul191-ff35' plugin works only in browsers based on"
+		elog "xulrunner-1.9.1 such as Firefox 3.5."
+	fi
+}