Update dependencies and flag defaults to match dev-java/icedtea, add cups flag. Remove xawt directory with -X.

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

7 files changed, 83 insertions, 422 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 67b3386887ff..2a47361605cc 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.9 2011/11/28 14:01:54 sera Exp $
+# 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 $
+
+  13 Feb 2012; Vlastimil Babka <caster@gentoo.org>
+  -icedtea-bin-1.10.3-r2.ebuild, -icedtea-bin-6.1.10.4.ebuild,
+  icedtea-bin-6.1.10.4-r1.ebuild, -icedtea-bin-7.2.0-r1.ebuild,
+  icedtea-bin-7.2.0-r2.ebuild:
+  Update dependencies and flag defaults to match dev-java/icedtea, add cups
+  flag. Remove xawt directory with -X.
 
 *icedtea-bin-7.2.0-r2 (28 Nov 2011)
 *icedtea-bin-6.1.10.4-r1 (28 Nov 2011)
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index a2ede9d8b12e..7acff99fd133 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -18,29 +18,16 @@ DIST icedtea-bin-nsplugin-7.2.0-amd64.tar.bz2 942826 RMD160 9c0921a685d7cfb78708
 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-7.2.0.tar.bz2 41228114 RMD160 efd44d62e5213ccdefec460bdd360b4e024a9714 SHA1 55d60e3bbdc2af95d3799c8fef776a17ef38ccb2 SHA256 cca3216ce6dfc8a10eb62bc615f6b4460983950fb977ff4b38874effe81cc3c5
-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.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.3-r1.tar.bz2 11634986 RMD160 ccf6b8d2ca0c7e2f4757cd9d1c50f5778d76a7ac SHA1 61ad01441f2287a059523c158730e69195fc8a0f SHA256 296e339dd1571dbbcc28c2d785490586aa7f883cca81d113a22e0a9da4b5163e
 DIST icedtea6-bin-doc-1.10.4.tar.bz2 11635657 RMD160 9e5bf35f3a8205bb1c89a816ddb2eff05fc09141 SHA1 38b0740d015dd4a4ad1dcd348581710d7ec512a3 SHA256 43fe4bc069222fdda85fb03e0ad31f8c0d4a46fab22a64a4b09cecb22f73216f
-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.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-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-r2-amd64.tar.bz2 903575 RMD160 e2e6686f3bfdbc90dbee94d422d04221a6e58b01 SHA1 e1e3ff7d403167a2b6cb8546a937668270521193 SHA256 0c170c6c67e7fb00308b5e684a50e81c191a9c8ec1aaac9f555b6cc2b965d67a
-DIST icedtea6-bin-nsplugin-1.10.3-r2-x86.tar.bz2 897189 RMD160 0edb8c03e300101263f99519acd91b078be6d5ff SHA1 8c7b286cd6426ffe11394ec5bee1b108cace6138 SHA256 2b387031dbd6d073d52914aeb9feb1aaf51d09e45537f7863b154d820215c0fd
 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.3-r1.tar.bz2 40821581 RMD160 3419b80c28bc001fce7c6fac7363ba613be6f580 SHA1 54f2c9dff1313e488122cf2355bcca8b49a8093a SHA256 3f725f60ddf317b5c1c8b00900ed9e3ad01c67d0533f9bd364c9de9b9511d868
 DIST icedtea6-bin-src-1.10.4.tar.bz2 40827387 RMD160 d6a610b3dc5ef5dd5e9e33e0e38f93e225c37394 SHA1 54f3ad33bfc1e512165e8de7e954c77c22ff0714 SHA256 d85de113997f4b8978d3b9312dfcd88d50debbf673118615e5a72244b56e8eab
-EBUILD icedtea-bin-1.10.3-r2.ebuild 3593 RMD160 5b23781328ccaf973c53d48c78e6249b6eba8e58 SHA1 dc40596a5cd27c44a73841fee13f8a17c2bbd18c SHA256 a43cc23efcc22e55d31522b4ade9f77839f2bc7a879cee31e3457e552778ad9b
 EBUILD icedtea-bin-1.10.4.ebuild 3039 RMD160 e4ef9734c53528cf712979c729f77c36f93fb075 SHA1 dde30b51ca3fda962528512adcfea6446d09ca6f SHA256 fc8f37899ca2f5e14d3049a91d2fe78f8cf848bd1b23b09fa9d813ae512d9fa7
-EBUILD icedtea-bin-6.1.10.4-r1.ebuild 3912 RMD160 7be52ddc1cf12c722ec44d1ce0eeac17fbc283ea SHA1 fe688192554d9bdc54fd9acea049cf6f0c044567 SHA256 db22a01736315eb1bdab255c97b28a1f980406055784730bb1e0e296e971183d
-EBUILD icedtea-bin-6.1.10.4.ebuild 3479 RMD160 0ae4d9e5045492571f8657bb1cfc41f6ca37658f SHA1 88ca7cd60e94aef96a7273fdfec7e00aa2c214b0 SHA256 144845191c932d75d2a2c736278e76ab492984608d77ebb8d6ecbf35a6e468c5
-EBUILD icedtea-bin-7.2.0-r1.ebuild 2950 RMD160 c447e5368c7d4605cbe316272feb021a48cacbf2 SHA1 17edb016a6a141654da8e89ae54fe876805175b8 SHA256 0dd8b747d533b78af571c2b3872f1c81091d6826abd7d43fa6bcc337ae6f216d
-EBUILD icedtea-bin-7.2.0-r2.ebuild 3379 RMD160 1c2693deee19c9dfb5ea737cef07826792c8f16a SHA1 9e2c2c8fc8d7c41cc1b5340e8b5f14c9f5b3f13c SHA256 b81c22190c6b6a4cdb8c2578cafec4ca39c60317227c4395dc754de9287bcc71
-MISC ChangeLog 14274 RMD160 3a06755b939f5f32090ad6d50983b37e28fa2d94 SHA1 aeb4edc5b7408c0d4d9360837a8b236e8a6ad48e SHA256 93801d9b3b3bf61a0440954bfffb17d11306250d1ddaa969cb63fadb309d4e9f
+EBUILD icedtea-bin-6.1.10.4-r1.ebuild 4167 RMD160 b6b5de8ce5f83723d93ba6459cc4da924f6489d1 SHA1 53650442a65942ae35f1c9f6333a49c134d05db0 SHA256 dc97171c5c349e58012bea9ce7d25b05be7229bfe44ff11e80cdf415504ca5fb
+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 metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea-bin/icedtea-bin-1.10.3-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-1.10.3-r2.ebuild
deleted file mode 100644
index 23c72227bd6b..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-1.10.3-r2.ebuild
+++ /dev/null
@@ -1,135 +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.3-r2.ebuild,v 1.1 2011/10/30 13:53:19 caster 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}-r1"
-SRC_URI="amd64? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-amd64.tar.bz2
-		${dist}/${XPN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-x86.tar.bz2
-		${dist}/${XPN}-libpng15-${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-${PVR}-amd64.tar.bz2 )
-		x86? ( ${dist}/${XPN}-nsplugin-${PVR}-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.4
-	>=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_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 ${XP}-libpng15/jre/lib/${arch}/*.so ${XP}/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/${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
index 0b13dc54d76b..8d91d0c7f011 100644
--- 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
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/11/28 14:01:54 sera Exp $
+# $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"
 
@@ -29,26 +29,43 @@ LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="X alsa cjk doc examples nsplugin source"
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
 REQUIRED_USE="nsplugin? ( X )"
 RESTRICT="strip"
 
-RDEPEND="
-	>=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
+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
-	virtual/jpeg
 	>=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
-		>=media-libs/fontconfig-2.6.0-r2:1.0
-		>=media-libs/freetype-2.3.9:2
-		>=x11-libs/libX11-1.3
-		>=x11-libs/libXext-1.1
-		>=x11-libs/libXi-1.3
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1
 		cjk? (
 			media-fonts/arphicfonts
 			media-fonts/baekmuk-fonts
@@ -57,21 +74,19 @@ RDEPEND="
 			media-fonts/sazanami
 		)
 	)
-	alsa? ( >=media-libs/alsa-lib-1.0.20 )
-	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
-	)"
+	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
 
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild
deleted file mode 100644
index a464d98fad9e..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild
+++ /dev/null
@@ -1,120 +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-6.1.10.4.ebuild,v 1.4 2011/11/21 11:07:41 sera Exp $
-
-EAPI="4"
-
-inherit java-vm-2
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-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="6"
-KEYWORDS="~amd64 ~x86"
-
-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=""
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}"
-
-	local arch=${ARCH}
-
-	# doins can't handle symlinks.
-	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
-
-	# 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
-		cd ..
-		cp -pPR icedtea-web-bin-${SLOT} "${D}/opt/"
-		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
-		docinto icedtea-web
-		dodoc doc/icedtea-web/*
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "/opt/${P}"
-}
-
-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 "${ROOT}/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-7.2.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
deleted file mode 100644
index dae69a39c8d5..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,109 +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-7.2.0-r1.ebuild,v 1.4 2011/11/21 11:07:41 sera Exp $
-
-EAPI="4"
-
-inherit java-vm-2
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-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="7"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=media-libs/giflib-4.1.6-r1
-	virtual/jpeg
-	media-libs/lcms:2
-	>=media-libs/libpng-1.5
-	>=sys-libs/zlib-1.2.3-r1
-	"
-PDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.20 )
-	X? (
-		>=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
-		>=net-print/cups-1.4
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.20.1:2
-		>=x11-libs/libXext-1.1
-		>=x11-libs/libXi-1.3
-		x11-libs/libXrender
-		>=x11-libs/libXtst-1.1
-		>=x11-libs/libX11-1.3
-		>=x11-libs/pango-1.24.5
-	)"
-DEPEND=""
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}"
-
-	local arch=${ARCH}
-
-	# doins can't handle symlinks.
-	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
-
-	# 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
-		cd ..
-		cp -pPR icedtea-web-bin-${SLOT} "${D}/opt/"
-		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
-		docinto icedtea-web
-		dodoc doc/icedtea-web/*
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "/opt/${P}"
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-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-7.2.0-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.0-r2.ebuild
index c92ce067b3d3..ef006625a856 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r2.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/11/28 14:01:54 sera Exp $
+# $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 $
 
 EAPI="4"
 
@@ -29,25 +29,19 @@ LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="X alsa cjk doc examples nsplugin source"
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
 REQUIRED_USE="nsplugin? ( X )"
 RESTRICT="strip"
 
-RDEPEND="
-	>=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=media-libs/giflib-4.1.6-r1
-	virtual/jpeg
-	media-libs/lcms:2
-	>=media-libs/libpng-1.5
-	>=sys-libs/zlib-1.2.3-r1
-	X? (
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
 		>=dev-libs/atk-1.30.0
 		>=dev-libs/glib-2.20.5:2
-		media-fonts/dejavu
 		>=media-libs/fontconfig-2.6.0-r2:1.0
 		>=media-libs/freetype-2.3.9:2
-		>=net-print/cups-1.4
 		>=x11-libs/cairo-1.8.8
 		x11-libs/gdk-pixbuf:2
 		>=x11-libs/gtk+-2.20.1:2
@@ -56,7 +50,23 @@ RDEPEND="
 		>=x11-libs/libXi-1.3
 		x11-libs/libXrender
 		>=x11-libs/libXtst-1.1
-		>=x11-libs/pango-1.24.5
+	>=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"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
 		cjk? (
 			media-fonts/arphicfonts
 			media-fonts/baekmuk-fonts
@@ -65,13 +75,19 @@ RDEPEND="
 			media-fonts/sazanami
 		)
 	)
-	alsa? ( >=media-libs/alsa-lib-1.0.20 )"
+	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
 
@@ -107,7 +123,7 @@ src_install() {
 
 	set_java_env
 	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+	java-vm_sandbox-predict /proc/self/coredump_filter
 }
 
 pkg_postinst() {