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.

(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)

3 files changed, 146 insertions, 1 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/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
+}