Removed pyxml dep (bug #367759)

(Portage version: 2.1.10.20/cvs/Linux x86_64)

3 files changed, 13 insertions, 6 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 41028e7bd4c0..b39ef0b94462 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.148 2011/07/18 00:01:45 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.149 2011/10/08 17:40:29 nixphoeni Exp $
+
+  08 Oct 2011; Joe Sapp <nixphoeni@gentoo.org> gdesklets-core-0.36.2-r3.ebuild,
+  gdesklets-core-0.36.3-r3.ebuild:
+  Removed dev-python/pyxml dependency and added "xml" python USE flag
+  requirement
 
   17 Jul 2011; Mark Loeser <halcy0n@gentoo.org>
   gdesklets-core-0.36.3-r3.ebuild:
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
index 9bc21b2b4756..fe1b5c68ab9e 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild,v 1.9 2011/06/10 00:53:10 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild,v 1.10 2011/10/08 17:40:29 nixphoeni Exp $
 
 EAPI=3
 # desklets don't run with USE=debug
 GCONF_DEBUG="no"
+PYTHON_USE_WITH="xml"
 PYTHON_DEPEND="2:2.4"
 
 inherit gnome2 python eutils autotools multilib bash-completion
@@ -23,14 +24,14 @@ IUSE=""
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 
 # is libgsf needed for runtime or just compiling?
+# only need expat for python-2.4, I think
 RDEPEND=">=dev-libs/glib-2.4
 	gnome-extra/libgsf
 	>=gnome-base/librsvg-2.8
 	>=gnome-base/libgtop-2.8.2
 	>=dev-python/pygtk-2.10
 	>=dev-python/gnome-python-2.6
-	>=dev-libs/expat-1.95.8
-	>=dev-python/pyxml-0.8.3-r1"
+	>=dev-libs/expat-1.95.8"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
index 5e2d27821b52..205e6fb2f0e0 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.7 2011/07/18 00:01:45 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.8 2011/10/08 17:40:29 nixphoeni Exp $
 
 EAPI=3
 # desklets don't run with USE=debug
 GCONF_DEBUG="no"
+PYTHON_USE_WITH="xml"
 PYTHON_DEPEND="2:2.4"
 
 inherit gnome2 python eutils autotools multilib bash-completion
@@ -23,6 +24,7 @@ IUSE="dbus"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 
 # is libgsf needed for runtime or just compiling?
+# only need expat for python-2.4, I think
 RDEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/librsvg-2.8
 	>=gnome-base/libgtop-2.8.2
@@ -33,7 +35,6 @@ RDEPEND=">=dev-libs/glib-2.4
 	>=dev-python/pyorbit-2.0.1
 	|| ( >=dev-python/gnome-vfs-python-2.6 >=dev-python/libgnome-python-2.6 )
 	>=dev-libs/expat-1.95.8
-	>=dev-python/pyxml-0.8.3-r1
 	dbus? ( dev-python/dbus-python )"
 
 DEPEND="${RDEPEND}