Collides with spice-gtk, add a blocker for now with a FIXME so that it doesn't get forgotten.

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

4 files changed, 32 insertions, 15 deletions

diff --git a/media-video/snappy/ChangeLog b/media-video/snappy/ChangeLog
index 294feaf6174a..2fa5ea9f301d 100644
--- a/media-video/snappy/ChangeLog
+++ b/media-video/snappy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/snappy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/ChangeLog,v 1.4 2011/09/21 09:01:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/ChangeLog,v 1.5 2011/11/07 07:43:30 nirbheek Exp $
+
+  07 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org> snappy-0.2.ebuild,
+  snappy-9999.ebuild:
+  Collides with spice-gtk, add a blocker for now with a FIXME so that it
+  doesn't get forgotten.
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> snappy-9999.ebuild:
   Migrate to git-2.
diff --git a/media-video/snappy/Manifest b/media-video/snappy/Manifest
index 80c4abbd6133..32b0e7b7c61a 100644
--- a/media-video/snappy/Manifest
+++ b/media-video/snappy/Manifest
@@ -1,17 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST snappy-0.2.tar.xz 375180 RMD160 70adc40d08eac4e03b4203cde0652ae46434e25a SHA1 5210c45a6a1c45433dd6df21b3e81d969feb777c SHA256 e492e4daf57f779d696a387f5835ad181757a3b84b0dc9ac25009f0899021be2
-EBUILD snappy-0.2.ebuild 1128 RMD160 bda6a02b05c57ea1538588c8e7af0ae03f467654 SHA1 62bee28751921134ee68d477a88a684e320d98a2 SHA256 60a781a67fa375c10e70570b0247cbe163d8d9f69a6a9c6a5af18829fe11390c
-EBUILD snappy-9999.ebuild 1187 RMD160 51e230572e7fb7adb65dc459c5fdd6cafa609a60 SHA1 c6514a1cd3499fad25689fb4c7607030a3007325 SHA256 7e1e46ea145683318edd6b37e8d89f8f17bfbe2fc7827025e6dd097fc2d94505
-MISC ChangeLog 809 RMD160 340950ec8a8bc0b362a0b8ab5263c1ae3251184a SHA1 06c9e5fba9b6368f64197c2c0f8594a43a20965d SHA256 7df862c3f29878a4c505daabb1e51fcccad2f2309ed00175f9d6ebf39c488e91
+EBUILD snappy-0.2.ebuild 1194 RMD160 5f3e39471772cf6b6c4ff1e32f7bf034deaa610a SHA1 6afd70fba6d19efad9c97bd47ed9dffc6cde085e SHA256 3a4cf85c16780ea0ef79e66a716c6f603c14d4fe1c7588bfc62eee4d727a1b33
+EBUILD snappy-9999.ebuild 1255 RMD160 939cee43743eb3e2cca41805bd80c9f0a632a36d SHA1 30702a9e7c07acf5a9c6464e7dda029916c6d480 SHA256 18f0e834a4c8ad03ae71a4ed089ec170ebd092f542afd9c903148ac25cf8bec3
+MISC ChangeLog 1005 RMD160 cbe398d7a51923425f44d934c5b1ed4a850a0197 SHA1 a61804dcc6de0cc0a897fb105e7be448095e75a9 SHA256 d8d7b06c12df8502245a7cf5382c83d4810fa0fc3550398fa7b2b877d9c62b34
 MISC metadata.xml 388 RMD160 8b640fbb53972a940b520e18eea10aa118ef6d93 SHA1 e2191249dc70ce99dc068fa2c2af66222fe12908 SHA256 a5712ae5b79e292fd80251642cedf75df402e95fa13062028ad4c51f77646531
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk55qHAACgkQfXuS5UK5QB25cQQAoID55OiOEAQm2X8BFjaCUsbF
-i7ovYc6TEMMA2/HxFD0tVsii3Ntl6qkJryje/yhnPtIdJ8HXJl/fgEeUf5iMEmYW
-/Cg9t0qo+Op/FWRTvGzi6qpFbKDc222YSfXEnryAZdetPwgMytNpAoaeZEUtLvsi
-iECRWgTOL9896ZXe5KA=
-=Gpyj
+iQIcBAEBAgAGBQJOt4wmAAoJEO/kOhxWD91kLJAP/0jPqsAd3Bj4gs9gRbuDP7v6
+8YyamxV8pD/DmvLzFgUre5lYsFaDNQSJBKbYr11n8uLmGLawHrraEwTK1lM1LWZc
+z2qiNLTRiIzLqtp1HuNpIloDr+FtFasLYpJcZocXuepjFM44AFafBb6Psdq8pW9N
+GsvTe/8MbKu6yiZ6O2mqTmzoUrFvKdMt93bUmork8s3aUjc8UUMuKOxEyhzuKPcy
+arFC2lPwkLJAyZvBf2lwcfSaW9fY53FiUR7x2KyIYhCOBlGu/jrnsTj3Tx1BDX5R
+lJV5F6ZBC+FTINb+K6G6JMpUFRai0HsbBuNwL5ht2+gt3IR9umO6NBp1mresjlk8
+cpZXzgwd4Wc+1VJZW2Aa6i+UweMyHQi6AZkQD6SLBCy1psRHiK/WA71+61LrL50v
+N1mCbj//BcPeaOjJVqNGBNI2kEaZTjZGZy4fUrGaXWheTKTgpdSR+2tIypdFWr4W
+Y9Y7o65W/o9jvgb8tAgr+QjUZtyRN/5JqNtDWh4HHgeUgpHqDG8KgV/QCDbvdgJx
+zCAwCnnyz3Jugcf/ghE3ZNW+VUrHcl59KL0UMADyDGpTE89f6S+rVpXe+nPPRDz0
+2XrORG8y/s4Ymr9col4apgITZX1T48ozhc0QykBs0ptJSb1mwGQ1w6iUIvYNoZ/f
+G4+/BO5lRnZ8Ig+o5F7c
+=Mznv
 -----END PGP SIGNATURE-----
diff --git a/media-video/snappy/snappy-0.2.ebuild b/media-video/snappy/snappy-0.2.ebuild
index 3a5415b7eeb4..c6d6f079dba8 100644
--- a/media-video/snappy/snappy-0.2.ebuild
+++ b/media-video/snappy/snappy-0.2.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/snappy/snappy-0.2.ebuild,v 1.1 2011/06/20 16:31:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/snappy-0.2.ebuild,v 1.2 2011/11/07 07:43:30 nirbheek Exp $
 
 EAPI="4"
 
@@ -32,7 +32,9 @@ RDEPEND=">=dev-libs/glib-2.26:2
 	>=media-libs/gstreamer-0.10.30:0.10
 	>=media-libs/gst-plugins-base-0.10.30:0.10
 
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10"
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+
+	!!net-misc/spice-gtk" # FIXME: File collision -- /usr/bin/snappy
 DEPEND="${RDEPEND}"
 
 # Re-add ToDo, docs/ for next release
diff --git a/media-video/snappy/snappy-9999.ebuild b/media-video/snappy/snappy-9999.ebuild
index 9b5754171e6f..ea93c15f3d76 100644
--- a/media-video/snappy/snappy-9999.ebuild
+++ b/media-video/snappy/snappy-9999.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/snappy/snappy-9999.ebuild,v 1.3 2011/09/21 09:01:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/snappy/snappy-9999.ebuild,v 1.4 2011/11/07 07:43:30 nirbheek Exp $
 
 EAPI="4"
 
@@ -33,7 +33,9 @@ RDEPEND=">=dev-libs/glib-2.26:2
 	>=media-libs/gstreamer-0.10.30:0.10
 	>=media-libs/gst-plugins-base-0.10.30:0.10
 
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10"
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+
+	!!net-misc/spice-gtk" # FIXME: File collision -- /usr/bin/snappy
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS README THANKS ToDo docs/clutter_controls_layout docs/keyboard_controls"