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

Package-Manager: portage-2.2.0_alpha173_p21/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 18 insertions, 13 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/Manifest b/net-libs/libsoup/Manifest
index 4cd339651818..c19266f51a15 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -8,14 +8,14 @@ DIST libsoup-2.42.1.tar.xz 732228 SHA256 20bd5365bb3e7de70fade91ac82c9dea3163631
 DIST libsoup-2.42.2.tar.xz 732296 SHA256 1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf SHA512 c0ba6bf6091f8efd75ebca317bde5af58e9ea81f42cccea74a1e009572f80ffd2cc8b3d07e62c657c4475152772a639eec8ca5178b9c26f4a33544c1a73d40e3 WHIRLPOOL 4a67b31b35d4697df9a25dda92d52d341aad735e16c13c34a2a3b2942ea147cb2edc42b52f010421a188cd6760ba13d98e4307023245230c303e4fcae31e8e5d
 EBUILD libsoup-2.38.1.ebuild 1995 SHA256 b03f25e36298ebdb5d576ec2b068e0748b6d7584e4d8886cada0b613cc59dd61 SHA512 2914117d4494a8f34b42ae2483028b84d90d9e1c5c84789a094d548b79463e5736fef2070e16734bbf624afb53845261340fbc5c9d7da8ee420266f1698294a5 WHIRLPOOL 8d8dd7c571ed9ccd0121007ce6da55b688b04afa1379b34dea1f4439b26dd3177eba8d1b9a56d6c00a01be79175b2963f95f93f34066b985ca4b805774936d32
 EBUILD libsoup-2.40.3.ebuild 2074 SHA256 b6c9bf8ab156fb21abedbce06921a67c1777dbe86fc3068cc85a1faeb3bb33cc SHA512 c41527a1852dc0263ffcee47b196b383c235bb338fafb65ed79dade940a7e45c749f619b066eda7f3f71503dc9095187b07ec3530cf89ad6c3345f75c35066a7 WHIRLPOOL 611c2a7895e06204f1df2a32237a3b9dd609ae44b90f4f12005f3f5980b2b70c2b7426820403a19378998287ec27b167b0a265b31a5ed5e238ed3f10c05b3a08
-EBUILD libsoup-2.42.1.ebuild 2242 SHA256 3115e6a51483fff1286cb643e0cf5fd4e0112a9099f92d41248d0ae1e64fa511 SHA512 ebf610958616e2a9c44fb464e79908b02ecdc6b05f315b416724a1b814c021c3a6ebfc19b814100d5dcf94663f74596a011f5f5bc27b6d73b6611f2441c31775 WHIRLPOOL 17bf9ad427215d0b3dd4de11bcb603f39b93ce1a2dc08c65bcb2aa700d2f24c293b2bc8e8abd35e44a942e5a2a8f297338a31b9af3cd85b0a014a2c26afe5dd1
-EBUILD libsoup-2.42.2.ebuild 2126 SHA256 6996f377051f5aa681b69355e237e585917b8b3a511635cd94e19be7dce86d5d SHA512 2e80a81900395a44c0ff6c558b71305e4621c6ba0f9e07e32196f5902b130b18fcce2e1805d8eee32e508619a404d94c9c2dbdceb530bddff244f25a8e6da8b1 WHIRLPOOL 4b71511db00f28fa6584d49441fef8621c9d4c94bd2a1753e70295bb322392d982a22951bd4f5cea4fb6e324afe9e45e058d7d70d6dfc1b360620b53a3799d2c
-MISC ChangeLog 40686 SHA256 bca29bd45debb6791ac24fcd897a4664e2a9643519277068b61a1d72216c95ff SHA512 e3975bbc0e386da437cb950bc868935c3f6cfaf5e37b0bf838e9e606e3feac49dd2bc066f43b2ebd1d3ab35ae43abbbacd8ff2caf81d23c2f13a7b67b89ecc49 WHIRLPOOL 050593f49dcadc9c5d94338a05431c1e55ff0aa98a632a94104598ac8b9b55cbb84b8e8e382594ef50362f72fa2952df5dbd56bf0eef234325db77b98fda3871
+EBUILD libsoup-2.42.1.ebuild 2244 SHA256 d55ba43494cfa30cf416237781bebced54b7b6bedd6eaf05a04d1edcad243b14 SHA512 27676cef4ff8f66240ee67ffb3181125c41b8aef92107bc2c6163aabf62c813497adffda5f949c721e24ae36b3f62193a5d793381750529b2271e62161e14eb3 WHIRLPOOL 52519f91448be8f900e2ab6cc7f6c1af057d7ac8c288acd77bf20c1ebf5dc2fda3d6e0b2c797ce50f979d52e37b10b519150130d3185bc4c081f655271c202e0
+EBUILD libsoup-2.42.2.ebuild 2128 SHA256 287ab6659a507ae8ad4c8910817e97e16ec37877b62e71b154adc983eeced728 SHA512 402fc94e21b5d578fd7df9232c2fe8e43cdb6976066195cf1e155d0aacf15e47bb67036b98aeb290254dfa85ddfd316ab6c7f45f49947641a15169cac92ad21b WHIRLPOOL 337e0a869912ad78fe5ae3ccac55fc8f0e2741993e13656d738426a1dc780abb4035e67728c0e68989dc671851d8af724faab7a8dc28bd1d76907c9bae82f31c
+MISC ChangeLog 40871 SHA256 69af4b82acf46be0b473dadae861af4eeb08ee1ddcb00472df667569cf3d32cf SHA512 293c99be3d1bf9b7af8118e936eaab98a766300bc926f82189d96516f6088884a9487d641a6be1e39edafc1c5e14e2f358f6e1455565929fb4ae029c8fd81d12 WHIRLPOOL ef3bc23ce8c669e17756c7053939e420c18071225f064b505a4aadabea459e5964d678b605de04aff8f928a3e4a278644d5142593db235dff3c8f3ad57ca1eaf
 MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF5gxkACgkQCaWpQKGI+9SRkgCfSqGAU7XnJurE7yWotdjWGHDr
-M50AnjdrOUn+Mj+mckonlNHTsoU5+Tez
-=sWai
+iEYEAREIAAYFAlGDBHgACgkQ/ejvha5XGaOjRQCgxkgWMvqxXJbb2hKSadQULXQD
+CakAoLw2oT8aSb2YkqekkFHx6dC8D72l
+=5Gnc
 -----END PGP SIGNATURE-----
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]