Revision bump to add mono-1.1.x compat.

(Portage version: 2.0.51.16)

7 files changed, 142 insertions, 6 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 0e1a4acbf927..97207421467c 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/muine
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.6 2004/12/02 00:07:45 latexer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.7 2005/02/09 03:17:29 latexer Exp $
+
+*muine-0.6.3-r2 (08 Feb 2005)
+
+  08 Feb 2005; Peter Johanson <latexer@gentoo.org>
+  +files/muine-0.6.3-mono-1.1.1-compat.diff, +muine-0.6.3-r2.ebuild:
+  Revision bump to add mono-1.1.x compat.
 
 *muine-0.6.3-r1 (01 Dec 2004)
 
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index a4147838b658..ac0667b6e7f2 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,6 +1,9 @@
+MD5 bf88cba3d08cf043c20ea1ae38810e5c muine-0.6.3-r2.ebuild 1310
 MD5 4390d0073478dd856de7aca8bf2df9be muine-0.6.3-r1.ebuild 1330
 MD5 14a4d12183eee79e8509fd826bfbdc0e ChangeLog 760
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 82ab4864ea0f61875933957b54363517 muine-0.6.3.ebuild 1228
+MD5 23905e3a18ad036ce42ccb76c81f1096 files/muine-0.6.3-mono-1.1.1-compat.diff 3384
 MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3 63
 MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r1 63
+MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r2 63
diff --git a/media-sound/muine/files/digest-muine-0.6.3-r2 b/media-sound/muine/files/digest-muine-0.6.3-r2
new file mode 100644
index 000000000000..9de74a90ae39
--- /dev/null
+++ b/media-sound/muine/files/digest-muine-0.6.3-r2
@@ -0,0 +1 @@
+MD5 dc7923e1e0ba87f0303bc30f14f604e3 muine-0.6.3.tar.gz 624566
diff --git a/media-sound/muine/files/muine-0.6.3-mono-1.1.1-compat.diff b/media-sound/muine/files/muine-0.6.3-mono-1.1.1-compat.diff
new file mode 100644
index 000000000000..b901cd049646
--- /dev/null
+++ b/media-sound/muine/files/muine-0.6.3-mono-1.1.1-compat.diff
@@ -0,0 +1,77 @@
+diff -aur muine-0.6.3-orig/src/HandleView.cs muine-0.6.3/src/HandleView.cs
+--- muine-0.6.3-orig/src/HandleView.cs	2004-05-11 13:50:07.000000000 -0400
++++ muine-0.6.3/src/HandleView.cs	2004-09-22 21:52:10.000000000 -0400
+@@ -34,15 +34,23 @@
+ 							  SignalDelegate cb, IntPtr data,
+ 							  IntPtr p, int flags);
+ 
++	private SignalDelegate PointerActivatedCB;
++	private SignalDelegate PointersReorderedCB;
++	private SignalDelegate SelectionChangedCB;
++
+ 	public HandleView () : base (IntPtr.Zero)
+ 	{
+ 		Raw = pointer_list_view_new ();
+ 
+-		g_signal_connect_data (Raw, "pointer_activated", new SignalDelegate (PointerActivatedCallback),
++		PointerActivatedCB = new SignalDelegate (PointerActivatedCallback);
++		PointersReorderedCB = new SignalDelegate (PointersReorderedCallback);
++		SelectionChangedCB = new SignalDelegate (SelectionChangedCallback);
++
++		g_signal_connect_data (Raw, "pointer_activated", PointerActivatedCB,
+ 				       IntPtr.Zero, IntPtr.Zero, 0);
+-		g_signal_connect_data (Raw, "pointers_reordered", new SignalDelegate (PointersReorderedCallback),
++		g_signal_connect_data (Raw, "pointers_reordered", PointersReorderedCB,
+ 				       IntPtr.Zero, IntPtr.Zero, 0);
+-		g_signal_connect_data (Raw, "selection_changed", new SignalDelegate (SelectionChangedCallback),
++		g_signal_connect_data (Raw, "selection_changed", SelectionChangedCB,
+ 				       IntPtr.Zero, IntPtr.Zero, 0);
+ 	}
+ 
+diff -aur muine-0.6.3-orig/src/NotificationAreaIcon.cs muine-0.6.3/src/NotificationAreaIcon.cs
+--- muine-0.6.3-orig/src/NotificationAreaIcon.cs	2004-06-18 15:14:28.000000000 -0400
++++ muine-0.6.3/src/NotificationAreaIcon.cs	2004-09-23 10:11:49.521428120 -0400
+@@ -190,8 +190,8 @@
+ 		x = menu_x;
+ 		y = menu_y;
+ 
+-		int monitor = menu.Screen.GetMonitorAtPoint (x, y);
+-		Gdk.Rectangle rect = menu.Screen.GetMonitorGeometry (monitor);
++		int monitor = ((Widget)menu).Screen.GetMonitorAtPoint (x, y);
++		Gdk.Rectangle rect = ((Widget)menu).Screen.GetMonitorGeometry (monitor);
+ 
+ 		int space_above = y - rect.Y;
+ 		int space_below = rect.Y + rect.Height - y;
+diff -aur muine-0.6.3-orig/src/Player.cs muine-0.6.3/src/Player.cs
+--- muine-0.6.3-orig/src/Player.cs	2004-06-05 09:56:38.000000000 -0400
++++ muine-0.6.3/src/Player.cs	2004-09-22 21:53:17.000000000 -0400
+@@ -182,6 +182,10 @@
+ 							         IntPtr p, int flags);
+ 	}
+ 
++	private IntSignalDelegate tick_cb;
++	private SignalDelegate eos_cb;
++	private StringSignalDelegate error_cb;
++
+ 	public Player () : base (IntPtr.Zero)
+ 	{
+ 		IntPtr error_ptr;
+@@ -193,11 +197,15 @@
+ 			throw new Exception (error);
+ 		}
+ 		
+-		ConnectInt.g_signal_connect_data (Raw, "tick", new IntSignalDelegate (TickCallback),
++		tick_cb = new IntSignalDelegate (TickCallback);
++		eos_cb = new SignalDelegate (EosCallback);
++		error_cb = new StringSignalDelegate (ErrorCallback);
++
++		ConnectInt.g_signal_connect_data (Raw, "tick", tick_cb,
+ 		                                  IntPtr.Zero, IntPtr.Zero, 0);
+-		Connect.g_signal_connect_data (Raw, "end_of_stream", new SignalDelegate (EosCallback),
++		Connect.g_signal_connect_data (Raw, "end_of_stream", eos_cb,
+ 				               IntPtr.Zero, IntPtr.Zero, 0);
+-		ConnectString.g_signal_connect_data (Raw, "error", new StringSignalDelegate (ErrorCallback),
++		ConnectString.g_signal_connect_data (Raw, "error", error_cb,
+ 				                     IntPtr.Zero, IntPtr.Zero, 0);
+ 
+ 		playing = false;
diff --git a/media-sound/muine/muine-0.6.3-r1.ebuild b/media-sound/muine/muine-0.6.3-r1.ebuild
index 5a8e6e2c641b..d7708330d6ff 100644
--- a/media-sound/muine/muine-0.6.3-r1.ebuild
+++ b/media-sound/muine/muine-0.6.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3-r1.ebuild,v 1.1 2004/12/02 00:07:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3-r1.ebuild,v 1.2 2005/02/09 03:17:29 latexer Exp $
 
 inherit gnome2 mono
 
diff --git a/media-sound/muine/muine-0.6.3-r2.ebuild b/media-sound/muine/muine-0.6.3-r2.ebuild
new file mode 100644
index 000000000000..e300a90a2508
--- /dev/null
+++ b/media-sound/muine/muine-0.6.3-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3-r2.ebuild,v 1.1 2005/02/09 03:17:29 latexer Exp $
+
+inherit gnome2 mono eutils
+
+DESCRIPTION="A music player for GNOME"
+HOMEPAGE="http://muine.gooeylinux.org/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+LICENSE="GPL-2"
+IUSE="xine mad oggvorbis flac"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND=">=dev-dotnet/mono-0.96
+	>=dev-dotnet/gtk-sharp-0.98
+	xine? ( >=media-libs/xine-lib-1_rc4 )
+	!xine? (
+		>=media-libs/gstreamer-0.8.0
+		>=media-libs/gst-plugins-0.8.0
+		>=media-plugins/gst-plugins-gnomevfs-0.8.0
+		mad? ( >=media-plugins/gst-plugins-mad-0.8.0 )
+		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.0 )
+		flac? ( >=media-plugins/gst-plugins-flac-0.8.0 )
+	)
+	>=media-libs/libid3tag-0.15.0b
+	>=media-libs/libvorbis-1.0
+	sys-libs/gdbm
+	>=gnome-base/gconf-2.0.0
+	>=gnome-base/gnome-vfs-2.0.0
+	>=x11-libs/gtk+-2.0.0
+	media-libs/flac"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper"
+
+use xine && \
+	G2CONF="${G2CONF} --enable-gstreamer=no" || \
+	G2CONF="${G2CONF} --enable-gstreamer=yes"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL \
+	  MAINTAINERS NEWS README TODO"
+
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-mono-1.1.1-compat.diff
+}
diff --git a/media-sound/muine/muine-0.6.3.ebuild b/media-sound/muine/muine-0.6.3.ebuild
index 6764e934fee5..a5ede776d2d8 100644
--- a/media-sound/muine/muine-0.6.3.ebuild
+++ b/media-sound/muine/muine-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3.ebuild,v 1.5 2004/10/26 21:54:26 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3.ebuild,v 1.6 2005/02/09 03:17:29 latexer Exp $
 
 inherit gnome2 mono