Pin dependencies to appropriate slots and make use of python eclass for proper mutliple python slots support.

Package-Manager: portage-2.2.0_alpha18/cvs/Linux x86_64

3 files changed, 28 insertions, 17 deletions

diff --git a/app-editors/gedit-plugins/ChangeLog b/app-editors/gedit-plugins/ChangeLog
index 1d93c0de13ce..692632794270 100644
--- a/app-editors/gedit-plugins/ChangeLog
+++ b/app-editors/gedit-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-editors/gedit-plugins
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.10 2010/11/01 12:30:24 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.11 2011/01/23 23:17:48 eva Exp $
+
+  23 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  gedit-plugins-2.30.0.ebuild:
+  Pin dependencies to appropriate slots and make use of python eclass for
+  proper mutliple python slots support.
+
+  23 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  gedit-plugins-2.30.0.ebuild:
+  Pin dependencies to appropriate slots and make use of python eclass for
+  proper mutliple python slots support.
 
   01 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
   gedit-plugins-2.30.0.ebuild:
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 8e25c095cc72..c13038b01130 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -9,13 +9,13 @@ AUX gedit-plugins-2.30.0-find-replace.patch 2338 RMD160 39d780467d6d72ea753f2836
 AUX gedit-plugins-2.30.0-keybinding-toggle.patch 2266 RMD160 17d0ab876ffebf85e435d4b2ea0e21a81ba79e20 SHA1 09ace961c9a109c5142d1d2b037a3062fc1a3913 SHA256 beb89349a7d5d8ab7a18fc8b0aa191eaa2801fbfbee006b2f4e96b64704bc777
 AUX gedit-plugins-2.30.0-replace-all.patch 1305 RMD160 97e01de393390f8642398c8c6a05712ac0e37149 SHA1 c642f47694241efcbf9389d316524af550e20c73 SHA256 1bfef4341f0fe8dd8b9f89ee3e99a4522338458a1d3b6ca34480a062160b8b81
 DIST gedit-plugins-2.30.0.tar.bz2 598898 RMD160 ef07b738c5936718a0ed9fdb50ddc3e4ee5b549b SHA1 0e0c3bc9655b0506e6be0e2ffc0611e47a35c059 SHA256 8a177f2455ee5c58bc4a19df013d5698b14ae6a3f31ed48347904cf467a79509
-EBUILD gedit-plugins-2.30.0.ebuild 2609 RMD160 d5c7d1571b738b78ed9b684e68f71fbbbe91cd37 SHA1 b20311e3b1bcb8b30767d215faebacd3f7343544 SHA256 1373e4b1217416ea6b4b95d75ebde998bb1af197fc6bb81d47e36cfe69a31d81
-MISC ChangeLog 2367 RMD160 5dbcfbd6f08b9a23bb700e5257095cb38392f96f SHA1 810fba87e941bddc07a6bc51630d3b0271cf831c SHA256 b7719331d8cc07a4ec4aa23a0e3119c18d7031b4ad49a07d2fbe3258acb0ea93
+EBUILD gedit-plugins-2.30.0.ebuild 2668 RMD160 3b64133b8f8d8f9ee0e580a4e629c034727b2c45 SHA1 ce28260dbbbc9fc78bebe4043937caf522783623 SHA256 f8e17524e59fb9272b0edbfdb084a0ef6fb16e244545aafdd0f21f485b44ed4b
+MISC ChangeLog 2767 RMD160 ec1efb448b7e2000b4f53e02f81bb08d20c408a4 SHA1 6bce762b61152546c286aa947076b457cab9afda SHA256 2866706f49022f98a114191431287b2aef0113cfc87763834d9953f139d87de6
 MISC metadata.xml 1138 RMD160 4f731728ecc862e7feeae02cb31199f9860f1544 SHA1 d66e5bf969d60c4c1aaf8b5d2c6d4b785b151c16 SHA256 35055675c727bcdcefa37c5c9323db6662f8d9fb43b538da91b64f9c79b07103
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzOsuoACgkQ1fmVwcYIWAbKsgCgyQRNlqDLYH5GUxQCU5mPX3zO
-/dcAnjdaHFtbN96wGkCjoWuGgJMFfzcT
-=2PC/
+iEYEARECAAYFAk08tyEACgkQ1fmVwcYIWAZrxACeJ+6vvBgptg5dt72NHLVO1ZrJ
+C+4An0KvwEuKk953OU9IEt7L+MC3gzwf
+=a9PJ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit-plugins/gedit-plugins-2.30.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-2.30.0.ebuild
index 0f8f537fdd74..76e28419e73c 100644
--- a/app-editors/gedit-plugins/gedit-plugins-2.30.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-2.30.0.ebuild
@@ -1,9 +1,11 @@
-# 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/app-editors/gedit-plugins/gedit-plugins-2.30.0.ebuild,v 1.2 2010/11/01 12:30:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-2.30.0.ebuild,v 1.3 2011/01/23 23:17:48 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
+PYTHON_DEPEND="session? 2"
+PYTHON_USE_WITH_OPT="session? xml"
 
 inherit gnome2 multilib python eutils
 
@@ -16,19 +18,16 @@ SLOT="0"
 
 IUSE="bookmarks +bracketcompletion charmap colorpicker +drawspaces +joinlines python +session showtabbar smartspaces terminal"
 
-RDEPEND=">=x11-libs/gtk+-2.14
+RDEPEND=">=x11-libs/gtk+-2.14:2
 		gnome-base/gconf
-		>=x11-libs/gtksourceview-2.6
+		>=x11-libs/gtksourceview-2.6:2.0
 		>=app-editors/gedit-2.29.3[python]
-		>=dev-python/pygtk-2.14
+		>=dev-python/pygtk-2.14:2
 		charmap? (
 			>=gnome-extra/gucharmap-2.24.3
 		)
-		session? (
-			dev-lang/python[xml]
-		)
 		python? (
-			>=dev-python/pygtksourceview-2.2.0
+			>=dev-python/pygtksourceview-2.2:2
 		)
 		terminal? (
 			dev-python/gconf-python
@@ -55,6 +54,8 @@ pkg_setup() {
 		--disable-dependency-tracking
 		--with-plugins=${myplugins}
 		$(use_enable python)"
+
+	python_set_active_version 2
 }
 
 src_prepare() {