Version bump, security bug #404095.

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

6 files changed, 39 insertions, 359 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 69511ee3262c..14fc93c83bfa 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2012/02/19 10:46:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.15 2012/03/03 21:25:31 caster Exp $
+
+*icedtea-bin-7.2.1 (03 Mar 2012)
+
+  03 Mar 2012; Vlastimil Babka <caster@gentoo.org> -files/icedtea6-bin.env,
+  -icedtea-bin-1.10.4.ebuild, -icedtea-bin-6.1.10.4-r1.ebuild,
+  -icedtea-bin-6.1.11.ebuild, +icedtea-bin-7.2.1.ebuild:
+  Version bump, security bug #404095.
 
   19 Feb 2012; Agostino Sarubbo <ago@gentoo.org> icedtea-bin-6.1.11.1.ebuild:
   Stable for AMD64, wrt security bug #404095
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 1e7e2e6e4b42..91d11fa23832 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,65 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX fontconfig.Gentoo.properties.src 15624 RMD160 6b750039895062bef070579e820865ff6c17f0ee SHA1 e9eb1977f7e898d59b11ebd5db53004746c8957e SHA256 06dc1c588fdf939f3942d435a9a695679b9d6b44591f6efb7bef3a5e38972b59
 AUX icedtea-bin-6.env 1061 RMD160 602b53f6a8fbef9db57f06dd4adf8046fc249fcb SHA1 a44f6aab9c616f9f0265b5191c225b60d1cae372 SHA256 a6aedf9a1a5eaa3bc5c26b0bd0ef5b79b12f7384e705a1f202929aee76399d92
 AUX icedtea-bin-7.env 1061 RMD160 0b2050dd26a4bdb8f2be98a46baeb1e4d5bec3d5 SHA1 054cfa603c114300a7287eac629ad9fdda900090 SHA256 4715904865c9794e0abfe69ae1bceb634c1e0182ba80046a0e086f84cb81087b
-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-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-doc-6.1.10.4.tar.bz2 11637503 RMD160 3b79217c5fe8f787c7989346a83deee9555c4451 SHA1 4db17acd1497008fe0c7e0700627172b7476530b SHA256 dba0fc8f96f563d21f145ad7831a930c2fccd4d02ca6adcc9aea41dc86c8feb3
+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-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-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-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-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-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-src-6.1.10.4.tar.bz2 40826041 RMD160 98e55e1e5a0a998e5cb686b83f72a5788413abfa SHA1 9c0d2e100a4d349d4ae8207bfceba531115c2bdd SHA256 7c935f41fd254ba1ca9b95a0452d6b319dc838a2c189ed426fa15f8260d4d092
+DIST icedtea-bin-nsplugin-7.2.1-amd64.tar.bz2 942956 RMD160 5687b44950199be2b8301d74289d42596a0f56a6 SHA1 fc5f6952af1371f5ba86010fb2ee928aee401b2e SHA256 9b17ae63c0b3197e85953f90e84475eb6368fee9ee4bc23264c219a991edbe35
+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-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
-DIST icedtea6-bin-doc-1.10.4.tar.bz2 11635657 RMD160 9e5bf35f3a8205bb1c89a816ddb2eff05fc09141 SHA1 38b0740d015dd4a4ad1dcd348581710d7ec512a3 SHA256 43fe4bc069222fdda85fb03e0ad31f8c0d4a46fab22a64a4b09cecb22f73216f
-DIST icedtea6-bin-examples-1.10.4-amd64.tar.bz2 2163675 RMD160 96f03ac17528cb0053a821fb2deb87b0f154b954 SHA1 9841620b29ebf530f3b1ebdce6a540ced91a03be SHA256 801d807d03a874ec60c04c89b441604cf28a55186ae50ed29c41488ea24fb05f
-DIST icedtea6-bin-examples-1.10.4-x86.tar.bz2 2132874 RMD160 60dd79e57f70117d547b00b9baeb948a95e52793 SHA1 7870cccc74b544d412bd0053bc75ff78b38de043 SHA256 f7801df925be998ce11bb0f8340154f2113ccea6163e544133163a623a8ce6ec
-DIST icedtea6-bin-nsplugin-1.10.4-amd64.tar.bz2 907288 RMD160 a97e343c99909ceedf6dcff6fa1429ff9e3ed4e5 SHA1 2f73c33a5b17ea03f1f37f4a2446bf8d4141fd0d SHA256 6d832600bcb5bacd37cbb94e948dfb94f3472fd90b92009184b56fb66300d8d1
-DIST icedtea6-bin-nsplugin-1.10.4-x86.tar.bz2 900912 RMD160 bd90075b7784463dcc1c2e37e740619e032402b0 SHA1 251ccd527c8b2ddd38f3c92320687eecfd4e09d1 SHA256 4cc4ece22041fd659bcb1e3364c376a45c16d0ddc97b141e93591e9c171feaf9
-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
+DIST icedtea-bin-src-7.2.1.tar.bz2 41253138 RMD160 a007f59d8639cb089db3584c96a2f8a66cc685a3 SHA1 1e2abb2f26f6ba054e8f149f70ef1214820c8ed1 SHA256 7ae867a543e93a415f463f953b82deb650a37253fb469c9dbf7fb3068f409bb2
 EBUILD icedtea-bin-6.1.11.1.ebuild 4193 RMD160 b4d673f3cdad03dd83f288eb8898a8f1a1cf42ab SHA1 fe2036b75069e2d2bf26b73b256e374dad23b4c0 SHA256 f2e06fe98c2e4475dd289dcbe9ab88ecd4a73c92a6d7f9843e223bf3066150ae
-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 15181 RMD160 8cd4e2c647878ecef49dcffe545af12e544447e4 SHA1 717059ac53705f20393c58a16ba60922ce19d924 SHA256 671cc509ac583c0b2bb84b2a7108ae2479caa26febc68ea1941284bea3053ecb
+EBUILD icedtea-bin-7.2.1.ebuild 3736 RMD160 3c15eccc31a6040a3e6c5924cc07204fb5abda51 SHA1 da0cb634e27c9b5ca80451d2b247c7c7a65c3273 SHA256 8bb41c731542ad13d4ba3211081168e8a4b0003564aaaea5886a3a68558cacff
+MISC ChangeLog 15453 RMD160 b96de0774df9045ab3cc7cc9e1c118de458db289 SHA1 13fa7d6202973b5fdc08f177091cf437c5e2427d SHA256 8de89b87a0747393262508b2197c08e802568f920923466c9c173aab6a593362
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPQNMoAAoJEOTDgjZ80txdylUH/2REiiux+fCmEji+UbJZ8uc3
-XiMFQSsMeR166lF3LqLvoL+6s3LdzA3zXJfVs7k4NxRkkc1fPO23PdUXYt79Uv0R
-I6w/fpuFTfnZevido4HaK1p08mY4M8IVbcmyXEN1zBlseAIrZ/7R+gITg5axhe/n
-7feD6qfZKADFHuXgdFOGK7DBB11+pQ1U93eroZMUSzCi1pF2qNGQ7KMGoZxpo+Il
-CAMbYCBJP9494os13Iodkll5VyMT2Hqf1f7ZRkZX/XoJm2EEtTMqloJYfZHONNsr
-dFbxPmITMoAh5amirJ2iOqN2g4hZLJOZfZPYuNX2aE7NinsU2Kw68JOxa1ASakU=
-=cng+
------END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-bin/files/icedtea6-bin.env b/dev-java/icedtea-bin/files/icedtea6-bin.env
deleted file mode 100644
index 606b4ace61cd..000000000000
--- a/dev-java/icedtea-bin/files/icedtea6-bin.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/icedtea6-bin.env,v 1.1 2011/10/30 13:53:19 caster Exp $
-
-VERSION="IcedTea6-bin @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-bin-@PV@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-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/icedtea6-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-1.10.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild
deleted file mode 100644
index 12b4706b17d5..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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-1.10.4.ebuild,v 1.2 2011/11/01 11:18:26 chainsaw Exp $
-
-EAPI="3"
-
-inherit java-vm-2
-
-# this ebuild is for package+slot move from icedtea6-bin
-# and the installation thus follows the old layout
-# future versions will change it
-XPN="icedtea6-bin"
-XP="${XPN}-${PV}"
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
-TARBALL_VERSION="${PV}"
-SRC_URI="amd64? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
-	doc? ( ${dist}/${XPN}-doc-${TARBALL_VERSION}.tar.bz2 )
-	examples? (
-		amd64? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
-	)
-	nsplugin? (
-		amd64? ( ${dist}/${XPN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${XPN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 )
-	)
-	source? ( ${dist}/${XPN}-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"
-
-S="${WORKDIR}/${XP}"
-
-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=""
-
-pkg_setup() {
-	java-vm-2_pkg_setup
-	VMHANDLE="${XPN}"
-}
-
-src_install() {
-	local dest="/opt/${XP}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}" || die
-
-	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} || die
-	if use doc ; then
-		dohtml -r ../doc/html/* || die "Failed to install documentation"
-	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 icedtea6-web-bin "${D}/opt/"
-		install_mozilla_plugin "/opt/icedtea6-web-bin/$(get_libdir)/IcedTeaPlugin.so"
-		docinto icedtea-web
-		dodoc doc/icedtea-web/*
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "/opt/${XP}"
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use nsplugin; then
-		elog "The icedtea6-bin 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-6.1.10.4-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.10.4-r1.ebuild
deleted file mode 100644
index 8d91d0c7f011..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.10.4-r1.ebuild,v 1.2 2012/02/13 21:33:33 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
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild
index 314ca7ed41a4..efac259c5637 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.1.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-6.1.11.ebuild,v 1.1 2012/02/14 07:46:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild,v 1.1 2012/03/03 21:25:31 caster Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ SRC_URI="
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
+SLOT="7"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="+X +alsa cjk +cups doc examples nsplugin source"
@@ -38,32 +38,33 @@ ALSA_COMMON_DEP="
 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"
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=media-libs/freetype-2.3.9:2
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf: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/libXrender
+		>=x11-libs/libXtst-1.1
+	>=x11-libs/pango-1.24.5"
 
 COMMON_DEP="
 	>=media-libs/giflib-4.1.6-r1
+	media-libs/lcms:2
 	>=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
-
-	)"
+	virtual/jpeg"
 
+# cups is needed for X. #390945 #390975
 RDEPEND="${COMMON_DEP}
 	X? (
+		${CUPS_COMMON_DEP}
 		${X_COMMON_DEP}
 		media-fonts/dejavu
 		cjk? (
@@ -122,25 +123,14 @@ src_install() {
 
 	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
+	java-vm_sandbox-predict /proc/self/coredump_filter
 }
 
 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."