Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702)

(Portage version: 2.1.11.58/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)

5 files changed, 15 insertions, 15 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 9877553fb977..d446e173d8eb 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.239 2013/02/02 22:58:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.240 2013/03/31 19:02:20 pacho Exp $
+
+  31 Mar 2013; Pacho Ramos <pacho@gentoo.org> rhythmbox-0.12.8-r1.ebuild,
+  rhythmbox-0.13.3.ebuild, rhythmbox-2.97.ebuild, rhythmbox-2.98.ebuild:
+  Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702)
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> rhythmbox-2.97.ebuild,
   rhythmbox-2.98.ebuild:
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
index 8bf361f096a3..92c97c231410 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.26 2012/12/20 15:58:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.27 2013/03/31 19:02:20 pacho Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -27,8 +27,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	>=gnome-base/gconf-2:2
 	>=gnome-extra/gnome-media-2.14
 	<gnome-extra/gnome-media-2.90
-	>=net-libs/libsoup-2.26:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 )
 
 	>=media-libs/gst-plugins-base-0.10.20:0.10
 	|| (
diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
index 857ae338bd10..4585186f64a8 100644
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.14 2012/12/20 15:58:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.15 2013/03/31 19:02:20 pacho Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -25,8 +25,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2
 	>=gnome-base/gconf-2
 	>=gnome-extra/gnome-media-2.14
 	<gnome-extra/gnome-media-2.91
-	>=net-libs/libsoup-2.26:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 )
 
 	>=media-libs/gst-plugins-base-0.10.20:0.10
 	|| (
diff --git a/media-sound/rhythmbox/rhythmbox-2.97.ebuild b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
index 896602e81a69..8acfe2f75fa9 100644
--- a/media-sound/rhythmbox/rhythmbox-2.97.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.16 2013/02/02 22:58:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.17 2013/03/31 19:02:20 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -35,8 +35,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=dev-libs/gobject-introspection-0.10.0
 	>=dev-libs/libpeas-0.7.3[gtk,python?]
 	>=dev-libs/totem-pl-parser-2.32.1
-	>=net-libs/libsoup-2.26:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 )
 	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection]
 	>=media-libs/gstreamer-0.10.32:0.10[introspection]
 	>=sys-libs/tdb-1.2.6
diff --git a/media-sound/rhythmbox/rhythmbox-2.98.ebuild b/media-sound/rhythmbox/rhythmbox-2.98.ebuild
index d1739f95ae40..a95a0f932852 100644
--- a/media-sound/rhythmbox/rhythmbox-2.98.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.98.ebuild,v 1.10 2013/02/02 22:58:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.98.ebuild,v 1.11 2013/03/31 19:02:20 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -36,8 +36,7 @@ COMMON_DEPEND="
 	>=dev-libs/gobject-introspection-0.10.0
 	>=dev-libs/libpeas-0.7.3[gtk,python?]
 	>=dev-libs/totem-pl-parser-3.2
-	>=net-libs/libsoup-2.26:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 )
 	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection]
 	>=media-libs/gstreamer-0.10.32:0.10[introspection]
 	>=sys-libs/tdb-1.2.6