Fix for file collitions with apbs
authorJustin Lecher <jlec@gentoo.org>
Thu, 5 Jan 2012 18:58:00 +0000 (18:58 +0000)
committerJustin Lecher <jlec@gentoo.org>
Thu, 5 Jan 2012 18:58:00 +0000 (18:58 +0000)
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

sci-libs/gts/ChangeLog
sci-libs/gts/Manifest
sci-libs/gts/gts-20100321-r1.ebuild
sci-libs/gts/gts-20100321-r2.ebuild
sci-libs/gts/gts-20100321-r3.ebuild

index 67ad4fe108359fb339fc83801c0dbb8cd57c0069..b9e92c1dd3c76ee3b5d25e578908bd160ea673b9 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.19 2012/01/04 17:35:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.20 2012/01/05 18:58:00 jlec Exp $
+
+  05 Jan 2012; Justin Lecher <jlec@gentoo.org> gts-20100321-r1.ebuild,
+  gts-20100321-r2.ebuild, gts-20100321-r3.ebuild:
+  Fix for file collitions with apbs
 
 *gts-20100321-r3 (04 Jan 2012)
 
index e317fd315b27c6028e7f266f272090e4744a73d6..dd3cbcf60d3e70edda67c761e9bd70783cef0efc 100644 (file)
@@ -5,15 +5,15 @@ AUX gts-0.7.6-include-fix.patch 1250 RMD160 6b804f6545e9441462c07d08de189de809a6
 AUX gts-20090909-examples.patch 457 RMD160 92f3586efcc3fd6b6215088aca4116bc34dc0b68 SHA1 e7008406d41377e832aa73618cdef04f97df6cd3 SHA256 224c7f54e070727d761309c445ffaf4e2b50ea7d405964da5c060d6052a5a02a
 AUX gts-20100321-examples.patch 472 RMD160 69737f927247c69849adff2cc9ac175f09d1178d SHA1 50acbc11281661ebf5488ed13b9acc6e6705e0db SHA256 e164f7eb970675b3333f709fc1a0a1225b0a6f7a16503fe9a2e3aac023826be7
 DIST gts-20100321.tar.gz 876320 RMD160 4ab3d3642408c57f213a186c823e9b4da4acf147 SHA1 02948e5c5db0574612cd3323662bd7a6966be53d SHA256 4b7fc999c3693c9dcc6dec444edc839c794cc1708ec0f13b6d0e2b9913b00e9f
-EBUILD gts-20100321-r1.ebuild 1205 RMD160 1fa28e1e41d83f72693acf6bf1a3b855755df888 SHA1 a440d7fbce4625a52afee2438d048ec7d1be87e8 SHA256 bc6f87c8dd4c39b49e3368420f6896e0c2f79f1a00ee79f534627bc9ec62b273
-EBUILD gts-20100321-r2.ebuild 1230 RMD160 0336b4fcf189e51524a69258b69ce1564656aa72 SHA1 48fe443d1504194f2b81de1c4658f4a6663ea15a SHA256 d690d3db95b0434e9cade12687ca7c65ea6dafeb803ebd904a0bf648e3ecb671
-EBUILD gts-20100321-r3.ebuild 1242 RMD160 29205782421840d9dba606a7f7d1c287abfcac8d SHA1 102159fcf29ae367e7e324004cc2d1ab83b38655 SHA256 9a2e63961d8d521b4618e96ca0072066aef7b51fff15aea2b618624ed9575805
-MISC ChangeLog 3173 RMD160 5acff3f93862b0f5ad78bd2ed535c3dd5d5f71aa SHA1 c8d7e8dacbac218b53aef1980af185ceb676500d SHA256 c92e503f8beb0890fb87c22ea681744084faeebc2a58e2abb32f2c37c6fc1a2e
+EBUILD gts-20100321-r1.ebuild 1215 RMD160 4b2f4a523815fbb2110cccc8233e993a76b6a7fe SHA1 cf2719e7957973bf4178b64e54f902fda38a7f42 SHA256 62db2ea8c507a4cef7cfe32edc5ea40072a199489e5f92b7c3288c636b527f20
+EBUILD gts-20100321-r2.ebuild 1240 RMD160 45b9f7ba352fdc0954988b3ac77f2fcdc21dbdb9 SHA1 3877a84746873a7e5cafbd0edd502b495e6a2e8c SHA256 c77abcd1ca5a9c750bc06b4f1601aed1af13325e32f96f31f11df6a8fd437304
+EBUILD gts-20100321-r3.ebuild 1243 RMD160 35ed50cd614918161b86b46d2971c0b3d62c118d SHA1 5ce6acb4dfafcf91db5a5d58645c8fe50fc7036c SHA256 6f0a5cd77a3f563400fc90e45fb65bb9c066c46fec7f1b209dd05db5445270d3
+MISC ChangeLog 3331 RMD160 a2205e54425b5db7f9064a95858c5ae8b470a3b1 SHA1 8630063edff1c839a8c1a9510b23b92adebeebc7 SHA256 96e536af039e24b6e01fef8ca312f8d79cea4850922fcf7bf188ffc7dfe69bbf
 MISC metadata.xml 328 RMD160 d0476ceb89877a7b1caa94159d442491e77118aa SHA1 78d18dcf9f1d970b161349902da034bca29ce293 SHA256 c65b1015ca27352fcf00d50fe76741a584e7af13f8d7bce3bf087c910b08006a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8EjeAACgkQgAnW8HDreRZcGgCgpaPlelQ2BIbrTTFmbb3suHjo
-syQAoMwmEr8tTHVGM+LaNU1vZ/tUJEva
-=6b4z
+iEYEAREKAAYFAk8F8sUACgkQgAnW8HDreRbV9gCcCTXu0SzADBZrhAeRcCCa/0ZL
+kGsAnj+KT+X3Gyh/CVGdAIIGShRB3ylv
+=DWG2
 -----END PGP SIGNATURE-----
index 70c77e92ddfb10df6e21beedbb73ff67205bb84c..468e0af8feb29aad4062f29ac8c3197702ee2282 100644 (file)
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r1.ebuild,v 1.5 2012/01/04 17:35:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r1.ebuild,v 1.6 2012/01/05 18:58:00 jlec Exp $
 
 EAPI=2
+
 inherit eutils fortran-2 autotools
 
 DESCRIPTION="GNU Triangulated Surface Library"
-LICENSE="LGPL-2"
 HOMEPAGE="http://gts.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples test"
 
@@ -19,7 +20,7 @@ RDEPEND="
 
        dev-libs/glib:2
        !dev-vcs/rcs
-       !sci-chemistry/apbs[tools]
+       !<=sci-chemistry/apbs-1.3-r1[tools]
        !<=sci-chemistry/ccp4-apps-6.1.3-r2"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
index e78fd7c317ca5030953992b5298dcfb42776dad8..54bd6719f3070a731bf0754885a23d036837fe41 100644 (file)
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r2.ebuild,v 1.4 2012/01/04 17:35:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r2.ebuild,v 1.5 2012/01/05 18:58:00 jlec Exp $
 
 EAPI=2
+
 inherit eutils fortran-2 autotools
 
 DESCRIPTION="GNU Triangulated Surface Library"
-LICENSE="LGPL-2"
 HOMEPAGE="http://gts.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples test"
 
@@ -18,7 +19,7 @@ RDEPEND="
        virtual/fortran
 
        dev-libs/glib:2
-       !sci-chemistry/apbs[tools]
+       !<=sci-chemistry/apbs-1.3-r1[tools]
        !<=sci-chemistry/ccp4-apps-6.1.3-r2"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
index d6611729644852f13338b08d18463f28ddb6611d..cdcb4f83343ed8b00c029f4d25b3b393dc603330 100644 (file)
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r3.ebuild,v 1.1 2012/01/04 17:35:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r3.ebuild,v 1.2 2012/01/05 18:58:00 jlec Exp $
 
 EAPI=2
+
 inherit eutils fortran-2 autotools
 
 DESCRIPTION="GNU Triangulated Surface Library"
-LICENSE="LGPL-2"
 HOMEPAGE="http://gts.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples test"