From 4c63268cee109e3ecadbfab81046125b5f926b06 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 4 Jan 2012 17:35:17 +0000 Subject: [PATCH] Block sci-chemistry/apbs[tools] or rename smooth to gts-smooth, dropp old Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- sci-libs/gts/ChangeLog | 11 ++++- sci-libs/gts/Manifest | 23 ++++----- sci-libs/gts/gts-20081607.ebuild | 48 ------------------- sci-libs/gts/gts-20100321-r1.ebuild | 5 +- sci-libs/gts/gts-20100321-r2.ebuild | 5 +- ...20090909.ebuild => gts-20100321-r3.ebuild} | 17 ++++--- sci-libs/gts/metadata.xml | 4 +- 7 files changed, 38 insertions(+), 75 deletions(-) delete mode 100644 sci-libs/gts/gts-20081607.ebuild rename sci-libs/gts/{gts-20090909.ebuild => gts-20100321-r3.ebuild} (64%) diff --git a/sci-libs/gts/ChangeLog b/sci-libs/gts/ChangeLog index 79f569040b43..67ad4fe10835 100644 --- a/sci-libs/gts/ChangeLog +++ b/sci-libs/gts/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/gts -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.18 2011/07/20 16:59:45 pacho Exp $ +# 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 $ + +*gts-20100321-r3 (04 Jan 2012) + + 04 Jan 2012; Justin Lecher -gts-20081607.ebuild, + -gts-20090909.ebuild, gts-20100321-r1.ebuild, gts-20100321-r2.ebuild, + +gts-20100321-r3.ebuild, metadata.xml: + Block sci-chemistry/apbs[tools] or rename smooth to gts-smooth, dropp old 20 Jul 2011; Pacho Ramos metadata.xml: Drop maintainer due retirement, bug #105599 diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest index eec31615234e..e317fd315b27 100644 --- a/sci-libs/gts/Manifest +++ b/sci-libs/gts/Manifest @@ -1,22 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX gts-0.7.6-include-fix.patch 1250 RMD160 6b804f6545e9441462c07d08de189de809a6206f SHA1 06e4aba9302c764b8bdb4cc14390e52a4e4345e7 SHA256 42f0cbe9f43d0a8605febd2b83a5e5fe08b2e2dfd6edf0a30f767c60e312ce50 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-20081607.tar.gz 861366 RMD160 1b53470b15c4525f123def7f88a1baa3f00d58e1 SHA1 d39484b09a679a0b43e4cea884d4a8bb5de97def SHA256 2695e0d56516db28ebbcffe74096e376dd6446a6e8dcfd62e30dbd4fd4ef3bb2 -DIST gts-20090909.tar.gz 875494 RMD160 06c3754870dca3fbdfabcdef42ab946d293750b0 SHA1 045c88be60c9d62b73edbeb94a4b8f7bd07c425b SHA256 d2ca54164715cf4398237694547263553557a09d182f902d76796e00fa898374 DIST gts-20100321.tar.gz 876320 RMD160 4ab3d3642408c57f213a186c823e9b4da4acf147 SHA1 02948e5c5db0574612cd3323662bd7a6966be53d SHA256 4b7fc999c3693c9dcc6dec444edc839c794cc1708ec0f13b6d0e2b9913b00e9f -EBUILD gts-20081607.ebuild 1016 RMD160 c37b2e46bedea448a9a30438dcb1656ca98660e0 SHA1 dd68896036ee276ea2a68471230ee5d4ebf3bc21 SHA256 c6e843a783d9596aeaa124082a3359566dce980fc1f4d200993f798ea510bb83 -EBUILD gts-20090909.ebuild 1069 RMD160 28f7865af90e316ce8a2bf5d97db5420aa17bf96 SHA1 b874efdd9b5e7f7ffc15dcb84c86fbd152eee882 SHA256 9cffda09089e96080ee00dbab7d1319927771b5e24e7c4c5a69dea77ccf5c0b4 -EBUILD gts-20100321-r1.ebuild 1177 RMD160 b368a8479955931c122ca9dfbebb9e3f71796082 SHA1 a3ceb09a2b661a39422cc576d6398fbe46cb4c70 SHA256 0e7dea9bd1b3de5a60ea4ae9861ed5831d2307be69bc61c5aed59cfa481f2a09 -EBUILD gts-20100321-r2.ebuild 1202 RMD160 97bc65329d6a6df2eeb6a92949571d4adcfb2051 SHA1 a41e8eb1221a7a84017f7b1f8a1d6d67cf8e6143 SHA256 0510fd1858ae15e8611871847ac7e19cf5d0e76ac2082b9d15719a714afcf464 -MISC ChangeLog 2883 RMD160 bd895aa80d564605334490fcbee1e81b3a2811b9 SHA1 f1991340535ba16af67fae276626e1edffd74c53 SHA256 2f966b3faa44caf3f14e7e67276c826e3c6fcc40c63cd6d15d1c84b14d94159c -MISC metadata.xml 326 RMD160 e2764f18511b59942cac08bd53fcb04bfde09158 SHA1 0f0fbc2f29633b5c8d7a14d88e1aede94363f2b8 SHA256 b703973b39f55b88505f9efde23f9317c80505c82564a1c7dd9233bcb14f4d8e +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 +MISC metadata.xml 328 RMD160 d0476ceb89877a7b1caa94159d442491e77118aa SHA1 78d18dcf9f1d970b161349902da034bca29ce293 SHA256 c65b1015ca27352fcf00d50fe76741a584e7af13f8d7bce3bf087c910b08006a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4nCYYACgkQCaWpQKGI+9SQqgCaAxwxWw38K7VS+vpzgxQsJwxj -DtAAniLzLTPJYCasSqLZFR1CAAfh7Sh2 -=cwzP +iEYEAREKAAYFAk8EjeAACgkQgAnW8HDreRZcGgCgpaPlelQ2BIbrTTFmbb3suHjo +syQAoMwmEr8tTHVGM+LaNU1vZ/tUJEva +=6b4z -----END PGP SIGNATURE----- diff --git a/sci-libs/gts/gts-20081607.ebuild b/sci-libs/gts/gts-20081607.ebuild deleted file mode 100644 index 737996a1e3da..000000000000 --- a/sci-libs/gts/gts-20081607.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20081607.ebuild,v 1.5 2011/06/21 15:18:09 jlec Exp $ - -EAPI="1" - -inherit eutils fortran-2 - -DESCRIPTION="GNU Triangulated Surface Library" -LICENSE="LGPL-2" -HOMEPAGE="http://gts.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" - -RDEPEND=" - virtual/fortran - - dev-libs/glib:2 - sys-apps/gawk - media-libs/netpbm" -DEPEND="${RDEPEND} - sys-devel/libtool - dev-util/pkgconfig" - -S="${WORKDIR}"/${PN}-snapshot-080704 - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-0.7.6-include-fix.patch -} - -src_install() { - make DESTDIR="${D}" install || die "Install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - - # install examples - insinto /usr/share/${PN}/examples - doins examples/*.c || die "Failed to install examples" - - # install additional docs - if use doc; then - dohtml doc/html/* - fi -} diff --git a/sci-libs/gts/gts-20100321-r1.ebuild b/sci-libs/gts/gts-20100321-r1.ebuild index 19a006e8f854..70c77e92ddfb 100644 --- a/sci-libs/gts/gts-20100321-r1.ebuild +++ b/sci-libs/gts/gts-20100321-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.4 2011/06/21 15:18:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r1.ebuild,v 1.5 2012/01/04 17:35:17 jlec Exp $ EAPI=2 inherit eutils fortran-2 autotools @@ -19,6 +19,7 @@ RDEPEND=" dev-libs/glib:2 !dev-vcs/rcs + !sci-chemistry/apbs[tools] !<=sci-chemistry/ccp4-apps-6.1.3-r2" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/sci-libs/gts/gts-20100321-r2.ebuild b/sci-libs/gts/gts-20100321-r2.ebuild index a476213fa067..e78fd7c317ca 100644 --- a/sci-libs/gts/gts-20100321-r2.ebuild +++ b/sci-libs/gts/gts-20100321-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.3 2011/06/21 15:18:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r2.ebuild,v 1.4 2012/01/04 17:35:17 jlec Exp $ EAPI=2 inherit eutils fortran-2 autotools @@ -18,6 +18,7 @@ RDEPEND=" virtual/fortran dev-libs/glib:2 + !sci-chemistry/apbs[tools] !<=sci-chemistry/ccp4-apps-6.1.3-r2" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/sci-libs/gts/gts-20090909.ebuild b/sci-libs/gts/gts-20100321-r3.ebuild similarity index 64% rename from sci-libs/gts/gts-20090909.ebuild rename to sci-libs/gts/gts-20100321-r3.ebuild index 84636785f315..d66117296448 100644 --- a/sci-libs/gts/gts-20090909.ebuild +++ b/sci-libs/gts/gts-20100321-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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-20090909.ebuild,v 1.4 2011/06/21 15:18:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r3.ebuild,v 1.1 2012/01/04 17:35:17 jlec Exp $ EAPI=2 inherit eutils fortran-2 autotools @@ -16,7 +16,9 @@ IUSE="doc examples test" RDEPEND=" virtual/fortran - dev-libs/glib:2" + + dev-libs/glib:2 + !<=sci-chemistry/ccp4-apps-6.1.3-r2" DEPEND="${RDEPEND} dev-util/pkgconfig test? ( media-libs/netpbm )" @@ -24,7 +26,7 @@ DEPEND="${RDEPEND} # tests are failing RESTRICT="test" -S="${WORKDIR}"/${PN}-snapshot-090909 +S="${WORKDIR}"/${PN}-snapshot-100321 src_prepare() { chmod +x test/*/*.sh @@ -34,7 +36,10 @@ src_prepare() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO + mv "${D}"/usr/bin/{,gts-}split || die + mv "${D}"/usr/bin/{,gts-}merge || die + mv "${D}"/usr/bin/{,gts-}smooth || die + dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die if use examples; then insinto /usr/share/doc/${PF}/examples @@ -43,6 +48,6 @@ src_install() { # install additional docs if use doc; then - dohtml doc/html/* + dohtml doc/html/* || die fi } diff --git a/sci-libs/gts/metadata.xml b/sci-libs/gts/metadata.xml index 14c7a6b771ae..f603fa10fc94 100644 --- a/sci-libs/gts/metadata.xml +++ b/sci-libs/gts/metadata.xml @@ -1,8 +1,8 @@ -sci - + sci + Gerris Flow Solver is a software program for the solution of the partial differential equations describing fluid flow. -- 2.26.2