Version bump and remove USE="hal" wrt #313399. Fix SRC_URI wrt #311065 by Johann...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/listen/ChangeLog b/media-sound/listen/ChangeLog
index 1398c63c0a360eaf0aaa0840758c513119c6d869..e461908620f3ac8b78ece38d0737d54b471a5dd1 100644 (file)
--- 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/Manifest b/media-sound/listen/Manifest
index 0f52e12a5042fc5872b6ef64e7b5f19e79f98f72..a4b6a1d36d4060797746b3cc998adcbdc047e0f8 100644 (file)
--- a/media-sound/listen/Manifest
+++ b/media-sound/listen/Manifest
@@ -1,5 +1,5 @@
-AUX listen-0.6.2-Makefile.patch 1531 RMD160 fcec8e580ec9b0de5f70cf37884cb2b9afbd39d2 SHA1 459733cef1c1aa64707695c85c31a349a4344da9 SHA256 2ebf09c6c37520da1537024fa74991fec0e5a5aaf13d6c4e81234bc509a32628
-DIST listen-0.6.3.tar.gz 880627 RMD160 a6b5e50fe56250cd2f092c6aae8666c2a8eb859c SHA1 c07a1af9495731fb69b0bf69f188e5ce3a93f1bd SHA256 04ffe8040e3fce5734ae81fde983a1b1d0546f21f863f54be5f26731041aa52a
-EBUILD listen-0.6.3.ebuild 1758 RMD160 5fa74ec9052ba6f9b49c2b017a99de1023889513 SHA1 df9bdf203d45f735bbca6e6ecd21194bceb808a3 SHA256 9766fa6e6afbb64292ccffae4340f4bb85d9bf830f446188f4936f86c77799b9
-MISC ChangeLog 3543 RMD160 7d0e31788eb64e4e972de52fa97e7dcca2fcaf6e SHA1 b664a05f7d492f5fb1dd35aeaff4ab0748abdcd1 SHA256 083f215806745cdfac5ee3f9e7e03e0da3a7e64d1dbfa3b4222fe7129a3fbd7e
+AUX listen-0.6.5-Makefile.patch 1209 RMD160 4d1fd772495b70093f329bd9f584da1c5f8e3054 SHA1 a2b5cb5678beb090992456b2c516376ec2118090 SHA256 43b37f5fadf88054f556ba42424bddfd81624d30649c5901cdefea9bfdd32503
+DIST listen-0.6.5.tar.gz 984613 RMD160 bfb1ef19f7a9118193a41ece860460e5fdd569cf SHA1 3a73976762816a6bb0912b30dc53c7150373c5a2 SHA256 23a4d33ef3251c529ac9a78d992557a2498fa05b825e76c9ab4bad431ed6c61a
+EBUILD listen-0.6.5.ebuild 1751 RMD160 7e8f3d7e7fb9892e4e1f9ffa33c69ca4180e3b23 SHA1 940a122f40c4719d528746431f584b3225a61a48 SHA256 72f2b91d7c9ad000df80866f8c9788ba437b5f25f684b1a28431846edf7585d9
+MISC ChangeLog 3838 RMD160 42968f5158c0ddf999a417a7949c33552981c281 SHA1 f06aeb7688ed672287e464b3ecd3e374b8305028 SHA256 c1e08ed655191247b183de2d8072a65f7cfe6cf2354c3246fa1932939da321b3
 MISC metadata.xml 1193 RMD160 6b53e81f5f2413b990f4c0f61cc06ef98f2d094b SHA1 b9840ab5d41fa7deb6e628182d0c7bcce6817c03 SHA256 141854aea30df019f6d1a5309726e04f13febe7a60f5a9af9a88947b8924437c

diff --git a/media-sound/listen/files/listen-0.6.2-Makefile.patch b/media-sound/listen/files/listen-0.6.5-Makefile.patch
similarity index 64%
rename from media-sound/listen/files/listen-0.6.2-Makefile.patch
rename to media-sound/listen/files/listen-0.6.5-Makefile.patch
index 378c5bf7c3be6b709d0228b6df60ae68cf146557..5d13bbc30237bc54f91bb66dd55c7d3e573fda19 100644 (file)
--- 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
similarity index 66%
rename from media-sound/listen/listen-0.6.3.ebuild
rename to media-sound/listen/listen-0.6.5.ebuild
index 6ab7c60bab84088819857beabb8cc022e4843d1e..2aac33a90d798f5e704e3554c914c8a651169f57 100644 (file)
--- 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
 }