From: Tim Harder <radhermit@gentoo.org>
Date: Mon, 10 Oct 2011 17:53:54 +0000 (+0000)
Subject: Block <quvi-0.4.0 due to file collisions (bug #386645).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7c4aefcc68570b575d0157f23ccc88121a9c0c7a;p=gentoo.git

Block <quvi-0.4.0 due to file collisions (bug #386645).

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

diff --git a/media-libs/libquvi/ChangeLog b/media-libs/libquvi/ChangeLog
index 5ab6f909a62f..83fa0ff71136 100644
--- a/media-libs/libquvi/ChangeLog
+++ b/media-libs/libquvi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libquvi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquvi/ChangeLog,v 1.1 2011/10/10 07:32:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquvi/ChangeLog,v 1.2 2011/10/10 17:53:54 radhermit Exp $
+
+  10 Oct 2011; Tim Harder <radhermit@gentoo.org> libquvi-0.4.0.ebuild:
+  Block <quvi-0.4.0 due to file collisions (bug #386645).
 
 *libquvi-0.4.0 (10 Oct 2011)
 
diff --git a/media-libs/libquvi/Manifest b/media-libs/libquvi/Manifest
index 60f19953b994..053b11499197 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA512
 
 DIST libquvi-0.4.0.tar.xz 260920 RMD160 fd9bc356153c6ce864f6a1107e4302c304561841 SHA1 d0a1b452ff47f488b163bad1b201b1e66ca61cc6 SHA256 5edcc66a9bb7125abc32ac30e8c1fb1f657516a86ac03a4495a348098c1a7d56
-EBUILD libquvi-0.4.0.ebuild 860 RMD160 4fe4ce4c2a44449de0d1fd0fc96dba5fb6b19f99 SHA1 ddfdeacf5d58368b5a02fcb714231bd42d7ca7e1 SHA256 19f0e87949bc231a6fadfd9ec2e5e02e7556acc1eb67eb80f5204ebbf9dcf837
-MISC ChangeLog 350 RMD160 9b862a438dcb0c91c698b52b1bf7b0f3c870dd97 SHA1 1c94dd47af02c2942b1b7bf8091276b4bae3a52c SHA256 fc3fd947b5f50376ff155a490ee5cf78f9ab63401199c33f4c043fa54af4a7a9
+EBUILD libquvi-0.4.0.ebuild 885 RMD160 8cada915acbbfc4e78be1c6ad4a769f956d5bb5b SHA1 51bd7455b5e63ccd6e1b0c743548f3e207ee0898 SHA256 65fc9522f8fc40a5e116c35285f0fbd238d839dcefe2fa957f8d5cb8d3a3c23b
+MISC ChangeLog 480 RMD160 45acebe30a5259d3e3f59deeb380945953f9163c SHA1 5f388e1fcdb47ebecbbd336baa9e522baeb999f5 SHA256 9b27696f2a86f670744ab71b989e5876af2f627e07eb621c36cc39cadfce9e86
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOkp+nAAoJEEqz6FtPBkyjTD4IAKo/NFVwNE/P48+0FI2zA0wL
-yDNKApA5K/8alcJ4JdZrcqj/IcDSQw3cftvSJOCrjDPMBhsdKpCXFIZSCLUO3u1x
-PVubhUInaqI10DH5quqAAPrWJpOlD56Vtlakfa5y4DXCbR9ZqoIhC5MEtGYiKJ5r
-ryJT5gGKcQk7vN5J7ogMQsZetQXFn+MNzf8JgXZQ74cIlQohADK+NwgwyMtLPksU
-EHn0MhzQNf0PNfpHlR7FgQQ1w+6bBp2BzJTT2vKGsPYsOJlsHOz7T4+uBKJpCIKx
-/bK+8fho4ACgf0WUwljHLt5hCLS2wNNy76vD1B+jqsTjUg8e/QBSEYolfC4lZho=
-=8VbB
+iQEcBAEBCgAGBQJOkzE7AAoJEEqz6FtPBkyjHmwH/jcUgWSVQyzdG5byAvRGf5Wj
+2QXBC2H9Ns55MWVn/8MTt09l5XrNgKUu9L9srsJn7x2seOpAVTq0gZ7QgBHJIlMh
+tYLq9Wrl317bE4V2ZSSw8+M2Lspmy0C1U8AhuijGrAlC16rAcxZrnGK3Tzauh+64
+435JR4mBGjB+BuhYtFIpCsNqRznK47SvC/QmcWKiamv/r4ZM/cnL0FVOixTTj4c7
+bch0Sz4zV0GDJNAolEKTAuIUTXdjNlCahWOKNImgbVssZPbbk/cXnKgOAmit0BXC
+br8kRck7Bmy4hXVB/nuMqQKChZSztb5Qe1k0WyjGwr62PaNrQ4LZVZUprwUn8lg=
+=x1BO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libquvi/libquvi-0.4.0.ebuild b/media-libs/libquvi/libquvi-0.4.0.ebuild
index bb02e40ee7d9..92b534cd013f 100644
--- a/media-libs/libquvi/libquvi-0.4.0.ebuild
+++ b/media-libs/libquvi/libquvi-0.4.0.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-libs/libquvi/libquvi-0.4.0.ebuild,v 1.1 2011/10/10 07:32:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquvi/libquvi-0.4.0.ebuild,v 1.2 2011/10/10 17:53:54 radhermit Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples static-libs"
 
 RDEPEND=">=net-misc/curl-7.18.2
+	!<media-libs/quvi-0.4.0
 	>=media-libs/libquvi-scripts-0.4.0
 	>=dev-lang/lua-5.1[deprecated]"
 DEPEND="${RDEPEND}