Block sci-libs/gts with USE=tools because of file collision on /usr/bin/smooth, ...

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

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index 33b5d103bbb9912c7327fbf8b199ac8654560f40..f9b4465ddb85df086a7a8ff0fb23e292a2c30db6 100644 (file)
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.52 2011/07/20 16:54:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.53 2011/12/13 14:25:50 jlec Exp $
+
+  13 Dec 2011; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r4.ebuild,
+  apbs-1.3.ebuild, apbs-1.3-r1.ebuild:
+  Block sci-libs/gts with USE=tools because of file collision on
+  /usr/bin/smooth, #387689
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #105599

diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 451bc6a7469c9d32f5c6a1f23b7acd7817d1e9fd..4294982dff28a8e46bfb3dff4014881cee7f75f7 100644 (file)
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX apbs-1.2.0-contrib.patch 382 RMD160 4c0c75e57fb6a0c298606d87785a5b9daa8db457 SHA1 653295c9ff7ac075613dd82ce332b41b0e2ea37e SHA256 0b2a1c518c66de6010954f101c1622cfd570bbfcc4774d98607174e57e67f1b3
 AUX apbs-1.2.0-link.patch 1716 RMD160 904e7123d32f628171aa728a761c9d7fd95e967d SHA1 63265d0c7c636749292d90efe6a989e7e48251b6 SHA256 37faa758d6439f22853aa9d4524e3e8770437d3986e00649a193b0a97f369bba
@@ -19,15 +19,15 @@ AUX apbs-1.3-shared.patch 2888 RMD160 89d7e36f6a361753a178111ce87d01616ccd9864 S
 AUX apbs-1.3-zlib.patch 1231 RMD160 a0278f6883bf045de59aae921072a756495587b9 SHA1 2635e07429e4ad110c347beeaf0cea1f1d279a85 SHA256 77e4752ccd3c466efcadb95c50004c2f62147e9f220d10a871ec7a72d30eb2be
 DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143025b398 SHA1 dc3e6933a987ff9fdf88db510db79b3dacb100d6 SHA256 7d088def1ed7689127eb64014ea44069b9d7bfc995941fe5800ff753d48c87be
 DIST apbs-1.3-source.tar.gz 48625351 RMD160 c075a747dc28f382f3a383a0944a1b20e0c8a9f1 SHA1 1494f36e35f2e4b1a18d4b22516fad4948c6391f SHA256 5fa5b597f7d5a3d9bb55429ec4fefc69e7d0f918d568c3c4a288088c0fde9ef2
-EBUILD apbs-1.2.1b-r4.ebuild 3579 RMD160 2f1b8d4fd9c50f057b2b7e07c1e32f820ca68c00 SHA1 964f517ba628e4f1b4c4fe4e45b18e5e1ab212cb SHA256 b856d41c344abf816461d3b2b2f3faea2fdc9356b59384f206efaf1184ca48f2
-EBUILD apbs-1.3-r1.ebuild 4517 RMD160 d53748119205f228b8fc5b92dcfc3684e9bff9af SHA1 e83b113812e4f38f2353fa77fa31b026bfba0458 SHA256 e1183011aeb3b5ca803be2f8ea7d0897572cfb19bde34b6fd499ecd097bc5a6e
-EBUILD apbs-1.3.ebuild 4332 RMD160 d2d599eee21aa0c6714d47366e82d896c7245ff8 SHA1 27c3fd8a30854595099cd8c42e9aba8f0662f1b6 SHA256 702d58033a291a7d41edf296fd6bae66a34716ceaab608ac338d4153e63ff679
-MISC ChangeLog 8791 RMD160 d713e851c40cb2a553fa820468eed8ef3e5ea818 SHA1 0199e6ef18edc36d86fb388136ebdaa75d230982 SHA256 fa75a45bbf5017f7cf7773439d9e2485b29f13e21bbed55f45b753ace175e682
+EBUILD apbs-1.2.1b-r4.ebuild 3605 RMD160 9cc3a6e31fef129da866bf90f6a6eeb97710a111 SHA1 c8df66903bcaf4e2cd39715112b9b83280513820 SHA256 38dc067d4a8efd351a15d292b3d00424e3782871e1ff8caada78a8ab2772bfac
+EBUILD apbs-1.3-r1.ebuild 4543 RMD160 ad848dd2f7f9f02dc13bbd1ac4b98ccccbb20c8e SHA1 d3140513caa7d5ea77472d560e040a3f38024849 SHA256 04edd7a4849302039b34cbbad5623eeaaf163eb32b20d84fa5253126b85f0f99
+EBUILD apbs-1.3.ebuild 4358 RMD160 c3897181791ca3715ed77f30031af6a811f2beac SHA1 17c656a149e83de4a8158145ded80423f4fe5d3a SHA256 d3683ca49b49838368d70658a0e28b30f6a172de1709983d11a33bd1dc042cde
+MISC ChangeLog 8992 RMD160 f7012914ac84ddd21f6ddd837569aaf16db2cdb1 SHA1 d35a7d688b8442d94cc309b4a1dbe2d5a6287bf6 SHA256 1d10d93f0c21f6656ffe567787e0686d53505ed8f2339652f69a17d569a569c0
 MISC metadata.xml 871 RMD160 e50499e926ad62fc924b5c48f6d6fd56519c7cf7 SHA1 fe5335ee3c033f9f0b336663c4065ba4af3f9c8b SHA256 510d88fd555af07b55320109b1a56718980f6eb9e3569f9c39d88c82268cf56f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4nCGgACgkQCaWpQKGI+9S8KACfUKqRVpqtYATc7eScq7rrONQj
-yo4AoIDLuVHaGRPGyhZGqVudO1uAOHCM
-=e2N2
+iEYEAREKAAYFAk7nYHMACgkQgAnW8HDreRad5ACgmPMNryL1Lsbc/9SdpXJ7wXTi
+NA4AoJDqFHzWfBXSzxAfH4SDSSqqAXbE
+=J17d
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild b/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild
index 00f87514ed8509b148d54613dcb610847a8c4b44..6e12308713ea70d45aa5d314c8d402e4f8b124af 100644 (file)
--- a/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild
+++ b/sci-chemistry/apbs/apbs-1.2.1b-r4.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/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild,v 1.12 2011/07/02 08:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild,v 1.13 2011/12/13 14:25:50 jlec Exp $
 
 EAPI="3"
 
@@ -26,6 +26,7 @@ DEPEND="
        sys-libs/readline
        virtual/fortran
        arpack? ( sci-libs/arpack )
+       tools? ( !sci-libs/gts )
        mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 

diff --git a/sci-chemistry/apbs/apbs-1.3-r1.ebuild b/sci-chemistry/apbs/apbs-1.3-r1.ebuild
index d5ecba804bf2aaef1de0861d98d4cc9044b7fbbc..014b1b0f584939ec03345c6eb7a28c34ae710e71 100644 (file)
--- a/sci-chemistry/apbs/apbs-1.3-r1.ebuild
+++ b/sci-chemistry/apbs/apbs-1.3-r1.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/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.8 2011/07/07 09:29:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.9 2011/12/13 14:25:50 jlec Exp $
 
 EAPI="3"
 
@@ -26,6 +26,7 @@ DEPEND="
        sys-libs/readline
        virtual/fortran
        arpack? ( sci-libs/arpack )
+       tools? ( !sci-libs/gts )
        fetk? (
                sci-libs/fetk
                sci-libs/amd

diff --git a/sci-chemistry/apbs/apbs-1.3.ebuild b/sci-chemistry/apbs/apbs-1.3.ebuild
index 5939b16a69f2599314df5900959b3fd38856d733..4a9602f43de8e738ef124aa61c2b91c18b689f50 100644 (file)
--- a/sci-chemistry/apbs/apbs-1.3.ebuild
+++ b/sci-chemistry/apbs/apbs-1.3.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/sci-chemistry/apbs/apbs-1.3.ebuild,v 1.8 2011/07/02 08:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3.ebuild,v 1.9 2011/12/13 14:25:50 jlec Exp $
 
 EAPI="3"
 
@@ -26,6 +26,7 @@ DEPEND="
        sys-libs/readline
        virtual/fortran
        arpack? ( sci-libs/arpack )
+       tools? ( !sci-libs/gts )
        fetk? (
                sci-libs/fetk
                sci-libs/amd