Patched out thinice and including it on depend

4 files changed, 48 insertions, 8 deletions

diff --git a/x11-themes/gnome-themes/ChangeLog b/x11-themes/gnome-themes/ChangeLog
index 548019691a63..36c3322b9bf7 100644
--- a/x11-themes/gnome-themes/ChangeLog
+++ b/x11-themes/gnome-themes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gnome-themes
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.24 2003/10/07 22:56:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.25 2003/10/08 03:56:12 obz Exp $
+
+  08 Oct 2003; Mike Gardiner <obz@gentoo.org> gnome-themes-2.4.0.ebuild,
+  files/gnome-themes-2.4.0-nothinice.patch:
+  Re the FIXME in the ebuild and bug #30497 added a patch to not use the
+  thinice-engine included here, and then depend on our version in
+  x11-plugins/gtk-engines-thinice.
 
   07 Oct 2003; Alastair Tse <liquidx@gentoo.org> gnome-themes-0.3.ebuild,
   gnome-themes-2.2.1.ebuild, gnome-themes-2.2.2.ebuild,
diff --git a/x11-themes/gnome-themes/Manifest b/x11-themes/gnome-themes/Manifest
index 4740e287715b..1f178c11e014 100644
--- a/x11-themes/gnome-themes/Manifest
+++ b/x11-themes/gnome-themes/Manifest
@@ -1,12 +1,13 @@
-MD5 0f73dce5ec4f3e2162d31f95a0643366 ChangeLog 3054
 MD5 72c1eb129002bef37eba203c63901dd2 gnome-themes-2.2.1.ebuild 982
 MD5 47b8ed2c589f50c63da6979b17aab1e7 gnome-themes-2.2.2-r1.ebuild 876
-MD5 e672f7662d9adeb08b483e4b575fd66f gnome-themes-2.2.2.ebuild 1069
 MD5 931f9388410584461b6c4bc394555274 gnome-themes-2.2.ebuild 917
-MD5 4dbb4e2973aaa53ac4dc459255ab6ce6 gnome-themes-2.4.0.ebuild 832
+MD5 e672f7662d9adeb08b483e4b575fd66f gnome-themes-2.2.2.ebuild 1069
+MD5 9cf768a25033117562bdababd31e2bb5 ChangeLog 3342
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e49a55d1b7e0eff886352d2dc9058e97 files/digest-gnome-themes-2.2 70
+MD5 16b25d41e58cf82ab3c8bf6e6f882140 gnome-themes-2.4.0.ebuild 952
 MD5 72bc1748d57dc94b06dfc5ea161b14bd files/digest-gnome-themes-2.2.1 72
 MD5 97769356747d4e13bc1ab80682fd9326 files/digest-gnome-themes-2.2.2 72
-MD5 97769356747d4e13bc1ab80682fd9326 files/digest-gnome-themes-2.2.2-r1 72
 MD5 b237b2cea04972f1f32619728e79805d files/digest-gnome-themes-2.4.0 72
+MD5 e49a55d1b7e0eff886352d2dc9058e97 files/digest-gnome-themes-2.2 70
+MD5 97769356747d4e13bc1ab80682fd9326 files/digest-gnome-themes-2.2.2-r1 72
+MD5 1c5f99943a8108a29d4a8eebbfb04db2 files/gnome-themes-2.4.0-nothinice.patch 1225
diff --git a/x11-themes/gnome-themes/files/gnome-themes-2.4.0-nothinice.patch b/x11-themes/gnome-themes/files/gnome-themes-2.4.0-nothinice.patch
new file mode 100644
index 000000000000..f31229657bd1
--- /dev/null
+++ b/x11-themes/gnome-themes/files/gnome-themes-2.4.0-nothinice.patch
@@ -0,0 +1,23 @@
+--- gnome-themes-2.4.0/Makefile.in.old	2003-10-08 11:35:12.953139520 +0800
++++ gnome-themes-2.4.0/Makefile.in	2003-10-08 11:35:47.165938384 +0800
+@@ -120,7 +120,7 @@
+ VERSION = @VERSION@
+ prefix = @prefix@
+ 
+-SUBDIRS = gtk-themes gtk-engines metacity-themes icon-themes 	       	desktop-themes 		common HighContrast LargePrint LowContrastLargePrint 		HighContrastLargePrint  LowContrast 		HighContrastLargePrintInverse HighContrastInverse 		ThinIce 		po
++SUBDIRS = gtk-themes gtk-engines metacity-themes icon-themes 	       	desktop-themes 		common HighContrast LargePrint LowContrastLargePrint 		HighContrastLargePrint  LowContrast 		HighContrastLargePrintInverse HighContrastInverse 			po
+ 
+ 
+ EXTRA_DIST =  	gnome-themes.spec 	gnome-themes.spec.in 	low-contrast-preset.scm 	intltool-extract.in 	intltool-merge.in 	intltool-update.in
+
+--- gnome-themes-2.4.0/gtk-engines/Makefile.in.old	2003-10-08 11:36:17.904265448 +0800
++++ gnome-themes-2.4.0/gtk-engines/Makefile.in	2003-10-08 11:36:27.177855648 +0800
+@@ -120,7 +120,7 @@
+ VERSION = @VERSION@
+ prefix = @prefix@
+ 
+-SUBDIRS = hc-engine thinice
++SUBDIRS = hc-engine
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/x11-themes/gnome-themes/gnome-themes-2.4.0.ebuild b/x11-themes/gnome-themes/gnome-themes-2.4.0.ebuild
index 0fa9810c23d3..d7c4e9639464 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.4.0.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.4.0.ebuild,v 1.3 2003/10/07 22:56:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.4.0.ebuild,v 1.4 2003/10/08 03:56:12 obz Exp $
 
 # FIXME : the engines in here should probably be disabled and done in seperate ebuilds
 
@@ -17,10 +17,20 @@ LICENSE="GPL-2"
 RDEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
-	>=x11-themes/gtk-engines-2.2.0"
+	>=x11-themes/gtk-engines-2.2.0
+	>=x11-themes/gtk-engines-thinice-2.0.2"
 
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.23
 	!x11-theme/gtk-themes"
 
 DOCS="AUTHORS COPYING README INSTALL NEWS ChangeLog"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-nothinice.patch
+
+}
+