Fix missing gnome-base/dconf RDEPEND wrt #383729 by "Faustus"

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index b3ef62433ac85778a4de19844fcd377fab752bb8..4f3524f67dc7b84f8ed3ff76b94c0b0b2d28c2f4 100644 (file)
--- 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/Manifest b/media-video/gnome-mplayer/Manifest
index 63132517295ccf183266959a0ea0b26cba6f5e1b..a9f2b6aa99e70e7cc5b69ed4c47088bb6b028cbb 100644 (file)
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gnome-mplayer-1.0.0-libnotify-0.7.patch 1091 RMD160 701b3bc3e5e103ba2e32f3185a4ce4a4b5e8ef0d SHA1 b42a416fa332ab144081fafeb12c003a43805745 SHA256 e18662cb267fdb12c30af59be49e83ef7b0b1bbdbc6b9a990a2369dfa363ee86
 AUX gnome-mplayer-1.0.4-noalsa.patch 548 RMD160 74ae3582c87d52fe2ae04a02e6625ed71edc0678 SHA1 1f030882a5a53fda07567c0a91fb0c9c0a3f4f6d SHA256 5ff4bcbd2af09c2c80dbf15d48da13fa80ebec411238ef2490fbf5ec22ac0ba9
@@ -8,13 +8,17 @@ DIST gnome-mplayer-1.0.3.tar.gz 1016907 RMD160 f8bd3a0c35f7362dcf1052612b49726e5
 DIST gnome-mplayer-1.0.4.tar.gz 1069389 RMD160 d2c42caa22b66b94e98d72b8c53074aa61e8485c SHA1 15c329573692e97bb550063854ddc6404309b265 SHA256 e2f6e20e983f520512d2f13f343566f2afb8cd7296c0a27e3f95b5b635bdbecc
 EBUILD gnome-mplayer-1.0.0.ebuild 1771 RMD160 8c6d2c8900008492ddb1f760eb2bb3526ca88b7f SHA1 a93345c185fde28e1c876b198797df2f0553f57c SHA256 b542174a84d7f6518518ca4ee0a65babc04d55bfc24fd0ff52b8a79d97894ec8
 EBUILD gnome-mplayer-1.0.3-r2.ebuild 2028 RMD160 c526f7960cbeef2d298800a0270ebfd561c10e47 SHA1 d5659fa7af299ccb1469e1d9498e4aa8f2651ac5 SHA256 7691841ab0d962f26b40c30d676c3ff54fdb0681efa0470cb4b22e06795cb96d
-EBUILD gnome-mplayer-1.0.4.ebuild 2120 RMD160 da750fde0f5ccca703fb67b58c642ab8bf1658cf SHA1 d6b27ab7faf36eab481c182dd92d6fb7f94b2b33 SHA256 bf73b96b007022cdd6c3cac570b19b7816f536d01198b08ebef8221f19525afd
-MISC ChangeLog 8846 RMD160 5208e73d1119a2bb7392896d061731e486d490e9 SHA1 8b7b18ab5869a5a08a81be10b8a5d3b996cac7bf SHA256 4c7797e016bdb54e9f8e46f5a24b27323e9a25ebf521c587f2455f765ed7da4c
+EBUILD gnome-mplayer-1.0.4.ebuild 2184 RMD160 b50fcb7a30e27df0e75adad7c01070c0434261f7 SHA1 a6421162b3ee348f3ee952d605613d4c64bfb53a SHA256 1d116b382631fcdc1c8fa46e628abd92cf1dbee61ece7bf88b4bf0f85c4a0b1c
+MISC ChangeLog 8999 RMD160 3251084de91df171244d5011d365da84d77159b9 SHA1 f976cc2be7c3dbd37efa60c811b6a12c363f5358 SHA256 47d6a53cee9a7ab58982e757a7fc1ac058888325c9afda2ab9a7cffad3fab1a3
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4cYh8ACgkQodBTJSDyo66R4gD+NFRjZv1CLIh+QAzb70txAK21
-TUMVGx7XYQLdBz5M3/YA/06H6iNpisvArI20QR5UR0/unPlcqLoEggxdEWowvhtr
-=KbNQ
+iQEcBAEBAgAGBQJOgctwAAoJEEdUh39IaPFNZAMH/jMFuKIjmDTqOGQvppDtjiac
+f3+QSRgdwV17FhsAUO1Q592VPF6dkMHwnclpdDl2RdcCDsnwsI1GP1P2DDjfOYAJ
+c0u1K0Tb/rqBBJNLKwtKUcRM7rmmv4nKssTsXV1FR3fMjbXs8SovC+aaCzWgkSre
+NhKBsYH9x4YOCxYc2K7ZegjrxwPrpwE7Mv2iriFZGicWWnszdB831I2YrOWFVv1+
+Ve3agLLXa2NMUj+DFeASw7rT/zRo1AYf5xPvOFwolvUJL5XRlpnUEHupVVnaQ/J+
+KuD/sZPWtW9nyKX+7ii7ALRsWeQCj9ExfgezysV+EwptZxAP8lDfIEHactsjyLA=
+=rYPm
 -----END PGP SIGNATURE-----

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 cb1bdc22c895ed82045d716b61ab6eccf735cd8f..3e8c4a090bdc32cbad7d75b1d21c0e00a78c9649 100644 (file)
--- 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"