works with xorg

8 files changed, 52 insertions, 24 deletions

diff --git a/x11-themes/blueglass-xcursors/ChangeLog b/x11-themes/blueglass-xcursors/ChangeLog
index ca07493c6a4b..551b05fafaa1 100644
--- a/x11-themes/blueglass-xcursors/ChangeLog
+++ b/x11-themes/blueglass-xcursors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/blueglass-xcursors
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/ChangeLog,v 1.8 2004/03/24 22:26:21 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/ChangeLog,v 1.9 2004/06/09 01:49:35 swtaylor Exp $
+
+  08 Jun 2004; Scott W Taylor <swtaylor@gentoo.org>
+  blueglass-xcursors-0.4.ebuild:
+  play nicely with xorg
 
   24 Mar 2004; David Holm <dholm@gentoo.org> blueglass-xcursors-0.4.ebuild:
   Added to ~ppc.
diff --git a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
index 88bcc5f0266a..7fbc92b9fcfd 100644
--- a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
+++ b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild,v 1.7 2004/04/27 19:52:28 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild,v 1.8 2004/06/09 01:49:35 swtaylor Exp $
 
 MY_P="5532-BlueGlass-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -11,13 +11,19 @@ SLOT="0"
 KEYWORDS="x86 sparc amd64 ~alpha ppc"
 IUSE=""
 DEPEND=""
-RDEPEND=">=x11-base/xfree-4.3.0-r2"
+RDEPEND="virtual/x11"
 
 # Note: although the package name is BlueGlass, the tarball & authors directions
 # use the directory 'Blue'.
 src_install() {
-	mkdir -p ${D}/usr/share/cursors/xfree/Blue/cursors/
-	cp -d ${WORKDIR}/${MY_P:5}/Blue/cursors/* ${D}/usr/share/cursors/xfree/Blue/cursors/ || die
+    # Set up X11 implementation
+	X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+
+	mkdir -p ${D}/usr/share/cursors/${X11_IMPLEM}/Blue/cursors/
+	cp -d ${WORKDIR}/${MY_P:5}/Blue/cursors/* ${D}/usr/share/cursors/${X11_IMPLEM}/Blue/cursors/ || die
 	dodoc ${WORKDIR}/${MY_P:5}/{COPYING,README}
 }
 
@@ -30,7 +36,7 @@ pkg_postinst() {
 	einfo "Xcursor.size: 48"
 	einfo ""
 	einfo "To globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/xfree/default/index.theme"
+	einfo "   /usr/share/cursors/${X11_IMPLEM}/default/index.theme"
 	einfo "and change the line:"
 	einfo "    Inherits=[current setting]"
 	einfo "to"
diff --git a/x11-themes/golden-xcursors/ChangeLog b/x11-themes/golden-xcursors/ChangeLog
index 1b6bb8c41e0b..6a662cf08db8 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.7 2004/03/24 22:27:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.8 2004/06/09 01:48:58 swtaylor Exp $
+
+  08 Jun 2004; Scott W Taylor <swtaylor@gentoo.org>
+  golden-xcursors-0.8.ebuild:
+  play nicely with xorg
 
   24 Mar 2004; David Holm <dholm@gentoo.org> golden-xcursors-0.8.ebuild:
   Added to ~ppc.
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
index 26c7b9e854a5..27485c4bd1c5 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-2004 Gentoo Technologies, Inc.
 # 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.7 2004/04/27 20:13:55 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild,v 1.8 2004/06/09 01:48:58 swtaylor Exp $
 
 MY_P="5507-Golden-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -11,11 +11,17 @@ SLOT="0"
 KEYWORDS="x86 sparc amd64 ~alpha ppc"
 IUSE=""
 DEPEND=""
-RDEPEND=">=x11-base/xfree-4.3.0-r2"
+RDEPEND="virtual/x11"
 
 src_install() {
-	mkdir -p ${D}/usr/share/cursors/xfree/Gold/cursors/
-	cp -d ${WORKDIR}/${MY_P:5}/Gold/cursors/* ${D}/usr/share/cursors/xfree/Gold/cursors/ || die
+    # Set up X11 implementation
+	X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+    X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+    X11_IMPLEM="${X11_IMPLEM##*\/}"
+    einfo "X11 implementation is ${X11_IMPLEM}."
+
+	mkdir -p ${D}/usr/share/cursors/${X11_IMPLEM}/Gold/cursors/
+	cp -d ${WORKDIR}/${MY_P:5}/Gold/cursors/* ${D}/usr/share/cursors/${X11_IMPLEM}/Gold/cursors/ || die
 	dodoc ${WORKDIR}/${MY_P:5}/{COPYING,README}
 }
 
@@ -29,7 +35,7 @@ pkg_postinst() {
 	einfo ""
 	einfo ""
 	einfo "To globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/xfree/default/index.theme"
+	einfo "   /usr/share/cursors/${X11_IMPLEM}/default/index.theme"
 	einfo "and change the line:"
 	einfo "   Inherits=[current setting]"
 	einfo "to"
diff --git a/x11-themes/silver-xcursors/ChangeLog b/x11-themes/silver-xcursors/ChangeLog
index 4f0b3ab96f59..99c69b6c1f01 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.7 2004/03/24 22:29:14 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.8 2004/06/09 01:48:23 swtaylor Exp $
+
+  08 Jun 2004; Scott W Taylor <swtaylor@gentoo.org>
+  silver-xcursors-0.4.ebuild:
+  play nicely with xorg
 
   24 Mar 2004; David Holm <dholm@gentoo.org> silver-xcursors-0.4.ebuild:
   Added to ~ppc.
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.3-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.3-r1.ebuild
index eb20125f46f4..15ad48a6f27b 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.3-r1.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.3-r1.ebuild,v 1.1 2003/06/19 02:47:22 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.3-r1.ebuild,v 1.2 2004/06/09 01:48:23 swtaylor Exp $
 
 MY_P="5533-Silver-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.3.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.3.ebuild
index ba889d81a2b0..fabf91bb4556 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.3.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.3.ebuild,v 1.1 2003/06/19 02:18:18 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.3.ebuild,v 1.2 2004/06/09 01:48:23 swtaylor Exp $
 
 MY_P="5533-Silver-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
index d054535da83d..4e81a48b6442 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-2004 Gentoo Technologies, Inc.
 # 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.7 2004/04/27 21:02:47 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild,v 1.8 2004/06/09 01:48:23 swtaylor Exp $
 
 MY_P="5533-Silver-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -11,12 +11,16 @@ SLOT="0"
 KEYWORDS="x86 sparc amd64 ~alpha ppc"
 IUSE=""
 DEPEND=""
-RDEPEND=">=x11-base/xfree-4.3.0-r2"
-
+RDEPEND="virtual/x11"
 
 src_install() {
-	mkdir -p ${D}/usr/share/cursors/xfree/Silver/cursors/
-	cp -d  ${WORKDIR}/${MY_P:5}/Silver/cursors/* ${D}/usr/share/cursors/xfree/Silver/cursors/ || die
+    X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+    X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+    X11_IMPLEM="${X11_IMPLEM##*\/}"
+    einfo "X11 implementation is ${X11_IMPLEM}."
+
+	mkdir -p ${D}/usr/share/cursors/${X11_IMPLEM}/Silver/cursors/
+	cp -d  ${WORKDIR}/${MY_P:5}/Silver/cursors/* ${D}/usr/share/cursors/${X11_IMPLEM}/Silver/cursors/ || die
 	dodoc ${WORKDIR}/${MY_P:5}/{COPYING,README}
 }
 
@@ -29,7 +33,7 @@ pkg_postinst() {
 	einfo "Xcursor.size: 48"
 	einfo ""
 	einfo "To globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/xfree/default/index.theme"
+	einfo "   /usr/share/cursors/${X11_IMPLEM}/default/index.theme"
 	einfo "and change the line:"
 	einfo "   Inherits=[current setting]"
 	einfo "to"
@@ -38,5 +42,5 @@ pkg_postinst() {
 	einfo ""
 	ewarn "If you experience flickering, try setting the following line in"
 	ewarn "the Device section of your XF86Config:"
-	ewarn "Option  \"HWCursor\"  \"false\""
+	ewarn "Option \"HWCursor\" \"false\""
 }