Version bump, security bug #346799.

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

5 files changed, 20 insertions, 235 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index cf39b9b7c410..cac9a2a50db7 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.41 2010/11/07 22:08:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.42 2010/11/27 12:57:33 caster Exp $
+
+*icedtea6-bin-1.9.2 (27 Nov 2010)
+
+  27 Nov 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.8.1.ebuild, -icedtea6-bin-1.8.1-r1.ebuild,
+  -icedtea6-bin-1.9.ebuild, +icedtea6-bin-1.9.2.ebuild:
+  Version bump, security bug #346799.
 
   07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   icedtea6-bin-1.9.1.ebuild:
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index 117e51dc7a9b..a509f2f9cc1c 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -1,39 +1,21 @@
 AUX icedtea6-bin.env 947 RMD160 8f72b884c823f408755a3b06daea5af7705da488 SHA1 7473e4d987d5b0e9f1dbf48fbf4978e37d2f64b9 SHA256 b0f675b427f42d7fd1bbf1314523144a2bfc9f5ad44f89568adce120929f74e3
-DIST icedtea6-bin-core-1.8.1-amd64.tar.bz2 35467633 RMD160 d1f302dd12c85de550cb62202096ed4ccc41bd7c SHA1 590cf19c4907f57c7d0df0ed3b31d6d3d5c2527f SHA256 78785bfe0a73d52e8b880ecd18082627c4442ca81aa0181a4f60f88b7842ad2b
-DIST icedtea6-bin-core-1.8.1-r1-amd64.tar.bz2 35470548 RMD160 350df67fc214d1840b9c3620033736435e3e1820 SHA1 0f5845eddcdadbbd51f891c1a8cc228c681cfd9a SHA256 6230abfb97eb7fad1e326aaaf6d99a1ede36eac2698e9b2f58b4c81548182a94
-DIST icedtea6-bin-core-1.8.1-r1-x86.tar.bz2 36611326 RMD160 c22497d70fa81b340b9181143d86f481052ba68e SHA1 8b3ae05ef144dfe21205bb159d2a3a07df936b22 SHA256 98f6cfb7f989fdb82fca6ae220650be2f24435951910f4b0e62821cb188ef3be
-DIST icedtea6-bin-core-1.8.1-x86.tar.bz2 36612465 RMD160 833d096c2634d88bf7a9c47c7c2dd71e7de9daac SHA1 57793ee027064e7479c9ef012019210f867cbd44 SHA256 84d7afb0531b7b43165ee3a4bf919954662eef98481bdc522b42a02c9982fc3a
-DIST icedtea6-bin-core-1.9-amd64.tar.bz2 35709590 RMD160 857ec2ed3ef5c1be243f6376a684bb0aa675a035 SHA1 6052bc4a2ba715b55dd2ee2a2b76b1a648bb9b84 SHA256 d394a8e494ae4ed9bbef314858ff46ddcd172e09a07fbe6c5ab77064a9b4928e
-DIST icedtea6-bin-core-1.9-x86.tar.bz2 36959767 RMD160 b32756fe977a3577ecbb53a96d976eed44581b15 SHA1 f3b3e7f717d142069d15acbb71d1f5c171d222da SHA256 ad082c0fa79428e4702ea57e80e082cb17fe9848f327ce98848c0ef38e5de325
 DIST icedtea6-bin-core-1.9.1-amd64.tar.bz2 35783717 RMD160 01072eba378ffcf02b87ee68d8647bf6e0d642cd SHA1 f92baff7f748340afe198b80f475fd140be72948 SHA256 6c5d74dce8d5cf843296fed095b42e081afbe6db2ebcf597fe3596a499daa9b0
 DIST icedtea6-bin-core-1.9.1-x86.tar.bz2 36924988 RMD160 d3fbf606cc43a412cf2044d64f3434ef9f1ecbcf SHA1 9e4254ce22b470b687adf965d360f7c4dbd85aa4 SHA256 82ad4775eee2c2ecffb9ad870342221cc4f38eb3a5522de64b1d26f9fe8d62c2
-DIST icedtea6-bin-doc-1.8.1-r1.tar.bz2 11525550 RMD160 ba87437c743c15876be920118fda4c1af65b02ad SHA1 f085d89b8b8183a2416c947343af27d9deb226fe SHA256 cbf216a6eb54be9f6f3755c9669b911d099ffd74e68cdd537ed0717af5cce58c
-DIST icedtea6-bin-doc-1.8.1.tar.bz2 11528838 RMD160 ccd82ee96a419d018697c4731adb477b2951eff5 SHA1 0f7121e587d0b5986ed6a792c276c25df1b2f577 SHA256 ea6aa7b46a3cce9f3bfc331073351f6366cd944e6d0d29ae5a15b47fda9f25b7
+DIST icedtea6-bin-core-1.9.2-amd64.tar.bz2 35838514 RMD160 abc0bd3403d927d07757ebf70540a553c22c0579 SHA1 7c3f084b79d3d262f3d9dc712b8dd6c6c4281f37 SHA256 767d43101859c89e4d7034c18f9b038bf48ec2c320f3c6e592bd882f4fa36d89
+DIST icedtea6-bin-core-1.9.2-x86.tar.bz2 36960745 RMD160 990a843bfaa9a2a0c4517d3fb8d8f97e0d2ebf04 SHA1 ceaed88d09c88aec2665828d93b1060b8eb65348 SHA256 c36557baa3b9ca5f32eb6b8ee2a83000dc91ad4264acc7751f36f8087e5c8ced
 DIST icedtea6-bin-doc-1.9.1.tar.bz2 11635939 RMD160 67776061228c42261b5b356a2c6634fc8a2c3872 SHA1 8eaefafe8bc3c39889f784556296d656fb5e8390 SHA256 9dcd6a8e723cc27570843df07a295453193009bd29ec28164f6e78d86b41d064
-DIST icedtea6-bin-doc-1.9.tar.bz2 11637982 RMD160 0364b3408d37f376ca81135c715507dba7245095 SHA1 fffc67922f689a8c272c7c58f0c3b17cfc74f883 SHA256 4e6d16c102248d70b3d80552928b2d566a606ea2f6469e7b9f69f95b5e744e6c
-DIST icedtea6-bin-examples-1.8.1-amd64.tar.bz2 2192076 RMD160 d1ba4226a529b1e420d9c4f4a54c99ea0406eaaa SHA1 dc4014125f61003f00fc264a97356b491b4fdcf0 SHA256 56e6ef43188fe451d2c375247785a78679505d6e2b126788120e5749b8c36ea3
-DIST icedtea6-bin-examples-1.8.1-r1-amd64.tar.bz2 2191601 RMD160 b463a34735d925869932c0ba195c56a2be2f6a80 SHA1 9a4bb5e7e1e8fdf6193c23807d4675cd89ddd9e2 SHA256 b39a4acc6f9fa9d8524d8ab4a05900ce130ccb4927ae095156eff8af03453d13
-DIST icedtea6-bin-examples-1.8.1-r1-x86.tar.bz2 2162230 RMD160 16912eaf025cdd1977da216f969e451cef5a3533 SHA1 f022f95872e2f4aaa676b94cd0215a3c073fb879 SHA256 921664fa55cae77ee7f0b5246406a430839ce0f0799165878127464a8f131ec1
-DIST icedtea6-bin-examples-1.8.1-x86.tar.bz2 2161453 RMD160 8c4bb43424775e7633928106c638318423b17775 SHA1 9ee82e27ba9f06142a2f8eed98f8ded05bd1836e SHA256 14091f4e391ce78afb4c50c6998f40840f60f1a43985c03793f98bafcab39f78
-DIST icedtea6-bin-examples-1.9-amd64.tar.bz2 2193307 RMD160 9048682cf5061891893ac12bbea632164df63234 SHA1 372a6895da0d811478987f3966d483d23c6cc76e SHA256 418f143e9844562450b3810981ef5e0493df6174e05a4f87ee71e9a91173a057
-DIST icedtea6-bin-examples-1.9-x86.tar.bz2 2163207 RMD160 5be9fcf7d11dc3ea7b7179f9909c4b87dd4e9875 SHA1 325398a6174c02012deca43453401a66f75df1c4 SHA256 4aa35a72602aed53633a728e373f18964dd234a2c37318681b4b8f8057cfcd72
+DIST icedtea6-bin-doc-1.9.2.tar.bz2 11639502 RMD160 fbae7efacfd3f8568efab7dd64d3ec8ab2d2d426 SHA1 6bb01aa593cd9575d7f756218c2c1ea76bb968cd SHA256 d6e5090478916c6c4796a10e9852fb217fc7a1a97ed8b64857b0cf89e057bb84
 DIST icedtea6-bin-examples-1.9.1-amd64.tar.bz2 2192996 RMD160 d858b8aaafeedc7c00eef3b9d4e8540f92e16ccb SHA1 91b20845b6f2d98280c9191c2653d541b2b66bd7 SHA256 b7c884391e5d7225ba3583b331a8b675a48cc01fec628e1fddc95c7898f80cde
 DIST icedtea6-bin-examples-1.9.1-x86.tar.bz2 2162907 RMD160 cb69e633d34b455cc0fb85494ba57c76d681a376 SHA1 11b3364438ce7f0b44cfee87cbfd2dbb508b3734 SHA256 c575302fc1a84725a015516fd7a8b304b5c784d9b39c6e95f8141889424f1669
-DIST icedtea6-bin-nsplugin-1.8.1-amd64.tar.bz2 79576 RMD160 fac40dc1fce7d12ad31f4ceeda8cff70c90382e7 SHA1 0758b8a6b4f75096590dbb4e99a3e8a5c7797080 SHA256 bed3d659a69c0430e1188aa5bea23194b58b2f6b89fc4d897a2c7545e9f84724
-DIST icedtea6-bin-nsplugin-1.8.1-r1-amd64.tar.bz2 79271 RMD160 7e7ab7e7d877dca92998bd59e21151995eb7cfcd SHA1 ef6095911b2e3d2119f9126c04a47c81aae42060 SHA256 bbc87dca87b9c71250ede09fd68ce47f2dec688578a1b5f224b282f222c8cc9a
-DIST icedtea6-bin-nsplugin-1.8.1-r1-x86.tar.bz2 73130 RMD160 2a18fc411d54321627da92cecbea9338d12435ff SHA1 60261d01672d867dbeb9af537fb525c9fd9590cf SHA256 e8922b31f785373b657215233136a74766ff9b40b054f7f01f130402e96c8e8e
-DIST icedtea6-bin-nsplugin-1.8.1-x86.tar.bz2 73653 RMD160 01e984aa9730149cd661f53ff4f01e68358655d4 SHA1 55eee5bd09e28930f1f2999c8af9befe01d27be4 SHA256 704fa752307d38562625f643b596c5208c8e90ed439df3748b2601a0b8918063
-DIST icedtea6-bin-nsplugin-1.9-amd64.tar.bz2 79124 RMD160 3114ba49afa0fc06123a26aab1af3d8c2b28368f SHA1 f6b2133142398948e2df304a4fc2259a8eef90ff SHA256 c471325462fab4fd26c2d9491c8a49e328fd888b1ee0c5dcc3f618c0bb04e2e5
-DIST icedtea6-bin-nsplugin-1.9-x86.tar.bz2 73117 RMD160 51b627b49fc315ea7c3e9581873398a7008de76e SHA1 8f1517af63f0efea5d62dd4b645a824718367bbe SHA256 4504a9f3297378f8b38b114eb567dbc731d039060eef712001d41ca0ba6c5287
+DIST icedtea6-bin-examples-1.9.2-amd64.tar.bz2 2193111 RMD160 74c0973fd1b0511ce22e0a85cb19d73e374035f3 SHA1 ca5529123e25e447edccd4472b17d3ae4c54cc32 SHA256 afc6c9bdb1e802ed5e9a7442d39abd94508d64629535f1b60d9670c9cd733211
+DIST icedtea6-bin-examples-1.9.2-x86.tar.bz2 2163021 RMD160 0602948f6d253071689abd8de078aae440dd8e6c SHA1 f71e38d4b792f94086a37f3c024dbd8c90103fcf SHA256 23de330cf6aa8970fda7d61204fdcaafb31a550eb1deea1ce5f5b549120a6dc8
 DIST icedtea6-bin-nsplugin-1.9.1-amd64.tar.bz2 79217 RMD160 90d5eb5431a7890c53c474eb5593af9f1fcffb5a SHA1 08e021a67a706dbb91d3f85bc6ed27e0764a15d5 SHA256 2e310e13ee33c2772e03804077beceed736d285077799198a0f0a2197a87445f
 DIST icedtea6-bin-nsplugin-1.9.1-x86.tar.bz2 73082 RMD160 2f4fadcb6f14ca744da5a64767f899121f388237 SHA1 2faf54eb38350377f8304f8450d9cad870a478ec SHA256 7349fc23682b8bd488e643636f85eeb11f0c1fe9d220596c520fa0e937c9b3ba
-DIST icedtea6-bin-src-1.8.1-r1.tar.bz2 26811995 RMD160 bab4a7579993dd2ebdf1c5c19ef2aeb83f4bd581 SHA1 eacb13b54f9505cf61ccef07768b1348080dfbff SHA256 52dba3b5195ea65df7a0124d2a7875974dc45f996384ae783ebd985da0b65851
-DIST icedtea6-bin-src-1.8.1.tar.bz2 26810585 RMD160 f1f89e03832455dcb7b091ff5ca4b265f32cd867 SHA1 1af53800ea86d332a58d0190f1805dccd9bb1322 SHA256 12cb9b7c2f78559842ad8eeb40dcc017631a3e8ca4ba216f462ad40e4654a8b1
+DIST icedtea6-bin-nsplugin-1.9.2-amd64.tar.bz2 79235 RMD160 c629536ad1e07fa5c3b8b595184fa58aeadca478 SHA1 fdaf5f3632cd39219a1ce74f23de63e3281baed5 SHA256 86c2aed3dcca5b8113c6b2a964657a6493f8d8897e7e52e6e9c3be4c782485a8
+DIST icedtea6-bin-nsplugin-1.9.2-x86.tar.bz2 73127 RMD160 e7086b6c3e2fe72401b20c8f8f22bdacd9742593 SHA1 ac1f41bd87c02146d32d0b446737a6551fc721f3 SHA256 a347a6fbd7f7fec05d8692e50e7066e5000b2dc711e26ff2ec6d14443c5cc959
 DIST icedtea6-bin-src-1.9.1.tar.bz2 26846492 RMD160 7eb8151445c1fc5826ece07d7999d0b46fc52314 SHA1 171e2776c43d119c8a0576269c3aad9f9461cf8c SHA256 73f8a7b99fb52fdcc96a957133c7ad69c841f28b1e3ab7ea995cc3c93003f776
-DIST icedtea6-bin-src-1.9.tar.bz2 26848255 RMD160 28327c13a6dfa3fa9f5946ef8065c66b34fa6820 SHA1 79c740e39deb82aeb0a8a00233aab6a03937f900 SHA256 3914f2cc967887c400a2fa11ba0b64b053eb24d14f6ee298613410ff8511aee4
-EBUILD icedtea6-bin-1.8.1-r1.ebuild 2693 RMD160 3cccf6b4b7bedc491ceaa38ed4a4b9102c3ca9c5 SHA1 48a40d897bc5f8155746bc657f586ccc4a9c56fb SHA256 5bc46e546d27eaaa2df448f9336709ac2087de3efe626778ef31b4d26131a174
-EBUILD icedtea6-bin-1.8.1.ebuild 2694 RMD160 a59540adacfd9c64ddebc978e89a3e5f4381208b SHA1 bfa36c51e9094c9c89aecbf511ac3302ac1fec05 SHA256 40721139b0e74813a00548fa88db89f568375ace62d362807f4bf7faca3fa844
+DIST icedtea6-bin-src-1.9.2.tar.bz2 26851925 RMD160 28a446cbef37f955a195e8fe94fae0e8ae266482 SHA1 63cbe5e88f3a4368462c9c9a32e4c64bb9ecdbc3 SHA256 eee8728b218af2517d2e71be4ce2edbd5ca84c67289c6d1d44fffedc510cd8d2
 EBUILD icedtea6-bin-1.9.1.ebuild 2732 RMD160 05b7644097683b34b2c52d2691f4fa06ee0af7ae SHA1 77e7df7a20bcfba0bd57aada83eedb267f34a60e SHA256 9e718caa8c72c953e256c59ccf6d460b8cdd7a78c8e9a8cc7d435f10f9203961
-EBUILD icedtea6-bin-1.9.ebuild 2690 RMD160 cad58ef788f4570c6e3c1217d7c28788533e1462 SHA1 ffd6c74b06a8fa276469c751cb570c21a9bb6ee6 SHA256 29dc8aeaaa63fa985cc1f646ac758b4bfa2d21c66c0576f1c338e549386e7931
-MISC ChangeLog 6877 RMD160 174d6034e219aa589a5fc10280b95498d0450b6d SHA1 28440c1ae7d6e42378046827573a2f36ef58bb48 SHA256 e9b042b2443887de1d2e2ecabd0d4305e18170c4870cd70601eebfa6d1f8689a
+EBUILD icedtea6-bin-1.9.2.ebuild 2731 RMD160 5d0a829aa36db8fc700fcadef96c951642c1162a SHA1 a4d67435c15577f91946daa9c1a88417bad2b8b9 SHA256 b301b20c9abb709778ddf88eba09c8e752631091665b995fef072aca845ced1a
+MISC ChangeLog 7116 RMD160 c021eee6f07c4e142ff988f63ec2e61190f2df25 SHA1 930a7f2630c098b6c644b39867d1c1e0160b45ad SHA256 b36ba2f5d82c1962ef758d3e552cb2de4de0d057a5496ed789d10afdd56e2849
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.8.1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.8.1.ebuild
deleted file mode 100644
index 5476e1d234be..000000000000
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.8.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 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.8.1.ebuild,v 1.3 2010/07/31 14:41:26 hwoarang Exp $
-
-EAPI="1"
-
-inherit java-vm-2
-
-dist="mirror://gentoo/"
-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="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
-
-RDEPEND=">=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.9
-	>=media-libs/giflib-4.1.6-r1
-	>=media-libs/jpeg-8
-	>=media-libs/libpng-1.4:0
-	>=sys-libs/zlib-1.2.3-r1
-	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.0.5
-		>=x11-libs/libXi-1.2.1
-		>=x11-libs/libXtst-1.0.3
-		>=x11-libs/libX11-1.2.2
-		x11-libs/libXt
-	)
-	nsplugin? (
-		>=dev-libs/atk-1.26.0
-		>=dev-libs/glib-2.20.5:2
-		>=dev-libs/nspr-4.8
-		>=x11-libs/cairo-1.8.8
-		>=x11-libs/gtk+-2.16.6:2
-		>=x11-libs/pango-1.24.5
-	)"
-DEPEND=""
-
-src_install() {
-	local dest="/opt/${P}"
-	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
-		use x86 && arch=i386
-		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so"
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-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/icedtea6-bin/icedtea6-bin-1.8.1-r1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild
index 5998f671b0d2..0950d4a69a86 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.8.1-r1.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.8.1-r1.ebuild,v 1.1 2010/09/01 20:14:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.2.ebuild,v 1.1 2010/11/27 12:57:33 caster Exp $
 
 EAPI="1"
 
@@ -35,7 +35,7 @@ S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
 RDEPEND=">=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.11.2
 	>=media-libs/giflib-4.1.6-r1
-	>=media-libs/jpeg-8
+	|| ( >=media-libs/jpeg-8 >=media-libs/libjpeg-turbo-1.0.90 )
 	>=media-libs/libpng-1.4:0
 	>=sys-libs/zlib-1.2.3-r1
 	alsa? ( >=media-libs/alsa-lib-1.0.20 )
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.ebuild
deleted file mode 100644
index 657a5474a03e..000000000000
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.9.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 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.9.ebuild,v 1.3 2010/10/13 18:56:37 hwoarang Exp $
-
-EAPI="1"
-
-inherit java-vm-2
-
-dist="mirror://gentoo/"
-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 )
-	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="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
-
-RDEPEND=">=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=media-libs/giflib-4.1.6-r1
-	>=media-libs/jpeg-8
-	>=media-libs/libpng-1.4:0
-	>=sys-libs/zlib-1.2.3-r1
-	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}" || 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
-		use x86 && arch=i386
-		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so"
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-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
-}