Change yacc dep to || ( sys-devel/bison dev-util/yacc ). Thanks to Castagnola Roberto...

Package-Manager: portage-2.1.2_rc4-r3

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 31970dd2576bfd66c7734b898a714a9cc28eca89..84358103b15b7799f50ad427b2f406134074548b 100644 (file)
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.33 2007/01/23 00:12:48 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.34 2007/01/23 20:57:20 masterdriverz Exp $
+
+  23 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  xxdiff-3.2.ebuild:
+  Change yacc dep to || ( sys-devel/bison dev-util/yacc ). Thanks to
+  Castagnola Roberto, bug 163451
 
 *xxdiff-3.2 (23 Jan 2007)
 

diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 6e16e2bcf5073635fa1c2cebfca326b3756a25d7..5ce8eaf038cccf79bc57afdccf41cbe32d30328b 100644 (file)
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -12,14 +12,14 @@ EBUILD xxdiff-3.0.2-r1.ebuild 1547 RMD160 4a05591cb23f8fe2c68831303226db9c42b29b
 MD5 e98e2c40d5cd9527666c4efd50e2dcc3 xxdiff-3.0.2-r1.ebuild 1547
 RMD160 4a05591cb23f8fe2c68831303226db9c42b29be7 xxdiff-3.0.2-r1.ebuild 1547
 SHA256 9e1316b8d4dcf7a79dc4063b4b555a7e86482d0ee6101eef7614ca8fb48d9102 xxdiff-3.0.2-r1.ebuild 1547
-EBUILD xxdiff-3.2.ebuild 1345 RMD160 d8181b0e39608aebd0e72f5ac3511620a1b77c3f SHA1 04aae9af541e5bf860b3ae03f6effddd3c8e3902 SHA256 560d3d2572d184cb040cb873c23de35b46bb90ac63c28397c7d5765730385f80
-MD5 a0410785cfb1033fc8d09b78cbb1c7e9 xxdiff-3.2.ebuild 1345
-RMD160 d8181b0e39608aebd0e72f5ac3511620a1b77c3f xxdiff-3.2.ebuild 1345
-SHA256 560d3d2572d184cb040cb873c23de35b46bb90ac63c28397c7d5765730385f80 xxdiff-3.2.ebuild 1345
-MISC ChangeLog 4534 RMD160 7b458b341abebcc970ea790a150ad9f538099f95 SHA1 3309b10ecdbcd3e45340792b41bda0ff53b06b9e SHA256 1776ca3716d318e3499ea2054235f7200c787f9f374c73b3ee5e4378520ada80
-MD5 ebba7e8a17a1e9be75ee3eaca30c9f83 ChangeLog 4534
-RMD160 7b458b341abebcc970ea790a150ad9f538099f95 ChangeLog 4534
-SHA256 1776ca3716d318e3499ea2054235f7200c787f9f374c73b3ee5e4378520ada80 ChangeLog 4534
+EBUILD xxdiff-3.2.ebuild 1368 RMD160 062fc5e0c11ec5db5650c970f2d40092f7c4ce74 SHA1 43cfd00e40e3edfe5cad4252c44d5107fce8b684 SHA256 b20226b61e701c3ee98334ed83a9b4c3aceef35aa0ecbdc0806521cdafd300f2
+MD5 72c15fa27d488a08cfb03ad99d88b76d xxdiff-3.2.ebuild 1368
+RMD160 062fc5e0c11ec5db5650c970f2d40092f7c4ce74 xxdiff-3.2.ebuild 1368
+SHA256 b20226b61e701c3ee98334ed83a9b4c3aceef35aa0ecbdc0806521cdafd300f2 xxdiff-3.2.ebuild 1368
+MISC ChangeLog 4717 RMD160 21f818c2fafbaea9470f5980160cec26ff8504f4 SHA1 379646d64f8cfb04bbd3e1c839ba4e0a30b69258 SHA256 9560545dc4dfa62e10fb6451d904131d0f621bf1dd49430bc24f754a428cfb73
+MD5 15af202a2fbc93ef1c6fdf0fca89fe53 ChangeLog 4717
+RMD160 21f818c2fafbaea9470f5980160cec26ff8504f4 ChangeLog 4717
+SHA256 9560545dc4dfa62e10fb6451d904131d0f621bf1dd49430bc24f754a428cfb73 ChangeLog 4717
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160

diff --git a/dev-util/xxdiff/xxdiff-3.2.ebuild b/dev-util/xxdiff/xxdiff-3.2.ebuild
index e5ec626d767f2b23dbf6ac84104794fe32f5faa8..09de99e586dc250770fea613081a45484991e776 100644 (file)
--- a/dev-util/xxdiff/xxdiff-3.2.ebuild
+++ b/dev-util/xxdiff/xxdiff-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2.ebuild,v 1.1 2007/01/23 00:12:48 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2.ebuild,v 1.2 2007/01/23 20:57:20 masterdriverz Exp $
 
 inherit distutils eutils kde-functions
 
@@ -16,7 +16,7 @@ IUSE="kde python"
 DEPEND="=x11-libs/qt-3*
        kde? ( >=kde-base/kdelibs-3.1 )
        sys-devel/flex
-       dev-util/yacc"
+       || ( sys-devel/bison dev-util/yacc )"
 RDEPEND="${DEPEND}
        sys-apps/diffutils"