Update to install properly for xfree or xorg-x11, add virtual/x11 to RDEPEND.

5 files changed, 36 insertions, 33 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index 117f2b0d3ed4..d53b9cef95aa 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/redhat-artwork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.37 2004/09/05 09:57:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.38 2004/10/04 02:47:32 spyderous Exp $
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  redhat-artwork-0.73.ebuild, redhat-artwork-0.95.ebuild,
+  redhat-artwork-0.96.ebuild:
+  Update to install properly for xfree or xorg-x11, add virtual/x11 to RDEPEND.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index aa956b2595cc..7e14a28781fb 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 529e4d255e0cf6fc200d8414fe6d3792 ChangeLog 5639
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 1886bd5778a302ac4c4dd237b73a5ace redhat-artwork-0.73.ebuild 5031
-MD5 93ed8247156a2a21c7abe12d03cf9860 redhat-artwork-0.95.ebuild 4932
-MD5 7f180853f34419e00441b3a536541cc8 redhat-artwork-0.96.ebuild 5259
-MD5 02c6cd8ef02988ff1cbc6673d6a8cace ChangeLog 5414
+MD5 f1980198c7d81a65d244ea80fa7fe675 redhat-artwork-0.73.ebuild 5214
+MD5 4d82ea50df7b58eff3c60c86d600fa54 redhat-artwork-0.95.ebuild 5119
+MD5 d4eed42761ae74734e3e33b34d534bf4 redhat-artwork-0.96.ebuild 5276
 MD5 927835d1878c71d197a09b5ec12f145d files/digest-redhat-artwork-0.73 75
+MD5 dd889dbdcebae49dc59d0d60dff259de files/redhat-artwork-0.63-cursors.patch 1071
 MD5 17e6ab0b628ed039eb471b3dba20157a files/digest-redhat-artwork-0.95 75
 MD5 bd1e13df0214635279d65b8c6c245759 files/digest-redhat-artwork-0.96 75
-MD5 dd889dbdcebae49dc59d0d60dff259de files/redhat-artwork-0.63-cursors.patch 1071
 MD5 9912a3c64a0b848f2ccf2673f2b3093d files/redhat-artwork-0.63-gcc2.patch 483
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBOuMkI1lqEGTUzyQRAptKAJ4oRu4n0SfpjR2sMP6GoDGz41VsnQCgrCT3
-WNKyZj+4HTNJelz0jLltnHE=
-=tyBO
------END PGP SIGNATURE-----
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild
index 9e6e4185308b..7b9afd84a47c 100644
--- a/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.73.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/redhat-artwork/redhat-artwork-0.73.ebuild,v 1.14 2004/07/13 20:30:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild,v 1.15 2004/10/04 02:47:32 spyderous Exp $
 
 inherit eutils rpm
 
@@ -25,8 +25,8 @@ DEPEND=">=sys-devel/autoconf-2.58
 		>=kde-base/kdebase-3.0.2 )
 	gtk2? ( >=x11-libs/gtk+-2* )"
 # Because one may only want to use the theme with kde OR gtk OR Metacity
-# OR gdm, we don't want any run-time dependencies...
-RDEPEND=""
+# OR gdm, we don't want either as run-time dependencies...
+RDEPEND="virtual/x11"
 
 # We need to change some RedHat-specific stuff to Gentoo-style...
 _replace() {
@@ -164,11 +164,15 @@ src_install () {
 	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
 	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
 
-	# move cursors to /usr/share/cursors/xfree
+	# move cursors to /usr/share/cursors/${X11_IMPL}
+	X11_IMPLEM_P="$(portageq best_version ${ROOT} virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+
 	for x in Bluecurve Bluecurve-inverse; do
-		dodir /usr/share/cursors/xfree/${x}
-		mv ${D}/usr/share/icons/${x}/cursors ${D}/usr/share/cursors/xfree/${x}
-		dosym /usr/share/cursors/xfree/${x}/cursors /usr/share/icons/${x}/cursors
+		dodir /usr/share/cursors/${X11_IMPLEM}/${x}
+		mv ${D}/usr/share/icons/${x}/cursors ${D}/usr/share/cursors/${X11_IMPLEM}/${x}
+		dosym /usr/share/cursors/${X11_IMPLEM}/${x}/cursors /usr/share/icons/${x}/cursors
 	done
 
 	# remove xmms skin if unneeded
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild
index 08bc925b07d0..f211f5a4594b 100644
--- a/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.95.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/redhat-artwork/redhat-artwork-0.95.ebuild,v 1.7 2004/07/07 16:58:50 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild,v 1.8 2004/10/04 02:47:32 spyderous Exp $
 
 inherit eutils rpm
 
@@ -26,8 +26,8 @@ DEPEND=">=sys-devel/autoconf-2.58
 		>=kde-base/kdebase-3.0.2 )
 	gtk2? ( >=x11-libs/gtk+-2* )"
 # Because one may only want to use the theme with kde OR gtk OR Metacity
-# OR gdm, we don't want any run-time dependencies...
-RDEPEND=""
+# OR gdm, we don't want either as run-time dependencies...
+RDEPEND="virtual/x11"
 
 # We need to change some RedHat-specific stuff to Gentoo-style...
 _replace() {
@@ -162,11 +162,15 @@ src_install () {
 	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
 	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
 
-	# move cursors to /usr/share/cursors/xfree
+	# move cursors to /usr/share/cursors/${X11_IMPL}
+	X11_IMPLEM_P="$(portageq best_version ${ROOT} virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+
 	for x in Bluecurve Bluecurve-inverse; do
-		dodir /usr/share/cursors/xfree/${x}
-		mv ${D}/usr/share/icons/${x}/cursors ${D}/usr/share/cursors/xfree/${x}
-		dosym /usr/share/cursors/xfree/${x}/cursors /usr/share/icons/${x}/cursors
+		dodir /usr/share/cursors/${X11_IMPLEM}/${x}
+		mv ${D}/usr/share/icons/${x}/cursors ${D}/usr/share/cursors/${X11_IMPLEM}/${x}
+		dosym /usr/share/cursors/${X11_IMPLEM}/${x}/cursors /usr/share/icons/${x}/cursors
 	done
 
 	# remove xmms skin if unneeded
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild
index 65bd45a62e9c..55e34c9d3ead 100644
--- a/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.96.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/redhat-artwork/redhat-artwork-0.96.ebuild,v 1.5 2004/08/13 22:34:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild,v 1.6 2004/10/04 02:47:32 spyderous Exp $
 
 inherit eutils rpm
 
@@ -26,8 +26,8 @@ DEPEND=">=sys-devel/autoconf-2.58
 		>=kde-base/kdebase-3.0.2 )
 	gtk2? ( >=x11-libs/gtk+-2* )"
 # Because one may only want to use the theme with kde OR gtk OR Metacity
-# OR gdm, we don't want any run-time dependencies...
-RDEPEND=""
+# OR gdm, we don't want either as run-time dependencies...
+RDEPEND="virtual/x11"
 
 # We need to change some RedHat-specific stuff to Gentoo-style...
 _replace() {