Restrict block of gtk-engines-thinice. Resolves bug #46357.

(Portage version: 2.0.51.22-r1)

9 files changed, 12 insertions, 90 deletions

diff --git a/x11-themes/gnome-themes/ChangeLog b/x11-themes/gnome-themes/ChangeLog
index 39f61e65f3a1..f37d6c6f8d35 100644
--- a/x11-themes/gnome-themes/ChangeLog
+++ b/x11-themes/gnome-themes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gnome-themes
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.80 2005/05/18 01:54:19 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.81 2005/06/04 17:57:09 leonardop Exp $
+
+  04 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-themes-2.6.2.ebuild, gnome-themes-2.8.1.ebuild,
+  gnome-themes-2.8.2.ebuild:
+  Restrict gtk-engines-thinice block to versions >= 2. Resolves bug #46357.
 
   18 May 2005; Jason Wever <weeve@gentoo.org> gnome-themes-2.8.2.ebuild:
   Stable on SPARC.
diff --git a/x11-themes/gnome-themes/files/digest-gnome-themes-2.6.3 b/x11-themes/gnome-themes/files/digest-gnome-themes-2.6.3
deleted file mode 100644
index dd9ec4c56dbc..000000000000
--- a/x11-themes/gnome-themes/files/digest-gnome-themes-2.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfaf15f973e7ed91459b8ad0ca368839 gnome-themes-2.6.3.tar.bz2 2608334
diff --git a/x11-themes/gnome-themes/files/digest-gnome-themes-2.8.0 b/x11-themes/gnome-themes/files/digest-gnome-themes-2.8.0
deleted file mode 100644
index cafc6b78e08a..000000000000
--- a/x11-themes/gnome-themes/files/digest-gnome-themes-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f40cd7f3d6af3bb1aeab09ca84c146dc gnome-themes-2.8.0.tar.bz2 2721351
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
deleted file mode 100644
index f31229657bd1..000000000000
--- a/x11-themes/gnome-themes/files/gnome-themes-2.4.0-nothinice.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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.6.2.ebuild b/x11-themes/gnome-themes/gnome-themes-2.6.2.ebuild
index 71cedb0b914f..2617a6063b75 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.6.2.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.6.2.ebuild,v 1.14 2005/01/08 23:28:54 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.6.2.ebuild,v 1.15 2005/06/04 17:57:09 leonardop Exp $
 
 # FIXME : the engines in here should probably be disabled and done in seperate ebuilds
 
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=x11-themes/gtk-engines-2.2.0
-	!x11-themes/gtk-engines-thinice
+	!>=x11-themes/gtk-engines-thinice-2
 	!x11-themes/gtk-engines-lighthouseblue
 	!x11-themes/gtk-engines-crux
 	!x11-themes/gtk-engines-mist"
diff --git a/x11-themes/gnome-themes/gnome-themes-2.6.3.ebuild b/x11-themes/gnome-themes/gnome-themes-2.6.3.ebuild
deleted file mode 100644
index e6f1dfb4407f..000000000000
--- a/x11-themes/gnome-themes/gnome-themes-2.6.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.6.3.ebuild,v 1.4 2005/01/08 23:28:54 slarti Exp $
-
-# FIXME : the engines in here should probably be disabled and done in seperate ebuilds
-
-inherit gnome2
-
-DESCRIPTION="A set of gnome2 themes, with sets for users with limited or low vision"
-HOMEPAGE="http://www.gnome.org/softwaremap/projects/gnome-themes"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=x11-themes/gtk-engines-2.2.0
-	!x11-themes/gtk-engines-thinice
-	!x11-themes/gtk-engines-lighthouseblue
-	!x11-themes/gtk-engines-crux
-	!x11-themes/gtk-engines-mist"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	!x11-themes/gtk-themes"
-
-DOCS="AUTHORS README INSTALL NEWS ChangeLog"
diff --git a/x11-themes/gnome-themes/gnome-themes-2.8.0.ebuild b/x11-themes/gnome-themes/gnome-themes-2.8.0.ebuild
deleted file mode 100644
index 1ff52da34a21..000000000000
--- a/x11-themes/gnome-themes/gnome-themes-2.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.8.0.ebuild,v 1.9 2005/01/08 23:28:54 slarti Exp $
-
-# FIXME : the engines in here should probably be disabled and done in seperate ebuilds
-
-inherit gnome2
-
-DESCRIPTION="A set of gnome2 themes, with sets for users with limited or low vision"
-HOMEPAGE="http://www.gnome.org/softwaremap/projects/gnome-themes"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=x11-themes/gtk-engines-2.2.0
-	!x11-themes/gtk-engines-thinice
-	!x11-themes/gtk-engines-lighthouseblue
-	!x11-themes/gtk-engines-crux
-	!x11-themes/gtk-engines-mist
-	!x11-themes/gtk-engines-smooth"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	!x11-themes/gtk-themes"
-
-G2CONF="${G2CONF} $(use_enable accessibility all-themes)"
-DOCS="AUTHORS COPYING README INSTALL NEWS ChangeLog"
diff --git a/x11-themes/gnome-themes/gnome-themes-2.8.1.ebuild b/x11-themes/gnome-themes/gnome-themes-2.8.1.ebuild
index cf31850a92f4..23cb7219bc88 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.8.1.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.8.1.ebuild,v 1.9 2005/04/02 03:32:22 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.8.1.ebuild,v 1.10 2005/06/04 17:57:09 leonardop Exp $
 
 # FIXME : the engines in here should probably be disabled and done in seperate ebuilds
 
@@ -16,7 +16,7 @@ IUSE="accessibility"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=x11-themes/gtk-engines-2.2.0
-	!x11-themes/gtk-engines-thinice
+	!>=x11-themes/gtk-engines-thinice-2
 	!x11-themes/gtk-engines-lighthouseblue
 	!x11-themes/gtk-engines-crux
 	!x11-themes/gtk-engines-mist
diff --git a/x11-themes/gnome-themes/gnome-themes-2.8.2.ebuild b/x11-themes/gnome-themes/gnome-themes-2.8.2.ebuild
index 2c1849597e2a..9c3f416ca3be 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.8.2.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.8.2.ebuild,v 1.6 2005/05/18 01:54:19 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.8.2.ebuild,v 1.7 2005/06/04 17:57:09 leonardop Exp $
 
 # FIXME : the engines in here should probably be disabled and done in seperate ebuilds
 
@@ -16,7 +16,7 @@ IUSE="accessibility"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=x11-themes/gtk-engines-2.2.0
-	!x11-themes/gtk-engines-thinice
+	!>=x11-themes/gtk-engines-thinice-2
 	!x11-themes/gtk-engines-lighthouseblue
 	!x11-themes/gtk-engines-crux
 	!x11-themes/gtk-engines-mist