Block File Collisions

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-office/sc/ChangeLog b/app-office/sc/ChangeLog
index bd949cdd4e5896c328bc3c90e30e61554b9e2469..fd074edd6f0403a954e4c713400c0badd45c2cd0 100644 (file)
--- a/app-office/sc/ChangeLog
+++ b/app-office/sc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/sc
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.21 2008/03/07 23:09:14 cla Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.22 2010/07/03 07:15:19 jlec Exp $
+
+  03 Jul 2010; Justin Lecher <jlec@gentoo.org> sc-7.16-r1.ebuild:
+  Block File Collisions
 
   08 Mar 2008; Dawid Węgliński <cla@gentoo.org> sc-7.16-r1.ebuild:
   Stable on x86 (bug #212456)

diff --git a/app-office/sc/Manifest b/app-office/sc/Manifest
index 0606a3c839259598707046e8cf8684840f9a8352..4447cb4232bc0b390b02d4d1112434f006c084be 100644 (file)
--- a/app-office/sc/Manifest
+++ b/app-office/sc/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sc-7.16-amd64.patch 484 RMD160 d2fb70219f8e8ef1c7bb19b15b3a1edb58680c5c SHA1 97d196e3d1493c61e46f67968504a9452118265c SHA256 0cdc2d63c04e233f0c4b1fba6e2b4acb7008d28f585b2dd44016697026595652
 AUX sc-7.16-lex-syntax.patch 340 RMD160 9d79d5ad664195613f3e806ef96fba7071df9ed7 SHA1 faaaae61b6a43a67b36082c2a1a1367942c8bf7b SHA256 d4d1e066920813b5e5dd69830d9bad0c8ab1a5767799453e5a2cfe5e2ff252d6
 DIST sc-7.16.tar.gz 210809 RMD160 bcaffd292bc3d0868e5be870fee743c6b3294377 SHA1 33c77561fbbecc7fa3cf0d62ce244172edd0de3d SHA256 1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d1765
-EBUILD sc-7.16-r1.ebuild 1411 RMD160 a264eb6cde1ce2f184902aea86c6ccf6df4823d5 SHA1 75fa3ff55113a2887a30f3b9d28148d1901e1cfe SHA256 a03d0c6c0ac7854bb4cbd5a16c7a624c4907c091d7834d7a222ba8003dda4a3b
-MISC ChangeLog 2759 RMD160 6eb9b2f2e03fbebd61b364097d5026cd557db228 SHA1 8d7c975699612d18f47f69581f4d8e758ec5dfa3 SHA256 4ffcf3ff59501bbac81fc3427d63b1a543fe7918d8f3e3181ffe2c9c99c252d7
+EBUILD sc-7.16-r1.ebuild 1487 RMD160 a6b350c8f9041fc279947422494f57316829f5d2 SHA1 c22ec7f648fd3553a3197a912124cfdea0bcc469 SHA256 6094df4442d02f987a9ed8ebe1abcedb2b25ee66c32ccc0fcd76dcffc7d37216
+MISC ChangeLog 2851 RMD160 cab26b173562187268475c541ed5686286831721 SHA1 f08774aa2d576913588307ca0632b53e7970407c SHA256 6da30185fb486870d5a9586948cd2a5b607860117d24f384fed99acf70a1b944
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwu444ACgkQgAnW8HDreRYGggCeNf0vqo+aJx7isIwBFS8WLEVD
+Sk0AnRb49kWHQQnlZWMDK2ZJ5YOVXBqe
+=G6mU
+-----END PGP SIGNATURE-----

diff --git a/app-office/sc/sc-7.16-r1.ebuild b/app-office/sc/sc-7.16-r1.ebuild
index 960547f3bfb1c18d63c789a5ab170f9d26d6db33..d9fb05713116f8d50076c78fc135829dbb3d7f8e 100644 (file)
--- a/app-office/sc/sc-7.16-r1.ebuild
+++ b/app-office/sc/sc-7.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v 1.5 2008/03/07 23:09:14 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v 1.6 2010/07/03 07:15:19 jlec Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,7 +14,9 @@ KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2"
-
+RDEPEND="${DEPEND}
+       !dev-lang/stratego
+       !<sci-chemistry/ccp4-apps-6.1.3-r4"
 src_unpack() {
        unpack ${A}
        cd "${S}"