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

(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

6 files changed, 80 insertions, 406 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/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() {