Revbump to migrate the icedtea-bin handle from 'icedtea6-bin' to the standard 'icedtea-bin-6'. System VM setting is migrated automatically, but this may break user VM setting, sorry. Fixes bug #380813. Add updated timezone data compiled from 2011n, fixes e.g. Russian DST, bug #389411.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

4 files changed, 157 insertions, 12 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 8a860ebdb553..78c5d4b20042 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.2 2011/11/01 11:18:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.3 2011/11/07 22:09:46 caster Exp $
+
+*icedtea-bin-6.1.10.4 (07 Nov 2011)
+
+  07 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+  +icedtea-bin-6.1.10.4.ebuild, +files/icedtea-bin-6.env:
+  Revbump to migrate the icedtea-bin handle from 'icedtea6-bin' to the standard
+  'icedtea-bin-6'. System VM setting is migrated automatically, but this may
+  break user VM setting, sorry. Fixes bug #380813. Add updated timezone data
+  compiled from 2011n, fixes e.g. Russian DST, bug #389411.
 
   01 Nov 2011; Tony Vroon <chainsaw@gentoo.org> icedtea-bin-1.10.4.ebuild:
   Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney &
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 7ff0e0aa54b2..67f8e3953f6c 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,7 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX icedtea-bin-6.env 1061 RMD160 5bd0123642cab8b0f0b1855871d53228ea4390c0 SHA1 da103ac9feb13b13f9b6b6ecfe26d78a2a56f995 SHA256 864276f6354d7518ff9850a7d979a0b617a9f43b29c96d13ae47d4bb7c51bac1
 AUX icedtea6-bin.env 1064 RMD160 462893fc95efd9ce523a11c94c1b498f224759bc SHA1 c51005f11175eaabfd90939115eaeefb53dfd46a SHA256 5de4d28cf676ade13433650021185cfc5b0acdb819a9656ff9ec6294d3d2ac65
+DIST icedtea-bin-core-6.1.10.4-amd64.tar.bz2 35176677 RMD160 187ebe23df94efcaad05c675853f1f24c6a1555b SHA1 e060202c69ab7ff46c5bef75673f33957a596b92 SHA256 26e7655179ec5bb55934e3cb804297e3d337808134fc7fe6eaeee4a43b8ed2b9
+DIST icedtea-bin-core-6.1.10.4-x86.tar.bz2 36140827 RMD160 528a60952f810f5d74396fd9bd0f87cc6a30c440 SHA1 6a1bfdea50b9fb1627178a066065eb1a0b1e71e7 SHA256 2ac6a1e3f45a6157bc10579f3316df1dda4cd22b0b87341fb45a834fde2027c0
+DIST icedtea-bin-doc-6.1.10.4.tar.bz2 11637503 RMD160 3b79217c5fe8f787c7989346a83deee9555c4451 SHA1 4db17acd1497008fe0c7e0700627172b7476530b SHA256 dba0fc8f96f563d21f145ad7831a930c2fccd4d02ca6adcc9aea41dc86c8feb3
+DIST icedtea-bin-examples-6.1.10.4-amd64.tar.bz2 2163621 RMD160 6bb155a63befb0b2231daa26da51b30d1a1858cd SHA1 a8df3ef61f22daf61040fab782eb27cd61f96d5f SHA256 9784f3003e1901d99f651c6d03d228c94ef79d1a40c3b4227a4a38a19862f3bf
+DIST icedtea-bin-examples-6.1.10.4-x86.tar.bz2 2132911 RMD160 11e394788fb863d6b956d6dd459266ed25a7a6d2 SHA1 ec723731dd25352916a53b4ecbe29c22ceedbcc1 SHA256 8e5693b299af618ab70c50cfd8f5add0ce952aff41f41be802572beca04f608c
+DIST icedtea-bin-nsplugin-6.1.10.4-amd64.tar.bz2 907232 RMD160 6b6fb67ac9db0ece06f75852809600a0960e8b14 SHA1 e60e6607566803defe31f2e4be559ad5cdef8dae SHA256 b90b8a04e9d2b090a4b34bc6e0b9eb6a6199441cccfdd44f0aba423282179501
+DIST icedtea-bin-nsplugin-6.1.10.4-x86.tar.bz2 900726 RMD160 40aaac18af5f189c93a8fde4bd2b153bbca15dfe SHA1 68d74fd90aa3e6a6ba25e1078e4c0293a29329a8 SHA256 ba2b9c8dc27a301a37612d4469b0c878e25b37862021a347136e15eb3451c6ad
+DIST icedtea-bin-src-6.1.10.4.tar.bz2 40826041 RMD160 98e55e1e5a0a998e5cb686b83f72a5788413abfa SHA1 9c0d2e100a4d349d4ae8207bfceba531115c2bdd SHA256 7c935f41fd254ba1ca9b95a0452d6b319dc838a2c189ed426fa15f8260d4d092
 DIST icedtea6-bin-core-1.10.3-r1-amd64.tar.bz2 35172739 RMD160 bd5ca15b67ea1ec9341d2012791da028cf7c5a94 SHA1 df2d32707188fc4b6f0e4f421d060715e59fac18 SHA256 787671a9de31b71957bddb596441822d4d1df11d33be6e8e75668783301f4a8a
 DIST icedtea6-bin-core-1.10.3-r1-x86.tar.bz2 36138198 RMD160 cff53aa963466a4e39483d4978f41354dac61638 SHA1 760c1f1023edb89b5f02575dfeccffee782b0ff5 SHA256 fa8dd5fa4e059c32c0aa6bc4ac6b13832f17aa70ad51c1c0e0058f77c8da1a05
 DIST icedtea6-bin-core-1.10.4-amd64.tar.bz2 35182604 RMD160 b073884ce59c30303af3de7c05aa5324432c69d7 SHA1 9ad772cfaf755c1cf0d6261e10d2b48c016497b0 SHA256 3ab2d27f9ce6024854be87dd440da3a615f77f2afaac7fea5bf3a99f65c324f2
@@ -22,12 +28,6 @@ DIST icedtea6-bin-src-1.10.3-r1.tar.bz2 40821581 RMD160 3419b80c28bc001fce7c6fac
 DIST icedtea6-bin-src-1.10.4.tar.bz2 40827387 RMD160 d6a610b3dc5ef5dd5e9e33e0e38f93e225c37394 SHA1 54f3ad33bfc1e512165e8de7e954c77c22ff0714 SHA256 d85de113997f4b8978d3b9312dfcd88d50debbf673118615e5a72244b56e8eab
 EBUILD icedtea-bin-1.10.3-r2.ebuild 3593 RMD160 5b23781328ccaf973c53d48c78e6249b6eba8e58 SHA1 dc40596a5cd27c44a73841fee13f8a17c2bbd18c SHA256 a43cc23efcc22e55d31522b4ade9f77839f2bc7a879cee31e3457e552778ad9b
 EBUILD icedtea-bin-1.10.4.ebuild 3039 RMD160 e4ef9734c53528cf712979c729f77c36f93fb075 SHA1 dde30b51ca3fda962528512adcfea6446d09ca6f SHA256 fc8f37899ca2f5e14d3049a91d2fe78f8cf848bd1b23b09fa9d813ae512d9fa7
-MISC ChangeLog 12560 RMD160 536864f19695e14bd4758a77085297f72681d1af SHA1 12459e117ab82195f450dc4ead21eff144478a2b SHA256 1ad24f7ed41b098d2ddabfe8c6d0e1474b4152730c4a60ff6223cd261e555a3d
+EBUILD icedtea-bin-6.1.10.4.ebuild 3366 RMD160 a78570989e4da6c15f71aaa5b9e8094ffeb808e4 SHA1 46779a707fe996ff4ad6964d426cfb34a6694cfa SHA256 7d88170cc9d89b60e11493f90f221fbad436c92a7b4c78aa57f8594d7062de18
+MISC ChangeLog 12999 RMD160 5cda93e6c84feba5e70c45d29eab41bc1e32cbc0 SHA1 2bb3916dd8448aab5a61bbee7a04134f262008c7 SHA256 6d5564b67d20d5993e1c18e125980a7d1fd97ce4f337d34e00a8c75c3771b1f9
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk6v1ZUACgkQp5vW4rUFj5qj2ACfVHX8Go+2eT1Jv3fTynojJbhL
-xVQAn2zC/+YWcPeSZovFsILe/ExM65bh
-=rsyx
------END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-bin/files/icedtea-bin-6.env b/dev-java/icedtea-bin/files/icedtea-bin-6.env
new file mode 100644
index 000000000000..a851c8700546
--- /dev/null
+++ b/dev-java/icedtea-bin/files/icedtea-bin-6.env
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/files/icedtea-bin-6.env,v 1.1 2011/11/07 22:09:46 caster Exp $
+
+VERSION="IcedTea-bin @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild
new file mode 100644
index 000000000000..a3bca1c00bdd
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild,v 1.1 2011/11/07 22:09:46 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+DESCRIPTION="A Gentoo-made binary build of the Icedtea6 JDK"
+TARBALL_VERSION="${PV}"
+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="6"
+KEYWORDS="~amd64 ~x86"
+
+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.5
+	>=sys-libs/zlib-1.2.3-r1
+	"
+PDEPEND="
+	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}"
+
+	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}
+	if use doc ; then
+		dohtml -r ../doc/html/*
+	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
+		cd ..
+		cp -pPR icedtea-web-bin-${SLOT} "${D}/opt/"
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc doc/icedtea-web/*
+	fi
+
+	set_java_env
+	java-vm_revdep-mask "/opt/${P}"
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${ROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin; then
+		elog "The icedtea-bin-${SLOT} 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
+}