Remove one older version, fix deps to account for future SLOT of gtk-sharp-2.0 stuff, and add a patch to fix compilation with libgnome-2.10 (See bug #83419).

Package-Manager: portage-2.0.51.19

6 files changed, 40 insertions, 53 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 4b9480e1051d..18e5f5be9ce5 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/muine
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.10 2005/03/11 03:19:55 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.11 2005/03/15 01:51:49 latexer Exp $
+
+  14 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/muine-0.6.3-gnome-2.10-compat.diff, -muine-0.6.3-r1.ebuild,
+  muine-0.6.3-r2.ebuild:
+  Remove one older version, fix deps to account for future SLOT of gtk-sharp-2.0
+  stuff, and add a patch to fix compilation with libgnome-2.10 (See bug #83419).
 
   10 Mar 2005; Peter Johanson <latexer@gentoo.org> muine-0.6.3-r1.ebuild,
   muine-0.6.3-r2.ebuild:
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index cf133d254095..b410a05a792d 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,7 +1,6 @@
-MD5 9e7c8e0a42e386922575343bbb63a5bd muine-0.6.3-r2.ebuild 1415
-MD5 c85a044c61ffab3c2214f68a01705879 muine-0.6.3-r1.ebuild 1328
-MD5 80ed1567b14dac663e10abe80c595efd ChangeLog 1366
+MD5 fe5440ed19aee80b9b2a6464e736660a muine-0.6.3-r2.ebuild 1581
+MD5 72126e1c6b96d8d1737b47e87536e3c2 ChangeLog 1674
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 23905e3a18ad036ce42ccb76c81f1096 files/muine-0.6.3-mono-1.1.1-compat.diff 3384
-MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r1 63
+MD5 e8f743f78010f9e787d738c4dc2c3afa files/muine-0.6.3-gnome-2.10-compat.diff 846
 MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r2 63
diff --git a/media-sound/muine/files/digest-muine-0.6.3-r1 b/media-sound/muine/files/digest-muine-0.6.3-r1
deleted file mode 100644
index 9de74a90ae39..000000000000
--- a/media-sound/muine/files/digest-muine-0.6.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc7923e1e0ba87f0303bc30f14f604e3 muine-0.6.3.tar.gz 624566
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
new file mode 100644
index 000000000000..111df1588c8f
--- /dev/null
+++ b/media-sound/muine/files/muine-0.6.3-gnome-2.10-compat.diff
@@ -0,0 +1,24 @@
+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/muine-0.6.3-r1.ebuild b/media-sound/muine/muine-0.6.3-r1.ebuild
deleted file mode 100644
index 06f0da399efc..000000000000
--- a/media-sound/muine/muine-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.3 2005/03/11 03:19:55 latexer Exp $
-
-inherit gnome2 mono
-
-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 ~ppc"
-
-RDEPEND=">=dev-lang/mono-1.0
-	>=dev-dotnet/gtk-sharp-1.0.4-r1
-	>=dev-dotnet/gnome-sharp-1.0.4
-	>=dev-dotnet/glade-sharp-1.0.4
-	>=dev-dotnet/gconf-sharp-1.0.4
-	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"
diff --git a/media-sound/muine/muine-0.6.3-r2.ebuild b/media-sound/muine/muine-0.6.3-r2.ebuild
index 9a25085f2852..583df2e2f889 100644
--- a/media-sound/muine/muine-0.6.3-r2.ebuild
+++ b/media-sound/muine/muine-0.6.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2005/03/11 03:19:55 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3-r2.ebuild,v 1.5 2005/03/15 01:51:49 latexer Exp $
 
 inherit gnome2 mono eutils
 
@@ -17,6 +17,10 @@ RDEPEND=">=dev-lang/mono-1.0
 	>=dev-dotnet/gnome-sharp-1.0.4
 	>=dev-dotnet/glade-sharp-1.0.4
 	>=dev-dotnet/gconf-sharp-1.0.4
+	=dev-dotnet/gtk-sharp-1.0*
+	=dev-dotnet/gnome-sharp-1.0*
+	=dev-dotnet/glade-sharp-1.0*
+	=dev-dotnet/gconf-sharp-1.0*
 	xine? ( >=media-libs/xine-lib-1_rc4 )
 	!xine? (
 		>=media-libs/gstreamer-0.8.0
@@ -49,4 +53,5 @@ DOCS="AUTHORS COPYING ChangeLog INSTALL \
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-mono-1.1.1-compat.diff
+	epatch ${FILESDIR}/${P}-gnome-2.10-compat.diff
 }