From: Stefan Schweizer <genstef@gentoo.org>
Date: Mon, 26 Mar 2007 20:24:24 +0000 (+0000)
Subject: Deprecate nxserver eclasses and remove virtual/x11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=869b3839d35b937381bc726b0553aa7f251717e3;p=gentoo.git

Deprecate nxserver eclasses and remove virtual/x11
---

diff --git a/eclass/nxserver-1.3.2.eclass b/eclass/nxserver-1.3.2.eclass
index 47136def127a..cc087e256778 100644
--- a/eclass/nxserver-1.3.2.eclass
+++ b/eclass/nxserver-1.3.2.eclass
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.3.2.eclass,v 1.13 2006/10/14 20:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.3.2.eclass,v 1.14 2007/03/26 20:24:24 genstef Exp $
 #
+# DEPRECATED
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
 
@@ -23,7 +24,6 @@ RDEPEND="$RDEPEND
 	>=media-libs/jpeg-6b-r3
 	>=sys-libs/glibc-2.3.2-r1
 	>=sys-libs/zlib-1.1.4-r1
-	virtual/x11
 	>=net-misc/openssh-3.6.1_p2
 	>=dev-lang/perl-5.8.0-r12"
 
diff --git a/eclass/nxserver-1.4.eclass b/eclass/nxserver-1.4.eclass
index 15a5d3b2e141..09a615b10efe 100644
--- a/eclass/nxserver-1.4.eclass
+++ b/eclass/nxserver-1.4.eclass
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.11 2006/10/14 20:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.12 2007/03/26 20:24:24 genstef Exp $
 #
+# DEPRECATED
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
 #
@@ -27,7 +28,6 @@ DEPEND=">=sys-apps/shadow-4.0.3-r6
 RDEPEND=">=media-libs/jpeg-6b-r3
 	>=sys-libs/glibc-2.3.2-r1
 	>=sys-libs/zlib-1.1.4-r1
-	virtual/x11
 	>=net-misc/openssh-3.6.1_p2
 	>=dev-lang/perl-5.8.0-r12"
 
diff --git a/eclass/nxserver.eclass b/eclass/nxserver.eclass
index 607139e6d4d8..d6567f204395 100644
--- a/eclass/nxserver.eclass
+++ b/eclass/nxserver.eclass
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.20 2006/10/14 20:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.21 2007/03/26 20:24:24 genstef Exp $
 #
+# DEPRECATED
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
 
@@ -19,7 +20,6 @@ SRC_URI="nxserver-${MY_PV}.i386.rpm"
 RDEPEND=">=media-libs/jpeg-6b-r3
 	>=sys-libs/glibc-2.3.2-r1
 	>=sys-libs/zlib-1.1.4-r1
-	virtual/x11
 	>=net-misc/openssh-3.6.1_p2
 	>=dev-lang/perl-5.8.0-r12"
 
diff --git a/eclass/nxserver_1.5.eclass b/eclass/nxserver_1.5.eclass
index 71727d34e291..750edb2ac2df 100644
--- a/eclass/nxserver_1.5.eclass
+++ b/eclass/nxserver_1.5.eclass
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver_1.5.eclass,v 1.4 2006/10/14 20:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver_1.5.eclass,v 1.5 2007/03/26 20:24:24 genstef Exp $
 #
+# DEPRECATED
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
 #
@@ -16,7 +17,7 @@ SLOT="0"
 RESTRICT="nomirror strip fetch"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
-DEPEND="|| ( (
+DEPEND="
 			x11-proto/xproto
 			x11-proto/xf86vidmodeproto
 			x11-proto/glproto
@@ -28,9 +29,6 @@ DEPEND="|| ( (
 			x11-libs/libXvMC
 			media-libs/mesa
 			x11-misc/xdialog
-		)
-		virtual/x11
-	)
 	sys-apps/shadow
 	net-misc/openssh
 	!prebuilt? (
@@ -47,7 +45,6 @@ DEPEND="|| ( (
 
 RDEPEND="media-libs/jpeg
 	sys-libs/zlib
-	virtual/x11
 	net-misc/openssh
 	dev-lang/perl
 	=net-misc/nxclient-1.5*"