Version Bump. Really closes Bug #38378.

4 files changed, 193 insertions, 4 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index 6e5c1b0b9f94..04fb137ef615 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/redhat-artwork 
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.24 2003/11/11 10:55:43 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.25 2003/11/16 03:55:47 tad Exp $
+
+*redhat-artwork-0.88-r2 (16 Nov 2003)
+
+  16 Nov 2003; Troy Dack <tad@gentoo.org> redhat-artwork-0.88-r2.ebuild:
+  Version bump. Really closes Bug #32378. SRC_URI is set to fetch from
+  fedora.
 
   11 Nov 2003; Troy Dack <tad@gentoo.org> :
   Version Bump. Closes Bug #32378. Thanks to Simon Watson <simon@swat.me.uk> for
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index 501ab31b0e09..9b56b47a88a1 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,11 +1,11 @@
 MD5 d225b0a14a6c0a28cc96e9b3b9e5d3b3 redhat-artwork-0.73.ebuild 5069
 MD5 bf50cf9bee92bdeda2411a69b9395cb1 redhat-artwork-0.39.ebuild 3773
 MD5 6c7274df70d3010b70b294fe7101ca48 redhat-artwork-0.81.ebuild 5030
-MD5 b28ea1fa56508eefa3e7e85b2e2d5f3d redhat-artwork-0.88.ebuild 5024
+MD5 58e046085c81a6133043cbdba963260f redhat-artwork-0.88.ebuild 5006
 MD5 4533680520b21fdf1d238ca3eb18a2c4 redhat-artwork-0.47.ebuild 4373
-MD5 6569935c29ee071647625ea04457e624 ChangeLog 3828
+MD5 ec5e4843af083c5e9e938941e27bab2b ChangeLog 4022
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 1967be4b070ac7ea75644bcce416e4dd redhat-artwork-0.88-r2.ebuild 5024
+MD5 0307b184aeeba2f0a0d07fda09968fcf redhat-artwork-0.88-r2.ebuild 5027
 MD5 9912a3c64a0b848f2ccf2673f2b3093d files/redhat-artwork-0.63-gcc2.patch 483
 MD5 dd889dbdcebae49dc59d0d60dff259de files/redhat-artwork-0.63-cursors.patch 1071
 MD5 4158bb6cda9c431dd4a10309ab20ab06 files/digest-redhat-artwork-0.88-r2 75
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
new file mode 100644
index 000000000000..642bebbcc7bd
--- /dev/null
+++ b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.88-r2
@@ -0,0 +1 @@
+MD5 9294f4709be3961846743db3e608c2ab redhat-artwork-0.88-2.src.rpm 8275410
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.88-r2.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.88-r2.ebuild
new file mode 100644
index 000000000000..6b77279d7a1b
--- /dev/null
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.88-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/11/16 03:55:47 tad Exp $
+
+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
+	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=""
+
+inherit eutils rpm
+
+S="${WORKDIR}/${P}"
+
+# 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=1
+	# 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
+	[ -n "`use xmms`" ] || rm -rf ${D}/usr/share/xmms
+
+	cd ${S}
+	dodoc AUTHORS NEWS README ChangeLog
+}
+