Drop nautilus useflag, see bug 266801. Don't enable gnome by default, let

profile or user take care of that. Leave -r1 for testing with nautilus,
while proceeding with -r2 as stable candidate.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 66 insertions, 2 deletions

diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index ff87046e9c97..a617e33b49e6 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2009/05/29 21:50:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.15 2009/06/01 01:52:23 yngwin Exp $
+
+*gnome-mplayer-0.9.5-r2 (01 Jun 2009)
+
+  01 Jun 2009; Ben de Groot <yngwin@gentoo.org>
+  +gnome-mplayer-0.9.5-r2.ebuild:
+  Drop nautilus useflag, see bug 266801. Don't enable gnome by default, let
+  profile or user take care of that. Leave -r1 for testing with nautilus,
+  while proceeding with -r2 as stable candidate.
 
   29 May 2009; Steve Dibb <beandog@gentoo.org> gnome-mplayer-0.6.3.ebuild:
   amd64 stable
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index f8a2d28a272e..84874c7fb2e1 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -5,5 +5,6 @@ DIST gnome-mplayer-0.9.5.tar.gz 747308 RMD160 474cc743f36254e92e171656a05e19c9ad
 EBUILD gnome-mplayer-0.6.0.ebuild 842 RMD160 50100d067a9a71c5264278ee83fdc7c04458edb5 SHA1 052236a7dba16ce0da860d02fac5ae176755251b SHA256 6b9d3170b59aceb1ee1bad3f83efa6b12ead466740eecf147ba0507fb890fcfa
 EBUILD gnome-mplayer-0.6.3.ebuild 999 RMD160 2f02217e077fa3538506571df8486312c1323107 SHA1 10f374d32b4e6f280a7dfe85ea56af7029f1ef3e SHA256 eb81930e2b8152f0aab6fd9f3b1a9b51843527d397a1c7698a31c55a6dc5801d
 EBUILD gnome-mplayer-0.9.5-r1.ebuild 1477 RMD160 da70c99f38144644ed1d7ecc50a26298cd59a767 SHA1 a636d397ef7e133475ac5f7e266db3b5389dc7b4 SHA256 61ecd36144b823e04d40fe8254f700a1c1540efa052f89a821e4ea01e4fd49aa
-MISC ChangeLog 2395 RMD160 47a53fb571938008c5c81aa19fe166694caa05d7 SHA1 82cc8f5fdac99b34c39dc9006e55b0e852b8b95a SHA256 8b5d2dc86570d2c23f00f3161663e8e39b7bea12e042be9cb9eb15ee29fa88a5
+EBUILD gnome-mplayer-0.9.5-r2.ebuild 1406 RMD160 80e696a9d951e8852aae4835f98dfcb06835e937 SHA1 cc8a23dc11c77151ec3f0a7f5dba7a498a2ab4d5 SHA256 30e1fbeb4b671598f2ae3f8bdc1a5820c2f8c7aa1eac5526a246ce4410dc3d9b
+MISC ChangeLog 2715 RMD160 cb2d5bc15b6d3d0d17ede111d6cedc0a62cbe21b SHA1 02e40f5bbc0f2db34451918012a69705b5960f83 SHA256 1659f666c956b788786352905a05057103dc507800bbff1bb3080728c5099f06
 MISC metadata.xml 309 RMD160 5e13774680b78b83b20f8ffba77e54d22d7fba60 SHA1 d6d8c8f36d45b4f20f1d57ef22890c4415dabbae SHA256 f93cf32a0b04e0d971ceb1112c76977ca16427c3631c664340efc58c331cf9ee
diff --git a/media-video/gnome-mplayer/gnome-mplayer-0.9.5-r2.ebuild b/media-video/gnome-mplayer/gnome-mplayer-0.9.5-r2.ebuild
new file mode 100644
index 000000000000..ef6ab223226a
--- /dev/null
+++ b/media-video/gnome-mplayer/gnome-mplayer-0.9.5-r2.ebuild
@@ -0,0 +1,55 @@
+# 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.5-r2.ebuild,v 1.1 2009/06/01 01:52:23 yngwin Exp $
+
+EAPI="2"
+GCONF_DEBUG=no
+inherit gnome2 eutils
+
+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="~amd64 ~ppc ~x86"
+IUSE="+alsa gnome ipod +libnotify musicbrainz"
+
+RDEPEND="dev-libs/glib:2
+	>=x11-libs/gtk+-2.12:2
+	dev-libs/dbus-glib
+	media-video/mplayer[ass]
+	alsa? ( media-libs/alsa-lib )
+	gnome? ( gnome-base/gconf:2
+		gnome-base/gvfs )
+	ipod? ( media-libs/libgpod )
+	libnotify? ( x11-libs/libnotify )
+	musicbrainz? ( net-misc/curl
+		media-libs/musicbrainz:3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+DOCS="ChangeLog README DOCS/keyboard_shortcuts.txt"
+
+PATCHES=( "${FILESDIR}"/${P}-gettext.patch )
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--with-gio
+		$(use_with alsa)
+		$(use_with gnome gconf)
+		$(use_enable gnome schemas-install)
+		$(use_with ipod libgpod)
+		$(use_with libnotify)
+		$(use_with musicbrainz libmusicbrainz3)"
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+	# remove duplicate doc dir
+	rm -rf "${D}"/usr/share/doc/${PN}
+	# remove empty dir
+	rmdir -p "${D}"/var/lib
+}