diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-10-19 10:25:52 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-10-19 10:25:52 +0000 |
commit | a8564e2289ef9cf5d4eb7acfd233d5bb1e7a2fef (patch) | |
tree | 5ee2fe95a8d2828c6a34475a15b59c34d32df065 | |
parent | sci-chemistry/raster3d: Remove virtual/fortran and always call fortran-2_pkg_... (diff) | |
download | historical-a8564e2289ef9cf5d4eb7acfd233d5bb1e7a2fef.tar.gz historical-a8564e2289ef9cf5d4eb7acfd233d5bb1e7a2fef.tar.bz2 historical-a8564e2289ef9cf5d4eb7acfd233d5bb1e7a2fef.zip |
sci-chemistry/refmac: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass
Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916
-rw-r--r-- | sci-chemistry/refmac/ChangeLog | 9 | ||||
-rw-r--r-- | sci-chemistry/refmac/Manifest | 39 | ||||
-rw-r--r-- | sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild | 5 | ||||
-rw-r--r-- | sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild | 5 | ||||
-rw-r--r-- | sci-chemistry/refmac/refmac-5.6.0117.ebuild | 85 | ||||
-rw-r--r-- | sci-chemistry/refmac/refmac-5.6.0119.ebuild | 5 |
6 files changed, 32 insertions, 116 deletions
diff --git a/sci-chemistry/refmac/ChangeLog b/sci-chemistry/refmac/ChangeLog index 9e45bd5b8c82..7ae1313f6607 100644 --- a/sci-chemistry/refmac/ChangeLog +++ b/sci-chemistry/refmac/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-chemistry/refmac -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.49 2011/07/11 08:59:06 jlec Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.50 2012/10/19 10:25:51 jlec Exp $ + + 19 Oct 2012; Justin Lecher <jlec@gentoo.org> refmac-5.5.0110-r2.ebuild, + refmac-5.5.0110-r3.ebuild, -refmac-5.6.0117.ebuild, refmac-5.6.0119.ebuild: + Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the + updated fortran-2.eclass *refmac-5.6.0119 (11 Jul 2011) diff --git a/sci-chemistry/refmac/Manifest b/sci-chemistry/refmac/Manifest index 869648990cfc..63543bff0b87 100644 --- a/sci-chemistry/refmac/Manifest +++ b/sci-chemistry/refmac/Manifest @@ -1,25 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX 5.5-test.log.patch 1146 RMD160 0ea6293e8ecde3b9ae12658a523e3c30a5c9f01b SHA1 d026fdea6a487754f7e48ec24bcf4851a613b6d1 SHA256 d2c2a09f44e525dc255bc2ac93ca4194b24ca1fe58c31f0e3b5c32e439dfe2e7 -AUX 5.5.0110-allow-dynamic-linking.patch 2730 RMD160 3637d62986050317a1480e5074ecfac5307fb216 SHA1 c3035d478f22a9d9b95b70aaa3a357eb91d9375f SHA256 72e782184abc94f8efa46082e3b0d30000e745c8ee9141affa2c178b1cf87d35 -AUX 5.5.0110-gcc4.6.patch 473 RMD160 9912c28fec294080ee8e26f27067eaf40317f41d SHA1 e666295b8ddeaa07dc5485660210d001798e46ac SHA256 a33de3aa7236a6b711d5f578fea549da03130eabb061252c40b57e8ce3fe1778 -AUX 5.6.0110-allow-dynamic-linking.patch 16438 RMD160 149cfb8af3f35afc61c26d99d42992f6baa2f265 SHA1 dc5e1b2a95311b043afbd0de5e2b606ee5d42cf8 SHA256 ac854d5e755b05809d4015763b6ea8552f1733d5bc5073778ce82c812083624b -AUX 5.6.0116-allow-dynamic-linking.patch 16438 RMD160 149cfb8af3f35afc61c26d99d42992f6baa2f265 SHA1 dc5e1b2a95311b043afbd0de5e2b606ee5d42cf8 SHA256 ac854d5e755b05809d4015763b6ea8552f1733d5bc5073778ce82c812083624b -DIST refmac5.6_source_v5.6.0117.tar.gz 1291407 RMD160 690beb9ba7ffa59ca4326f91c7ab8ff58b1b3a4c SHA1 9dea92fb08230538d0c1ef14e84383666905a03f SHA256 17a0a63d7d9307a2694e5f3e09d8c4d99b47cbe57ef55ba7cbe16cb2b7fd3590 -DIST refmac5.6_source_v5.6.0119.tar.gz 1401231 RMD160 3c2d74b7f9cbe6c172ac76e478a055077150c11e SHA1 f3fb383fb30a5a7841af833ca84fa08033d8c780 SHA256 928085930ba8893814bffd6f959c91bdad97b4ad27f6703455a4e3ad93b2ef1e -DIST refmac_5.5.0110.tar.gz 1326832 RMD160 6613ca8b70e54e7827f8ff02b7d497560cb83e39 SHA1 ba2e38db6c88550bd901b474de881d6514b4d74e SHA256 1353fb1042586ec8fa37d0a90f274890d0ccc02377af5216200662338dfe08ca -DIST test-framework.tar.gz 130933173 RMD160 7122539dc713615dca2ddaddfd8d152cd22624d0 SHA1 1d3e3019a67afb9b2346e919c859d402d3250fea SHA256 df050a2a29da80518cb0616a0bbeb82298ea0721549348d15353bf0f66240605 -EBUILD refmac-5.5.0110-r2.ebuild 2193 RMD160 d15e5d23dfb33ace94dc9d3d56d3c02a59690f9d SHA1 bd23072a69463aed6b476780b9759c57ec451854 SHA256 a8f8b2cc925982d331483c982db592a788f2fbbfeecb23dacf8e15b83bd38dce -EBUILD refmac-5.5.0110-r3.ebuild 2244 RMD160 b00d318dbc50ca46484970c33df72475e2cc2ab9 SHA1 892969800a89e1030747111b179c7b65be0b4814 SHA256 2e5df31c1fec48928db20599b733d519de838b8038e9d8be9acfdd4e7a4435ae -EBUILD refmac-5.6.0117.ebuild 2240 RMD160 9cfe05e5038928c6da6c6e79fb26274a869d0c93 SHA1 5c6e2064cd83a1d48762a56f732ddffed73d2650 SHA256 9c0f1e5bc426ff2fc613cbaac035dbe1c6274cae857f8f2e9798c6f814accf3b -EBUILD refmac-5.6.0119.ebuild 2253 RMD160 0bc21bc33bed6306faaa262f933c444ed73ba083 SHA1 7aff0798cfd0e7f2637f1212891d353c1129806c SHA256 b8e7be972a2631ce22833388e42b74f2af41463111a1209f359d86845c130307 -MISC ChangeLog 9695 RMD160 da45d0388d0e2d802d9f2cd91cae57da67cdf2e8 SHA1 d5c4c1b142578b890c75d93c911f7c89a302ead8 SHA256 704a78b8988576c0ffed560e072c4494d6994a508425b8c5671b7c900f1b6700 -MISC metadata.xml 316 RMD160 917d597c9b5e463cfaa0fc0ba55ff4da57666287 SHA1 69b22933f054e2716b8f7266a5d7b727beec2739 SHA256 ddb73bd401586087617638304ef518e463312dbaa2c343c305cb22a2c93a1a1f +AUX 5.5-test.log.patch 1146 SHA256 d2c2a09f44e525dc255bc2ac93ca4194b24ca1fe58c31f0e3b5c32e439dfe2e7 SHA512 1819470e5e03c6748bce050acdb87b8f8ca38855f489f49cc2083f6d5c433e0dd3f27f44efa93cd6b9782c2254ea3e4d3a995cf2fb637aea116d4e932fd896f8 WHIRLPOOL 2816f0c98f26e2a31e19a82e0cf902fcde56dd3cb27975dad3741070c35d278f309d88c7d0926a36e873b036b47935bf8217130d7f767395af347d957d3cfead +AUX 5.5.0110-allow-dynamic-linking.patch 2730 SHA256 72e782184abc94f8efa46082e3b0d30000e745c8ee9141affa2c178b1cf87d35 SHA512 c14464441ebd16a1904b54226405cfecfc01b65b8db181f84ba0ca48593ab6371c819686c73a57b758859eb8c2a239186da1ea96f2a25746c181c938eb41398c WHIRLPOOL 78b9850021d4ac943ce2fa5964ac30ec659a1bb17367baf683fb29c35c76efdb2036da3d0e5339ae8d360023a1b3068cbfacbd14e09f358caf7e3dabd103115e +AUX 5.5.0110-gcc4.6.patch 473 SHA256 a33de3aa7236a6b711d5f578fea549da03130eabb061252c40b57e8ce3fe1778 SHA512 671a54407e75c3a89ff7ecd0e060d6ee7b83e5242a4350b907b24a53dde4de21b31e174e5cdc5dcf2d702a220bf6c5a1c7b45806142c06c7cd1ea92c086e6db3 WHIRLPOOL 586ebd6fcf20cd9ec14ae01ca1c50f7e7d34276fb8cb7db3e49bd7771423c3862f90d7794727e9ab05bd5438379e559ca7bca43b71778054c08bd5985533282a +AUX 5.6.0110-allow-dynamic-linking.patch 16438 SHA256 ac854d5e755b05809d4015763b6ea8552f1733d5bc5073778ce82c812083624b SHA512 7b51ed8e9818614cb80d089c6918ffdca9d70adcb6027845f282180750e0ba477849da79f3f5b5c46c7411361e7b555b961e30241b97a7d33cbf08686dead518 WHIRLPOOL 847aee909641fbfd64a182996359a3151915536fdc37a7fd1b3d4085b133b4d2f98415c497e6b64529bde232f602949c9149f40f74473124e4811eabbfe9b5bb +AUX 5.6.0116-allow-dynamic-linking.patch 16438 SHA256 ac854d5e755b05809d4015763b6ea8552f1733d5bc5073778ce82c812083624b SHA512 7b51ed8e9818614cb80d089c6918ffdca9d70adcb6027845f282180750e0ba477849da79f3f5b5c46c7411361e7b555b961e30241b97a7d33cbf08686dead518 WHIRLPOOL 847aee909641fbfd64a182996359a3151915536fdc37a7fd1b3d4085b133b4d2f98415c497e6b64529bde232f602949c9149f40f74473124e4811eabbfe9b5bb +DIST refmac5.6_source_v5.6.0119.tar.gz 1401231 SHA256 928085930ba8893814bffd6f959c91bdad97b4ad27f6703455a4e3ad93b2ef1e +DIST refmac_5.5.0110.tar.gz 1326832 SHA256 1353fb1042586ec8fa37d0a90f274890d0ccc02377af5216200662338dfe08ca SHA512 7e7fd1a7d2d11ef5f2e08cae61da62ecfe6978730ce4ca80f8b00be9bdad5e7d0ad493e1b8d57d64f1393f2017a87b8342e2607b08bc4018def798038a111728 WHIRLPOOL 587260eebd2df3115ba01ee03c11ab773d7316100a09af1f259f7795a139f978d94c569b8e4ab85982c2eeda628e643376231bdca5311fc8c7d2de5b65a033ac +DIST test-framework.tar.gz 130933173 SHA256 df050a2a29da80518cb0616a0bbeb82298ea0721549348d15353bf0f66240605 SHA512 3ef8253f472c5a481f836291afb80746ad73858e130130b848851b6b5dc53ada3b78c9f853af1c46fa22f469f2ce2f3248f5f760950e118610922c0429a7da16 WHIRLPOOL 022c1b493ecd35e769b44d1e52a351b4883682ef9759626bac36e26cc61078d95de0ec2531ed706897c683c38727139fa7a13d06b64c597026817ed79612d16d +EBUILD refmac-5.5.0110-r2.ebuild 2176 SHA256 917c95d3cd2ecf9316374ae0a803da4dc1082f7e25ee7f741a95005a82be08bf SHA512 3df4bce2dc1def1ee037480e0cecfdb30a73cf52a101f0e3a7ff7b1bfa38501cb17eb4bdcacdda1062c12c37d9c5c65985b207b1fd49397b916b873c88838160 WHIRLPOOL 1cb8c53c53582f170de5d11fc3bfa381fc71d51640b8b0e66cc9c7ed33795c27c898df5c311912116246651f81701167451eb7297e5d6b4c1b6973026adcde90 +EBUILD refmac-5.5.0110-r3.ebuild 2227 SHA256 0b4d7a957318e0ddb18ca492915ae6d57a8983f8fa26668556ec14a74cb7dc21 SHA512 72660f72a24d19a1896b2e979ab8512f3a639e7aeceb789ad6b0d93ca5f6f28ad6ab045b06925f3ca1ab3d163a0a6f4851e023103ae8e6c1635d10af1aa3c016 WHIRLPOOL e3b1f627902d1065395af8520bff722b22a011fcf2bc9c8f811ba8f682de2409ed333c8aabed0ec93abb7b79b4934e09bbf3b26e9732a54fc7f7881447d60ee0 +EBUILD refmac-5.6.0119.ebuild 2236 SHA256 57e67ac139959f601c0bbc471d3347dbef4ff4aad791f4673d4eb901e8633b57 SHA512 62d9cd7da45bc1865c634e5dc33d2c4d20c1d158acc091397350bbf64f25908c476c00b83bc75090203c5c4682ef6a297c271785690484e42e2caa6cfb38d2f8 WHIRLPOOL 1d819045b96ccd8fc6cbfbc1892359ee2bf3b5aaebbc264d5bfdd1a9e930d16bfa3f4a7861349ea8265b1b09513eed058477737f8e2bbbb1288de0385a4c8ea5 +MISC ChangeLog 9953 SHA256 44cf77d9dc2a9bb1d6403f2993efab35d590a5ff8b7d3a96d2bd99f0c0a90044 SHA512 a3bac057d70b712b968612054ec48c9a1105907495936cf2959158af1422da639a58d01684ab53cc50e119b0cb176b19051d0a6454c1b094600d2c6ed52ad068 WHIRLPOOL 8a317eae591548f9f0a75c5e5c692ea9c94d4257083967b4fd566a62f1c88300fda021932bf33b4ea7bdb8c864f7a9b8744adb4d7cc54093e15d883cdd5539f8 +MISC metadata.xml 316 SHA256 ddb73bd401586087617638304ef518e463312dbaa2c343c305cb22a2c93a1a1f SHA512 2312a2bbe32d5e62d36be10ad94b811d3791befa4d44560fd62dbf886b3d17130045f2777ca03c978d5da6026fa70a4af413aaa6eba867c1018ec41d08dc85f1 WHIRLPOOL 5e12c3669af5f3f198a6d834320fd48edd0a4d6767cfab2e582ae513f545437a1438966c628396548c348f19c189fb25e745d17c0d01c04ce3cb33e917f0527f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org -iEYEAREKAAYFAk4au18ACgkQgAnW8HDreRY84wCcC7qzC875+4Jura7DnI68x3CS -8CoAn2MiL2xV7RbE20aNClYwxpTSwrry -=lNSb +iEYEAREIAAYFAlCBKrAACgkQgAnW8HDreRbosQCgw0Jp/1wuOLoXKeleb9m3RpND +ak8AnRCsQbjslxKANbRPYUPIgIX8Ou/X +=JteP -----END PGP SIGNATURE----- diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild index c4a01357becb..8d7d0f0127c8 100644 --- a/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild +++ b/sci-chemistry/refmac/refmac-5.5.0110-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-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v 1.13 2011/06/29 11:11:20 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v 1.14 2012/10/19 10:25:51 jlec Exp $ EAPI=2 @@ -23,7 +23,6 @@ RDEPEND=" sci-libs/mmdb <sci-libs/monomer-db-1 virtual/blas - virtual/fortran virtual/lapack" DEPEND="${RDEPEND}" diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild index a109f350d3fe..d1a473524237 100644 --- a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild +++ b/sci-chemistry/refmac/refmac-5.5.0110-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-chemistry/refmac/refmac-5.5.0110-r3.ebuild,v 1.5 2011/06/29 11:11:20 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild,v 1.6 2012/10/19 10:25:51 jlec Exp $ EAPI=4 @@ -23,7 +23,6 @@ RDEPEND=" sci-libs/mmdb <sci-libs/monomer-db-1 virtual/blas - virtual/fortran virtual/lapack" DEPEND="${RDEPEND}" diff --git a/sci-chemistry/refmac/refmac-5.6.0117.ebuild b/sci-chemistry/refmac/refmac-5.6.0117.ebuild deleted file mode 100644 index fd14fe877bf7..000000000000 --- a/sci-chemistry/refmac/refmac-5.6.0117.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild,v 1.4 2011/06/29 11:11:20 jlec Exp $ - -EAPI=4 - -inherit base fortran-2 flag-o-matic toolchain-funcs versionator - -MY_PV="$(get_version_component_range 1-2)_source_v${PV}" - -DESCRIPTION="Macromolecular crystallographic refinement program" -HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac" -SRC_URI=" - ${HOMEPAGE}/data/refmac_experimental/${PN}${MY_PV}.tar.gz - test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - !sci-chemistry/makecif - >=sci-libs/ccp4-libs-6.1.3-r7 - sci-libs/mmdb - >sci-libs/monomer-db-1 - virtual/blas - virtual/fortran - virtual/lapack" -DEPEND="${RDEPEND}" - -FORTRAN_STANDARD="77 90" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/5.6.0116-allow-dynamic-linking.patch - ) - -src_prepare() { - base_src_prepare - use test && epatch "${FILESDIR}"/5.5-test.log.patch - [[ ${FC} == *gfortran* ]] && \ - append-fflags -fno-second-underscore && \ - append-cflags -DGFORTRAN -DPROTOTYPE && \ - append-libs -lgfortran -lgfortranbegin -lstdc++ - [[ ${FC} == *ifort* ]] && \ - append-libs -lstdc++ -} - -src_compile() { - emake \ - FC=$(tc-getFC) \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - COPTIM="${CFLAGS}" \ - FOPTIM="${FFLAGS:- -O2}" \ - VERSION="" \ - XFFLAGS="-fwhole-file" \ - XCFLAGS="" \ - LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb)" \ - LLIBLAPACK="$(pkg-config --libs lapack blas)" \ - LLIBOTHERS="${LIBS}" -} - -src_test() { - einfo "Starting tests ..." - source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh" - export PATH="${WORKDIR}/test-framework/scripts:${S}:${PATH}" - export CCP4_TEST="${WORKDIR}"/test-framework - export CCP4_SCR="${T}" - ln -sf refmac "${S}"/refmac5 - sed '/^ANISOU/d' -i ${CCP4_TEST}/data/pdb/1vr7.pdb - ccp4-run-thorough-tests -v test_refmac5 || die -} - -src_install() { - for i in refmac libcheck FreeTwin header2matr; do - exeinto /usr/libexec/ccp4/bin/ - doexe ${i} - dosym ../libexec/ccp4/bin/${i} /usr/bin/${i} - done - dosym refmac /usr/bin/refmac5 - dosym refmac /usr/libexec/ccp4/bin/refmac5 -} diff --git a/sci-chemistry/refmac/refmac-5.6.0119.ebuild b/sci-chemistry/refmac/refmac-5.6.0119.ebuild index c4726e13eb50..f5d8ee90f8e9 100644 --- a/sci-chemistry/refmac/refmac-5.6.0119.ebuild +++ b/sci-chemistry/refmac/refmac-5.6.0119.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-chemistry/refmac/refmac-5.6.0119.ebuild,v 1.1 2011/07/11 08:59:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0119.ebuild,v 1.2 2012/10/19 10:25:51 jlec Exp $ EAPI=4 @@ -25,7 +25,6 @@ RDEPEND=" sci-libs/mmdb >sci-libs/monomer-db-1 virtual/blas - virtual/fortran virtual/lapack" DEPEND="${RDEPEND}" |