Version bump.

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

4 files changed, 31 insertions, 66 deletions

diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index 6a94abb85c6f..368126c4446f 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gnome-mplayer
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.37 2009/12/11 19:55:23 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.38 2010/02/10 16:10:03 ssuominen Exp $
+
+*gnome-mplayer-0.9.9 (10 Feb 2010)
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +gnome-mplayer-0.9.9.ebuild:
+  Version bump.
 
   11 Dec 2009; Brent Baude <ranger@gentoo.org> gnome-mplayer-0.9.8.ebuild:
   Marking gnome-mplayer-0.9.8 ppc64 for bug 289703
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index cd0fea9ba56a..a535e1c1c601 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,8 +1,6 @@
-AUX gnome-mplayer-0.9.6-asneeded.patch 1016 RMD160 4a8d49b103ebb7c488e52f9d083bb276dc5a1a8a SHA1 37886d04935f4be709bf77b461208efbb496c8b1 SHA256 d850efe8cc1041e0b376a4ffc4ebf59f419a65a11f9cc91bf311fbbbc31508ac
-DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f
-DIST gnome-mplayer-0.9.6.tar.gz 813872 RMD160 9c1f9be01a4fc7be880ab7b5fa01e849a435078e SHA1 39fa5f7978bd67adab4fc055541d4d1c719afdf7 SHA256 5dec27feee7971d3b88e3b23ccc0e47ef2e7040ebc526b72629b78507c8c6c3f
 DIST gnome-mplayer-0.9.8.tar.gz 721269 RMD160 84a2433258af005aeea972d15eabe67aa970829c SHA1 8551c2c7b7b48eed315ab73a36237f8012ba73b7 SHA256 b275bae3f75e95e5b4e8b7596a7a362ba0ff9e5028e715540e4215bc8781af60
-EBUILD gnome-mplayer-0.9.6.ebuild 1587 RMD160 76a1eca79851d8c91dcca484b960159893ada00e SHA1 1f1c283d7a0931f831fce2fe719ef3c62ae054ee SHA256 5ced9e12db5178b82482f1a6fc8a2ee72832b2ec5f82ddbc39f8d89411c34c2b
+DIST gnome-mplayer-0.9.9.tar.gz 761902 RMD160 e6442f5fa895ba302696456302c699b72fdfba7e SHA1 8fe3c391a2f41c3c7306f7c8975aefa5c2c0f2fd SHA256 8180f8de085879280be4a6356ae70acd749f37eea48c943870d3caa145d2826d
 EBUILD gnome-mplayer-0.9.8.ebuild 1568 RMD160 380c61003ad785b94930f22c3ea030d645f20c54 SHA1 15c04470b3b6290abad0ce60f96da2c8da3fda3e SHA256 6f0ebab34c06dfaa7db09dc17eb4bec7902d69d18de05fee705eb10bc29d1e77
-MISC ChangeLog 5619 RMD160 2810bd6e6181589bf5526b8cd153f4830ebc4c61 SHA1 eb98686644ef8f904f610fea08d36b1e5f93c1bc SHA256 3a369937ef40ae92a72ddaeee9d6bfbea007bc9ff8694adafdd934f3c6436c97
+EBUILD gnome-mplayer-0.9.9.ebuild 1605 RMD160 d6a083a24a6cdb68a2d9d4b34a4b3e6fe59201e4 SHA1 c5e72d90da203b48e41b0ee440c6fde2e042decc SHA256 d9870d71893e8da75ccd15c35e1861333e185f177b7096cc828aa7bcdafb7d6a
+MISC ChangeLog 5760 RMD160 ee914e19f57828cd09faa5302dabaee00a6a09d4 SHA1 18fdd9fe1021d72a03516c870f9d614c5ba9dbaf SHA256 87d5dd001be24c3cb2f787b1e51f463a81d73683f9b772a05914b14975a90952
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
diff --git a/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch b/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch
deleted file mode 100644
index 34b7ac2e9aec..000000000000
--- a/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -aurN gnome-mplayer-0.9.6.orig/src/Makefile.am gnome-mplayer-0.9.6/src/Makefile.am
---- gnome-mplayer-0.9.6.orig/src/Makefile.am	2009-06-07 10:34:12.000000000 +0200
-+++ gnome-mplayer-0.9.6/src/Makefile.am	2009-06-07 10:39:18.000000000 +0200
-@@ -59,11 +59,19 @@
- 	langlist.h
- 
- 
--gnome_mplayer_LDFLAGS = 
-+gnome_mplayer_LDFLAGS =
- 
--gnome_mplayer_LDADD = $(GTK_LIBS) $(GIO_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(ALSA_LIBS) $(NOTIFY_LIBS) $(GPOD_LIBS) $(MUSICBRAINZ_LIBS) \
--    libgmtk/libgmtk.la \
--    libgmlib/libgmlib.la
-+gnome_mplayer_LDADD =		\
-+    libgmtk/libgmtk.la		\
-+    libgmlib/libgmlib.la	\
-+    $(GTK_LIBS)			\
-+    $(GIO_LIBS)			\
-+    $(DBUS_LIBS)		\
-+    $(GCONF_LIBS)		\
-+    $(ALSA_LIBS)		\
-+    $(NOTIFY_LIBS)		\
-+    $(GPOD_LIBS)		\
-+    $(MUSICBRAINZ_LIBS)
- 
- if HAVE_NAUTILUS
- 
-@@ -78,7 +86,8 @@
- libgnome_mplayer_properties_page_la_CFLAGS = \
-     $(NAUTILUS_CFLAGS) \
-     $(AM_CFLAGS)
--    
-+
-+libgnome_mplayer_properties_page_la_LDFLAGS = -module -avoid-version
- 
- endif #HAVE_NAUTILUS
- 
diff --git a/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild b/media-video/gnome-mplayer/gnome-mplayer-0.9.9.ebuild
index 4604a24dfc06..3aeab6a378a8 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-0.9.9.ebuild
@@ -1,54 +1,52 @@
-# 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-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild,v 1.10 2009/07/15 19:54:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-0.9.9.ebuild,v 1.1 2010/02/10 16:10:03 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
-inherit autotools eutils gnome2
+inherit gnome2
 
-DESCRIPTION="MPlayer GUI for GNOME Desktop Environment"
-HOMEPAGE="http://code.google.com/p/gnome-mplayer"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
-	!gnome? ( mirror://gentoo/${P}-gconf-2.m4.tgz )"
+DESCRIPTION="A GTK+ interface to MPlayer"
+HOMEPAGE="http://code.google.com/p/gnome-mplayer/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="+alsa gnome ipod +libnotify musicbrainz"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa gnome ipod libnotify musicbrainz pulseaudio"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND=">=dev-libs/glib-2.14:2
 	>=x11-libs/gtk+-2.12:2
-	dev-libs/dbus-glib
-	media-video/mplayer[ass]
+	>=dev-libs/dbus-glib-0.70
+	>=media-video/mplayer-1.0_rc4_p20091026[ass]
 	alsa? ( media-libs/alsa-lib )
 	gnome? ( gnome-base/gconf:2
 		gnome-base/gvfs
 		gnome-base/nautilus )
-	ipod? ( media-libs/libgpod )
+	ipod? ( >=media-libs/libgpod-0.7 )
 	libnotify? ( x11-libs/libnotify )
 	musicbrainz? ( net-misc/curl
-		media-libs/musicbrainz:3 )"
+		>=media-libs/musicbrainz-3 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
 pkg_setup() {
 	DOCS="ChangeLog README DOCS/keyboard_shortcuts.txt"
-	G2CONF+=" --disable-dependency-tracking
+	G2CONF="--disable-dependency-tracking
 		$(use_enable gnome schemas-install)
 		$(use_enable gnome nautilus)
+		--enable-panscan
 		--with-gio
 		$(use_with gnome gconf)
 		$(use_with alsa)
 		$(use_with libnotify)
 		$(use_with ipod libgpod)
-		$(use_with musicbrainz libmusicbrainz3)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	AT_M4DIR=${WORKDIR} eautoreconf
+		$(use_with musicbrainz libmusicbrainz3)
+		$(use_with pulseaudio flat-volume)
+		--without-gpm-new-method
+		--without-gpm-old-method"
 }
 
 src_install() {