Add patch to add compat with new gtk-sharp releases. Remove one older version.

(Portage version: 2.0.51.22-r2)

6 files changed, 29 insertions, 96 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 000042c87b11..0a89a354dbdb 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2005/07/08 11:18:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.21 2005/08/16 23:48:51 latexer Exp $
+
+  16 Aug 2005; Peter Johanson <latexer@gentoo.org>
+  +files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff, -muine-0.8.2.ebuild,
+  muine-0.8.3.ebuild:
+  Add patch to add compat with new gtk-sharp releases. Remove one older version.
 
   08 Jul 2005; David Holm <dholm@gentoo.org> muine-0.8.3.ebuild:
   Added to ~ppc.
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index 4b8baf81a67b..a2500e839bff 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,14 +1,15 @@
-MD5 11e807d85213ccfd03359f10ca46c6e6 ChangeLog 2990
-MD5 42dcaa983276bbd8e849c07f13677337 metadata.xml 245
 MD5 efc18f554d45025127675ee4601d23e8 muine-0.6.3-r2.ebuild 1642
 MD5 49f354dc1e312093cd9012b8933da075 muine-0.6.3-r3.ebuild 1751
 MD5 c757e976a7e572673f6daae730e69ecd muine-0.8.2.ebuild 2317
-MD5 69ce0e9856671a4e754666f5cec7e174 muine-0.8.3.ebuild 2704
-MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r2 63
+MD5 11e807d85213ccfd03359f10ca46c6e6 ChangeLog 2990
+MD5 42dcaa983276bbd8e849c07f13677337 metadata.xml 245
+MD5 2d37ee991aa93655b91ff0beb62cfb22 muine-0.8.3.ebuild 2767
 MD5 23905e3a18ad036ce42ccb76c81f1096 files/muine-0.6.3-mono-1.1.1-compat.diff 3384
-MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r3 63
 MD5 e8f743f78010f9e787d738c4dc2c3afa files/muine-0.6.3-gnome-2.10-compat.diff 846
-MD5 005546051d7ebbbbc94daf145d59b104 files/muine-0.6.3-libgstplay.diff 1412
-MD5 04dd533ff9f9a635c7c6930759d8f1f6 files/digest-muine-0.8.2 63
 MD5 d5dc53fe5feabb06a5204e6e51934bc7 files/muine-0.8.2-autoconf.diff 1187
+MD5 04dd533ff9f9a635c7c6930759d8f1f6 files/digest-muine-0.8.2 63
+MD5 005546051d7ebbbbc94daf145d59b104 files/muine-0.6.3-libgstplay.diff 1412
+MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r2 63
+MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r3 63
 MD5 80e26562df326c5879e45ac707aa7923 files/digest-muine-0.8.3 63
+MD5 31aa500432a0c61481b3c6b02dd0c37d files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff 490
diff --git a/media-sound/muine/files/digest-muine-0.8.2 b/media-sound/muine/files/digest-muine-0.8.2
deleted file mode 100644
index 4089a15ebac5..000000000000
--- a/media-sound/muine/files/digest-muine-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b6e8cf76cf35fe54eeb51d875f4e09f muine-0.8.2.tar.gz 754247
diff --git a/media-sound/muine/files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff b/media-sound/muine/files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff
new file mode 100644
index 000000000000..92807b7e30e9
--- /dev/null
+++ b/media-sound/muine/files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff
@@ -0,0 +1,12 @@
+diff -aur muine-0.8.3-orig/src/PlaylistWindow.cs muine-0.8.3/src/PlaylistWindow.cs
+--- muine-0.8.3-orig/src/PlaylistWindow.cs	2005-05-01 12:25:15.000000000 -0400
++++ muine-0.8.3/src/PlaylistWindow.cs	2005-08-16 19:29:45.000000000 -0400
+@@ -431,7 +431,7 @@
+ 		public void RestorePlaylist ()
+ 		{
+ 			// Load last playlist
+-			if (!File.Exists (FileUtils.PlaylistFile))
++			if (!System.IO.File.Exists (FileUtils.PlaylistFile))
+ 				return;
+ 
+ 			OpenPlaylistInternal (FileUtils.PlaylistFile,
diff --git a/media-sound/muine/muine-0.8.2.ebuild b/media-sound/muine/muine-0.8.2.ebuild
deleted file mode 100644
index e4f8354ac7f8..000000000000
--- a/media-sound/muine/muine-0.8.2.ebuild
+++ /dev/null
@@ -1,86 +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.8.2.ebuild,v 1.5 2005/05/25 15:21:31 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 vorbis flac aac"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND=">=dev-lang/mono-0.96
-	>=dev-dotnet/gtk-sharp-1.9.1
-	>=dev-dotnet/gnome-sharp-1.9.1
-	>=dev-dotnet/gnomevfs-sharp-1.9.1
-	>=dev-dotnet/glade-sharp-1.9.1
-	>=dev-dotnet/gconf-sharp-1.9.1
-	xine? ( >=media-libs/xine-lib-1_rc4 )
-	!xine? (
-		>=media-libs/gstreamer-0.8.9-r3
-		>=media-libs/gst-plugins-0.8.8
-		>=media-plugins/gst-plugins-gnomevfs-0.8.8
-		mad? ( >=media-plugins/gst-plugins-mad-0.8.8 )
-		vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.8
-			>=media-plugins/gst-plugins-vorbis-0.8.8 )
-		flac? ( >=media-plugins/gst-plugins-flac-0.8.8 )
-		aac? (
-			>=media-plugins/gst-plugins-faad-0.8.8
-			>=media-libs/faad2-2.0-r4
-		)
-	)
-	>=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.6.0
-	>=dev-util/intltool-0.29
-	>=sys-apps/dbus-0.23.2-r1
-	media-libs/flac"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-use xine && \
-	G2CONF="${G2CONF} --enable-gstreamer=no" || \
-	G2CONF="${G2CONF} --enable-gstreamer=yes"
-
-
-G2CONF="${G2CONF} $(use_enable aac faad2)"
-
-USE_DESTDIR=1
-DOCS="AUTHORS COPYING ChangeLog INSTALL \
-	  MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	if ! built_with_use sys-apps/dbus mono ; then
-		echo
-		eerror "In order to compile muine, you need to have sys-apps/dbus emerged"
-		eerror "with 'mono' in your USE flags. Please add that flag, re-emerge"
-		eerror "dbus, and then emerge muine."
-		die "sys-apps/dbus is missing the .NET binding."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Fix the install location of the dbus service file
-	sed -i "s:libdir)/dbus-1.0:datadir)/dbus-1:" \
-		${S}/data/Makefile.am || die "sed failed"
-
-	epatch ${FILESDIR}/${P}-autoconf.diff || die "epatch failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	gnome2_src_configure "$@"
-	emake -j1 || die "compile failure"
-}
diff --git a/media-sound/muine/muine-0.8.3.ebuild b/media-sound/muine/muine-0.8.3.ebuild
index d0a1b3d3c6a8..382ae02e20d4 100644
--- a/media-sound/muine/muine-0.8.3.ebuild
+++ b/media-sound/muine/muine-0.8.3.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.8.3.ebuild,v 1.4 2005/07/08 11:18:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.3.ebuild,v 1.5 2005/08/16 23:48:51 latexer Exp $
 
 inherit gnome2 mono eutils multilib
 
@@ -75,6 +75,8 @@ src_unpack() {
 	sed -i "s:libdir)/dbus-1.0:datadir)/dbus-1:" \
 		${S}/data/Makefile.am || die "sed failed"
 
+	epatch ${FILESDIR}/${P}-gtk-sharp-2.x.90-compat.diff || die
+
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
 }