Removed pyxml dep (bug #367759)

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 41028e7bd4c03340e929c77bcfb5c85e5b716123..b39ef0b94462ecd8253fd6a082ec618c5818b458 100644 (file)
--- 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/Manifest b/gnome-extra/gdesklets-core/Manifest
index de78cb825d590a2f4e1b97a3a85618234a43b305..a4fdbead1feaa0f821f39dfa811623e1f278bfcf 100644 (file)
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gdesklets-control-getid 1025 RMD160 8683ec0a308d50040352902962bdca70e7b013a1 SHA1 7fbbbd8c1ef9ca1cc5c0ab2432ded19b5df3ccf0 SHA256 5f53ea065e32ac686c9234935d55fce2a23693c9ba8a145eaca31d30b7795def
 AUX gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch 312 RMD160 f37835015fb90857ee53b4001c53ccf1efd3bb08 SHA1 d51901a750bf901d5428734b79280c30d6b6f201 SHA256 eec96d7fa8c17b4c9a6ec037bc8ac8c4165c5bc652a35cceddd4ad13e97c0dfa
@@ -8,14 +8,14 @@ AUX gdesklets-core-0.36.3-CFLAGS.patch 1091 RMD160 04837984101cc1ed089a0ea5a3504
 AUX gdesklets-core-getid-fix.patch 580 RMD160 d2be1e31658768b9d34d7500f9b6b76d524cec87 SHA1 b54a6a7b06b8634f9d07c0d98662db0164814ca5 SHA256 2be4b77748dc3ac89ad9709ff5f1fd014b78a4468542fad93183df539d77016a
 DIST gDesklets-0.36.2.tar.bz2 3423236 RMD160 93b6c21848fe05cfda539173192901c5c3213e7a SHA1 56742080aa04c27548b8856b6e6aca8861a0d9b5 SHA256 178c651038f5943a714bfe632427d91d58d2caace95a645ecca7c9bd0552d6c8
 DIST gdesklets-0.36.3.tar.bz2 3745626 RMD160 86da28930621071fca32d2bc9c0ebfe1a41d03f9 SHA1 0ad58885bf50f43aaa0cf186ba0678251f5de26a SHA256 805b0343635e5dcfd24d23ab10f0153ab5135dc971ba1712fbf4bddbeee26af5
-EBUILD gdesklets-core-0.36.2-r3.ebuild 3692 RMD160 46253f2278a15f8ab131b9e302c9ded17722c836 SHA1 63deaebcba17d87b5d81fa1d48f4f1f7b3b79735 SHA256 800cfa6d7e905e4ff76e0ad3ad90568dd14b79772e62524c6032757ece330cd6
-EBUILD gdesklets-core-0.36.3-r3.ebuild 3471 RMD160 f87a1650df9e39423526f780ddc3d514696e430b SHA1 d53311126054582b283f31cc0e7ce16018bf366e SHA256 cb4d5b814c0168740540fb3c60b817ab8706a753921bd03346c78560c32d1793
-MISC ChangeLog 27430 RMD160 27fc4f31aba6aadbb83a5535b2094e55f86a6e14 SHA1 5f6644d789068676095cd0b2b3bb859d88789487 SHA256 bbbdcce7cef6a1ad4e42a78aa167b40848ed68f0413fd14b7d42c2aa455a4666
+EBUILD gdesklets-core-0.36.2-r3.ebuild 3728 RMD160 94d4882f0be0465e0265f0e284732f9b9fbfb8dd SHA1 b400bfa0862b52070339541009271da9573332a9 SHA256 21bf7cd79452b6d1865aaddf50b30d61e517f1771635386cb336e6c1ed9762cd
+EBUILD gdesklets-core-0.36.3-r3.ebuild 3508 RMD160 1c7ee9d413c1d4d97ed1a004ed102a136e283b08 SHA1 9432215cae013154c975dd86c43a2a2c36fb0c7e SHA256 904ae21c88971ddc1a8150d9d6316897e3cea9df81208e211978a1573960eec9
+MISC ChangeLog 27632 RMD160 3ef3dacf2738222b924ccbe4976492582b0375a5 SHA1 23a71f08398f20a465136b753e71ed86a41b4c1e SHA256 5b6ac67758341a89926569980ace75760d4ba39dc4c710a60263187937cba66c
 MISC metadata.xml 393 RMD160 e2b43a43703079b731adbfe7ef2d112265b9fdaf SHA1 36dc36c90800e7d73ec015f5d92da2822c6f3b25 SHA256 b4b0b139bfb5f5f2b03813fc571937bf021bdf7d158d26816ffab10aa654f5cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4jd+8ACgkQCRZPokWLroTb5wCeJabU2vnX7pns+Ae0Uqpsvfrs
-KxAAn0biw8h3zExkRauG+3v+BZwwqdV1
-=6Vjm
+iF4EAREIAAYFAk6Qi2QACgkQguHVVE4VAzqGrAEAstMGJJljPfuzIv3D1Tu1+pnB
+KUvQyr4obYs0f3h2W7oA/iix1gDjh/LlvkLJHxHyAEYsFY0BbJBfw+s0szgaC+TM
+=qT5q
 -----END PGP SIGNATURE-----

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 9bc21b2b4756343c9fa4ad5a83dff437d39d464d..fe1b5c68ab9e36fdd21ca6f1d8d44a47cd3dd53b 100644 (file)
--- 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 5e2d27821b526b67f4a18604c8b73613786f9014..205e6fb2f0e030b74e276c959ab096061a7c7cb6 100644 (file)
--- 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}