Revbump updating plugin/javaws to icedtea-web-1.2.

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

4 files changed, 170 insertions, 15 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 14fc93c83bfa..e9a21233f2ba 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2012/03/03 21:25:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.16 2012/03/08 09:31:04 caster Exp $
+
+*icedtea-bin-7.2.1-r1 (08 Mar 2012)
+*icedtea-bin-6.1.11.1-r1 (08 Mar 2012)
+
+  08 Mar 2012; Vlastimil Babka <caster@gentoo.org>
+  +icedtea-bin-6.1.11.1-r1.ebuild, -icedtea-bin-7.2.0-r2.ebuild,
+  +icedtea-bin-7.2.1-r1.ebuild:
+  Revbump updating plugin/javaws to icedtea-web-1.2.
 
 *icedtea-bin-7.2.1 (03 Mar 2012)
 
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 91d11fa23832..75a4276d0d46 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -3,30 +3,27 @@ AUX icedtea-bin-6.env 1061 RMD160 602b53f6a8fbef9db57f06dd4adf8046fc249fcb SHA1
 AUX icedtea-bin-7.env 1061 RMD160 0b2050dd26a4bdb8f2be98a46baeb1e4d5bec3d5 SHA1 054cfa603c114300a7287eac629ad9fdda900090 SHA256 4715904865c9794e0abfe69ae1bceb634c1e0182ba80046a0e086f84cb81087b
 DIST icedtea-bin-core-6.1.11.1-amd64.tar.bz2 35211505 RMD160 25610ab514f8f4164cc6fc8c977ce16e08ef35b0 SHA1 c30e3babbe4a0310d27c1bc674d1bcfd8ab31f89 SHA256 499ab85ff5fab2e2132e8b7371d89b8de4d5c6fc683ae299dd10daa45ad55fd7
 DIST icedtea-bin-core-6.1.11.1-x86.tar.bz2 36183796 RMD160 cd0bbac611b99dc14c8d1cbd10b50bb6ce36bd33 SHA1 d21d7f861640763d8f34904d6d3fd6bd8d969daf SHA256 00960af708e2a5d5a87506973b4f21a74549efd0bdcb3c6f3708a27044a94610
-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-core-7.2.1-amd64.tar.bz2 34422285 RMD160 3578c8e12097ad7c5c6870e526bb9d6c020da948 SHA1 babd3ace5589d03b90c761659314ad9978ab8f78 SHA256 7fd650d9d728986e76be8d613f7ac7cf72913a9636ff4b23727cc0c01343e114
 DIST icedtea-bin-core-7.2.1-x86.tar.bz2 35461188 RMD160 9030e99953a52b3e5ede137e9f6087821f5ef3ca SHA1 f74add08de2fc518943e8b5909667d3f583fae3d SHA256 9f6b1c902de4ef11e930e63fa4ce34e5e14291d0b9c13a89768d2d1b04e4bcfd
 DIST icedtea-bin-doc-6.1.11.1.tar.bz2 11635130 RMD160 c2bae7e723def1bc905d904ce6c8684fef7c60b0 SHA1 178994b77202248c3c78c7e686920863fa003e8c SHA256 f4e520e5fc4c7b4a88e21e6a24b55f6dd703a1c8e2e8b71fa3171d8679a49d01
-DIST icedtea-bin-doc-7.2.0.tar.bz2 12519410 RMD160 fdf8fd65700bc2c9b0a32730aec871c6449bdab7 SHA1 a80f11ec3ad523feaa4d3e5e9d467808af9b0640 SHA256 be5e289f073df942ccc5289f710bd35bdb1f5b002fde742720eef9b13015aa5d
 DIST icedtea-bin-doc-7.2.1.tar.bz2 12518295 RMD160 eda11e9dc5a8b133d0eab93f3597a8f023a94a5d SHA1 4d0a402f87b9a783dfbee939542b68a90a16bf08 SHA256 5061f824c2888bad2aebb28930f74a64f5f913d175849c3ee16d8291fe79f398
 DIST icedtea-bin-examples-6.1.11.1-amd64.tar.bz2 2164582 RMD160 12bcfaa380a8119178200bcd5f3ecc11f82c5aa8 SHA1 edc614ad9d70f4126dbab410e7032a2b5dd32786 SHA256 d1ac0a1f5d24b1b420c02fd1c4fad20d001a26633453c79c10105b58f0f2b255
 DIST icedtea-bin-examples-6.1.11.1-x86.tar.bz2 2133905 RMD160 224128b4204d8ca3ee837c3f812d0f125d2b5034 SHA1 073c5b848f2b634d208bd74b77b5839c94ba4479 SHA256 27bc3312c52de408999a22f3d5bed40acfe04406702f65dc9759c4378be5716b
-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-examples-7.2.1-amd64.tar.bz2 2332698 RMD160 e46d06c2f9cb7c2ecb9ed2170571eb7f9a4fb728 SHA1 3bbe01386740e52a7676e0135d9bf7deb04ca381 SHA256 7fff369709838edcf84303d5fc3c12233ef4024a5b0c13a0fe5ca4be84e93389
 DIST icedtea-bin-examples-7.2.1-x86.tar.bz2 2309914 RMD160 c85bfe2265836cfb072ded11eadbd7dd25703af1 SHA1 56b5b5e38ba5d748aa08ac256dee4289566dc52f SHA256 4e176609ba23bb65226335fe20a19d7f79bbde35b19d11846dac277e5f33ee99
 DIST icedtea-bin-nsplugin-6.1.11.1-amd64.tar.bz2 906944 RMD160 b2134ef14404587be943bae566cdfd26364cb3ad SHA1 fc940bb5a0d18e6c00ce681bcbadb73efd375662 SHA256 d9680a0e787d96edce5c4730cabc17df17047705badc33e0da0eaf69385c7b00
+DIST icedtea-bin-nsplugin-6.1.11.1-r1-amd64.tar.bz2 928072 RMD160 06316e1444229ab2e8a7fa51f6208a6c26a50c8e SHA1 1eb6436daf41114bdc1732f6c0e72bd839392e38 SHA256 33d3da9ddcd8ad99852da8f3bb6553cf01b01cdfaca36b20e525b6ecd92f0309
+DIST icedtea-bin-nsplugin-6.1.11.1-r1-x86.tar.bz2 921659 RMD160 81ca99fb10c07f01f018f6b4f291df193c729ef9 SHA1 50d93f7ba8e19ec10dec46f7455836ae6823b931 SHA256 9a49d9c3981435de521115cb199c5e0ae899f6404a4dbc1ef433cac2645e0339
 DIST icedtea-bin-nsplugin-6.1.11.1-x86.tar.bz2 900804 RMD160 2c85b5e6484106727fdd225bb726550a00383633 SHA1 577bb5fb73acd3ceeac65475198c5d9cb404c1bd SHA256 56d2d1f357e9fcb20ec7648ae7a14f77a30f9feb24916787e00fadeac5d3b8bd
-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-nsplugin-7.2.1-amd64.tar.bz2 942956 RMD160 5687b44950199be2b8301d74289d42596a0f56a6 SHA1 fc5f6952af1371f5ba86010fb2ee928aee401b2e SHA256 9b17ae63c0b3197e85953f90e84475eb6368fee9ee4bc23264c219a991edbe35
+DIST icedtea-bin-nsplugin-7.2.1-r1-amd64.tar.bz2 961539 RMD160 1d2d1ce60e7f7ef19ac6b8d577c85831f8e1fcce SHA1 ed379cda9e4b8f1605783f86b4ebb01cbae9d1f2 SHA256 5904d7d89cbda51091e2cd4fa8b4abc8fab1c445f7647b9ed443f0f70aa05f5c
+DIST icedtea-bin-nsplugin-7.2.1-r1-x86.tar.bz2 955296 RMD160 6111e73babf6e6f473733ab7d012bb43a191abed SHA1 141ff2f9fd040720d2fb1bb1be6aee1a7ea58359 SHA256 449488c769a52664264861aff98103801ae486788ce2cb20262e22bdb9dbf277
 DIST icedtea-bin-nsplugin-7.2.1-x86.tar.bz2 936221 RMD160 2c8fbd9cbf82af0772e940a4e9455826ef6b00e9 SHA1 99a4607fd43aff590f77ca545ea65e10248c0b39 SHA256 ff411dd903a7eb369f4ce3c27205411a2d7f05f00d2a1507ee95dce8795aa64d
 DIST icedtea-bin-src-6.1.11.1.tar.bz2 40849905 RMD160 3a973f14ee45df2cc85056bcfd3a979c152c5b33 SHA1 173394b5ce77cb006592d121fd29221a6e5cf5f4 SHA256 5bee086bcd2774cdc8b31df53ffd455f2d77026244b947f815206cb363196eb9
-DIST icedtea-bin-src-7.2.0.tar.bz2 41228114 RMD160 efd44d62e5213ccdefec460bdd360b4e024a9714 SHA1 55d60e3bbdc2af95d3799c8fef776a17ef38ccb2 SHA256 cca3216ce6dfc8a10eb62bc615f6b4460983950fb977ff4b38874effe81cc3c5
 DIST icedtea-bin-src-7.2.1.tar.bz2 41253138 RMD160 a007f59d8639cb089db3584c96a2f8a66cc685a3 SHA1 1e2abb2f26f6ba054e8f149f70ef1214820c8ed1 SHA256 7ae867a543e93a415f463f953b82deb650a37253fb469c9dbf7fb3068f409bb2
+EBUILD icedtea-bin-6.1.11.1-r1.ebuild 4223 RMD160 bc16ebe391f17fec1a266a8de761a97228939f28 SHA1 fec84c9ecc65eff0f83aef6efa25bc124ebef8b6 SHA256 96166001d166bffe4f72b48d532a91a2c042a87986b27d87abdf8110a0120053
 EBUILD icedtea-bin-6.1.11.1.ebuild 4193 RMD160 b4d673f3cdad03dd83f288eb8898a8f1a1cf42ab SHA1 fe2036b75069e2d2bf26b73b256e374dad23b4c0 SHA256 f2e06fe98c2e4475dd289dcbe9ab88ecd4a73c92a6d7f9843e223bf3066150ae
-EBUILD icedtea-bin-7.2.0-r2.ebuild 3705 RMD160 030fcfa6f41b7c04b26aaf290fe293d97dac74ca SHA1 1f30e5cab3e3707c6d1da23c594f8634c38fb71c SHA256 f6fc1a781a94823a1243ad7758778c4f1b884ce22728c06f381dc3d5239a865c
+EBUILD icedtea-bin-7.2.1-r1.ebuild 3761 RMD160 1dfa593b2cabc6435f984828c4fd10bdb720c1e3 SHA1 4eb468277bf752ec7b69e19788ceba89be497d82 SHA256 9964f3eca1885f79cb379f81e0b33165b34d804b1b7c390ab0b95605f4e1e5f4
 EBUILD icedtea-bin-7.2.1.ebuild 3736 RMD160 3c15eccc31a6040a3e6c5924cc07204fb5abda51 SHA1 da0cb634e27c9b5ca80451d2b247c7c7a65c3273 SHA256 8bb41c731542ad13d4ba3211081168e8a4b0003564aaaea5886a3a68558cacff
-MISC ChangeLog 15453 RMD160 b96de0774df9045ab3cc7cc9e1c118de458db289 SHA1 13fa7d6202973b5fdc08f177091cf437c5e2427d SHA256 8de89b87a0747393262508b2197c08e802568f920923466c9c173aab6a593362
+MISC ChangeLog 15731 RMD160 39f945695756513069c9c834547c87c489250f5b SHA1 9b564208993081bdbef65780b1c5d3927921a5f6 SHA256 d44b3032b956b341dc46d97e340becbeaac19d37d4c7c80ff362eb5e75c61f3d
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild
new file mode 100644
index 000000000000..7260ccdf4344
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild
@@ -0,0 +1,149 @@
+# 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.1-r1.ebuild,v 1.1 2012/03/08 09:31:04 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
+
+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-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_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 && [[ -z ${REPLACING_VERSIONS} ]]; 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
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild
index ef006625a856..ad42dd7c40bb 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r2.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-7.2.0-r2.ebuild,v 1.2 2012/02/13 21:33:33 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild,v 1.1 2012/03/08 09:31:04 caster Exp $
 
 EAPI="4"
 
@@ -8,6 +8,7 @@ inherit java-vm-2 prefix
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
 
 DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
 HOMEPAGE="http://icedtea.classpath.org"
@@ -20,8 +21,8 @@ SRC_URI="
 		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 )
+		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
 	)
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
 
@@ -130,7 +131,7 @@ pkg_postinst() {
 	# Set as default VM if none exists
 	java-vm-2_pkg_postinst
 
-	if use nsplugin; then
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; 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."