Drop virtual/x11 references.

Package-Manager: portage-2.1.2.9

7 files changed, 32 insertions, 47 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 447082259a41..c2e827172a1f 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.75 2007/07/09 16:58:13 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.76 2007/07/22 09:56:48 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> libgdiplus-1.2.2.ebuild,
+  libgdiplus-1.2.3.ebuild, libgdiplus-1.2.4.ebuild:
+  Drop virtual/x11 references.
 
   09 Jul 2007; Jurek Bartuszek <jurek@gentoo.org>
   +files/libgdiplus-1.2.4-cairo.patch, libgdiplus-1.2.4.ebuild:
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild
index 9c01d3086230..8d77a28c4b16 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.2.2.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-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild,v 1.5 2007/01/14 02:58:31 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild,v 1.6 2007/07/22 09:56:48 graaff Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -17,14 +17,9 @@ RDEPEND=">=dev-libs/glib-2.6
 		 >=media-libs/freetype-2
 		 >=media-libs/fontconfig-2
 		   media-libs/libpng
-		 ||	(
-		 		(
-					x11-libs/libXrender
-					x11-libs/libX11
-					x11-libs/libXt
-				)
-				virtual/x11
-			)
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt
 		 exif? ( media-libs/libexif )
 		 gif? ( >=media-libs/giflib-4.1.3 )
 		 jpeg? ( media-libs/jpeg )
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild
index d37731b4a716..f96f63c30a30 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.2.3.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-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild,v 1.3 2007/04/30 17:21:37 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild,v 1.4 2007/07/22 09:56:48 graaff Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -17,14 +17,9 @@ RDEPEND=">=dev-libs/glib-2.6
 		 >=media-libs/freetype-2
 		 >=media-libs/fontconfig-2
 		   media-libs/libpng
-		 || (
-				(
-					x11-libs/libXrender
-					x11-libs/libX11
-					x11-libs/libXt
-				)
-				virtual/x11
-			)
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt
 		 exif? ( media-libs/libexif )
 		 gif? ( >=media-libs/giflib-4.1.3 )
 		 jpeg? ( media-libs/jpeg )
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild
index 34e4bb88a8c0..eee2212d22a9 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.2.4.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-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild,v 1.4 2007/07/09 16:58:13 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild,v 1.5 2007/07/22 09:56:48 graaff Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -17,14 +17,9 @@ RDEPEND=">=dev-libs/glib-2.6
 		 >=media-libs/freetype-2
 		 >=media-libs/fontconfig-2
 		   media-libs/libpng
-		 || (
-				(
-					x11-libs/libXrender
-					x11-libs/libX11
-					x11-libs/libXt
-				)
-				virtual/x11
-			)
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt
 		 exif? ( media-libs/libexif )
 		 gif? ( >=media-libs/giflib-4.1.3 )
 		 jpeg? ( media-libs/jpeg )
diff --git a/dev-dotnet/pnetlib/ChangeLog b/dev-dotnet/pnetlib/ChangeLog
index 1f750b3ac336..bb8583c0f888 100644
--- a/dev-dotnet/pnetlib/ChangeLog
+++ b/dev-dotnet/pnetlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/pnetlib
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/ChangeLog,v 1.38 2007/06/23 14:12:03 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/ChangeLog,v 1.39 2007/07/22 09:55:27 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> pnetlib-0.6.12.ebuild,
+  pnetlib-0.7.4.ebuild:
+  Drop virtual/x11 references.
 
   23 Jun 2007; Jurek Bartuszek <jurek@gentoo.org> pnetlib-0.6.12.ebuild:
   Fixed broken autotools handling (bug #160001)
diff --git a/dev-dotnet/pnetlib/pnetlib-0.6.12.ebuild b/dev-dotnet/pnetlib/pnetlib-0.6.12.ebuild
index 3bdd273888dd..ada0070281c5 100644
--- a/dev-dotnet/pnetlib/pnetlib-0.6.12.ebuild
+++ b/dev-dotnet/pnetlib/pnetlib-0.6.12.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-dotnet/pnetlib/pnetlib-0.6.12.ebuild,v 1.10 2007/06/23 14:12:03 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/pnetlib-0.6.12.ebuild,v 1.11 2007/07/22 09:55:27 graaff Exp $
 
 inherit eutils autotools
 
@@ -14,18 +14,14 @@ KEYWORDS="amd64 arm ~hppa ia64 ppc x86"
 IUSE="truetype X"
 
 DEPEND="=dev-dotnet/pnet-${PV}*
-	X? ( || (
-	( x11-libs/libSM
-	x11-libs/libXft )
-	virtual/x11 ) )
+	X? ( x11-libs/libSM
+	    x11-libs/libXft )
 	truetype? ( virtual/xft )
 	=sys-devel/automake-1.4_p6"
 
 RDEPEND="=dev-dotnet/pnet-${PV}*
-	X? ( || (
-	( x11-libs/libSM
-	x11-libs/libXft )
-	virtual/x11 ) )
+	X? ( x11-libs/libSM
+	    x11-libs/libXft )
 	truetype? ( virtual/xft )"
 
 src_unpack() {
diff --git a/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild b/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild
index 043969973173..fd552973ad1c 100644
--- a/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild
+++ b/dev-dotnet/pnetlib/pnetlib-0.7.4.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-dotnet/pnetlib/pnetlib-0.7.4.ebuild,v 1.9 2007/04/18 13:00:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild,v 1.10 2007/07/22 09:55:27 graaff Exp $
 
 inherit autotools eutils
 
@@ -14,18 +14,14 @@ KEYWORDS="amd64 arm hppa ia64 ppc x86"
 IUSE="doc truetype X"
 
 DEPEND="=dev-dotnet/pnet-${PV}*
-	X? ( || (
-	( x11-libs/libSM
-	x11-libs/libXft )
-	virtual/x11 ) )
+	X? ( x11-libs/libSM
+	    x11-libs/libXft )
 	truetype? ( virtual/xft )
 	=sys-devel/automake-1.4_p6"
 
 RDEPEND="=dev-dotnet/pnet-${PV}*
-	X? ( || (
-	( x11-libs/libSM
-	x11-libs/libXft )
-	virtual/x11 ) )
+	X? ( x11-libs/libSM
+	    x11-libs/libXft )
 	truetype? ( virtual/xft )"
 
 src_unpack() {