Move libsoup-gnome blocker to RDEPEND for file collisions reported in bug #468274.

(Portage version: 2.2.0_alpha173_p21/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)

3 files changed, 12 insertions, 7 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 34ead1eba1e4..7503d3675af4 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.306 2013/04/25 19:25:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.307 2013/05/03 00:27:33 zmedico Exp $
+
+  03 May 2013; Zac Medico <zmedico@gentoo.org> libsoup-2.42.1.ebuild,
+  libsoup-2.42.2.ebuild:
+  Move libsoup-gnome blocker to RDEPEND for file collisions reported in bug
+  #468274.
 
 *libsoup-2.42.2 (25 Apr 2013)
 
diff --git a/net-libs/libsoup/libsoup-2.42.1.ebuild b/net-libs/libsoup/libsoup-2.42.1.ebuild
index cbb9fde23a52..0e4c3a8ad7bb 100644
--- a/net-libs/libsoup/libsoup-2.42.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.42.1.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/net-libs/libsoup/libsoup-2.42.1.ebuild,v 1.2 2013/04/18 20:11:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.1.ebuild,v 1.3 2013/05/03 00:27:33 zmedico Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -24,14 +24,14 @@ RDEPEND="
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
+	!net-libs/libsoup-gnome
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
-	!net-libs/libsoup-gnome"
+	virtual/pkgconfig"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
diff --git a/net-libs/libsoup/libsoup-2.42.2.ebuild b/net-libs/libsoup/libsoup-2.42.2.ebuild
index d5427f2fb47a..844cd7ef1801 100644
--- a/net-libs/libsoup/libsoup-2.42.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.42.2.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/net-libs/libsoup/libsoup-2.42.2.ebuild,v 1.1 2013/04/25 19:25:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.2.ebuild,v 1.2 2013/05/03 00:27:33 zmedico Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -24,14 +24,14 @@ RDEPEND="
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
+	!net-libs/libsoup-gnome
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
-	!net-libs/libsoup-gnome"
+	virtual/pkgconfig"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]