Ebuild cleanup. Monolithic X is not supported any more.

(Portage version: 2.1.2-r9)

5 files changed, 28 insertions, 28 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index bce3aa9e2594..7ff0fa606550 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.185 2007/02/11 11:43:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.186 2007/02/11 11:52:31 betelgeuse Exp $
+
+  11 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  sun-jdk-1.4.2.13.ebuild, sun-jdk-1.5.0.10.ebuild, sun-jdk-1.5.0.11.ebuild,
+  sun-jdk-1.6.0-r1.ebuild:
+  Ebuild cleanup. Monolithic X is not supported any more.
 
 *sun-jdk-1.5.0.11 (11 Feb 2007)
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild
index 48b1c56e46c9..1ab0dbd02e5e 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild,v 1.4 2007/01/10 00:14:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild,v 1.5 2007/02/11 11:52:31 betelgeuse Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils
@@ -19,7 +19,7 @@ SRC_URI="${At}
 		jce? ( ${jce_policy} )"
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* x86"
+KEYWORDS="x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples nsplugin jce"
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild
index afb987847147..0eab135fde35 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild,v 1.3 2007/01/23 10:35:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild,v 1.4 2007/02/11 11:52:31 betelgeuse Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
 		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.5"
 LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="amd64 x86"
 RESTRICT="nostrip"
 IUSE="X alsa doc examples jce nsplugin"
 
@@ -41,7 +41,7 @@ RDEPEND="
 				x11-libs/libXp
 				x11-libs/libXt
 				x11-libs/libXtst
-			  )
+				)
 				virtual/x11
 			)
 		)"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
index 099eb5190de1..160bcd4badcf 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.1 2007/02/11 11:43:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.2 2007/02/11 11:52:31 betelgeuse Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
 		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.5"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="nostrip"
 IUSE="X alsa doc examples jce nsplugin"
 
@@ -31,15 +31,12 @@ RDEPEND="
 	sys-libs/glibc
 	alsa? ( media-libs/alsa-lib )
 	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
+	X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXp
+			x11-libs/libXt
 		)"
 
 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
index 9dbd735f0701..3f65c7d8f2db 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.5 2007/01/12 13:40:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.6 2007/02/11 11:52:31 betelgeuse Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
 		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="nostrip"
 IUSE="X alsa doc examples jce nsplugin"
 
@@ -39,15 +39,13 @@ RDEPEND="
 	x86? ( =virtual/libstdc++-3.3 )
 	sys-libs/glibc
 	alsa? ( media-libs/alsa-lib )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
+	X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXp
+			x11-libs/libXt
+			x11-libs/libXtst
 		)"
 
 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"