Revision bump with bugfixes

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 111 insertions, 100 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index f777c73031ed..9977a1a9b294 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/muine
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.57 2009/09/27 16:35:35 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.58 2010/07/03 16:46:30 pacho Exp $
+
+*muine-0.8.11-r1 (03 Jul 2010)
+
+  03 Jul 2010; Pacho Ramos <pacho@gentoo.org> -muine-0.8.10.ebuild,
+  -muine-0.8.11.ebuild, +muine-0.8.11-r1.ebuild,
+  +files/muine-0.8.11-drop-deprecated.patch,
+  +files/muine-0.8.11-multimedia-keys.patch:
+  Revision bump: fix dependencies (bug #292912 by gentoo_m), install docs in
+  proper place (bug #295173 by Diego E. 'Flameeyes' Pettenò), fix
+  multimedia key support broken since Gnome 2.22, replace deprecated gtk
+  functions letting this work with gtk+-2.20, fix missing icons and
+  intltoolize broken file, install gconf schemas properly. Remove old.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> muine-0.8.10-r1.ebuild:
   ppc stable #283739
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index ab27d501d487..c15482cd9c09 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+AUX muine-0.8.11-drop-deprecated.patch 1100 RMD160 482f77a78e58882f841d57c48aec88532851bbb0 SHA1 25464a0c9ed6f8c30a9ec871e1f7c62ab2755124 SHA256 3e750aa396460323d7c1a741f2b601c943246cebf4ef3ee77ec93accd75b8db8
+AUX muine-0.8.11-multimedia-keys.patch 1006 RMD160 088ab34810ac1e26b167eb662f704d547e2429d0 SHA1 331d62253df1e0ed9c97c5232da71042168affd0 SHA256 1da103b7eab6a9676e510657a5f5397c4eccc2e8979d4f25f8488d91f6f47005
 DIST muine-0.8.10.tar.bz2 611089 RMD160 c943ae7dddf456df7fd8d619b44e2c97c03b6297 SHA1 0c1b8420cd89a8fcae86982e205255d469e9dd29 SHA256 0bbc8ed72586b7e8ebdf60786f9d9c05c2f36f210acba36f01d645f9ff89ec37
 DIST muine-0.8.11.tar.bz2 647177 RMD160 2a2a3667120fd5f5d86a634871e586904b570855 SHA1 c1da39ba39d5af58aff0ec661c0bec54738e4b71 SHA256 fac70bd9ab8a3c7c48c1f48d10f06080f6b5a42ce32cce21a6ab472cb178ecd4
 EBUILD muine-0.8.10-r1.ebuild 2291 RMD160 f879c5be7fbfcb62369e10ead370914a4ede9f16 SHA1 08b9bcaec9385367fac95a38795f2d92f74cef37 SHA256 fd6adec2f73b629135c7f1d5d497a2036cd612798744fcb80e29f47b4ad35134
-EBUILD muine-0.8.10.ebuild 2245 RMD160 725dffba69d3737604dda03fc0533d55281e3ce7 SHA1 533c61d7f2d5268b080b293ff6f8b70a142f8168 SHA256 8ebec6284b72e42d971b94de773bbffa63a4d42ec2b962513ab2c014f2ec396e
-EBUILD muine-0.8.11.ebuild 1947 RMD160 db7e26e9edabf725062653d98d0e3065c9f10a5a SHA1 23431965f51a8318bd7337e49c49c15669350109 SHA256 def250bbc4e21f91358ab192db9b6f699fa7b94396586b867b89c6412ef8e151
-MISC ChangeLog 8624 RMD160 192a3e4fd8af6242b00e38e8703511a90d2fe867 SHA1 7d402423af63044d2efcd1606af884caf68f6f3a SHA256 ad2f5c3ee87a716eddd6145d9015b069f605ecff97c84cd4697a57b02fa06377
+EBUILD muine-0.8.11-r1.ebuild 2435 RMD160 8488e14d4902627dd7851c66bf24d2d66e0b2cca SHA1 0aa64a9c6384a4cffa5188c28291fa5f303cf99e SHA256 695e68fc86c85ff66dcab1d296f7107d054c7768865ea010499bd23d0705e391
+MISC ChangeLog 9219 RMD160 ec1538ebc454725dded3c7e07c8ba483a1e907b8 SHA1 2cc843960b7e498efc6b3c1c72f01e04f1d123e3 SHA256 41677fb30dd99376701e26eacded56f890308a5e0655edcb243c52069541e2c3
 MISC metadata.xml 184 RMD160 e6bfd6e86eb38a78381d278fbeade487579aaf84 SHA1 ec780d1693126026f6d2da5584e4e5e9ac217e5e SHA256 cc9f71b3a498c3d1d147de62c6557f1523b1fe59a6b489ca716a13dd71305291
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwvaW4ACgkQCaWpQKGI+9Sb1wCeJCWLG0p5JtxtM4uhWaAjp5yZ
+6KIAn1WeIM+tMRiSjsfd7+C5td5Kfgel
+=GMzU
+-----END PGP SIGNATURE-----
diff --git a/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch b/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch
new file mode 100644
index 000000000000..fa4b6d8ca2d8
--- /dev/null
+++ b/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch
@@ -0,0 +1,31 @@
+From 86e885f1f17db2ec3caa31b0ff7955dfe2b4e543 Mon Sep 17 00:00:00 2001
+From: daniel g. siegel <dgsiegel@gnome.org>
+Date: Tue, 27 Apr 2010 18:22:57 +0000
+Subject: replace some deprecated gtk functions
+
+use gtk_widget_has_focus instead of GTK_WIDGET_HAS_FOCUS and
+gtk_widget_get_state instead of GTK_WIDGET_STATE
+---
+diff --git a/libmuine/rb-cell-renderer-pixbuf.c b/libmuine/rb-cell-renderer-pixbuf.c
+index 42cff41..abf6958 100644
+--- a/libmuine/rb-cell-renderer-pixbuf.c
++++ b/libmuine/rb-cell-renderer-pixbuf.c
+@@ -295,14 +295,14 @@ rb_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
+ 
+   if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+     {
+-      if (GTK_WIDGET_HAS_FOCUS (widget))
++      if (gtk_widget_has_focus (widget))
+         state = GTK_STATE_SELECTED;
+       else
+         state = GTK_STATE_ACTIVE;
+     }
+   else
+     {
+-      if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
++      if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
+         state = GTK_STATE_INSENSITIVE;
+       else
+         state = GTK_STATE_NORMAL;
+--
+cgit v0.8.3.1
diff --git a/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch b/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch
new file mode 100644
index 000000000000..5bce0ca765c0
--- /dev/null
+++ b/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch
@@ -0,0 +1,26 @@
+From d4dd66d73885db1b2aea2a267197413559bed5bc Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Wed, 16 Sep 2009 21:30:06 +0000
+Subject: Fix multimedia key support for >=Gnome-2.22
+
+---
+diff --git a/src/GnomeMMKeys.cs b/src/GnomeMMKeys.cs
+index dd99718..af5419a 100644
+--- a/src/GnomeMMKeys.cs
++++ b/src/GnomeMMKeys.cs
+@@ -37,11 +37,11 @@ namespace Muine
+     public class GnomeMMKeys : IDisposable
+     {
+         private const string BusName = "org.gnome.SettingsDaemon";
+-        private const string ObjectPath = "/org/gnome/SettingsDaemon";
++        private const string ObjectPath = "/org/gnome/SettingsDaemon/MediaKeys";
+         
+         private delegate void MediaPlayerKeyPressedHandler(string application, string key);
+         
+-        [Interface("org.gnome.SettingsDaemon")]
++        [Interface("org.gnome.SettingsDaemon.MediaKeys")]
+         private interface ISettingsDaemon
+         {
+             void GrabMediaPlayerKeys(string application, uint time);
+--
+cgit v0.8.3.1
diff --git a/media-sound/muine/muine-0.8.10.ebuild b/media-sound/muine/muine-0.8.10.ebuild
deleted file mode 100644
index 0f4ba0010c5f..000000000000
--- a/media-sound/muine/muine-0.8.10.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.ebuild,v 1.7 2009/04/05 21:39:24 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.6
-	>=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" )
-
-# 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
-}
diff --git a/media-sound/muine/muine-0.8.11.ebuild b/media-sound/muine/muine-0.8.11-r1.ebuild
index 15400f7297f8..4247ee26ad2e 100644
--- a/media-sound/muine/muine-0.8.11.ebuild
+++ b/media-sound/muine/muine-0.8.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.11.ebuild,v 1.1 2009/09/13 20:17:20 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.11-r1.ebuild,v 1.1 2010/07/03 16:46:30 pacho Exp $
 
 EAPI=2
 
@@ -26,10 +26,8 @@ RDEPEND="
 	>=dev-dotnet/gnomevfs-sharp-2.6
 	>=dev-dotnet/dbus-sharp-0.4
 	>=dev-dotnet/dbus-glib-sharp-0.3
+	>=dev-dotnet/taglib-sharp-2.0.3
 	sys-libs/gdbm
-	>=media-libs/flac-1.1.2
-	>=media-libs/libvorbis-1
-	>=media-libs/libid3tag-0.15.0b
 	=media-libs/gstreamer-0.10*
 	=media-libs/gst-plugins-base-0.10*
 	=media-libs/gst-plugins-good-0.10*
@@ -51,8 +49,28 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS PLUGINS README TODO"
 
-src_configure() {
-	gnome2_src_configure --enable-compile-warnings=yes
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-compile-warnings=yes
+		--docdir=/usr/share/doc/"${PF}"
+	"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix multimedia key support for >=Gnome-2.22
+	epatch "${FILESDIR}/${P}-multimedia-keys.patch"
+
+	# Replace some deprecated gtk functions
+	epatch "${FILESDIR}/${P}-drop-deprecated.patch"
+
+	# Update icons, upstream bug #623480
+	sed "s:stock_timer:list-add:g" -i src/AddWindow.cs src/StockIcons.cs || die
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
 }
 
 src_install() {
@@ -62,6 +80,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	gnome2_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"