Revision bump with monodoc fixes, and remove ancient versions.

(Portage version: 2.1_pre3-r1)

7 files changed, 80 insertions, 151 deletions

diff --git a/media-sound/muine/files/digest-muine-0.6.3-r2 b/media-sound/muine/files/digest-muine-0.6.3-r2
deleted file mode 100644
index 9de74a90ae39..000000000000
--- a/media-sound/muine/files/digest-muine-0.6.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc7923e1e0ba87f0303bc30f14f604e3 muine-0.6.3.tar.gz 624566
diff --git a/media-sound/muine/files/digest-muine-0.6.3-r3 b/media-sound/muine/files/digest-muine-0.6.3-r3
deleted file mode 100644
index 9de74a90ae39..000000000000
--- a/media-sound/muine/files/digest-muine-0.6.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc7923e1e0ba87f0303bc30f14f604e3 muine-0.6.3.tar.gz 624566
diff --git a/media-sound/muine/files/digest-muine-0.8.3-r1 b/media-sound/muine/files/digest-muine-0.8.3-r1
new file mode 100644
index 000000000000..239cd1d18215
--- /dev/null
+++ b/media-sound/muine/files/digest-muine-0.8.3-r1
@@ -0,0 +1 @@
+MD5 4e21eeb8e809bebf1e13540e44a6259d muine-0.8.3.tar.gz 769686
diff --git a/media-sound/muine/files/muine-0.6.3-gnome-2.10-compat.diff b/media-sound/muine/files/muine-0.6.3-gnome-2.10-compat.diff
deleted file mode 100644
index 111df1588c8f..000000000000
--- a/media-sound/muine/files/muine-0.6.3-gnome-2.10-compat.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur muine-0.6.3.orig/libmuine/player-gst.c muine-0.6.3/libmuine/player-gst.c
---- muine-0.6.3.orig/libmuine/player-gst.c      2005-03-14 19:55:50.000000000 -0500
-+++ muine-0.6.3/libmuine/player-gst.c   2005-03-14 19:56:58.000000000 -0500
-@@ -26,7 +26,7 @@
- #include <gst/gst.h>
- #include <gst/gconf/gconf.h>
- #include <gst/play/play.h>
--#include <libgnome/gnome-i18n.h>
-+#include <glib/gi18n.h>
-
- #include "player.h"
-
-diff -ur muine-0.6.3.orig/libmuine/player-xine.c muine-0.6.3/libmuine/player-xine.c
---- muine-0.6.3.orig/libmuine/player-xine.c     2004-05-15 05:51:22.000000000 -0400
-+++ muine-0.6.3/libmuine/player-xine.c  2005-03-14 19:57:16.000000000 -0500
-@@ -23,7 +23,7 @@
- #include <math.h>
- #include <xine.h>
- #include <libgnomevfs/gnome-vfs-utils.h>
--#include <libgnome/gnome-i18n.h>
-+#include <glib/gi18n.h>
-
- #include "player.h"
-
diff --git a/media-sound/muine/files/muine-0.6.3-libgstplay.diff b/media-sound/muine/files/muine-0.6.3-libgstplay.diff
deleted file mode 100644
index 3fe82b0e07ca..000000000000
--- a/media-sound/muine/files/muine-0.6.3-libgstplay.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- player-gst.c	2004-04-20 20:25:44.000000000 +0100
-+++ /home/zaheer/player-gst.c	2005-03-15 14:14:10.312438632 +0000
-@@ -144,6 +144,7 @@
- player_construct (Player *player, char **error)
- {
- 	PlayerPriv *priv;
-+	GstElement* tempsink;
- 
- 	gst_init (NULL, NULL);
- 
-@@ -168,22 +169,33 @@
- 
- 	gst_play_set_data_src (priv->play, priv->source);
- 
--	priv->sink = gst_gconf_get_default_audio_sink ();
--	if (!priv->sink) {
-+	tempsink = gst_gconf_get_default_audio_sink ();
-+	if (!tempsink) {
- 		*error = g_strdup (_("Could not render default GStreamer audio output sink"));
- 
- 		return;
- 	}
- 
--	gst_play_set_audio_sink (priv->play, priv->sink);
-+	
-+
-+	/* gst_play_set_audio_sink (priv->play, priv->sink); */
- 
--	priv->volume = gst_bin_get_by_name (GST_BIN (priv->play), "volume");
-+	priv->volume = gst_element_factory_make ("volume", "muinevol");
- 	if (!priv->volume) {
- 		*error = g_strdup (_("Could not find the volume element in the GstPlay pipeline"));
- 
- 		return;
- 	}
- 
-+	priv->sink = gst_bin_new ("muineaudiosink");
-+	gst_bin_add_many (GST_BIN(priv->sink), priv->volume, tempsink, NULL);
-+	gst_element_link (priv->volume, tempsink);
-+	gst_element_add_ghost_pad (priv->sink, 
-+		gst_element_get_pad (priv->volume, "sink"),
-+		"sink");
-+	gst_play_set_audio_sink (priv->play, priv->sink);
-+
-+	//gst_bin_add (GST_BIN(priv->sink), tempsink);
- 	g_signal_connect (priv->play,
- 			  "error",
- 			  G_CALLBACK (error_cb),
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
deleted file mode 100644
index b901cd049646..000000000000
--- a/media-sound/muine/files/muine-0.6.3-mono-1.1.1-compat.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-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/files/muine-0.8.3-monodoc-update.diff b/media-sound/muine/files/muine-0.8.3-monodoc-update.diff
new file mode 100644
index 000000000000..a78bb6daa902
--- /dev/null
+++ b/media-sound/muine/files/muine-0.8.3-monodoc-update.diff
@@ -0,0 +1,79 @@
+diff -aur muine-0.8.3-orig/configure.in muine-0.8.3/configure.in
+--- muine-0.8.3-orig/configure.in	2005-05-04 10:01:12.000000000 -0700
++++ muine-0.8.3/configure.in	2006-01-21 11:58:46.000000000 -0800
+@@ -25,7 +25,7 @@
+ MONO_REQUIRED=1.0
+ GTKSHARP_REQUIRED=1.9.2
+ DBUSSHARP_REQUIRED=0.21
+-MONODOC_REQUIRED=0.16
++MONODOC_REQUIRED=1.1.8
+ 
+ dnl Audio backend stuff
+ AC_ARG_ENABLE(xine, [  --enable-xine=[no/yes]    compile with libxine support.],,enable_xine=no)
+@@ -154,7 +154,11 @@
+ PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQUIRED, have_monodoc=yes, have_monodoc=no)
+ AM_CONDITIONAL(ENABLE_MONODOC, test "x$have_monodoc" = "xyes")
+ 
+-AC_PATH_PROG(MONODOC, monodoc)
++AC_PATH_PROG(MDASSEMBLER, mdassembler)
++AC_PATH_PROG(MONODOCER, monodocer)
++
++MONODOC_SOURCESDIR=`pkg-config --variable=sourcesdir monodoc`
++AC_SUBST(MONODOC_SOURCESDIR)
+ 
+ dnl Intl
+ ALL_LINGUAS="az bg ca cs da de en_CA en_GB es et eu fi fr hr hu is ja ko lt ms nb nl no pl pt pt_BR ro ru rw sr sr@Latn sv zh_CN"
+diff -aur muine-0.8.3-orig/doc/Makefile.am muine-0.8.3/doc/Makefile.am
+--- muine-0.8.3-orig/doc/Makefile.am	2005-01-06 19:22:19.000000000 -0800
++++ muine-0.8.3/doc/Makefile.am	2006-01-21 11:56:10.000000000 -0800
+@@ -1,34 +1,36 @@
+ if ENABLE_MONODOC
+ TARGETS = muine-docs.zip muine-docs.tree muine-docs.source
+ 
++ASSEMBLIES = \
++	$(top_builddir)/PluginLib/muine-plugin.dll \
++	$(top_builddir)/DBusLib/muine-dbus.dll
++
++ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm)))
++
+ install-data-local:
+-	mkdir -p $(DESTDIR)/`monodoc --get-sourcesdir`
++	mkdir -p $(DESTDIR)/$(MONODOC_SOURCESDIR)
+ 	install -m 644 $(srcdir)/muine-docs.source \
+-		$(DESTDIR)/`monodoc --get-sourcesdir`
++		$(DESTDIR)/$(MONODOC_SOURCESDIR)
+ 	install -m 644 muine-docs.tree \
+-		$(DESTDIR)/`monodoc --get-sourcesdir`
++		$(DESTDIR)/$(MONODOC_SOURCESDIR)
+ 	install -m 644 muine-docs.zip \
+-		$(DESTDIR)/`monodoc --get-sourcesdir`
++		$(DESTDIR)/$(MONODOC_SOURCESDIR)
+ 
+ uninstall-local:
+-	rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/muine-docs.source
+-	rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/muine-docs.tree
+-	rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/muine-docs.zip
++	rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/muine-docs.source
++	rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/muine-docs.tree
++	rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/muine-docs.zip
+ else
+ TARGETS = 
+ endif
+ 
+ noinst_DATA = $(TARGETS)
+ 
+-ASSEMBLER = $(MONODOC) --assemble
+-UPDATER = $(MONODOC) --update
+-
+ muine-docs.zip muine-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+-	$(ASSEMBLER) --ecma $(srcdir)/en -o muine-docs
++	$(MDASSEMBLER) --ecma $(srcdir)/en -o muine-docs
+ 
+-update:
+-	$(UPDATER) $(top_builddir)/PluginLib/muine-plugin.dll -o ./en -f
+-	$(UPDATER) $(top_builddir)/DBusLib/muine-dbus.dll -o ./en -f
++update: $(ASSEMBLIES)
++	$(MONODOCER) $(ASSEMBLIES_BUILD) -path:en -updateto:en -delete
+ 
+ CLEANFILES = muine-docs.zip muine-docs.tree
+