Version bump, provides goodies for gnome-2.6

4 files changed, 199 insertions, 13 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index c82fa23a23a9..100d1ad0b174 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,9 @@
 # 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.26 2004/02/29 16:45:27 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.27 2004/04/12 00:26:12 khai Exp $
+
+  11 Apr 2004; <khai@gentoo.org> :
+  Version bump, includes goodies for gnome-2.6
 
 *redhat-artwork-0.88-r2 (16 Nov 2003)
 
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index ee404d4f1ebe..60e8a962bac5 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,16 +1,18 @@
-MD5 f8e5c06f640eaf7b019ea9675f3b5983 redhat-artwork-0.73.ebuild 5074
-MD5 147903230515f16c5047a787a226fc86 redhat-artwork-0.39.ebuild 3771
-MD5 ca43f5318345285225e5dd9cba77e89a redhat-artwork-0.81.ebuild 5039
 MD5 d1e9329284d9568304d60037af7b2f69 redhat-artwork-0.88.ebuild 5013
-MD5 94582f11702dd1c7156fff1c023969ea redhat-artwork-0.47.ebuild 4371
-MD5 22f2598ba37225285cd32e21f42d92a4 ChangeLog 4059
-MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 6a6a08031930c73544f6d657af399ed4 redhat-artwork-0.88-r2.ebuild 5037
-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
-MD5 2b18f0bfd9c83a7d52127c8cb69ba123 files/digest-redhat-artwork-0.39 75
+MD5 147903230515f16c5047a787a226fc86 redhat-artwork-0.39.ebuild 3771
+MD5 f8e5c06f640eaf7b019ea9675f3b5983 redhat-artwork-0.73.ebuild 5074
+MD5 ddcdad19375877fddbd5ceec72d0d1cd redhat-artwork-0.95.ebuild 4970
+MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 94582f11702dd1c7156fff1c023969ea redhat-artwork-0.47.ebuild 4371
+MD5 ca43f5318345285225e5dd9cba77e89a redhat-artwork-0.81.ebuild 5039
+MD5 a45ba953927a09f31259f36d4c18e395 ChangeLog 4142
+MD5 07bfc19897521cd9ca1abadf9fbcd02a files/digest-redhat-artwork-0.88 75
 MD5 3b65e10c4a020c4a0ea202f4865e686f files/digest-redhat-artwork-0.47 75
+MD5 2b18f0bfd9c83a7d52127c8cb69ba123 files/digest-redhat-artwork-0.39 75
 MD5 927835d1878c71d197a09b5ec12f145d files/digest-redhat-artwork-0.73 75
+MD5 dd889dbdcebae49dc59d0d60dff259de files/redhat-artwork-0.63-cursors.patch 1071
+MD5 9912a3c64a0b848f2ccf2673f2b3093d files/redhat-artwork-0.63-gcc2.patch 483
+MD5 4158bb6cda9c431dd4a10309ab20ab06 files/digest-redhat-artwork-0.88-r2 75
 MD5 ab78c055f898147fb116498693ea14a2 files/digest-redhat-artwork-0.81 75
-MD5 07bfc19897521cd9ca1abadf9fbcd02a files/digest-redhat-artwork-0.88 75
+MD5 17e6ab0b628ed039eb471b3dba20157a files/digest-redhat-artwork-0.95 75
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.95 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.95
new file mode 100644
index 000000000000..ea3a0c29b073
--- /dev/null
+++ b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.95
@@ -0,0 +1 @@
+MD5 43518646c972645553d7513aa88a9490 redhat-artwork-0.95-3.src.rpm 8197824
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild
new file mode 100644
index 000000000000..615e7221cd05
--- /dev/null
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2004 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.95.ebuild,v 1.1 2004/04/12 00:26:13 khai Exp $
+
+RH_EXTRAVERSION="3"
+
+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=""
+
+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
+}
+
+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
+	[ -n "`use xmms`" ] || rm -rf ${D}/usr/share/xmms
+
+	cd ${S}
+	dodoc AUTHORS NEWS README ChangeLog
+}
+