Fix bug 272651, bugzilla.gnome.org bug 584702. Patch by Iain Lane.

Package-Manager: portage-2.2_rc39/cvs/Linux x86_64

4 files changed, 121 insertions, 3 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 112e2d3c097a..ebf2d4a37017 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/muine
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.53 2009/04/05 17:19:23 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.54 2009/08/22 22:12:31 loki_val Exp $
+
+*muine-0.8.10-r1 (22 Aug 2009)
+
+  22 Aug 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +muine-0.8.10-r1.ebuild, +files/muine-0.8.10-gtk-sharp-2.12.9.patch:
+  Fix bug 272651, bugzilla.gnome.org bug 584702. Patch by Iain Lane.
 
   05 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> muine-0.8.10.ebuild:
   Remove -Werror from build, bug 260915. Also drop aac use-flag, since faad2
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index e4b546579645..136737feda8b 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,5 +1,7 @@
 AUX muine-0.8.10-buttons.patch 1704 RMD160 bf2f63cf2934d5fe79f57525eb7ca7f992a5ca91 SHA1 475d49d1de86c77be745fcaa2b8fd1e8f9f9a0e2 SHA256 cc03b9203b34bb51206b554a81fd575b680a535c2bc7a93018b0f93ac128d8e0
+AUX muine-0.8.10-gtk-sharp-2.12.9.patch 783 RMD160 83bcabe62948d9d7cc7dbc259bf91fe7dd7cf2cf SHA1 b55172b6eaa7efac13dd31c4fb4e3ce00e666539 SHA256 f541489bcb0cd7f4ba3b4a05d35fdcf5d66e3999164055bcf4b2ced46dd1888f
 DIST muine-0.8.10.tar.bz2 611089 RMD160 c943ae7dddf456df7fd8d619b44e2c97c03b6297 SHA1 0c1b8420cd89a8fcae86982e205255d469e9dd29 SHA256 0bbc8ed72586b7e8ebdf60786f9d9c05c2f36f210acba36f01d645f9ff89ec37
+EBUILD muine-0.8.10-r1.ebuild 2296 RMD160 496119c80cc61dfec514ca1678dc8ba7305e1d6c SHA1 e75e7f9ada14c2069d4bcd40414f100b46bdf136 SHA256 20b7bc20636dee6d7efa09d096b5201b88dfa2fd282ce7c7aad1e225fd6e3c85
 EBUILD muine-0.8.10.ebuild 2245 RMD160 725dffba69d3737604dda03fc0533d55281e3ce7 SHA1 533c61d7f2d5268b080b293ff6f8b70a142f8168 SHA256 8ebec6284b72e42d971b94de773bbffa63a4d42ec2b962513ab2c014f2ec396e
-MISC ChangeLog 8094 RMD160 ef70a854c5bb0153f531fe4b085549c936beb95b SHA1 a44816549aabae4ce1bf6cb1c36a38f86eae5b8c SHA256 674f8a7ac25e57e36b085877634d0b0de9451e1ad0edffe476502c07a2fe8c1d
+MISC ChangeLog 8320 RMD160 83e59912555d2ec4174ae8060f61b82229f88495 SHA1 a1a82872cb6befcdb7529ae0e39c0692f64334ce SHA256 a3b26fa96a558547b9164f4799d9d75a9a47fd44636356ed8fd00d5ffdc538ab
 MISC metadata.xml 184 RMD160 e6bfd6e86eb38a78381d278fbeade487579aaf84 SHA1 ec780d1693126026f6d2da5584e4e5e9ac217e5e SHA256 cc9f71b3a498c3d1d147de62c6557f1523b1fe59a6b489ca716a13dd71305291
diff --git a/media-sound/muine/files/muine-0.8.10-gtk-sharp-2.12.9.patch b/media-sound/muine/files/muine-0.8.10-gtk-sharp-2.12.9.patch
new file mode 100644
index 000000000000..2e318aaa52bf
--- /dev/null
+++ b/media-sound/muine/files/muine-0.8.10-gtk-sharp-2.12.9.patch
@@ -0,0 +1,19 @@
+diff --git a/src/HandleModel.cs b/src/HandleModel.cs
+index 285d160..b0fc106 100644
+--- a/src/HandleModel.cs
++++ b/src/HandleModel.cs
+@@ -489,12 +489,10 @@ namespace Muine
+ 		}
+ 
+ 		[DllImport("libgtk-2.0-0.dll")]
+-		static extern void gtk_tree_model_rows_reordered(IntPtr raw, IntPtr path, ref Gtk.TreeIter iter, out int new_order);
++		static extern void gtk_tree_model_rows_reordered(IntPtr raw, IntPtr path, ref Gtk.TreeIter iter, out int[] new_order);
+ 
+-		public int EmitRowsReordered(Gtk.TreePath path, Gtk.TreeIter iter) {
+-			int new_order;
++		public void EmitRowsReordered(Gtk.TreePath path, Gtk.TreeIter iter, int[] new_order) {
+ 			gtk_tree_model_rows_reordered(Handle, path.Handle, ref iter, out new_order);
+-			return new_order;
+ 		}
+ 
+ 		[DllImport("libgtk-2.0-0.dll")]
diff --git a/media-sound/muine/muine-0.8.10-r1.ebuild b/media-sound/muine/muine-0.8.10-r1.ebuild
new file mode 100644
index 000000000000..266c55ddff8a
--- /dev/null
+++ b/media-sound/muine/muine-0.8.10-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.10-r1.ebuild,v 1.1 2009/08/22 22:12:31 loki_val Exp $
+
+EAPI=2
+
+inherit base gnome2 mono eutils multilib flag-o-matic
+
+DESCRIPTION="A music player for GNOME"
+HOMEPAGE="http://muine-player.org"
+SRC_URI="http://download.gnome.org/sources/muine/0.8/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="flac mad vorbis xine"
+
+RDEPEND="x11-themes/gnome-icon-theme
+	>=dev-lang/mono-2
+	>=x11-libs/gtk+-2.6
+	>=dev-dotnet/gtk-sharp-2.12.9
+	>=dev-dotnet/glade-sharp-2.12.6
+	>=dev-dotnet/gnome-sharp-2.6
+	>=dev-dotnet/gconf-sharp-2.6
+	>=dev-dotnet/gnomevfs-sharp-2.6
+	>=dev-dotnet/dbus-sharp-0.4
+	>=dev-dotnet/dbus-glib-sharp-0.3
+	sys-libs/gdbm
+	>=media-libs/flac-1.1.2
+	>=media-libs/libvorbis-1
+	>=media-libs/libid3tag-0.15.0b
+	xine? ( >=media-libs/xine-lib-1 )
+	!xine? (
+		=media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-base-0.10*
+		=media-libs/gst-plugins-good-0.10*
+		=media-plugins/gst-plugins-gconf-0.10*
+		=media-plugins/gst-plugins-gnomevfs-0.10*
+		flac? ( =media-plugins/gst-plugins-flac-0.10* )
+		mad? ( =media-plugins/gst-plugins-mad-0.10* )
+		vorbis? ( =media-plugins/gst-plugins-ogg-0.10*
+			=media-plugins/gst-plugins-vorbis-0.10* )
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	>=dev-util/intltool-0.29
+	virtual/monodoc"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS PLUGINS README TODO"
+
+PATCHES=(
+	"${FILESDIR}/${P}-buttons.patch"
+	"${FILESDIR}/${P}-gtk-sharp-2.12.9.patch"
+	)
+
+# The build is not parallel safe
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	gnome2_src_unpack
+}
+
+src_prepare() {
+	base_src_prepare
+
+}
+
+src_configure() {
+	gnome2_src_configure --enable-compile-warnings=yes --disable-faad2  $(use_enable xine)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	gnome2_src_install
+	insinto /usr/$(get_libdir)/${PN}/plugins
+	doins "${S}"/plugins/TrayIcon.dll
+}
+
+pkg_postinst() {
+	elog
+	elog "Upstream no longer packages the tray icon plugin by default."
+	elog "The Gentoo ebuilds will continue to install the plugin, if you don't"
+	elog "want to use the plugin, remove TrayIcon.dll from"
+	elog "/usr/$(get_libdir)/muine/plugins/"
+	elog
+}