Revbump to bump icedtea-web to 1.1.2 and provide libpng-1.5 ABI variant, selected at build-time.

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

3 files changed, 44 insertions, 28 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 5a4eb42f852b..9af28ab21531 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.66 2011/09/17 19:23:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.67 2011/09/19 09:25:52 caster Exp $
+
+*icedtea6-bin-1.10.3-r1 (19 Sep 2011)
+
+  19 Sep 2011; Vlastimil Babka <caster@gentoo.org> -icedtea6-bin-1.10.2.ebuild,
+  +icedtea6-bin-1.10.3-r1.ebuild:
+  Revbump to bump icedtea-web to 1.1.2 and provide libpng-1.5 ABI variant,
+  selected at build-time.
 
   17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
   icedtea6-bin-1.10.2.ebuild, icedtea6-bin-1.10.3.ebuild:
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index c0dee275a29e..8c73e2e655c7 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX icedtea6-bin.env 1023 RMD160 6b5de5f11b11cecc72dc89077ec7795f322f030b SHA1 3392ee66d94e952ec63e682f5f1ad8cbb8b1d4a2 SHA256 729a1f5ee5c64c0270ae12acafd6a73dac0858edb5493868a98a2de4b606d0ff
-DIST icedtea6-bin-core-1.10.2-amd64.tar.bz2 35149854 RMD160 00100a4689a85bb5f8275d80385ba83159b30808 SHA1 7c7adffe4915d30258e394e8d24a5db2ad57b222 SHA256 457961a0bbf2b57d6cdbbf365c9c975f9cc23e3f80e620c285ddd3c8496651b1
-DIST icedtea6-bin-core-1.10.2-x86.tar.bz2 36115323 RMD160 0b75fb16d32d2d03cc45794e8bf2329c05c8ae04 SHA1 fc3a459853dcd42889a713da908383c7acfd9be7 SHA256 0f36d76c67dd8cb285b0a08695286cc71dd4e4dda5ce71f51fb6cb1b318f33e8
 DIST icedtea6-bin-core-1.10.3-amd64.tar.bz2 35157530 RMD160 6cdd0bca9ebdbbdf647870c9ae2d6a9d15550161 SHA1 534e5a75d61d1c28d765abbe13f4961789209c47 SHA256 45f7bab3c49b7dba40f3909164efd9992ca78de8b1d1b7641efb2647500ba257
+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.3-x86.tar.bz2 36118624 RMD160 395f0f2df6d2f3a3e7c6d8065b32d584de518bcb SHA1 859881b34b379cf77948e845d2188117b2ac1141 SHA256 a8accf8fc418f5e2247d3889be03f234b59194693890f209bf5e4b2da6e6b02b
-DIST icedtea6-bin-doc-1.10.2.tar.bz2 11635964 RMD160 54ef2780d9775d16652447c391c2ee1598bd213d SHA1 4a8ad338eb59aac79a5695ded5ad755ab7e93df9 SHA256 57c67588c91ba6aeb759867bbe37d9ae7e1b6c0f27fe88f5f6489ae5faa53351
+DIST icedtea6-bin-doc-1.10.3-r1.tar.bz2 11634986 RMD160 ccf6b8d2ca0c7e2f4757cd9d1c50f5778d76a7ac SHA1 61ad01441f2287a059523c158730e69195fc8a0f SHA256 296e339dd1571dbbcc28c2d785490586aa7f883cca81d113a22e0a9da4b5163e
 DIST icedtea6-bin-doc-1.10.3.tar.bz2 11636937 RMD160 1ab3acb745a6d5c81a9b156311aeb42f05fc8243 SHA1 d01900e8ae43e0a98ccfd4bf1a377f0b60ad9b46 SHA256 cbd06d390580f3b2432aa13eaf54a6ed8801c9ed7c4865b9ad7df4a719d20ad7
-DIST icedtea6-bin-examples-1.10.2-amd64.tar.bz2 2163400 RMD160 d12bbcd082742932edccf60f4105c961afa468f2 SHA1 85db2f018f085ceeb42fe649c2301739f3449cc7 SHA256 1e6688c8057a6997dbfec0f2ec443581146b7f416473f014a50bb9aa87521647
-DIST icedtea6-bin-examples-1.10.2-x86.tar.bz2 2132716 RMD160 375431179175961ef62e4a0467bc8e6dd870838a SHA1 460a6f605fb7d93b930cb5f0435d63c412eff473 SHA256 ab772772ed08cda86dccfc35e7c3b0e5a1df1e852f3aec72ae1ad6a243861d01
 DIST icedtea6-bin-examples-1.10.3-amd64.tar.bz2 2163289 RMD160 550e8229085820d45f5a0ab3212df8d5cb46d455 SHA1 963607ecb58d3c749ce030bab529a1b90250ffbd SHA256 a54a071ca13ba08aa95227015fed7eadc109e5fbf07508b754b62bb69fe05127
+DIST icedtea6-bin-examples-1.10.3-r1-amd64.tar.bz2 2163240 RMD160 3ab92f6a60556e2fa1dc2d38f52c061aaad177bf SHA1 4f1ad0d818cc333b7d04225ace03fe72f8e27ebf SHA256 3dcb0ead0f03738aa47c4292ec1bfbaa16a79511a6e209732a0ea6ac18f30d97
+DIST icedtea6-bin-examples-1.10.3-r1-x86.tar.bz2 2132727 RMD160 4928889c5a788d9f10801564b3c87db6648de722 SHA1 bb5fd487233dc0f5115fcfc59f0e0dd0f6743b8a SHA256 f01a936c8dc5c6b9277d4dcfed8177d0d206d4e11241e9a663353b540d213441
 DIST icedtea6-bin-examples-1.10.3-x86.tar.bz2 2132470 RMD160 45f4f3b59104a666aebd16ff1a8aa8fae812c5c5 SHA1 587528c024e463d945663947c9383e18856f1f3c SHA256 13ce844afb4d544e927619ed81a61716a278b231acac2c78378b7492e54e6bf7
-DIST icedtea6-bin-nsplugin-1.10.2-amd64.tar.bz2 898766 RMD160 51893142b39ee46f6eed3d78e93009dcbc494aaa SHA1 3d6465c37c521d5020bd436e4a6c9563162cb129 SHA256 f564c0e226d181c6f703d7189bc2577abd1c8fba467eb5cbc071a348f7f9142f
-DIST icedtea6-bin-nsplugin-1.10.2-x86.tar.bz2 892165 RMD160 8551e7baa5f5a7d8a92e451abbec79986f7abe8c SHA1 a2b52a22cbe9c93ea3a3e25fe224fbfc404456ef SHA256 96bf80b2a2b334b3044c870b841a0b09d7e0357bd5dae1717c17a028db0a3c42
+DIST icedtea6-bin-libpng15-1.10.3-r1-amd64.tar.bz2 18613 RMD160 7559ef8bcaaf85722f0228bdac45280e2f41a72e SHA1 b8f6ae994779fe67ac30d6e5347e9dc4a383419d SHA256 9934b24702a11864cfd5ff2531b00a9aa74bcc5cb3819d65253955ab1bd0e0bf
+DIST icedtea6-bin-libpng15-1.10.3-r1-x86.tar.bz2 17199 RMD160 9d1cd5e5285be002d9071cae08aca6150584d4b7 SHA1 b9c098527c596c7ec8b804b2270bff764421dde9 SHA256 d8e474e98601e30118564e7993e1d6fbabab28195f04ad74a0444d0cd0f0660f
 DIST icedtea6-bin-nsplugin-1.10.3-amd64.tar.bz2 901853 RMD160 8f0a7466b923f7e74b8c61f5a6780cbe36b693e7 SHA1 5e5dc9d7b2df7e5342cde6a3ed034cd23d098f03 SHA256 be394ce6b11b6706037600d28890cb2339581cc569eb50b86f1055891cd56ac3
+DIST icedtea6-bin-nsplugin-1.10.3-r1-amd64.tar.bz2 903283 RMD160 dd1528e492db15dfcf0fd1a35df1519d8f31c3aa SHA1 1f139f54f19060381f7bd72abf6c62f745616beb SHA256 39d796bb6c3038240c0906f353e6cf69783b331647bacd3e670d248746b515a8
+DIST icedtea6-bin-nsplugin-1.10.3-r1-x86.tar.bz2 897166 RMD160 759c93a30a59a2e1da71a25f42ea6e05c889e66c SHA1 f9238019b4880c5c02a97a51ce707328a1208db4 SHA256 3d140a8237c7fcee766ab6027af8b8c2042eaaccb4ffdcd829b9d22eb4aa4f61
 DIST icedtea6-bin-nsplugin-1.10.3-x86.tar.bz2 895214 RMD160 56f2d1167d3979c42823c325ff89437a9725640c SHA1 f9709e44fd9719f023f50839bf16fba2f10bcb26 SHA256 4583fa09fb83ec79e4ac71b7b423453877bf613cb4e3dfe02f169383f3b92503
-DIST icedtea6-bin-src-1.10.2.tar.bz2 40817645 RMD160 5331ebd98d5a480a8a02ae85ba15dec18e81f05c SHA1 c0bf5e7e6dbfc29c68656a38db160aaf565dca8a SHA256 1cc7f91f6849cc40b1b924e71d404910f45d74668cd6eb32439bc4d77adb76ff
+DIST icedtea6-bin-src-1.10.3-r1.tar.bz2 40821581 RMD160 3419b80c28bc001fce7c6fac7363ba613be6f580 SHA1 54f2c9dff1313e488122cf2355bcca8b49a8093a SHA256 3f725f60ddf317b5c1c8b00900ed9e3ad01c67d0533f9bd364c9de9b9511d868
 DIST icedtea6-bin-src-1.10.3.tar.bz2 40818662 RMD160 6285f875e59cd1f6423a45f975cae0dfc9945392 SHA1 d22efefbdefcf1e1e4476dbde44554b96e9f9dd9 SHA256 8a81efcf7ef34b64e1306b041b886a4281a28d9a21ea6cae2f899993d01394dd
-EBUILD icedtea6-bin-1.10.2.ebuild 2805 RMD160 c52331760423a3ae84691bfb1f23ca2af460189d SHA1 7a1e0b0994c160217ef7d12b2fd011531bf4793d SHA256 a094f47166b968f9835449366112ed1e0d12fab0b7086991e97ef5fbb423d519
+EBUILD icedtea6-bin-1.10.3-r1.ebuild 3358 RMD160 4fe8afe6e528ca961e7fb29e9022ef918341a2a4 SHA1 be931487b0f15f6fe2c7565496ceba4c81b77d72 SHA256 9af5d7b439b2081a60762884e7291755b56eb5957847b33e9736be4c9f90a8da
 EBUILD icedtea6-bin-1.10.3.ebuild 2804 RMD160 b6fdf191d76181ca748dbdb25951e4520f499043 SHA1 c9ff8f30fe540935325c55d76747e76f08d83e7e SHA256 4d5f717f370e4a4d251f4075b67e9605a532671d7685e6036eaf2ab4bddb18cc
-MISC ChangeLog 10842 RMD160 7598fbf44c1221d2fb613d03fe02e2482db9a27a SHA1 a3a334da2fcb2d61d3dca3ef847d4c03edcd5775 SHA256 0d6476c2f7069586a5a5598372a1482aee56b10f989d40ec9e38fab27bfcc12b
+MISC ChangeLog 11094 RMD160 d0f574f01b6f8789e17aa01de8b631aae6cfafd2 SHA1 2e84a4f37777fe96579a91456f5156577714a210 SHA256 9fc472c2a020fafde50d77dd6074aa4de0df41f160a07862857792ab95715b4a
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk508/QACgkQXkR9YqOcLPHOkAEAgZMC3IjxBBCno0YWFc81ZgyZ
-pKocgzYiBfkuqCdXZGMA/j1yR9a9XfqwsYmbpK1FxGSwvk8gC87cZ2aCthQ2Sq0a
-=KBfg
------END PGP SIGNATURE-----
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r1.ebuild
index 0dad02c03206..ee2b368e875f 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.10.2.ebuild,v 1.7 2011/09/17 19:23:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r1.ebuild,v 1.1 2011/09/19 09:25:52 caster Exp $
 
 EAPI="3"
 
@@ -9,8 +9,10 @@ inherit java-vm-2
 dist="http://dev.gentoo.org/~caster/distfiles/"
 DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
 TARBALL_VERSION="${PVR}"
-SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 
+		${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 
+		${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
 	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
 	examples? (
 		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
@@ -28,15 +30,15 @@ RESTRICT="strip"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
+S="${WORKDIR}/${P}"
 
 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.4*
+	>=media-libs/libpng-1.4
 	>=sys-libs/zlib-1.2.3-r1
 	"
 PDEPEND="
@@ -60,9 +62,24 @@ PDEPEND="
 	)"
 DEPEND=""
 
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=media-libs/libpng-1.5.0'; then
+		einfo "Installing libpng-1.5 ABI version"
+		local arch=${ARCH}
+		use x86 && arch=i386
+		mv -v ${P}-libpng15/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
+	else
+		elog "Installing libpng-1.4 ABI version"
+		elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.5"
+		elog "Note that revdep-rebuild will not do it automatically due to the mask file."
+	fi
+}
+
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}/${dest}"
+	local ddest="${D}/${dest}"
 	dodir "${dest}" || die
 
 	local arch=${ARCH}