fix the upnp_coherence plugin: use the "louie" module which comes

with "coherence"
bump PKGREVISION

5 files changed, 44 insertions, 6 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 263b590962e..1010f4fe20a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.77 2010/05/04 11:10:07 drochner Exp $
+# $NetBSD: Makefile,v 1.78 2010/05/20 21:15:54 drochner Exp $
 #
 
 DISTNAME=	rhythmbox-0.12.8
+PKGREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index fd5af85342b..92a9c3f0f83 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.34 2010/05/04 11:10:07 drochner Exp $
+$NetBSD: distinfo,v 1.35 2010/05/20 21:15:54 drochner Exp $
 
 SHA1 (rhythmbox-0.12.8.tar.bz2) = 5d27923cc29b81d7bfbc73d867d7976a5295f964
 RMD160 (rhythmbox-0.12.8.tar.bz2) = 072d4fa06408ebc181b40147db1575d0ef4c99fe
 Size (rhythmbox-0.12.8.tar.bz2) = 5358950 bytes
 SHA1 (patch-aa) = a31b22483c63ee73bf32ca583afcc82c29e9562a
-SHA1 (patch-ad) = a7c4ce6c5ce65b7262a9a7de2c2f8414cf27f100
+SHA1 (patch-ad) = 367a6014863472ec73fccd47a32437632a4492a2
+SHA1 (patch-ae) = 95bc80c0b6e760613f2e1ad715e05de7b45af0bb
+SHA1 (patch-af) = 8babe8d7e5912f0fbd3a12d0c39dfecf75fef4af
diff --git a/audio/rhythmbox/patches/patch-ad b/audio/rhythmbox/patches/patch-ad
index 54bf3c2db30..edd9796ba96 100644
--- a/audio/rhythmbox/patches/patch-ad
+++ b/audio/rhythmbox/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.8 2009/08/02 12:10:39 drochner Exp $
+$NetBSD: patch-ad,v 1.9 2010/05/20 21:15:54 drochner Exp $
 
---- plugins/coherence/upnp_coherence/MediaPlayer.py.orig	2009-07-31 15:50:21.000000000 +0200
+--- plugins/coherence/upnp_coherence/MediaPlayer.py.orig	2010-03-25 00:10:11.000000000 +0000
 +++ plugins/coherence/upnp_coherence/MediaPlayer.py
-@@ -260,7 +260,7 @@ class RhythmboxPlayer(log.Loggable):
+@@ -13,7 +13,7 @@ import rhythmdb
+ from coherence.upnp.core.soap_service import errorCode
+ from coherence.upnp.core import DIDLLite
+ 
+-import louie
++import coherence.extern.louie as louie
+ 
+ from coherence.extern.simple_plugin import Plugin
+ 
+@@ -302,7 +302,7 @@ class RhythmboxPlayer(log.Loggable):
  
                  if duration is not None:
                      h,m,s = duration.split(':')
diff --git a/audio/rhythmbox/patches/patch-ae b/audio/rhythmbox/patches/patch-ae
new file mode 100644
index 00000000000..523af285b79
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.8 2010/05/20 21:15:54 drochner Exp $
+
+--- plugins/coherence/upnp_coherence/__init__.py.orig	2010-03-25 00:10:11.000000000 +0000
++++ plugins/coherence/upnp_coherence/__init__.py
+@@ -12,7 +12,7 @@ import gobject, gtk
+ 
+ import gconf
+ 
+-import louie
++import coherence.extern.louie as louie
+ 
+ from coherence import log
+ 
diff --git a/audio/rhythmbox/patches/patch-af b/audio/rhythmbox/patches/patch-af
new file mode 100644
index 00000000000..5d4e540f637
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.7 2010/05/20 21:15:54 drochner Exp $
+
+--- plugins/coherence/upnp_coherence/MediaStore.py.orig	2010-03-25 00:10:11.000000000 +0000
++++ plugins/coherence/upnp_coherence/MediaStore.py
+@@ -6,7 +6,7 @@
+ 
+ import os.path
+ import rhythmdb
+-import louie
++import coherence.extern.louie as louie
+ import urllib
+ 
+ from coherence import __version_info__