Version bump. Also pre-populates .systemPrefs, fixes bug #402507.

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

3 files changed, 164 insertions, 2 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 2a47361605cc..b6a247dd75ac 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.10 2012/02/13 21:33:33 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.11 2012/02/14 07:46:36 caster Exp $
+
+*icedtea-bin-6.1.11 (14 Feb 2012)
+
+  14 Feb 2012; Vlastimil Babka <caster@gentoo.org> +icedtea-bin-6.1.11.ebuild:
+  Version bump. Also pre-populates .systemPrefs, fixes bug #402507.
 
   13 Feb 2012; Vlastimil Babka <caster@gentoo.org>
   -icedtea-bin-1.10.3-r2.ebuild, -icedtea-bin-6.1.10.4.ebuild,
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 7acff99fd133..df96f8ba7451 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -4,19 +4,27 @@ AUX icedtea-bin-7.env 1061 RMD160 0b2050dd26a4bdb8f2be98a46baeb1e4d5bec3d5 SHA1
 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-core-6.1.11-amd64.tar.bz2 35204282 RMD160 6e75cb0b50dc33818b10e83b78141ca20f5ca5f6 SHA1 0d184f2191cb97a2f12ab8019433f18d99ba0de3 SHA256 a3f7ca28d68c9a1fc0f5a308e555b2f6aada516c2855c7d12073dc93f98ab501
+DIST icedtea-bin-core-6.1.11-x86.tar.bz2 36176130 RMD160 3358fbc6d59765bf2a844038a1f3add5481910b2 SHA1 80ebbba2b90102235294aaf77dddb7e96593c731 SHA256 358f7fc641ded45d39414f391ceee800677733bb0fa741b5c6ceafe05e78bad9
 DIST icedtea-bin-core-7.2.0-amd64.tar.bz2 34275230 RMD160 da0edc7874649c0134129d355599eef24df4259b SHA1 2ea5a4cd4ec55fa57f470deee1daea930b57ac96 SHA256 88da5d66efd14ab383d2ea0299e12e4e9a0f6824f29af1d5432ad85e4a6984fe
 DIST icedtea-bin-core-7.2.0-x86.tar.bz2 35266178 RMD160 a982492f36ffe20bbd8efdc7185ecf83910348cd SHA1 647b1637d2107f717c1efd350715e8b2cf65aa69 SHA256 f464b8b9c804c354b49cb6c74c0eddf79d3b0bca5968df63c9528cc44d96f7c1
 DIST icedtea-bin-doc-6.1.10.4.tar.bz2 11637503 RMD160 3b79217c5fe8f787c7989346a83deee9555c4451 SHA1 4db17acd1497008fe0c7e0700627172b7476530b SHA256 dba0fc8f96f563d21f145ad7831a930c2fccd4d02ca6adcc9aea41dc86c8feb3
+DIST icedtea-bin-doc-6.1.11.tar.bz2 11634766 RMD160 e45f701368d4faf4a18a69e1862beb080909fa44 SHA1 c3112eb0179fe777ffbbf4b3aeb536f8c7a7de57 SHA256 d8bc135e0d26cff773faaf932deb03ef71d9488a2d3a90fc61cb37b64cb4089e
 DIST icedtea-bin-doc-7.2.0.tar.bz2 12519410 RMD160 fdf8fd65700bc2c9b0a32730aec871c6449bdab7 SHA1 a80f11ec3ad523feaa4d3e5e9d467808af9b0640 SHA256 be5e289f073df942ccc5289f710bd35bdb1f5b002fde742720eef9b13015aa5d
 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-examples-6.1.11-amd64.tar.bz2 2164095 RMD160 06566ff7a05f0065e8a009eb83df9dc784bb93ce SHA1 7de6657de04da7b1c713aba9f8d36983602a99d3 SHA256 25a9bb252af1e09bce30ace182841b3070add012628ea3b753f2db886f925ecc
+DIST icedtea-bin-examples-6.1.11-x86.tar.bz2 2132561 RMD160 1c025a6287e19e2c7b8b25537b2580f5f2b64c60 SHA1 c6faf3a9c95c71c8cd67f50e7172869a77e002d6 SHA256 bc617b72feb708e70f816f2c60a10e2767a3ecf904bd121860d5d12dbce6ebeb
 DIST icedtea-bin-examples-7.2.0-amd64.tar.bz2 2255942 RMD160 2443919fba3e1070a366f98fc63b63e8c7b417ae SHA1 cfeda7742a5af160bd8b8bebe1e9e7c2873018ed SHA256 8b775106f3648a0be6dfd149da9cdc30ba5751be3e70726cb36b4ef35d76ef86
 DIST icedtea-bin-examples-7.2.0-x86.tar.bz2 2240784 RMD160 46e88354297d7540c18cbe229e7c72a9eb124c03 SHA1 14ca7a58d855fc0703d76ddc446ef206a858047e SHA256 4db0ddd883ca67e60e85ea5cb337504a7e97455327b3581e8d3535471855a53c
 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-nsplugin-6.1.11-amd64.tar.bz2 906880 RMD160 47d54ad95d3ba505ef3b3e294c2a54b06acd2ad2 SHA1 b84d5d1f7c17af69442051ec082d207cb4f642bd SHA256 1ed4716f57f61d58435afa98406d615bb0587ea57396021f3b98efc6e142d989
+DIST icedtea-bin-nsplugin-6.1.11-x86.tar.bz2 900838 RMD160 4ceb32f7ecad134ec30be28369bf3d8c8fb5a4b2 SHA1 6a428985d43edcf33fd064091cfc83d6dea6bd3c SHA256 82d11ac1e5fd12fab5e9dd7ffd5b3964580cb4a20feb66d3c8765722f1910dce
 DIST icedtea-bin-nsplugin-7.2.0-amd64.tar.bz2 942826 RMD160 9c0921a685d7cfb787081025b97afea7d8f59e41 SHA1 fa12b6c313da541a2be7f1621548da632f4b26fc SHA256 b7451d2cabd113b6622250731db8d1d31e596437f5a91cdbd03a04bb13679d34
 DIST icedtea-bin-nsplugin-7.2.0-x86.tar.bz2 936501 RMD160 ae1525eb3079ddfeae83f331dec1174d26822deb SHA1 6f8da0307172ef979cd5fca628c9652f98e63327 SHA256 1777b4d4954793d535e7f681f6809cdc4ac48855e0fb1414dc9adfeb26b94498
 DIST icedtea-bin-src-6.1.10.4.tar.bz2 40826041 RMD160 98e55e1e5a0a998e5cb686b83f72a5788413abfa SHA1 9c0d2e100a4d349d4ae8207bfceba531115c2bdd SHA256 7c935f41fd254ba1ca9b95a0452d6b319dc838a2c189ed426fa15f8260d4d092
+DIST icedtea-bin-src-6.1.11.tar.bz2 40848115 RMD160 3a74642c558336b1114a1644d6de54f88901efd0 SHA1 312481ccb66903124e3596e5734d1b215b13e9d1 SHA256 d7d960f5ad6ff7eb84ee3b54cd23f5fd49c5d84c876f94852fcb00c3366a5d92
 DIST icedtea-bin-src-7.2.0.tar.bz2 41228114 RMD160 efd44d62e5213ccdefec460bdd360b4e024a9714 SHA1 55d60e3bbdc2af95d3799c8fef776a17ef38ccb2 SHA256 cca3216ce6dfc8a10eb62bc615f6b4460983950fb977ff4b38874effe81cc3c5
 DIST icedtea6-bin-core-1.10.4-amd64.tar.bz2 35182604 RMD160 b073884ce59c30303af3de7c05aa5324432c69d7 SHA1 9ad772cfaf755c1cf0d6261e10d2b48c016497b0 SHA256 3ab2d27f9ce6024854be87dd440da3a615f77f2afaac7fea5bf3a99f65c324f2
 DIST icedtea6-bin-core-1.10.4-x86.tar.bz2 36141759 RMD160 5d8eceeb6c68ed4bf349a5cfd168e2c6ff1fe83f SHA1 5fd628c6245f58357876336ab8c23a69ae3fe027 SHA256 0e11bdce0a3ec196d088a8e067a41d879f56c4fd75d4a24fa8d4b49d18a67a6f
@@ -28,6 +36,7 @@ DIST icedtea6-bin-nsplugin-1.10.4-x86.tar.bz2 900912 RMD160 bd90075b7784463dcc1c
 DIST icedtea6-bin-src-1.10.4.tar.bz2 40827387 RMD160 d6a610b3dc5ef5dd5e9e33e0e38f93e225c37394 SHA1 54f3ad33bfc1e512165e8de7e954c77c22ff0714 SHA256 d85de113997f4b8978d3b9312dfcd88d50debbf673118615e5a72244b56e8eab
 EBUILD icedtea-bin-1.10.4.ebuild 3039 RMD160 e4ef9734c53528cf712979c729f77c36f93fb075 SHA1 dde30b51ca3fda962528512adcfea6446d09ca6f SHA256 fc8f37899ca2f5e14d3049a91d2fe78f8cf848bd1b23b09fa9d813ae512d9fa7
 EBUILD icedtea-bin-6.1.10.4-r1.ebuild 4167 RMD160 b6b5de8ce5f83723d93ba6459cc4da924f6489d1 SHA1 53650442a65942ae35f1c9f6333a49c134d05db0 SHA256 dc97171c5c349e58012bea9ce7d25b05be7229bfe44ff11e80cdf415504ca5fb
+EBUILD icedtea-bin-6.1.11.ebuild 4162 RMD160 0335cf312373ed308c4f5ab25179e89f599e222a SHA1 9527ede2afa90774cca6bc1b15f3256940b9af7f SHA256 7cd80919bedcd288b1110abb64eaa0d175fbf7a24ff3b6f4522dc57d90b2059e
 EBUILD icedtea-bin-7.2.0-r2.ebuild 3705 RMD160 030fcfa6f41b7c04b26aaf290fe293d97dac74ca SHA1 1f30e5cab3e3707c6d1da23c594f8634c38fb71c SHA256 f6fc1a781a94823a1243ad7758778c4f1b884ce22728c06f381dc3d5239a865c
-MISC ChangeLog 14602 RMD160 5a399ce98ea4b407edd8e0e8581d5a4753f0136a SHA1 2d72e56de95e7d36046988c3865f45340f9f476b SHA256 cc56fae2bacc4ffa5875976eb492bddf100da13e14571c6189f36974d958601c
+MISC ChangeLog 14785 RMD160 cb949fe8f7f4c30b6b8571c2eec9351ae74e5ef8 SHA1 9711bf80e5fdfd9d0a1f6ab412fd5bb32fb77e36 SHA256 6d7a0224d750a6b88510d202be9605badd2bbd55507e92fd4bcc6ed669d9b149
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild
new file mode 100644
index 000000000000..314ca7ed41a4
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2012 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.11.ebuild,v 1.1 2012/02/14 07:46:36 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+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 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.9:2
+	>=x11-libs/gtk+-2.20.1:2
+	>=x11-libs/libX11-1.3
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXtst-1.1"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/libpng-1.5
+	>=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg
+	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/pango-1.24.5
+
+	)"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	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
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+}
+
+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 "${EROOT}/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
+}