cleanup and fix multiple issues with 0.96 including LC_ALL (#59334), long standing qt sandbox violations (#25445), xfree/xorg cursor install paths (#53348)

12 files changed, 29 insertions, 853 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index a49c80cc4449..fcb7b0c9b73d 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,14 @@
 # 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.34 2004/07/13 20:30:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.35 2004/08/04 23:01:56 liquidx Exp $
+
+  04 Aug 2004; Alastair Tse <liquidx@gentoo.org> -redhat-artwork-0.39.ebuild,
+  -redhat-artwork-0.47.ebuild, -redhat-artwork-0.81.ebuild,
+  -redhat-artwork-0.88-r2.ebuild, -redhat-artwork-0.88.ebuild,
+  redhat-artwork-0.96.ebuild:
+  cleanup and fix multiple issues with 0.96 including LC_ALL (#59334), long
+  standing qt sandbox violations (#25445), xfree/xorg cursor install paths
+  (#53348)
 
   13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
   redhat-artwork-0.73.ebuild:
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.39 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.39
deleted file mode 100644
index 68704e42c1df..000000000000
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.39
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13111462cee77d7bc68cd5793e444371 redhat-artwork-0.39-1.src.rpm 5269178
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.47 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.47
deleted file mode 100644
index d303b29ad27d..000000000000
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.47
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dba00c3881499d5e7060aa6a3f33affe redhat-artwork-0.47-3.src.rpm 7639189
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.81 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.81
deleted file mode 100644
index 4b9e173670c2..000000000000
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.81
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e2e1e376304bd0ffbb4f532eac5cf2e redhat-artwork-0.81-1.src.rpm 7668186
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.88 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.88
deleted file mode 100644
index 84050c690102..000000000000
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.88
+++ /dev/null
@@ -1 +0,0 @@
-MD5 022ae5389cdfe5b0a741a1351125c92d redhat-artwork-0.88-1.src.rpm 8273914
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.88-r2 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.88-r2
deleted file mode 100644
index 642bebbcc7bd..000000000000
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.88-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9294f4709be3961846743db3e608c2ab redhat-artwork-0.88-2.src.rpm 8275410
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.39.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.39.ebuild
deleted file mode 100644
index 07e59fd37fbc..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-0.39.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.39.ebuild,v 1.13 2004/06/24 23:37:31 agriffis Exp $
-
-DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="ftp://ftp.sunet.se/pub/Linux/distributions/redhat/redhat/linux/rawhide/SRPMS/SRPMS/${P}-1.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha"
-IUSE="kde"
-
-# Needed to build...
-DEPEND="sys-devel/autoconf
-	sys-devel/automake
-	app-arch/rpm2targz
-	>=media-libs/gdk-pixbuf-0.2.5
-	=x11-libs/gtk+-1.2*
-	>=x11-libs/gtk+-2.0
-	kde? (	>=x11-libs/qt-3.0.5
-			>=kde-base/kdebase-3.0.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=""
-
-# We need to change som RedHat-specific stuff to Gentoo-style...
-_replace() {
-	FROM=$1
-	TO=$2
-
-	for FILE in $(fgrep -r -l "${FROM}" *); do
-		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
-		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
-		mv "${FILE}.$$" "${FILE}"
-		echo Done.
-	done
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A}
-	tar xvzf ${P}*.src.tar.gz
-	tar xvzf ${P}.tar.gz
-}
-
-src_compile() {
-
-	# disable qt and kde support if kde use keyword is not set
-	# note: qt and kde support seem to be tied together... maybe someone with
-	# autoconf experience can seperate the two
-	use kde || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e	"s|dnl KDE_USE_QT||" \
-		-e  "s|KDE_||g" \
-		-e	"s|AC_PATH_KDE||" \
-		-e	"s|art/kde/Makefile||" \
-		-e	"s|art/kde/kwin/Makefile||" \
-		-e	"s|art/kde/kwin/Bluecurve/Makefile||" \
-			configure.in.old > configure.in
-
-	mv art/Makefile.am art/Makefile.am.old
-	sed -e 	"s|kde||" \
-		-e	"s|qt||" \
-			art/Makefile.am.old > art/Makefile.am
-
-	mv art/Makefile.in art/Makefile.in.old
-	sed -e  "s|kde||" \
-		-e  "s|qt||" \
-			art/Makefile.in.old > art/Makefile.in
-
-	autoconf
-	automake
-
-	)
-
-	# paths have to be fixed for kde
-	use kde && (
-
-	# Fix paths...
-	_replace "/usr/lib/qt3"          "${QTDIR}"
-	_replace '${libdir}/qt3'         "${QTDIR}"
-	_replace '$(libdir)/qt3'         "${QTDIR}"
-	_replace "/usr/lib/kde3"         "${KDEDIR}/lib"
-	_replace '${libdir}/kde3'        "${KDEDIR}/lib"
-	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
-
-	chmod +x configure
-
-	)
-
-	econf || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	use kde && (
-		dodir ${KDEDIR}/share
-		mv ${D}/usr/share/apps ${D}/${KDEDIR}/share/apps
-		mv ${D}/usr/share/icons ${D}/${KDEDIR}/share/icons
-
-	# Until someone makes a nice Gentoo-replacement for the
-	# RedHat-logo in the splash, we don't install the splash
-	# at all... :)
-	rm -rf ${D}/${KDEDIR}/share/apps/ksplash
-
-	)
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f ${D}/usr/share/pixmaps/splash/gnome-splash.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/screenshot.png
-
-	cd ${D}/usr/share/gdm/themes/Bluecurve/
-
-	# replace redhat logo with gnome logo from happygnome theme
-	sed -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' \
-		Bluecurve.xml > Bluecurve.xml.mod || die
-
-	mv Bluecurve.xml.mod Bluecurve.xml
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
-	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
-
-	cd ${S}
-	dodoc AUTHORS NEWS README
-}
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.47.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.47.ebuild
deleted file mode 100644
index 8f2b8649e57b..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-0.47.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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.47.ebuild,v 1.11 2004/06/24 23:37:31 agriffis Exp $
-
-RH_EXTRAVERSION="3"
-
-DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="ftp://ftp.sunet.se/pub/Linux/distributions/redhat/redhat/linux/rawhide/SRPMS/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha"
-IUSE="kde gtk"
-
-# Needed to build...
-DEPEND="sys-devel/autoconf
-	sys-devel/automake
-	app-arch/rpm2targz
-	>=x11-libs/gtk+-2.0
-	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
-			=x11-libs/gtk+-1.2* )
-	kde? (	>=x11-libs/qt-3.0.5
-		>=kde-base/kdebase-3.0.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=""
-
-# We need to change some RedHat-specific stuff to Gentoo-style...
-_replace() {
-	FROM=$1
-	TO=$2
-
-	for FILE in $(fgrep -r -l "${FROM}" *); do
-		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
-		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
-		mv "${FILE}.$$" "${FILE}"
-		echo Done.
-	done
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A}
-	tar xvzf ${P}*.src.tar.gz
-	tar xvzf ${P}.tar.gz
-}
-
-src_compile() {
-
-	# disable qt and kde support if kde use keyword is not set
-	# note: qt and kde support seem to be tied together... maybe someone with
-	# autoconf experience can seperate the two
-	use kde || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e	"s|dnl KDE_USE_QT||" \
-		-e "s|KDE_||g" \
-		-e "s|AC_PATH_KDE||" \
-		-e "s|art/kde/Makefile||" \
-		-e "s|art/kde/kwin/Makefile||" \
-		-e "s|art/kde/kwin/Bluecurve/Makefile||" \
-			configure.in.old > configure.in
-
-	mv art/Makefile.am art/Makefile.am.old
-	sed -e 	"s|kde||" \
-		-e	"s|qt||" \
-			art/Makefile.am.old > art/Makefile.am
-
-	mv art/Makefile.in art/Makefile.in.old
-	sed -e  "s|kde||" \
-		-e  "s|qt||" \
-			art/Makefile.in.old > art/Makefile.in
-
-	autoconf
-	automake
-	)
-
-	# disable gtk 1.x support if gtk use keyword is not set
-	use gtk || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e  "s|AM_PATH_GTK(1.2.9, ,||" \
-		-e  "s|AC_MSG_ERROR(.*GTK+-1.*||" \
-		-e  "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \
-		-e  "s|AC_MSG_ERROR(.*gtk_style.*||" \
-		-e  "s|             \$GTK_LIBS)||" \
-		-e  "s|AM_PATH_GDK_PIXBUF||" \
-		-e  "s|art/gtk/Bluecurve1/Makefile||" \
-		-e  "s|art/gtk/Bluecurve1/gtk/Makefile||" \
-	configure.in.old > configure.in
-
-	mv art/gtk/Makefile.am art/gtk/Makefile.am.old
-	sed -e  "s|Bluecurve1||" \
-	art/gtk/Makefile.am.old > art/gtk/Makefile.am
-
-	autoconf
-	automake
-	)
-
-	# paths have to be fixed for kde
-	use kde && (
-
-	# Fix paths...
-	_replace "/usr/lib/qt3"          "${QTDIR}"
-	_replace '${libdir}/qt3'         "${QTDIR}"
-	_replace '$(libdir)/qt3'         "${QTDIR}"
-	_replace "/usr/lib/kde3"         "${KDEDIR}/lib"
-	_replace '${libdir}/kde3'        "${KDEDIR}/lib"
-	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
-
-	chmod +x configure
-
-	)
-
-	econf || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	use kde && (
-		dodir ${KDEDIR}/share/apps
-		mv ${D}/usr/share/apps/* ${D}/${KDEDIR}/share/apps
-		rmdir ${D}/usr/share/apps
-
-		dodir ${KDEDIR}/share/icons
-		dosym /usr/share/icons/Bluecurve ${KDEDIR}/share/icons/Bluecurve
-	)
-
-	use kde || (
-		rm -rf ${D}/usr/share/apps
-	)
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/screenshot.png
-
-	cd ${D}/usr/share/gdm/themes/Bluecurve/
-
-	# replace redhat logo with gnome logo from happygnome theme
-	sed -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' \
-		Bluecurve.xml > Bluecurve.xml.mod || die
-
-	mv Bluecurve.xml.mod Bluecurve.xml
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
-	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
-
-	cd ${S}
-	dodoc AUTHORS NEWS README ChangeLog
-}
-
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.81.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.81.ebuild
deleted file mode 100644
index 5e9d23fe4426..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-0.81.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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.81.ebuild,v 1.8 2004/06/28 23:20:04 mr_bones_ Exp $
-
-inherit eutils rpm
-
-RH_EXTRAVERSION="1"
-
-DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="http://ftp.redhat.com/pub/redhat/linux/rawhide/SRPMS/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~alpha ~sparc"
-IUSE="kde gtk xmms gtk2"
-
-# Needed to build...
-DEPEND=">=sys-devel/autoconf-2.58
-	sys-devel/automake
-	media-gfx/icon-slicer
-	>=x11-libs/gtk+-2.0
-	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
-			=x11-libs/gtk+-1.2* )
-	kde? (	>=x11-libs/qt-3.0.5
-		>=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=""
-
-# We need to change some RedHat-specific stuff to Gentoo-style...
-_replace() {
-	FROM=$1
-	TO=$2
-
-	for FILE in $(fgrep -r -l "${FROM}" *); do
-		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
-		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
-		mv "${FILE}.$$" "${FILE}"
-		echo Done.
-	done
-}
-
-src_unpack() {
-	rpm_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/redhat-artwork-0.63-gcc2.patch
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF=2.5
-	# dies is LANG has UTF-8
-	export LANG=C
-
-	use kde || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e	"s|dnl KDE_USE_QT||" \
-		-e "s|KDE_||g" \
-		-e "s|AC_PATH_KDE||" \
-		-e "s|art/kde/Makefile||" \
-		-e "s|art/kde/kwin/Makefile||" \
-		-e "s|art/kde/kwin/Bluecurve/Makefile||" \
-			configure.in.old > configure.in
-
-	mv art/Makefile.am art/Makefile.am.old
-	sed -e 	"s|kde||" \
-		-e	"s|qt||" \
-			art/Makefile.am.old > art/Makefile.am
-
-	mv art/Makefile.in art/Makefile.in.old
-	sed -e  "s|kde||" \
-		-e  "s|qt||" \
-			art/Makefile.in.old > art/Makefile.in
-
-	autoconf
-	automake
-
-	)
-
-	# disable gtk 1.x support if gtk use keyword is not set
-	use gtk || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e  "s|AM_PATH_GTK(1.2.9, ,||" \
-		-e  "s|AC_MSG_ERROR(.*GTK+-1.*||" \
-		-e  "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \
-		-e  "s|AC_MSG_ERROR(.*gtk_style.*||" \
-		-e  "s|             \$GTK_LIBS)||" \
-		-e  "s|AM_PATH_GDK_PIXBUF||" \
-		-e  "s|art/gtk/Bluecurve1/Makefile||" \
-		-e  "s|art/gtk/Bluecurve1/gtk/Makefile||" \
-	configure.in.old > configure.in
-
-	mv art/gtk/Makefile.am art/gtk/Makefile.am.old
-	sed -e  "s|Bluecurve1||" \
-	art/gtk/Makefile.am.old > art/gtk/Makefile.am
-
-	autoconf
-	automake
-	)
-
-	# paths have to be fixed for kde
-	use kde && (
-
-	# Fix paths...
-	_replace "/usr/lib/qt3"          "${QTDIR}"
-	_replace '${libdir}/qt3'         "${QTDIR}"
-	_replace '$(libdir)/qt3'         "${QTDIR}"
-	_replace "/usr/lib/kde3"         "${KDEDIR}/lib"
-	_replace '${libdir}/kde3'        "${KDEDIR}/lib"
-	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
-	chmod +x configure
-
-	)
-
-	# fix iconrc
-	mv art/gtk/make-iconrc.sh art/gtk/make-iconrc.sh.broken
-	sed 's|ICON_PATH=$3|ICON_PATH=/usr/share/icons/Bluecurve/24x24/stock|' \
-		art/gtk/make-iconrc.sh.broken >  art/gtk/make-iconrc.sh
-	chmod +x art/gtk/make-iconrc.sh
-
-	./configure || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr kde_moduledir=${D}/${KDEDIR}/lib \
-	styledir=${D}/${KDEDIR}/lib/kde3/plugins/styles \
-	settingsdir=${D}/${KDEDIR}/etc/settings install || die
-
-	use kde && (
-		dodir ${KDEDIR}/share/apps
-		mv ${D}/usr/share/apps/* ${D}/${KDEDIR}/share/apps
-		rmdir ${D}/usr/share/apps
-
-		dodir ${KDEDIR}/share/icons
-		dosym /usr/share/icons/Bluecurve ${KDEDIR}/share/icons/Bluecurve
-	)
-
-	use kde || (
-		rm -rf ${D}/usr/share/apps
-	)
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/screenshot.png
-
-	cd ${D}/usr/share/gdm/themes/Bluecurve/
-
-	# replace redhat logo with gnome logo from happygnome theme
-	sed -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' \
-		Bluecurve.xml > Bluecurve.xml.mod || die
-
-	mv Bluecurve.xml.mod Bluecurve.xml
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
-	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
-
-	# move cursors to /usr/share/cursors/xfree
-	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
-	done
-
-	# remove xmms skin if unneeded
-	use xmms || rm -rf ${D}/usr/share/xmms
-
-	cd ${S}
-	dodoc AUTHORS NEWS README ChangeLog
-}
-
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.88-r2.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.88-r2.ebuild
deleted file mode 100644
index bcedc347e1be..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-0.88-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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.88-r2.ebuild,v 1.7 2004/06/28 23:20:04 mr_bones_ Exp $
-
-inherit eutils rpm
-
-RH_EXTRAVERSION="2"
-
-DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~alpha ~sparc"
-IUSE="kde gtk xmms gtk2"
-
-# Needed to build...
-DEPEND=">=sys-devel/autoconf-2.58
-	sys-devel/automake
-	media-gfx/icon-slicer
-	>=x11-libs/gtk+-2.0
-	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
-			=x11-libs/gtk+-1.2* )
-	kde? (	>=x11-libs/qt-3.0.5
-		>=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=""
-
-# We need to change some RedHat-specific stuff to Gentoo-style...
-_replace() {
-	FROM=$1
-	TO=$2
-
-	for FILE in $(fgrep -r -l "${FROM}" *); do
-		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
-		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
-		mv "${FILE}.$$" "${FILE}"
-		echo Done.
-	done
-}
-
-src_unpack() {
-	rpm_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/redhat-artwork-0.63-gcc2.patch
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF=2.5
-	# dies is LANG has UTF-8
-	export LANG=C
-
-	use kde || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e	"s|dnl KDE_USE_QT||" \
-		-e "s|KDE_||g" \
-		-e "s|AC_PATH_KDE||" \
-		-e "s|art/kde/Makefile||" \
-		-e "s|art/kde/kwin/Makefile||" \
-		-e "s|art/kde/kwin/Bluecurve/Makefile||" \
-			configure.in.old > configure.in
-
-	mv art/Makefile.am art/Makefile.am.old
-	sed -e 	"s|kde||" \
-		-e	"s|qt||" \
-			art/Makefile.am.old > art/Makefile.am
-
-	mv art/Makefile.in art/Makefile.in.old
-	sed -e  "s|kde||" \
-		-e  "s|qt||" \
-			art/Makefile.in.old > art/Makefile.in
-
-	autoconf
-	automake
-
-	)
-
-	# disable gtk 1.x support if gtk use keyword is not set
-	use gtk || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e  "s|AM_PATH_GTK(1.2.9, ,||" \
-		-e  "s|AC_MSG_ERROR(.*GTK+-1.*||" \
-		-e  "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \
-		-e  "s|AC_MSG_ERROR(.*gtk_style.*||" \
-		-e  "s|             \$GTK_LIBS)||" \
-		-e  "s|AM_PATH_GDK_PIXBUF||" \
-		-e  "s|art/gtk/Bluecurve1/Makefile||" \
-		-e  "s|art/gtk/Bluecurve1/gtk/Makefile||" \
-	configure.in.old > configure.in
-
-	mv art/gtk/Makefile.am art/gtk/Makefile.am.old
-	sed -e  "s|Bluecurve1||" \
-	art/gtk/Makefile.am.old > art/gtk/Makefile.am
-
-	autoconf
-	automake
-	)
-
-	# paths have to be fixed for kde
-	use kde && (
-
-	# Fix paths...
-	_replace "/usr/lib/qt3"          "${QTDIR}"
-	_replace '${libdir}/qt3'         "${QTDIR}"
-	_replace '$(libdir)/qt3'         "${QTDIR}"
-	_replace "/usr/lib/kde3"         "${KDEDIR}/lib"
-	_replace '${libdir}/kde3'        "${KDEDIR}/lib"
-	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
-	chmod +x configure
-
-	)
-
-	# fix iconrc
-	mv art/gtk/make-iconrc.pl art/gtk/make-iconrc.pl.broken
-	sed 's|$ARGV\[3\]|\"/usr/share/icons/Bluecurve\"|' \
-		art/gtk/make-iconrc.pl.broken >  art/gtk/make-iconrc.pl
-	chmod +x art/gtk/make-iconrc.pl
-
-	./configure || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr kde_moduledir=${D}/${KDEDIR}/lib \
-	styledir=${D}/${KDEDIR}/lib/kde3/plugins/styles \
-	settingsdir=${D}/${KDEDIR}/etc/settings install || die
-
-	use kde && (
-		dodir ${KDEDIR}/share/apps
-		mv ${D}/usr/share/apps/* ${D}/${KDEDIR}/share/apps
-		rmdir ${D}/usr/share/apps
-
-		dodir ${KDEDIR}/share/icons
-		dosym /usr/share/icons/Bluecurve ${KDEDIR}/share/icons/Bluecurve
-	)
-
-	use kde || (
-		rm -rf ${D}/usr/share/apps
-	)
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/screenshot.png
-
-	cd ${D}/usr/share/gdm/themes/Bluecurve/
-
-	# replace redhat logo with gnome logo from happygnome theme
-	sed -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' \
-		Bluecurve.xml > Bluecurve.xml.mod || die
-
-	mv Bluecurve.xml.mod Bluecurve.xml
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
-	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
-
-	# move cursors to /usr/share/cursors/xfree
-	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
-	done
-
-	# remove xmms skin if unneeded
-	use xmms || rm -rf ${D}/usr/share/xmms
-
-	cd ${S}
-	dodoc AUTHORS NEWS README ChangeLog
-}
-
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild
deleted file mode 100644
index 71fa7f27f849..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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.88.ebuild,v 1.8 2004/06/28 23:20:04 mr_bones_ Exp $
-
-inherit eutils rpm
-
-RH_EXTRAVERSION="1"
-
-DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~alpha ~sparc"
-IUSE="kde gtk xmms gtk2"
-
-# Needed to build...
-DEPEND=">=sys-devel/autoconf-2.58
-	sys-devel/automake
-	media-gfx/icon-slicer
-	>=x11-libs/gtk+-2.0
-	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
-			=x11-libs/gtk+-1.2* )
-	kde? (	>=x11-libs/qt-3.0.5
-		>=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=""
-
-# We need to change some RedHat-specific stuff to Gentoo-style...
-_replace() {
-	FROM=$1
-	TO=$2
-
-	for FILE in $(fgrep -r -l "${FROM}" *); do
-		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
-		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
-		mv "${FILE}.$$" "${FILE}"
-		echo Done.
-	done
-}
-
-src_unpack() {
-	rpm_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/redhat-artwork-0.63-gcc2.patch
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF=2.5
-	# dies is LANG has UTF-8
-	export LANG=C
-
-	use kde || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e	"s|dnl KDE_USE_QT||" \
-		-e "s|KDE_||g" \
-		-e "s|AC_PATH_KDE||" \
-		-e "s|art/kde/Makefile||" \
-		-e "s|art/kde/kwin/Makefile||" \
-		-e "s|art/kde/kwin/Bluecurve/Makefile||" \
-			configure.in.old > configure.in
-
-	mv art/Makefile.am art/Makefile.am.old
-	sed -e 	"s|kde||" \
-		-e	"s|qt||" \
-			art/Makefile.am.old > art/Makefile.am
-
-	mv art/Makefile.in art/Makefile.in.old
-	sed -e  "s|kde||" \
-		-e  "s|qt||" \
-			art/Makefile.in.old > art/Makefile.in
-
-	autoconf
-	automake
-
-	)
-
-	# disable gtk 1.x support if gtk use keyword is not set
-	use gtk || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e  "s|AM_PATH_GTK(1.2.9, ,||" \
-		-e  "s|AC_MSG_ERROR(.*GTK+-1.*||" \
-		-e  "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \
-		-e  "s|AC_MSG_ERROR(.*gtk_style.*||" \
-		-e  "s|             \$GTK_LIBS)||" \
-		-e  "s|AM_PATH_GDK_PIXBUF||" \
-		-e  "s|art/gtk/Bluecurve1/Makefile||" \
-		-e  "s|art/gtk/Bluecurve1/gtk/Makefile||" \
-	configure.in.old > configure.in
-
-	mv art/gtk/Makefile.am art/gtk/Makefile.am.old
-	sed -e  "s|Bluecurve1||" \
-	art/gtk/Makefile.am.old > art/gtk/Makefile.am
-
-	autoconf
-	automake
-	)
-
-	# paths have to be fixed for kde
-	use kde && (
-
-	# Fix paths...
-	_replace "/usr/lib/qt3"          "${QTDIR}"
-	_replace '${libdir}/qt3'         "${QTDIR}"
-	_replace '$(libdir)/qt3'         "${QTDIR}"
-	_replace "/usr/lib/kde3"         "${KDEDIR}/lib"
-	_replace '${libdir}/kde3'        "${KDEDIR}/lib"
-	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
-	chmod +x configure
-
-	)
-
-	# fix iconrc
-	mv art/gtk/make-iconrc.pl art/gtk/make-iconrc.pl.broken
-	sed 's|$ARGV\[3\]|\"/usr/share/icons/Bluecurve\"|' \
-		art/gtk/make-iconrc.pl.broken >  art/gtk/make-iconrc.pl
-	chmod +x art/gtk/make-iconrc.pl
-
-	./configure || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr kde_moduledir=${D}/${KDEDIR}/lib \
-	styledir=${D}/${KDEDIR}/lib/kde3/plugins/styles \
-	settingsdir=${D}/${KDEDIR}/etc/settings install || die
-
-	use kde && (
-		dodir ${KDEDIR}/share/apps
-		mv ${D}/usr/share/apps/* ${D}/${KDEDIR}/share/apps
-		rmdir ${D}/usr/share/apps
-
-		dodir ${KDEDIR}/share/icons
-		dosym /usr/share/icons/Bluecurve ${KDEDIR}/share/icons/Bluecurve
-	)
-
-	use kde || (
-		rm -rf ${D}/usr/share/apps
-	)
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/screenshot.png
-
-	cd ${D}/usr/share/gdm/themes/Bluecurve/
-
-	# replace redhat logo with gnome logo from happygnome theme
-	sed -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' \
-		Bluecurve.xml > Bluecurve.xml.mod || die
-
-	mv Bluecurve.xml.mod Bluecurve.xml
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
-	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
-
-	# move cursors to /usr/share/cursors/xfree
-	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
-	done
-
-	# remove xmms skin if unneeded
-	use xmms || rm -rf ${D}/usr/share/xmms
-
-	cd ${S}
-	dodoc AUTHORS NEWS README ChangeLog
-}
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild
index 95b3da34f345..75e2a74fae57 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.3 2004/06/28 23:20:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild,v 1.4 2004/08/04 23:01:56 liquidx Exp $
 
 inherit eutils rpm
 
@@ -42,15 +42,14 @@ _replace() {
 	done
 }
 
-src_unpack() {
-	rpm_src_unpack
-}
-
 src_compile() {
 
+	use kde && addwrite "${QTDIR}/etc/settings"
+
 	export WANT_AUTOCONF=2.5
 	# dies is LANG has UTF-8
 	export LANG=C
+	export LC_ALL=C
 
 	use kde || (
 
@@ -74,9 +73,6 @@ src_compile() {
 		-e  "s|qt||" \
 			art/Makefile.in.old > art/Makefile.in
 
-	autoconf
-	automake
-
 	)
 
 	# disable gtk 1.x support if gtk use keyword is not set
@@ -98,8 +94,10 @@ src_compile() {
 	sed -e  "s|Bluecurve1||" \
 	art/gtk/Makefile.am.old > art/gtk/Makefile.am
 
-	autoconf
-	automake
+	)
+
+	[ -z "`use kde`" -o -z "`use gtk`" ] && (
+		aclocal && autoconf && automake --add-missing || die "auto* failed"
 	)
 
 	# paths have to be fixed for kde
@@ -127,6 +125,10 @@ src_compile() {
 }
 
 src_install () {
+	# dies is LANG has UTF-8
+	export LANG=C
+	export LC_ALL=C
+
 	make prefix=${D}/usr kde_moduledir=${D}/${KDEDIR}/lib \
 	styledir=${D}/${KDEDIR}/lib/kde3/plugins/styles \
 	settingsdir=${D}/${KDEDIR}/etc/settings install || die
@@ -162,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