Version bump and remove USE="hal" wrt #313399. Fix SRC_URI wrt #311065 by Johann Schmitz. Missing dbus-python rdepend wrt #299891 by Paul Mulders.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 34 insertions, 27 deletions

diff --git a/media-sound/listen/ChangeLog b/media-sound/listen/ChangeLog
index 1398c63c0a36..e461908620f3 100644
--- a/media-sound/listen/ChangeLog
+++ b/media-sound/listen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/listen
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/ChangeLog,v 1.24 2009/08/28 14:07:58 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/ChangeLog,v 1.25 2010/04/06 17:01:31 ssuominen Exp $
+
+*listen-0.6.5 (06 Apr 2010)
+
+  06 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +listen-0.6.5.ebuild,
+  +files/listen-0.6.5-Makefile.patch:
+  Version bump and remove USE="hal" wrt #313399. Fix SRC_URI wrt #311065 by
+  Johann Schmitz. Missing dbus-python rdepend wrt #299891 by Paul Mulders.
 
 *listen-0.6.3 (28 Aug 2009)
 
diff --git a/media-sound/listen/files/listen-0.6.2-Makefile.patch b/media-sound/listen/files/listen-0.6.5-Makefile.patch
index 378c5bf7c3be..5d13bbc30237 100644
--- a/media-sound/listen/files/listen-0.6.2-Makefile.patch
+++ b/media-sound/listen/files/listen-0.6.5-Makefile.patch
@@ -1,7 +1,6 @@
-diff -ur listen-0.6.2.orig/Makefile listen-0.6.2/Makefile
---- listen-0.6.2.orig/Makefile	2009-05-11 19:37:47.000000000 +0300
-+++ listen-0.6.2/Makefile	2009-07-17 11:55:48.000000000 +0300
-@@ -49,10 +49,8 @@
+--- Makefile
++++ Makefile
+@@ -50,10 +50,8 @@
  	echo 'Name=org.gnome.Listen' >> org.gnome.Listen.service
  	echo 'Exec=$(BINDIR)/listen' >> org.gnome.Listen.service
  
@@ -13,20 +12,16 @@ diff -ur listen-0.6.2.orig/Makefile listen-0.6.2/Makefile
  	@echo "Done"
  	@echo "Type: make install now"
  
-@@ -103,12 +101,8 @@
+@@ -104,8 +102,6 @@
  
  install: make-install-dirs
  	install -m 644 src/*.py $(DESTDIR)$(LIBDIR)/listen
 -	install -m 644 src/*.pyc $(DESTDIR)$(LIBDIR)/listen
 -	install -m 644 src/*.pyo $(DESTDIR)$(LIBDIR)/listen
  	for dir in $(PYSRC_DIR); do \
- 		install -m 644 src/$${dir}/*.py $(DESTDIR)$(LIBDIR)/listen/$${dir} ; \
--		install -m 644 src/$${dir}/*.pyc $(DESTDIR)$(LIBDIR)/listen/$${dir} ; \
--		install -m 644 src/$${dir}/*.pyo $(DESTDIR)$(LIBDIR)/listen/$${dir} ; \
- 	done
- 	
- 	install -m 644 src/mmkeys.so $(DESTDIR)$(LIBDIR)/listen/
-@@ -120,7 +114,7 @@
+ 		for file in src/$${dir}/*.py; do \
+ 			grep '^#@nodistribution' $$file >/dev/null && echo "$$file not distribued" && continue ; \
+@@ -122,7 +118,7 @@
  	install -m 644 data/img/listen.png $(DESTDIR)$(DATADIR)/pixmaps/
  	
  	install -m 644 listen.desktop $(DESTDIR)$(DATADIR)/applications/
diff --git a/media-sound/listen/listen-0.6.3.ebuild b/media-sound/listen/listen-0.6.5.ebuild
index 6ab7c60bab84..2aac33a90d79 100644
--- a/media-sound/listen/listen-0.6.3.ebuild
+++ b/media-sound/listen/listen-0.6.5.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/listen-0.6.3.ebuild,v 1.1 2009/08/28 14:07:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/listen/listen-0.6.5.ebuild,v 1.1 2010/04/06 17:01:31 ssuominen Exp $
 
 EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
 inherit eutils multilib python
 
 DESCRIPTION="A Music player and management for GNOME"
-HOMEPAGE="http://www.listen-project.org"
-SRC_URI="http://download.listen-project.org/lastest/${P}.tar.gz"
+HOMEPAGE="http://www.listen-project.org/"
+SRC_URI="http://download.listen-project.org/0.6/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="hal +libsexy musicbrainz webkit"
+IUSE="+libsexy musicbrainz webkit"
 
-RDEPEND=">=dev-lang/python-2.5
+RDEPEND="dev-python/dbus-python
 	>=dev-python/pygtk-2.8:2
 	dev-python/pyxdg
 	|| ( dev-python/python-xlib dev-python/egg-python )
 	dev-python/gnome-vfs-python
-	|| ( x11-misc/notification-daemon x11-misc/xfce4-notifyd )
+	|| ( x11-misc/notification-daemon xfce-extra/xfce4-notifyd )
 	media-libs/mutagen
 	dev-python/gst-python:0.10
 	media-plugins/gst-plugins-meta:0.10
@@ -28,7 +31,6 @@ RDEPEND=">=dev-lang/python-2.5
 	dev-python/pyinotify
 	libsexy? ( dev-python/sexy-python )
 	media-libs/libgpod[python]
-	hal? ( sys-apps/hal )
 	musicbrainz? ( <dev-python/python-musicbrainz-2005
 		>=media-libs/tunepimp-0.5.3-r2[python] )"
 DEPEND="${RDEPEND}
@@ -36,25 +38,28 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
 	sys-devel/gettext
-	!<media-sound/listen-0.6.2
 	!media-radio/ax25-apps
 	!dev-tinyos/listen"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.2-Makefile.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
 }
 
 src_compile() {
 	if use webkit; then
-		CHECK_DEPENDS="0" emake || die "emake failed"
+		CHECK_DEPENDS="0" emake PYTHON="$(PYTHON)" || die
 	else
-		USE_GTKMOZEMBED="1" CHECK_DEPENDS="0" emake || die "emake failed"
+		USE_GTKMOZEMBED="1" CHECK_DEPENDS="0" emake PYTHON="$(PYTHON)" || die
 	fi
 }
 
 src_install() {
 	DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" emake \
-		install || die "emake install failed"
+		install || die
 	dodoc README
 }