diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-11-07 07:43:30 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-11-07 07:43:30 +0000 |
| commit | b873b4018d988d8145944d24323b846c8d021e04 (patch) | |
| tree | ee1ce3b34cef6484d42456964f06732bfbeb7b04 /media-video/snappy | |
| parent | masked development release version bump (diff) | |
| download | gentoo-2-b873b4018d988d8145944d24323b846c8d021e04.tar.gz gentoo-2-b873b4018d988d8145944d24323b846c8d021e04.tar.bz2 gentoo-2-b873b4018d988d8145944d24323b846c8d021e04.zip | |
Collides with spice-gtk, add a blocker for now with a FIXME so that it doesn't get forgotten.
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'media-video/snappy')
| -rw-r--r-- | media-video/snappy/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/snappy/snappy-0.2.ebuild | 6 | ||||
| -rw-r--r-- | media-video/snappy/snappy-9999.ebuild | 6 |
3 files changed, 14 insertions, 5 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/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" |