Deps for modular X (bug #117643).

(Portage version: 2.1_pre3-r1)

6 files changed, 26 insertions, 24 deletions

diff --git a/x11-themes/golden-xcursors/ChangeLog b/x11-themes/golden-xcursors/ChangeLog
index 72199e7ebca5..8bc111cd97aa 100644
--- a/x11-themes/golden-xcursors/ChangeLog
+++ b/x11-themes/golden-xcursors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/golden-xcursors
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.19 2005/10/02 19:39:06 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.20 2006/01/03 20:42:51 nelchael Exp $
+
+  03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  golden-xcursors-0.8.ebuild:
+  Deps for modular X (bug #117643).
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org>
   golden-xcursors-0.8.ebuild:
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
index d16c67ae2cb3..a16e9856bce7 100644
--- a/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild,v 1.19 2005/10/02 19:39:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild,v 1.20 2006/01/03 20:42:51 nelchael Exp $
 
 MY_P="5507-Golden-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="virtual/x11"
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )"
 
 src_install() {
 	# Set up X11 implementation
diff --git a/x11-themes/golden-xcursors/metadata.xml b/x11-themes/golden-xcursors/metadata.xml
index 31bd1cf869a6..c28f9340e872 100644
--- a/x11-themes/golden-xcursors/metadata.xml
+++ b/x11-themes/golden-xcursors/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<maintainer>
-<email>desktop-misc@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
-
diff --git a/x11-themes/silver-xcursors/ChangeLog b/x11-themes/silver-xcursors/ChangeLog
index 3e818b766053..dab660aae7f4 100644
--- a/x11-themes/silver-xcursors/ChangeLog
+++ b/x11-themes/silver-xcursors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/silver-xcursors
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.18 2005/10/02 20:05:05 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.19 2006/01/03 20:45:35 nelchael Exp $
+
+  03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  silver-xcursors-0.4.ebuild:
+  Deps for modular X (bug #117643).
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org>
   silver-xcursors-0.4.ebuild:
diff --git a/x11-themes/silver-xcursors/metadata.xml b/x11-themes/silver-xcursors/metadata.xml
index 31bd1cf869a6..c28f9340e872 100644
--- a/x11-themes/silver-xcursors/metadata.xml
+++ b/x11-themes/silver-xcursors/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<maintainer>
-<email>desktop-misc@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>desktop-misc@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
-
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
index 370aefbfeb49..9f1658f61d22 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild,v 1.19 2005/10/02 20:05:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild,v 1.20 2006/01/03 20:45:35 nelchael Exp $
 
 MY_P="5533-Silver-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="virtual/x11"
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )"
 
 src_install() {
 	#X11_IMPLEM_P="$(best_version virtual/x11)"