elementtree from >=python-2.5 also works, bug 185520.

Package-Manager: portage-2.1.3_rc8

4 files changed, 21 insertions, 17 deletions

diff --git a/media-sound/exaile/ChangeLog b/media-sound/exaile/ChangeLog
index 8bc4cbf2d336..51f2a3c13eaa 100644
--- a/media-sound/exaile/ChangeLog
+++ b/media-sound/exaile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/exaile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.23 2007/07/07 13:56:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.24 2007/07/16 13:12:53 drac Exp $
+
+  16 Jul 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.9-r3.ebuild,
+  exaile-0.2.10-r1.ebuild:
+  elementtree from >=python-2.5 also works, bug 185520.
 
   07 Jul 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.10-r1.ebuild:
   We need fixed pysqlite-2.3.4-r1 for tr_TR.utf8 locale.
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 9361e73d822f..b1b6127d7aca 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -16,18 +16,18 @@ RMD160 5e8190e703de0d59386a932394fcce6d4a479886 files/exaile-0.2.x-strip.patch 3
 SHA256 842b3d627b9fe528f540a0b6a46b52a8db32cd578b1f2e1430a4b6b364bbf097 files/exaile-0.2.x-strip.patch 386
 DIST exaile_0.2.10.tar.gz 516304 RMD160 80a688361964659785932ff1de3be71c798f5082 SHA1 201052c99762405fa99132f6ded308543fd1998b SHA256 11cbef758b770fcab44a73b0b3d7f7daa37c1eb3c9e96cb6754e664f76609184
 DIST exaile_0.2.9.tar.gz 421296 RMD160 333362939e80f2feb5bd81d51e134cb4d29f74f2 SHA1 100e048b35b59f89c7874c60cb235df69005a8f4 SHA256 b8377fd0559a1ca7b98b47348a436b9dc90658b1dde17115b429e907f045ca98
-EBUILD exaile-0.2.10-r1.ebuild 2780 RMD160 7e76376de607db702ff3a65b39a31830720c9261 SHA1 678b879f3b8f6b4757c1f15b7dccc7bb564f0fb6 SHA256 2f4c0767267de08f0641b685773b934d1e78da6617d536cc5b908bd8bae529de
-MD5 b9985cd80657961c1fad2efeaddd0915 exaile-0.2.10-r1.ebuild 2780
-RMD160 7e76376de607db702ff3a65b39a31830720c9261 exaile-0.2.10-r1.ebuild 2780
-SHA256 2f4c0767267de08f0641b685773b934d1e78da6617d536cc5b908bd8bae529de exaile-0.2.10-r1.ebuild 2780
-EBUILD exaile-0.2.9-r3.ebuild 2662 RMD160 90d0899fb4895991c773d428d22ee4966d37f887 SHA1 228878a1fcb210cedccdf60cce9743442a16d113 SHA256 18f46db7b9361e74c48751ac437d3e2c32c9e37e3419d1caf7424a6b706260b9
-MD5 fe6a8a4d202a76a53ab6b004b80511a2 exaile-0.2.9-r3.ebuild 2662
-RMD160 90d0899fb4895991c773d428d22ee4966d37f887 exaile-0.2.9-r3.ebuild 2662
-SHA256 18f46db7b9361e74c48751ac437d3e2c32c9e37e3419d1caf7424a6b706260b9 exaile-0.2.9-r3.ebuild 2662
-MISC ChangeLog 3960 RMD160 c3a8c8810ac13d5ef28cef3fbe288df1fdbad952 SHA1 ba3d63d49ae768bc62ce7115ce30b95f918ccb5c SHA256 0b4cb2525a2a547fce72780e7fe2271596fe36e774881cff63ca008a8af316e5
-MD5 d5922ade61d8077ed4854f09606d2916 ChangeLog 3960
-RMD160 c3a8c8810ac13d5ef28cef3fbe288df1fdbad952 ChangeLog 3960
-SHA256 0b4cb2525a2a547fce72780e7fe2271596fe36e774881cff63ca008a8af316e5 ChangeLog 3960
+EBUILD exaile-0.2.10-r1.ebuild 2804 RMD160 2954e78aeb1ba61bd134121b67e8c82a12a0a89a SHA1 8f2934cac0762a54c9a0237a40bf297a61350d6e SHA256 178f4dfa22e06a8983a250de3c1dd17d714e562210655dae4e6641ce081c1b65
+MD5 b0b61c22adcf80d9dbc49293142cda6e exaile-0.2.10-r1.ebuild 2804
+RMD160 2954e78aeb1ba61bd134121b67e8c82a12a0a89a exaile-0.2.10-r1.ebuild 2804
+SHA256 178f4dfa22e06a8983a250de3c1dd17d714e562210655dae4e6641ce081c1b65 exaile-0.2.10-r1.ebuild 2804
+EBUILD exaile-0.2.9-r3.ebuild 2691 RMD160 da9a11586058f0d8c541412040edc95fdad9b431 SHA1 5609a31a77b2146e591f2fb5ff7f03c2973d08fd SHA256 5d1543be85a2a65300857f19b2d1938f1fe823a1a1a1035fbd247e92aff8474f
+MD5 ce4cdeee216aee8838e5f881303a1a13 exaile-0.2.9-r3.ebuild 2691
+RMD160 da9a11586058f0d8c541412040edc95fdad9b431 exaile-0.2.9-r3.ebuild 2691
+SHA256 5d1543be85a2a65300857f19b2d1938f1fe823a1a1a1035fbd247e92aff8474f exaile-0.2.9-r3.ebuild 2691
+MISC ChangeLog 4117 RMD160 c6e25004672d6fc37a2c15f1738b5da57eb24b4e SHA1 5c18d7c57db1e45c33585a2d9e4e2bdc5f57ebff SHA256 7a7b0f50e6da819a386c7e80daf1e6ed2927f37f4a96a42910bd48c4c41cdd69
+MD5 6360de56728839b299aeb918503cc1cc ChangeLog 4117
+RMD160 c6e25004672d6fc37a2c15f1738b5da57eb24b4e ChangeLog 4117
+SHA256 7a7b0f50e6da819a386c7e80daf1e6ed2927f37f4a96a42910bd48c4c41cdd69 ChangeLog 4117
 MISC metadata.xml 214 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f SHA1 ec7c7723b21b430e43c31acc7176045413af0225 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba
 MD5 97f43390489104c86df538d5759098f0 metadata.xml 214
 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f metadata.xml 214
diff --git a/media-sound/exaile/exaile-0.2.10-r1.ebuild b/media-sound/exaile/exaile-0.2.10-r1.ebuild
index a259b6d3de7c..85f69e062048 100644
--- a/media-sound/exaile/exaile-0.2.10-r1.ebuild
+++ b/media-sound/exaile/exaile-0.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.10-r1.ebuild,v 1.5 2007/07/11 19:30:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.10-r1.ebuild,v 1.6 2007/07/16 13:12:53 drac Exp $
 
 inherit eutils fdo-mime multilib python
 
@@ -21,7 +21,7 @@ IUSE="aac alsa cdparanoia flac gnome ipod libnotify libsexy mad musepack ogg
 RDEPEND=">=dev-python/pygtk-2.8.6
 	>=dev-python/pysqlite-2.3.4-r1
 	>=media-libs/mutagen-1.6
-	dev-python/elementtree
+	|| ( >=dev-lang/python-2.5 dev-python/elementtree )
 	dev-python/dbus-python
 	libnotify? ( dev-python/notify-python )
 	libsexy? ( dev-python/sexy-python )
diff --git a/media-sound/exaile/exaile-0.2.9-r3.ebuild b/media-sound/exaile/exaile-0.2.9-r3.ebuild
index 68a86ab32da4..8440341fcedd 100644
--- a/media-sound/exaile/exaile-0.2.9-r3.ebuild
+++ b/media-sound/exaile/exaile-0.2.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.9-r3.ebuild,v 1.2 2007/07/05 18:21:56 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.9-r3.ebuild,v 1.3 2007/07/16 13:12:53 drac Exp $
 
 inherit eutils fdo-mime python toolchain-funcs
 
@@ -21,7 +21,7 @@ IUSE="aac alsa cdparanoia flac gnome ipod libnotify libsexy mad musepack ogg
 RDEPEND=">=dev-python/pygtk-2.8.6
 	>=dev-python/pysqlite-2
 	>=media-libs/mutagen-1.6
-	dev-python/elementtree
+	|| ( >=dev-lang/python-2.5 dev-python/elementtree )
 	>=gnome-base/librsvg-2
 	dev-python/dbus-python
 	libnotify? ( dev-python/notify-python )