remove dep on virtual/lpr

8 files changed, 34 insertions, 34 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 98e611e556b2..9b69681c20ce 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.97 2004/12/21 21:37:17 axxo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.98 2005/01/01 18:19:47 axxo Exp $
+
+  01 Jan 2005; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.5.0.01.ebuild,
+  sun-jdk-1.5.0.ebuild:
+  remove dep on virtual/lpr
 
 *sun-jdk-1.5.0.01 (21 Dec 2004)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 189135fc7429..46bc1a2e0588 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d6d886798667665a990163e79d72fe11 sun-jdk-1.5.0.01.ebuild 7204
-MD5 59bf21f3d7980e2b7b2f0b7260b9dd9a sun-jdk-1.3.1.13.ebuild 3802
-MD5 e22788803f0fd581cd5e60e23cdefa97 sun-jdk-1.4.2.06.ebuild 6393
-MD5 8cd7b78a6f968cc64098ac22461a7f30 sun-jdk-1.2.2.017.ebuild 3149
-MD5 e5fdb7cb12af035716e81715eff30ad2 sun-jdk-1.5.0.ebuild 7123
-MD5 2ad661ec7ec297fbc0f63fc66cd1fe42 sun-jdk-1.4.2.05.ebuild 6420
-MD5 19e9e12378229ec1a3468015654ed769 ChangeLog 20409
+MD5 a9c06c2ffecc2644a89d44b3629e1ace sun-jdk-1.5.0.01.ebuild 7201
+MD5 9299ace5688576a9b9ab9ddf5a4dfca4 sun-jdk-1.3.1.13.ebuild 3802
+MD5 a2ea64d7d46902fa9280b14c3a99af24 sun-jdk-1.4.2.06.ebuild 6393
+MD5 183d3481b4e5d7b6367616cff588b875 sun-jdk-1.2.2.017.ebuild 3149
+MD5 3d16dd7dd84584d4446dc024aa4caf16 sun-jdk-1.5.0.ebuild 7120
+MD5 b198a28b00dc9afdf1b189370705a232 sun-jdk-1.4.2.05.ebuild 6420
+MD5 1b8780fbf788f708c1b5a819b7099aa0 ChangeLog 20536
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 e69378131ebaaa3322d156533d441dce files/digest-sun-jdk-1.5.0 206
 MD5 0f94a657aa38fbca24dd767967474bc4 files/sun-jdk-1.3.1.13 475
@@ -24,7 +24,7 @@ MD5 e94f26fe6387bf27dc7b105879ca1be6 files/digest-sun-jdk-1.5.0.01 212
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFByJep/rLF9B432nYRAnTrAKCSXjgb5snuC7hsJJaXqv00EVRCrACfTzMD
-n8CyUu8Y/4vpKR3gW52XL2o=
-=gT+f
+iD8DBQFB1unQ/rLF9B432nYRApqBAJ43HAG9qMhMFsF6qXFoK2IjyM0RzgCgt5tm
+UgLc1+mP8u+vk2TbMgUS5uY=
+=qNZZ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
index 9d5dd20f3552..f94758ceec6c 100644
--- a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2.2.017.ebuild,v 1.3 2004/09/29 20:59:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild,v 1.4 2005/01/01 18:19:47 axxo Exp $
 
 inherit java
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
index 62c2159a48b2..6f81b85991f7 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.3.1.13.ebuild,v 1.3 2004/10/20 15:38:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.4 2005/01/01 18:19:47 axxo Exp $
 
 inherit java eutils
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
index c269b85f0c68..882b3a893d73 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.05.ebuild,v 1.4 2004/09/29 20:59:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild,v 1.5 2005/01/01 18:19:47 axxo Exp $
 
 inherit java eutils
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.06.ebuild
index 31e2d83def7a..4d13cdb2d8a2 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.06.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.06.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.06.ebuild,v 1.3 2004/10/26 12:57:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.06.ebuild,v 1.4 2005/01/01 18:19:47 axxo Exp $
 
 inherit java eutils
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.01.ebuild
index 4fe103389a98..7102a21d6b90 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.01.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.01.ebuild,v 1.1 2004/12/21 21:37:17 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.01.ebuild,v 1.2 2005/01/01 18:19:47 axxo Exp $
 
 inherit java eutils
 
@@ -32,12 +32,10 @@ IUSE="doc gnome kde mozilla jce"
 #
 DEPEND=">=dev-java/java-config-1.2
 	sys-apps/sed
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	virtual/lpr"
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
 
 RDEPEND="x86? ( sys-libs/lib-compat )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	virtual/lpr"
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
 
 PROVIDE="virtual/jre-1.5
 	virtual/jdk-1.5"
@@ -224,7 +222,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	eerror "Some parts of Sun's JDK require XFree86 to be installed."
+	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
 	eerror "Be careful which Java libraries you attempt to use."
 
 	echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild
index 870e50a35942..ae25cf166a9e 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.ebuild,v 1.2 2004/10/09 17:06:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild,v 1.3 2005/01/01 18:19:47 axxo Exp $
 
 inherit java eutils
 
@@ -29,12 +29,10 @@ IUSE="doc gnome kde mozilla jce"
 #
 DEPEND=">=dev-java/java-config-1.2
 	sys-apps/sed
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	virtual/lpr"
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
 
 RDEPEND="x86? ( sys-libs/lib-compat )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	virtual/lpr"
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
 
 PROVIDE="virtual/jre-1.5
 	virtual/jdk-1.5"
@@ -220,7 +218,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	eerror "Some parts of Sun's JDK require XFree86 to be installed."
+	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
 	eerror "Be careful which Java libraries you attempt to use."
 
 	echo