Fix elementtree depends for bug 185533.

Package-Manager: portage-2.1.3.4

7 files changed, 14 insertions, 173 deletions

diff --git a/media-sound/listen/ChangeLog b/media-sound/listen/ChangeLog
index 03ba7503417f..8bc5eb981b6f 100644
--- a/media-sound/listen/ChangeLog
+++ b/media-sound/listen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/listen
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/ChangeLog,v 1.18 2007/07/16 15:53:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/ChangeLog,v 1.19 2007/08/11 10:34:15 drac Exp $
+
+  11 Aug 2007; Samuli Suominen <drac@gentoo.org> listen-0.5-r1.ebuild:
+  Fix elementtree depends for bug 185533.
 
   16 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org> listen-0.5.ebuild,
   listen-0.5-r1.ebuild:
diff --git a/media-sound/listen/Manifest b/media-sound/listen/Manifest
index 22b84bcc69d9..a90d7b758413 100644
--- a/media-sound/listen/Manifest
+++ b/media-sound/listen/Manifest
@@ -1,35 +1,20 @@
-AUX Makefile.patch 1772 RMD160 e14288538c27a7865ea3a9b03e3de990fa428ec5 SHA1 9fb5bb38f3664503c35a832b33bc36b4c08eeafc SHA256 830c5a9995ed9413504da898a2dbec272ec6b55541096d5e8292a9737a0b534c
-MD5 fba6be21e26dfab77f5a9ab98f399c9d files/Makefile.patch 1772
-RMD160 e14288538c27a7865ea3a9b03e3de990fa428ec5 files/Makefile.patch 1772
-SHA256 830c5a9995ed9413504da898a2dbec272ec6b55541096d5e8292a9737a0b534c files/Makefile.patch 1772
-AUX check.patch 704 RMD160 46d865573a113103a908355222c36f7a51d4d2fc SHA1 3c3f13e127f03f8b2d1056b2c4892cccf5ff0941 SHA256 9f718e10851dc424164f09f38ad968b90ebac998292de04dfb2ed6a06a52dfab
-MD5 46d522406b232becea63c9f3b212a8a9 files/check.patch 704
-RMD160 46d865573a113103a908355222c36f7a51d4d2fc files/check.patch 704
-SHA256 9f718e10851dc424164f09f38ad968b90ebac998292de04dfb2ed6a06a52dfab files/check.patch 704
 AUX listen_dbusfix.patch 1668 RMD160 ce4605ab1f978bef872758cd14e8ad2259b6768e SHA1 89e10e65faaec431f7628a5e8f4b5d9bbb17c4bb SHA256 421cbca575108526066f7a0185318916228cd1371ed4044a9afe59ea896a8f1b
 MD5 2faba4c19c09732bc890498c6efa836e files/listen_dbusfix.patch 1668
 RMD160 ce4605ab1f978bef872758cd14e8ad2259b6768e files/listen_dbusfix.patch 1668
 SHA256 421cbca575108526066f7a0185318916228cd1371ed4044a9afe59ea896a8f1b files/listen_dbusfix.patch 1668
 DIST listen-0.5.tar.bz2 393093 RMD160 77f26a8ef74972b783e44576433e23ecd1269dcf SHA1 7d8ed8893a1eaa3c3a2e51aca975987cb05c9c2b SHA256 476395566f896426d8d41ce398c46a8b0bf1bef7b964945321488c9e977a59bc
-EBUILD listen-0.5-r1.ebuild 3748 RMD160 9784975375b2a287deffda140eef6dec5720737a SHA1 3c3bbbfeb3edc033d60abe3fb6465c58108be859 SHA256 165ebf49300c133b263096c0addd9e6fc1f2a42dcedf529f0ef408893abb93a3
-MD5 2158ce736cf3567babbe29d0267612c7 listen-0.5-r1.ebuild 3748
-RMD160 9784975375b2a287deffda140eef6dec5720737a listen-0.5-r1.ebuild 3748
-SHA256 165ebf49300c133b263096c0addd9e6fc1f2a42dcedf529f0ef408893abb93a3 listen-0.5-r1.ebuild 3748
-EBUILD listen-0.5.ebuild 3062 RMD160 c4a2fea8b70dc577e4d3a84ca74128406790d98c SHA1 7ba18ba651952a6354e4014f798c67c5d0706d3a SHA256 eae41077d22a718ee73421c681903eeaf3284b3fd2d4aad713b9dfd7de64d4a7
-MD5 9004c53b0339ae64138cff6a15aa69bc listen-0.5.ebuild 3062
-RMD160 c4a2fea8b70dc577e4d3a84ca74128406790d98c listen-0.5.ebuild 3062
-SHA256 eae41077d22a718ee73421c681903eeaf3284b3fd2d4aad713b9dfd7de64d4a7 listen-0.5.ebuild 3062
-MISC ChangeLog 2672 RMD160 d7b68462489f5c5b96253261a57eb2e5d5d938a0 SHA1 4e83a1d62bd2514e0d37dd8ed5da128a2c855ca8 SHA256 105eee2a79ef261c6417122b772f8d749b8fc19897636354ffa08983931ed228
-MD5 be12e0f6e953883f866d41b24aa88440 ChangeLog 2672
-RMD160 d7b68462489f5c5b96253261a57eb2e5d5d938a0 ChangeLog 2672
-SHA256 105eee2a79ef261c6417122b772f8d749b8fc19897636354ffa08983931ed228 ChangeLog 2672
+EBUILD listen-0.5-r1.ebuild 3772 RMD160 b9a0b1e2b4b722744ce0dbe7c2608613b8f36005 SHA1 6aae235d2c75a03d6264094f1c84777be3b59773 SHA256 c98550dd47a4eed9807ec866a5c42cd699e41e378d5695bbfb16ac7a0e0fe34e
+MD5 9803328e4d6cac1da22361673eacb49b listen-0.5-r1.ebuild 3772
+RMD160 b9a0b1e2b4b722744ce0dbe7c2608613b8f36005 listen-0.5-r1.ebuild 3772
+SHA256 c98550dd47a4eed9807ec866a5c42cd699e41e378d5695bbfb16ac7a0e0fe34e listen-0.5-r1.ebuild 3772
+MISC ChangeLog 2781 RMD160 194ef7eb6dbefdf010d119f4b508b2ab9b7562d1 SHA1 f96db5712c7da6abebae772154003e25d5b9b0f6 SHA256 e2a956b6d9321b7543556c2ba99c3957c034e0c7251ada2b2d81c5dadc738db8
+MD5 e23f1d6f7849bded0d0a6fe0898ec0e5 ChangeLog 2781
+RMD160 194ef7eb6dbefdf010d119f4b508b2ab9b7562d1 ChangeLog 2781
+SHA256 e2a956b6d9321b7543556c2ba99c3957c034e0c7251ada2b2d81c5dadc738db8 ChangeLog 2781
 MISC metadata.xml 1147 RMD160 ec3671d06317c200dd320652a84d45b49075f64d SHA1 8fa0a88b084ec1244df3f96ba40b7a7aed447b19 SHA256 5bb5195518570f9911e5f1d0d135a2fb637e7602dd15d9004ccc8e2b9c126eed
 MD5 05c53ecbaaf53640e2f9cba67505205a metadata.xml 1147
 RMD160 ec3671d06317c200dd320652a84d45b49075f64d metadata.xml 1147
 SHA256 5bb5195518570f9911e5f1d0d135a2fb637e7602dd15d9004ccc8e2b9c126eed metadata.xml 1147
-MD5 65ed31d140208e881b8affa51a56542b files/digest-listen-0.5 235
-RMD160 a651dbbd2df33f94058ddb01dd460e6a66176805 files/digest-listen-0.5 235
-SHA256 fc433e142a3847c81f158a652d68914f30f6ede20f855525e55a6111417227a7 files/digest-listen-0.5 235
 MD5 65ed31d140208e881b8affa51a56542b files/digest-listen-0.5-r1 235
 RMD160 a651dbbd2df33f94058ddb01dd460e6a66176805 files/digest-listen-0.5-r1 235
 SHA256 fc433e142a3847c81f158a652d68914f30f6ede20f855525e55a6111417227a7 files/digest-listen-0.5-r1 235
diff --git a/media-sound/listen/files/Makefile.patch b/media-sound/listen/files/Makefile.patch
deleted file mode 100644
index 2a1e2c45f06c..000000000000
--- a/media-sound/listen/files/Makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile	2006-09-05 11:30:51.000000000 +0200
-+++ Makefile.new	2006-10-15 03:40:37.000000000 +0200
-@@ -3,10 +3,9 @@
- PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
- PREFIX ?= /usr
- 
--GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
- 
- all: check mmkeys.so po-data
--	docbook2x-man listen.1.docbook
-+	#docbook2x-man listen.1.docbook
- 	@echo "Done"
- 	@echo "Type: make install now"
- 
-@@ -15,7 +14,7 @@ check: 
- 	@which python || ( echo "Not found." && /bin/false )
- 	@./check.py
- 	@echo "Checking for gtkmozembed path..."
--	@if test -d $(GTKMOZEMBED_PATH) ; then echo "Found: $(GTKMOZEMBED_PATH)"; else echo "Not found, install mozilla-devel or firefox-devel"; exit 1;  fi
-+	#@if test -d $(GTKMOZEMBED_PATH) ; then echo "Found: $(GTKMOZEMBED_PATH)"; else echo "Not found, install mozilla-devel or firefox-devel"; exit 1;  fi
- 
- daap.py:
- 	cd daap && python ./setup.py build  && cd ..
-@@ -69,8 +68,9 @@ install: make-install-dirs install-po
- 	install -m 644 data/img/listen.png $(DESTDIR)$(PREFIX)/share/pixmaps/
- 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
- 	
--	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
--	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
-+	echo "#!/bin/sh" > listen 
-+	GTKMOZEMBED_PATH=$( pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null | sed -e "s/-L//g" -e "s/[ ]/\,/" -e "s/[  ]//g" )
-+	GTKMOZEMBED_PATH=${GTKMOZEMBED_PATH} echo "LD_LIBRARY_PATH=\"${GTKMOZEMBED_PATH}\"" "$(PREFIX)/lib/listen/listen.py \"$@\"" >> listen
- 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
- 
- install-po:
diff --git a/media-sound/listen/files/check.patch b/media-sound/listen/files/check.patch
deleted file mode 100644
index 96ed40f19f98..000000000000
--- a/media-sound/listen/files/check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-*** check.py	2006-09-05 11:30:51.000000000 +0200
---- /check.py	2006-10-01 00:52:10.000000000 +0200
-***************
-*** 56,62 ****
-      print "Checking for mutagen:",
-      try: 
-           import mutagen
-! 	 if float(mutagen.version_string) < 1.6:
-  		raise ImportError
-      except ImportError:
-          raise SystemExit("not found\n%s require mutagen >= 1.6.\n"
---- 56,64 ----
-      print "Checking for mutagen:",
-      try: 
-           import mutagen
-! 	 import string
-! 	 version = string.split(mutagen.version_string, ".")
-! 	 if float(version[0]) + float(version[1]) / 10 < 1.6:
-  		raise ImportError
-      except ImportError:
-          raise SystemExit("not found\n%s require mutagen >= 1.6.\n"
diff --git a/media-sound/listen/files/digest-listen-0.5 b/media-sound/listen/files/digest-listen-0.5
deleted file mode 100644
index f79a0b515ebc..000000000000
--- a/media-sound/listen/files/digest-listen-0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63fd29c927c455f84fbf5bf3f8dba2a5 listen-0.5.tar.bz2 393093
-RMD160 77f26a8ef74972b783e44576433e23ecd1269dcf listen-0.5.tar.bz2 393093
-SHA256 476395566f896426d8d41ce398c46a8b0bf1bef7b964945321488c9e977a59bc listen-0.5.tar.bz2 393093
diff --git a/media-sound/listen/listen-0.5-r1.ebuild b/media-sound/listen/listen-0.5-r1.ebuild
index 0d303e77c9d3..7e85bd079073 100644
--- a/media-sound/listen/listen-0.5-r1.ebuild
+++ b/media-sound/listen/listen-0.5-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/listen/listen-0.5-r1.ebuild,v 1.3 2007/07/16 15:53:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/listen-0.5-r1.ebuild,v 1.4 2007/08/11 10:34:15 drac Exp $
 
 inherit eutils virtualx
 
@@ -19,7 +19,7 @@ RDEPEND=">=media-libs/gst-plugins-base-0.10.0
 	>=media-plugins/gst-plugins-cdparanoia-0.10.0
 	>=media-plugins/gst-plugins-xvideo-0.10.0
 	>=media-libs/mutagen-1.6
-	>=dev-python/elementtree-1.2.6
+	|| ( >=dev-lang/python-2.5 >=dev-python/elementtree-1.2.6 )
 	mad? ( >=media-plugins/gst-plugins-mad-0.10.0
 			dev-python/pymad )
 	vorbis? ( >=media-plugins/gst-plugins-ogg-0.10.0
diff --git a/media-sound/listen/listen-0.5.ebuild b/media-sound/listen/listen-0.5.ebuild
deleted file mode 100644
index 76dcf70c51f2..000000000000
--- a/media-sound/listen/listen-0.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/listen-0.5.ebuild,v 1.4 2007/07/16 15:53:45 mr_bones_ Exp $
-
-inherit eutils virtualx
-
-DESCRIPTION="A Music player and management for GNOME"
-HOMEPAGE="http://www.listen-project.org"
-SRC_URI="http://download.listen-project.org/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-IUSE="aac cdr flac ipod mad vorbis libsexy"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND=">=media-libs/gst-plugins-base-0.10.0
-	>=media-libs/gst-plugins-good-0.10.0
-	>=media-plugins/gst-plugins-gnomevfs-0.10.0
-	>=media-plugins/gst-plugins-gconf-0.10.0
-	>=media-plugins/gst-plugins-cdparanoia-0.10.0
-	>=media-plugins/gst-plugins-xvideo-0.10.0
-	>=media-libs/mutagen-1.6
-	>=dev-python/elementtree-1.2.6
-	mad? ( >=media-plugins/gst-plugins-mad-0.10.0
-			dev-python/pymad )
-	vorbis? ( >=media-plugins/gst-plugins-ogg-0.10.0
-			>=media-plugins/gst-plugins-vorbis-0.10.0
-			dev-python/pyvorbis
-			dev-python/pyogg )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10.0 )
-	aac? ( >=media-plugins/gst-plugins-faad-0.10.0
-			dev-python/ctypes )
-	ipod? ( >=media-libs/libgpod-0.3.2-r1 )
-	cdr? ( app-cdr/serpentine )"
-#	musicbrainz? ( dev-python/python-musicbrainz2
-#			media-libs/tunepimp )"
-
-DEPEND="${RDEPEND}
-	>=x11-libs/gtk+-2.8
-	>=media-libs/gstreamer-0.10.0
-	dev-python/dbus-python
-	>=dev-lang/python-2.4
-	>=dev-python/pygtk-2.6
-	>=dev-python/gst-python-0.10
-	>=dev-db/sqlite-3.2.7-r1
-	>=dev-python/pysqlite-2.3.0
-	>=media-libs/mutagen-1.6
-	dev-python/gnome-python
-	dev-python/gnome-python-extras
-	libsexy? ( dev-python/sexy-python )"
-
-pkg_setup() {
-	if use ipod && ! built_with_use media-libs/libgpod python ; then
-		echo
-		eerror "In order to install iPod suport, you need to have media-libs/libgpod"
-		eerror "with 'python' in your USE flags. Please add that flag,"
-		eerror "re-emerge libgpod, and then emerge listen."
-		die "media-libs/libgpod is missing the python binding."
-	fi
-
-	if ! built_with_use gnome-base/gnome-vfs hal ; then
-		echo
-		eerror "In order to install Listen, you need to have gnome-base/gnome-vfs"
-		eerror "with 'hal' in your USE flags. Please add that flag,"
-		eerror "re-emerge gnome-vfs, and then emerge listen."
-		die "gnome-base/gnome-vfs is missing the hal binding."
-	fi
-}
-
-src_compile() {
-	mkdir -p "${T}/home"
-	export HOME="${T}/home"
-	export GST_REGISTRY=${T}/home/registry.cache.xml
-	addpredict /root/.gconfd
-	addpredict /root/.gconf
-	addpredict /var/lib/cache/gstreamer-0.10
-	sed -i "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):g" Makefile
-	Xemake -j1 || die "make failed"
-}
-
-src_install() {
-	Xmake DESTDIR="${D}" PREFIX="/usr" install || die "Install failure"
-}
-
-pkg_postinst() {
-	echo "#!/bin/sh" > /usr/bin/listen
-	GTKMOZEMBED_PATH=$( pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null | sed -e "s/-L//g" -e "s/[ ]/\,/" -e "s/[  ]//g" )
-	echo "LD_LIBRARY_PATH=\"${GTKMOZEMBED_PATH}\"" "python /usr/lib/listen/listen.py \"\$@\"" >> /usr/bin/listen
-}