5 files changed, 37 insertions, 27 deletions
diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index d60f37cb766f..0c5ba5ec5d51 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gwyddion
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.24 2010/12/02 05:08:34 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.25 2011/03/02 13:42:52 jlec Exp $
+
+  02 Mar 2011; Justin Lecher <jlec@gentoo.org> gwyddion-2.10.ebuild,
+  gwyddion-2.18.ebuild, gwyddion-2.19.ebuild, gwyddion-2.21.ebuild:
+  Correct Slots for gtk 3 introduction to tree
 
 *gwyddion-2.21 (02 Dec 2010)
 
diff --git a/sci-visualization/gwyddion/gwyddion-2.10.ebuild b/sci-visualization/gwyddion/gwyddion-2.10.ebuild
index d5e664e79e40..5cb75b4181b9 100644
--- a/sci-visualization/gwyddion/gwyddion-2.10.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.10.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.10.ebuild,v 1.5 2010/08/07 13:50:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.10.ebuild,v 1.6 2011/03/02 13:42:52 jlec Exp $
+
+EAPI="1"
 
 DESCRIPTION="A software framework for SPM data analysis"
 HOMEPAGE="http://gwyddion.net/"
@@ -11,13 +13,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="python perl ruby nls tiff fftw"
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	python? ( virtual/python )
 	perl? ( dev-lang/perl )
 	ruby? ( =dev-lang/ruby-1.8* )
 	tiff? ( media-libs/tiff )
 	fftw? ( >=sci-libs/fftw-3 )
-	>=x11-libs/gtk+-2.8
+	x11-libs/gtk+:2
 	x11-libs/pango
 	x11-libs/cairo
 	x11-libs/gtkglext"
diff --git a/sci-visualization/gwyddion/gwyddion-2.18.ebuild b/sci-visualization/gwyddion/gwyddion-2.18.ebuild
index 39f431045a97..9483e71d3f47 100644
--- a/sci-visualization/gwyddion/gwyddion-2.18.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.18.ebuild,v 1.2 2010/05/21 09:29:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.18.ebuild,v 1.3 2011/03/02 13:42:52 jlec Exp $
 
 EAPI=2
 
@@ -17,19 +17,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
 
-RDEPEND=">=x11-libs/gtk+-2.8
+RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/cairo
 	x11-libs/pango
 	x11-libs/libXmu
 	fftw? ( >=sci-libs/fftw-3 )
-	gnome? ( gnome-base/gconf )
+	gnome? ( gnome-base/gconf:2 )
 	kde? ( >=kde-base/kdelibs-4 )
 	opengl? ( virtual/opengl x11-libs/gtkglext )
 	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk )
+	python? ( dev-python/pygtk:2 )
 	ruby? ( dev-ruby/narray )
-	sourceview? ( >=x11-libs/gtksourceview-2 )
-	xml? ( dev-libs/libxml2 )"
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sci-visualization/gwyddion/gwyddion-2.19.ebuild b/sci-visualization/gwyddion/gwyddion-2.19.ebuild
index f21d27081719..6d02e26408dd 100644
--- a/sci-visualization/gwyddion/gwyddion-2.19.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.19.ebuild,v 1.2 2010/05/21 09:29:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.19.ebuild,v 1.3 2011/03/02 13:42:52 jlec Exp $
 
 EAPI=2
 
@@ -17,19 +17,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
 
-RDEPEND=">=x11-libs/gtk+-2.8
+RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/cairo
 	x11-libs/pango
 	x11-libs/libXmu
 	fftw? ( >=sci-libs/fftw-3 )
-	gnome? ( gnome-base/gconf )
+	gnome? ( gnome-base/gconf:2 )
 	kde? ( >=kde-base/kdelibs-4 )
 	opengl? ( virtual/opengl x11-libs/gtkglext )
 	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk )
+	python? ( dev-python/pygtk:2 )
 	ruby? ( dev-ruby/narray )
-	sourceview? ( >=x11-libs/gtksourceview-2 )
-	xml? ( dev-libs/libxml2 )"
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sci-visualization/gwyddion/gwyddion-2.21.ebuild b/sci-visualization/gwyddion/gwyddion-2.21.ebuild
index 7c75b1a4fc7c..391126052745 100644
--- a/sci-visualization/gwyddion/gwyddion-2.21.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.21.ebuild,v 1.1 2010/12/02 05:08:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.21.ebuild,v 1.2 2011/03/02 13:42:52 jlec Exp $
 
 EAPI=2
 
@@ -17,19 +17,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
 
-RDEPEND=">=x11-libs/gtk+-2.8
+RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/cairo
 	x11-libs/pango
 	x11-libs/libXmu
 	fftw? ( >=sci-libs/fftw-3 )
-	gnome? ( gnome-base/gconf )
+	gnome? ( gnome-base/gconf:2 )
 	kde? ( >=kde-base/kdelibs-4 )
 	opengl? ( virtual/opengl x11-libs/gtkglext )
 	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk )
+	python? ( dev-python/pygtk:2 )
 	ruby? ( dev-ruby/narray )
-	sourceview? ( >=x11-libs/gtksourceview-2 )
-	xml? ( dev-libs/libxml2 )"
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig