summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/gnome-mplayer')
-rw-r--r--media-video/gnome-mplayer/ChangeLog6
-rw-r--r--media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild14
2 files changed, 13 insertions, 7 deletions
diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index b3ef62433ac8..4f3524f67dc7 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.61 2011/07/12 15:03:21 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.62 2011/09/27 13:10:22 ssuominen Exp $
+
+ 27 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+ gnome-mplayer-1.0.4.ebuild:
+ Fix missing gnome-base/dconf RDEPEND wrt #383729 by "Faustus"
12 Jul 2011; Thomas Kahle <tomka@gentoo.org> gnome-mplayer-1.0.3-r2.ebuild:
x86 stable per bug 367091
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
index cb1bdc22c895..3e8c4a090bdc 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild,v 1.2 2011/07/08 19:59:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild,v 1.3 2011/09/27 13:10:22 ssuominen Exp $
EAPI=4
inherit eutils fdo-mime gnome2-utils
@@ -14,21 +14,23 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="alsa dbus gnome ipod libnotify musicbrainz pulseaudio"
-RDEPEND=">=dev-libs/glib-2.26:2
- || ( >=media-video/mplayer-1.0_rc4_p20091026-r1[ass] media-video/mplayer2[ass] )
+COMMON_DEPEND=">=dev-libs/glib-2.26:2
x11-libs/gtk+:3
x11-libs/libX11
x11-libs/libXScrnSaver
alsa? ( media-libs/alsa-lib )
dbus? ( >=dev-libs/dbus-glib-0.92 )
- gnome? ( gnome-base/gvfs
- gnome-base/nautilus )
+ gnome? ( gnome-base/nautilus )
ipod? ( >=media-libs/libgpod-0.7 )
libnotify? ( x11-libs/libnotify )
musicbrainz? ( net-misc/curl
>=media-libs/musicbrainz-3 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+ || ( >=media-video/mplayer-1.0_rc4_p20100101[ass] media-video/mplayer2[ass] )
+ gnome-base/dconf
+ gnome? ( gnome-base/gvfs )"
+DEPEND="${COMMON_DEPEND}
dev-util/pkgconfig
sys-devel/gettext"