From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EED6B198005 for ; Tue, 5 Mar 2013 08:34:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6F08E051E; Tue, 5 Mar 2013 08:34:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66503E051E for ; Tue, 5 Mar 2013 08:34:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23C0733DCF4 for ; Tue, 5 Mar 2013 08:34:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B166BE4073 for ; Tue, 5 Mar 2013 08:34:37 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1362472466.9740c173b3b398daa2298f4e4b4d310d6327ba0b.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/ X-VCS-Repository: proj/gnome X-VCS-Files: media-sound/rhythmbox/rhythmbox-9999.ebuild X-VCS-Directories: media-sound/rhythmbox/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 9740c173b3b398daa2298f4e4b4d310d6327ba0b X-VCS-Branch: master Date: Tue, 5 Mar 2013 08:34:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e69feb70-d7ca-495f-8183-a8599c3edc8b X-Archives-Hash: baeb2e7a7a5e6b7f1251ffbfe6c9680d commit: 9740c173b3b398daa2298f4e4b4d310d6327ba0b Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Mar 5 08:34:26 2013 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Mar 5 08:34:26 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9740c173 media-sound/rhythmbox: Pull in webkit-gtk-1.10 for gstreamer-1.0 Otherwise, we get symbol collisions --- media-sound/rhythmbox/rhythmbox-9999.ebuild | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild index b66fd8d..c7fc2d4 100644 --- a/media-sound/rhythmbox/rhythmbox-9999.ebuild +++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild @@ -33,6 +33,7 @@ REQUIRED_USE=" webkit? ( python )" # FIXME: double check what to do with fm-radio plugin +# webkit-gtk-1.10 is needed because it uses gstreamer-1.0 COMMON_DEPEND=">=dev-libs/glib-2.32.0:2 dev-libs/json-glib >=dev-libs/libxml2-2.7.8:2 @@ -59,7 +60,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32.0:2 >=net-dns/avahi-0.6 media-plugins/gst-plugins-soup:1.0 ) keyring? ( >=app-crypt/libsecret-0.14 ) - html? ( >=net-libs/webkit-gtk-1.3.9:3 ) + html? ( >=net-libs/webkit-gtk-1.10:3 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( >=dev-python/pygobject-3.0:3 ) @@ -90,7 +91,7 @@ RDEPEND="${COMMON_DEPEND} keyring? ( >=app-crypt/libsecret-0.14[introspection] ) webkit? ( dev-python/mako - >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) + >=net-libs/webkit-gtk-1.10:3[introspection] ) ) " # gtk-doc-am needed for eautoreconf # dev-util/gtk-doc-am