amd64 stable wrt #289703

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

4 files changed, 9 insertions, 60 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/Manifest b/media-video/gnome-mplayer/Manifest
index d97cbfc25c37..9fa2943eb6b2 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,10 +1,8 @@
 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.7.tar.gz 688220 RMD160 da7739d926592fbc85ba9a9d9097e3b96817e771 SHA1 8fe8063358490c0d9eb16d20b93e002117e5620b SHA256 d149aba0908bcaaad98be30444bb714e7eb6b22127b8fd015ae0b72e4cb27cc2
 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
-EBUILD gnome-mplayer-0.9.7.ebuild 1480 RMD160 87be3a0127fc073665b944965c31d039f91ef511 SHA1 fc58fff6f3c8eaefd24304358e643e49dc97c342 SHA256 0b017d087ae605c59aa38cc6b1bfda3dfa42e3f4b36579732965c304c1eb68dc
-EBUILD gnome-mplayer-0.9.8.ebuild 1577 RMD160 60577fbe0834d051137c8d1166acdcf060a5c413 SHA1 4d5f4a1044388d4ca2065d2a9beefcc950545987 SHA256 89e8c9f319fa431c33db5f16d18b6b60f0bd8ca85f59f05c2176c7236811dad3
-MISC ChangeLog 4963 RMD160 714d1e08138f1d70001763459ff65faeb2e2ad34 SHA1 8360be29bbe451af7f7b1ad2e210a0b0b61a361c SHA256 2fc3f5d0639bb720c224e45117476e98666077dae7050aa402d9299ebfe2a296
+EBUILD gnome-mplayer-0.9.8.ebuild 1576 RMD160 7b60114ed4853192b817c85e27d8fc9f21fde282 SHA1 4c005cab6b8b8ccb95a9575b2b84f0fd615dd1da SHA256 da65eda6d7ab22f97c85ff60cf74e66e768c8ee88e3be6aaeae10c4346aa26c5
+MISC ChangeLog 5075 RMD160 d9c5a0fdf6cadfdb8bc63f12c1dc286f66ba076f SHA1 66079510fa987a6b0037b14f76f3ea42a2b38286 SHA256 17f7c46aa10d4dc7d82a4328003e276d5cb68214c8a9a8d48b3093b8aa6d0abb
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
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