version bump (#36470)

5 files changed, 140 insertions, 4 deletions

diff --git a/x11-themes/ximian-artwork/ChangeLog b/x11-themes/ximian-artwork/ChangeLog
index 521246411601..cdad7d5d5f72 100644
--- a/x11-themes/ximian-artwork/ChangeLog
+++ b/x11-themes/ximian-artwork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/ximian-artwork
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.9 2004/02/15 13:26:19 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.10 2004/03/29 15:07:23 liquidx Exp $
+
+*ximian-artwork-0.2.29.0.6.3 (29 Mar 2004)
+
+  29 Mar 2004; Alastair Tse <liquidx@gentoo.org>
+  ximian-artwork-0.2.29.0.6.3.ebuild,
+  files/ximian-artwork-0.2.29-disable_industrial.patch:
+  version bump (#36470)
 
   15 Feb 2004; David Holm <dholm@gentoo.org>
   ximian-artwork-0.2.29.0.6.2.ebuild:
diff --git a/x11-themes/ximian-artwork/Manifest b/x11-themes/ximian-artwork/Manifest
index 5878dcd86595..1b4a2302a77a 100644
--- a/x11-themes/ximian-artwork/Manifest
+++ b/x11-themes/ximian-artwork/Manifest
@@ -1,8 +1,11 @@
-MD5 b7cdd4d4a88b8e6e1db221d3f40cfdd2 ChangeLog 1563
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 1b4c4fa82b474f72f9c1b0cad23fe7b1 ChangeLog 1778
+MD5 3520a4c1133de2f5c3c1363f60ed2f69 ximian-artwork-0.2.29.0.6.3.ebuild 1751
 MD5 6faea1f94bbbe6aade199936143d81d2 ximian-artwork-0.2.26.0.6.1-r1.ebuild 2140
 MD5 bdd580179ad953e8e59a3cdf3447ca69 ximian-artwork-0.2.29.0.6.2.ebuild 1879
-MD5 4c7e2c510200a7fcf63d66700ada089c files/digest-ximian-artwork-0.2.26.0.6.1-r1 88
+MD5 d9e6ded479cfe7c67372ca49a48e7538 files/digest-ximian-artwork-0.2.29.0.6.2 88
+MD5 f3b6233f881db50604d1cceebc2c2b40 files/digest-ximian-artwork-0.2.29.0.6.3 88
 MD5 481c98be012989222f01734d8c6e43e4 files/ximian-artwork-0.2.26-corruption_fix.patch 716
+MD5 4c7e2c510200a7fcf63d66700ada089c files/digest-ximian-artwork-0.2.26.0.6.1-r1 88
 MD5 a733ce592710282d7d68dceedcf32d00 files/ximian-artwork-0.2.26-gdm.patch 520
-MD5 d9e6ded479cfe7c67372ca49a48e7538 files/digest-ximian-artwork-0.2.29.0.6.2 88
+MD5 4f09d13cbbc85be041773d463dd83fc3 files/ximian-artwork-0.2.29-disable_industrial.patch 2313
diff --git a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.3 b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.3
new file mode 100644
index 000000000000..d9e33b6ea029
--- /dev/null
+++ b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.3
@@ -0,0 +1 @@
+MD5 e9cb7d70a2e86570b8f9b7fff730adbc ximian-artwork-0.2.29-0.ximian.6.3.src.rpm 3824967
diff --git a/x11-themes/ximian-artwork/files/ximian-artwork-0.2.29-disable_industrial.patch b/x11-themes/ximian-artwork/files/ximian-artwork-0.2.29-disable_industrial.patch
new file mode 100644
index 000000000000..fd2c1e777812
--- /dev/null
+++ b/x11-themes/ximian-artwork/files/ximian-artwork-0.2.29-disable_industrial.patch
@@ -0,0 +1,64 @@
+diff -ur ximian-artwork-0.2.29/Makefile.am ximian-artwork-0.2.29.new/Makefile.am
+--- ximian-artwork-0.2.29/Makefile.am	2003-02-21 19:53:29.000000000 +0000
++++ ximian-artwork-0.2.29.new/Makefile.am	2004-03-29 15:42:55.605995624 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = po gdm gnome-session gtk icons galeon metacity nautilus wallpapers xmms
++SUBDIRS = po gdm gnome-session icons galeon metacity nautilus xmms
+ 
+ THEME_IN_FILES=index.theme.in
+ 
+Only in ximian-artwork-0.2.29.new: Makefile.am~
+diff -ur ximian-artwork-0.2.29/configure.ac ximian-artwork-0.2.29.new/configure.ac
+--- ximian-artwork-0.2.29/configure.ac	2003-07-09 20:44:25.000000000 +0100
++++ ximian-artwork-0.2.29.new/configure.ac	2004-03-29 15:43:55.508889000 +0100
+@@ -19,30 +19,24 @@
+ 
+ AC_PROG_INTLTOOL([0.23])
+ 
+-AM_PATH_GTK(1.2.9, , 
+-        AC_MSG_ERROR([*** GTK+-1.2.9 not installed - please install first ***]))
+-AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,
+-             AC_MSG_ERROR([*** gtk_style_set_prop_experimental() not found; perhaps you have an old CVS version of GTK+ ***]),
+-             $GTK_LIBS)
+-
+-PKG_CHECK_MODULES(XIMART, gtk+-2.0)
+-AC_SUBST(XIMART_CFLAGS)
+-AC_SUBST(XIMART_LIBS)
++dnl AM_PATH_GTK(1.2.9, , 
++dnl        AC_MSG_ERROR([*** GTK+-1.2.9 not installed - please install first ***]))
++dnl AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,
++dnl              AC_MSG_ERROR([*** gtk_style_set_prop_experimental() not found; perhaps you have an old CVS version of GTK+ ***]),
++dnl             $GTK_LIBS)
++
++dnl PKG_CHECK_MODULES(XIMART, gtk+-2.0)
++dnl AC_SUBST(XIMART_CFLAGS)
++dnl AC_SUBST(XIMART_LIBS)
+ 
+-GTK2_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-AC_SUBST(GTK2_VERSION)
++dnl GTK2_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++dnl AC_SUBST(GTK2_VERSION)
+ 
+ AC_CONFIG_FILES([
+ Makefile
+ galeon/Makefile
+ gdm/Makefile
+ gnome-session/Makefile
+-gtk/Makefile
+-gtk/gtk1-engine/Makefile
+-gtk/gtk1-engine/gtk/Makefile
+-gtk/gtk2-engine/Makefile
+-gtk/gtk2-engine/gtk-2.0/Makefile
+-gtk/gtk2-engine/gtk-2.0/gtkrc
+ icons/Makefile
+ icons/Industrial/Makefile
+ icons/Industrial/24x24/Makefile
+@@ -70,7 +64,6 @@
+ nautilus/Makefile
+ nautilus/patterns/Makefile
+ nautilus/throbber/Makefile
+-wallpapers/Makefile
+ xmms/Makefile
+ po/Makefile.in
+ ])
+Only in ximian-artwork-0.2.29.new: configure.ac~
diff --git a/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild b/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild
new file mode 100644
index 000000000000..683a5b63b36e
--- /dev/null
+++ b/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild,v 1.1 2004/03/29 15:07:23 liquidx Exp $
+
+inherit rpm
+
+# bash magic to extract last 2 versions as XIMIAN_V, 
+# third last version as RPM_V and the rest as MY_PV
+MY_PV=${PV%.[0-9]*.[0-9]*.[0-9]*}
+END_V=${PV/${MY_PV}./}
+RPM_V=${END_V%.[0-9]*.[0-9]*}
+XIMIAN_V=${END_V#[0-9]*.}
+
+DESCRIPTION="Ximian Desktop's GTK, Galeon, GDM, Metacity, Nautilus, XMMS themes, icons and cursors."
+HOMEPAGE="http://www.ximian.com/xd2/"
+SRC_URI="ftp://ftp.ximian.com/pub/xd2/redhat-9-i386/source/${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.src.rpm"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="xmms"
+
+DEPEND="sys-devel/autoconf
+	sys-devel/automake
+	app-arch/rpm2targz"
+	
+
+RDEPEND=">=x11-themes/gnome-themes-extras-0.5"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	rpm_src_unpack
+	epatch ${FILESDIR}/${PN}-${MY_PV}-disable_industrial.patch
+}
+
+src_compile() {
+	aclocal && autoconf && automake || die
+	econf || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	# Removing trademarks
+	patch ${D}/usr/share/gdm/themes/industrial/industrial.xml < ${FILESDIR}/${PN}-0.2.26-gdm.patch || die "patch failed"
+	rm -f ${D}/usr/share/gdm/themes/industrial/xd2logo.png
+	rm -rf ${D}/usr/share/pixmaps/ximian
+	rm -f ${D}/usr/share/pixmaps/ximian-desktop-stripe.png
+
+	# Moving cursors
+	dodir /usr/share/cursors/xfree/Industrial
+	mv ${D}/usr/share/icons/Industrial/cursors ${D}/usr/share/cursors/xfree/Industrial
+
+	# remove xmms skin if unneeded
+	[ -n "`use xmms`" ] || rm -rf ${D}/usr/share/xmms
+
+	cd ${S}
+	dodoc COPYING ChangeLog
+}
+