amd64 stable wrt #289703

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 7 insertions, 56 deletions

diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index 57a965ea738c..981c67caf22d 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2009/09/29 11:42:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.32 2009/10/19 11:31:52 ssuominen Exp $
+
+  19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-mplayer-0.9.8.ebuild:
+  amd64 stable wrt #289703
 
 *gnome-mplayer-0.9.8 (29 Sep 2009)
 
diff --git a/media-video/gnome-mplayer/gnome-mplayer-0.9.7.ebuild b/media-video/gnome-mplayer/gnome-mplayer-0.9.7.ebuild
deleted file mode 100644
index 36f2b348c79e..000000000000
--- a/media-video/gnome-mplayer/gnome-mplayer-0.9.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 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.7.ebuild,v 1.1 2009/08/29 16:51:16 ssuominen Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="alsa gnome ipod libnotify musicbrainz"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.12:2
-	>=dev-libs/dbus-glib-0.70
-	media-video/mplayer[ass]
-	alsa? ( media-libs/alsa-lib )
-	gnome? ( gnome-base/gconf:2
-		gnome-base/gvfs
-		gnome-base/nautilus )
-	ipod? ( >=media-libs/libgpod-0.7 )
-	libnotify? ( x11-libs/libnotify )
-	musicbrainz? ( net-misc/curl
-		media-libs/musicbrainz:3 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	DOCS="ChangeLog README DOCS/keyboard_shortcuts.txt"
-	G2CONF="--disable-dependency-tracking
-		$(use_enable gnome schemas-install)
-		$(use_enable gnome nautilus)
-		--with-gio
-		$(use_with gnome gconf)
-		$(use_with alsa)
-		$(use_with libnotify)
-		$(use_with ipod libgpod)
-		$(use_with musicbrainz libmusicbrainz3)
-		--without-gpm-new-method
-		--without-gpm-old-method"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rmdir -p "${D}"/var/lib # rm empty dir from destdir
-}
diff --git a/media-video/gnome-mplayer/gnome-mplayer-0.9.8.ebuild b/media-video/gnome-mplayer/gnome-mplayer-0.9.8.ebuild
index 052bea4de77f..61ffabc341f9 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-0.9.8.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.8.ebuild,v 1.1 2009/09/29 11:42:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-0.9.8.ebuild,v 1.2 2009/10/19 11:31:52 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="alsa gnome ipod libnotify musicbrainz pulseaudio"
 
 RDEPEND=">=dev-libs/glib-2.14:2