mr_bones_ changed xfree dep to virtual/x11. Update the rest of the ebuild to suit.

3 files changed, 28 insertions, 11 deletions

diff --git a/x11-themes/golden-xcursors/ChangeLog b/x11-themes/golden-xcursors/ChangeLog
index 2d9e7547826b..079260e2d1f4 100644
--- a/x11-themes/golden-xcursors/ChangeLog
+++ b/x11-themes/golden-xcursors/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/golden-xcursors
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.10 2004/06/25 03:03:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.11 2004/10/04 01:33:03 spyderous Exp $
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  golden-xcursors-0.7-r1.ebuild, golden-xcursors-0.7.ebuild:
+  mr_bones_ changed xfree dep to virtual/x11. Update the rest of the ebuild to
+  suit.
 
   09 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
   golden-xcursors-0.8.ebuild:
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.7-r1.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.7-r1.ebuild
index adcce16b4a1b..403e4e998894 100644
--- a/x11-themes/golden-xcursors/golden-xcursors-0.7-r1.ebuild
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.7-r1.ebuild,v 1.5 2004/10/04 01:07:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.7-r1.ebuild,v 1.6 2004/10/04 01:33:03 spyderous Exp $
 
 MY_P="5507-Golden-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -14,9 +14,15 @@ DEPEND=""
 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
-	dodoc ${WORKDIR}/${MY_P:5}/{COPYING,README}
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+
+	dodir /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}/README
 }
 
 pkg_postinst() {
@@ -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/golden-xcursors/golden-xcursors-0.7.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.7.ebuild
index 1bd288ae9ed4..666c8ed648a1 100644
--- a/x11-themes/golden-xcursors/golden-xcursors-0.7.ebuild
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.7.ebuild,v 1.5 2004/10/04 01:07:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.7.ebuild,v 1.6 2004/10/04 01:33:03 spyderous Exp $
 
 MY_P="5507-Golden-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -14,9 +14,15 @@ DEPEND=""
 RDEPEND="virtual/x11"
 
 src_install() {
-	mkdir -p ${D}/usr/share/cursors/xfree/gold/cursors/
-	cp -d gold/cursors/* ${D}/usr/share/cursors/xfree/gold/cursors/ || die
-	dodoc COPYING README
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+
+	dodir /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}/README
 }
 
 pkg_postinst() {
@@ -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"