From 19f0bc9bf360c6113ef135e67b28110e1154e753 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 19 Oct 2012 09:56:24 +0000 Subject: sci-chemistry/molrep: 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 --- sci-chemistry/molrep/ChangeLog | 9 ++++++-- sci-chemistry/molrep/Manifest | 33 ++++++++++++++------------- sci-chemistry/molrep/molrep-11.0.02.ebuild | 22 ++++++++---------- sci-chemistry/molrep/molrep-11.0.03-r1.ebuild | 6 ++--- sci-chemistry/molrep/molrep-11.0.03.ebuild | 6 ++--- 5 files changed, 38 insertions(+), 38 deletions(-) (limited to 'sci-chemistry') diff --git a/sci-chemistry/molrep/ChangeLog b/sci-chemistry/molrep/ChangeLog index 56390e985234..4a6a2babca08 100644 --- a/sci-chemistry/molrep/ChangeLog +++ b/sci-chemistry/molrep/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-chemistry/molrep -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/ChangeLog,v 1.20 2011/10/04 15:21:19 jlec Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/ChangeLog,v 1.21 2012/10/19 09:56:23 jlec Exp $ + + 19 Oct 2012; Justin Lecher molrep-11.0.02.ebuild, + molrep-11.0.03.ebuild, molrep-11.0.03-r1.ebuild: + Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the + updated fortran-2.eclass *molrep-11.0.03-r1 (04 Oct 2011) diff --git a/sci-chemistry/molrep/Manifest b/sci-chemistry/molrep/Manifest index 79e105609d53..a0247f5f0baf 100644 --- a/sci-chemistry/molrep/Manifest +++ b/sci-chemistry/molrep/Manifest @@ -1,21 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX 10.2.35-respect-FLAGS.patch 2368 RMD160 4f24b345f0c78de0c0222abfef987d61fe1356d0 SHA1 bc445d646208de7e879a5989b66296fd89b2fc96 SHA256 809d9f290a1eb59b8fc5904328e72c30b65d3be821a61a1bff050bc446bdc991 -AUX 11.0.00-respect-FLAGS.patch 364 RMD160 b364dfd896cd954740960eb32c15f47e9c2cdffd SHA1 50e945f5f6f8b0785547c2bebeea26f93421bb39 SHA256 04a8fbd74b3f9280fbb7d5abe701cee5f59901c258afdfc16b4d37809200c461 -AUX 11.0.00-test.patch 5153 RMD160 70dabd2f772cbcad4c8cd1ea617838a6a1b61f55 SHA1 b3b66bcb1661a1fcd3c7700310dda4a1642293c3 SHA256 f057baee3a42a3a517199c039018d8042d4da098976636950871d650e6d5acd1 -AUX 11.0.03-EOR.patch 513 RMD160 1a81d602555b623d9a521fc2826577e483bd2aa6 SHA1 76569a0846677cb2482098bf8d24196607071d07 SHA256 e413668dbe47d072ce7deb5b19584f45edf148e69522f6afa50eb39ec1c88bda -DIST molrep-11.0.02.tar.gz 3594084 RMD160 d4238e39a21aa6c7b3373a8db243c54f817e4408 SHA1 f54becab42f5a484a33e11e3c8515d8bed37a880 SHA256 6acb00bc91ad76027461ce6055eda72c8de34e5243449a31d5ede9e537e9adce -DIST molrep-11.0.03.tar.gz 3643087 RMD160 fce47895d194db79c2b5b32ccc7b6f87779dc0c8 SHA1 a6af659714a9df2b658811f853880602df85bae6 SHA256 f4c317713b0dddf0ca883734f0bfe27600b50f8d4dd354ea8ae8245e21ce4392 -EBUILD molrep-11.0.02.ebuild 1321 RMD160 57658320e01c25d541111e696673ac53cb15b3f9 SHA1 dd02dccd6159e89fcbb62947de7254a2fbe28239 SHA256 37b5a21b9933ac19b5fc4c2f2b9551d84c2cd3359ef9f300b5c93d505f582a8d -EBUILD molrep-11.0.03-r1.ebuild 1433 RMD160 3b3624641c63181ae57a2746b935ae130cfb7614 SHA1 20b1cde02c44a9c8dc9eac380b98e5845ef2aa89 SHA256 1f1ede97bf18198007b5ce45c1fa8b207ab07708b3d6f011ef4608a39d0f2bee -EBUILD molrep-11.0.03.ebuild 1396 RMD160 4732300b9e46d5ec710751712d037d5e732c26bd SHA1 a358cfe0404f87a0ecefdcaecaf9efa20315f1d3 SHA256 7ade7d97df43efbbf799a5b5fd09d5e372d089c83a79a862595c4f3f17ca7e9a -MISC ChangeLog 2792 RMD160 64d9d84193fe4d3e744cc7b1f2a27e03e74477a2 SHA1 f4571ac1212cfbfe13f33fec195ba8f632bae037 SHA256 83b879b959dfc98255112310fab676d86c8c4a99eda2358edc8440e8af488ea5 -MISC metadata.xml 229 RMD160 e5d681054ef371ecfe4d6828e8b722b716968b37 SHA1 e91b223d4c687993ccca1be424e4feedad208570 SHA256 0f110645272f37341c3729c03cf88dbb871ed82db98c8b0dbda8734343b88567 +AUX 10.2.35-respect-FLAGS.patch 2368 SHA256 809d9f290a1eb59b8fc5904328e72c30b65d3be821a61a1bff050bc446bdc991 SHA512 a64c3a6c9ab51f89090e279ac29fba299a03f35230693c6f290ed5232c96d5fbdee14710dedbc6ffaa891a4450737afec4ace43e9db84e67fee596143a264f85 WHIRLPOOL b5a02f14817bd04c052e552da28da2a266421d5b19925c97033df806e6f784d772fb507975df52826b51b7b078bb0f16c5130263669a069bdcc65e7bb384dec5 +AUX 11.0.00-respect-FLAGS.patch 364 SHA256 04a8fbd74b3f9280fbb7d5abe701cee5f59901c258afdfc16b4d37809200c461 SHA512 6950d8e58ff77c24b7fe4e6c9c3bebef0be2fb9be5b8a58e67dddcbefce9e496ab70701d9c827883a20fa926d260d71edaf3d8cd66d5c07cc528ebb219ff354d WHIRLPOOL 0d7f003fbaf7b40635710f27fb9baf656898605308f5dd503ace3b1e7f6a41f0e4b6f4e7c25e393be58a5d04ba79c1c282cdc6cdd853660233db44ab0573a3ff +AUX 11.0.00-test.patch 5153 SHA256 f057baee3a42a3a517199c039018d8042d4da098976636950871d650e6d5acd1 SHA512 320c53a17c5e726de1fbc81e4be29bdfb61c55104a884dd05a299777c9617532c6583de231f3657910ac9808c12131a09c1b87f5cf32b3c920788347554bb320 WHIRLPOOL 287d0e477d198d98d03cfc6b0ebf5c523f250c8c71f2e6ead913d267ae41ebd4fbbee856f20c44c3b52f1f11ee491489faffc47c981056539a11cacfe1e71053 +AUX 11.0.03-EOR.patch 513 SHA256 e413668dbe47d072ce7deb5b19584f45edf148e69522f6afa50eb39ec1c88bda SHA512 43630d80c2430378c6df98c75d784ea5753e240ab8c137a58d9bf1b3ca8d24f62934a37aad1560af1c99eeffc6c04d24c24f14ac8c44597c57d82f4731bb1cff WHIRLPOOL 918a7ef30bb4cd081e85b4ddaad4a9db2fa4f73c82c9b009a00b97e966ccaabc04c9851736f990956a7c793f070c652b7ff4a8f5c24d2c9e8fcd15c9d48e1659 +DIST molrep-11.0.02.tar.gz 3594084 SHA256 6acb00bc91ad76027461ce6055eda72c8de34e5243449a31d5ede9e537e9adce +DIST molrep-11.0.03.tar.gz 3643087 SHA256 f4c317713b0dddf0ca883734f0bfe27600b50f8d4dd354ea8ae8245e21ce4392 +EBUILD molrep-11.0.02.ebuild 1269 SHA256 f23b105aacd16c80c0cdd4c8b4fd52b9e185d8b66bb22917e205548c23af8406 SHA512 d2552222cc14830558c96e554abe6782d9c6fcaa8536e58e2da002b68f9d460a615b06c6038a9bdb7ac51a371057cf901a63c82961458746f8a037a583369968 WHIRLPOOL f6e90ccaa07fd3e12a8db9b6202393e55b8594f44fee7d08e114caf314021b8ce8a34e8a04aa590881eef7177414852911f45f3b600db8243166fb9c3fb31362 +EBUILD molrep-11.0.03-r1.ebuild 1415 SHA256 cda1f7b822d4d3a0a6fa262756b6b9c8601084c37bf68f46cd343ce2f40f2a48 SHA512 c21bfde3fb961d03069ae40b652a52ccce7caacf93eace1f0bbcfeff04abb3ed95dc9530089504e8e2fe9092e11a667d0a665ab74a14a1df1d79a1cda926e74e WHIRLPOOL 39df7552b0760a357eff014e07ffc8e6374cf0174299866e383fac0e723b02c39b99280380a963c04fa14acf7732ae7d72f3df7a361a9ce870ee61ed4cba0e23 +EBUILD molrep-11.0.03.ebuild 1378 SHA256 a151bf384b0126419ad54224877e630e3acc581692a29130486b119c57308306 SHA512 b8d67e8eb71deb357fd5c76217f67ae55909abed2e06bcc2c59dcccbc11621fb32a44d78163d7a489114d36ce4653b47b657aaa13357753062cfef51063e284b WHIRLPOOL 3d1e8a0862f3e776e4859b20395d7c4e69f0c6a1d9fa1cae5435f2282fd593c160924cfdeed6c7fef96886092d411689a73057543b13182a1e6ed7b97e46dd74 +MISC ChangeLog 3019 SHA256 941d4eb26bfbf6613ffa0938b1cd80a914a6ec8c1fc7b79d7c1b1fa5ae2033b4 SHA512 bc01803c9e692f9075715c8d60af6c5c710a343c61970da5c511e99c689850b6e8ca2f02d010577e3a9d8516855fb556479b294b95dcc1f036dd79f51c303b53 WHIRLPOOL 9ff6f5077a07cdab730be98dd508df84368caa13a5b1050e5c4fc971de070732c7a6ff60b543f94c10e7b072468bd3b7f4f4cbe500d720fbcca2c855789536ca +MISC metadata.xml 229 SHA256 0f110645272f37341c3729c03cf88dbb871ed82db98c8b0dbda8734343b88567 SHA512 2e7cece2f0eb384df9ecb83d07ff9082abefd8f1e797006cbda98a018aeab49a48253ae8094cd0298c2ee8279274d707f0c0b2c0665e6273d9bbb432d6b579c9 WHIRLPOOL 44140ec3764af0d7a442dcaaf0b2904dbd279197bfbe014d5388cf8fe5016156237840985b0f3f7603cac3a0cfda3cf83291976e15bfbc8cb82dbfa13d5c451b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org -iEYEAREKAAYFAk6LJHMACgkQgAnW8HDreRYOVACgkhfomwWkKRIDT1HN1gkBK4oo -YDsAnjzgJexLw/QkZQ8r/FIFmfWegf2j -=Pe5t +iEYEAREIAAYFAlCBI8gACgkQgAnW8HDreRZQNQCgh2LIOSUFzutpCKrh2PIsgsij +xqMAoJ5NFWqtZiwAeq8dZmHxTIriIzpM +=LPV2 -----END PGP SIGNATURE----- diff --git a/sci-chemistry/molrep/molrep-11.0.02.ebuild b/sci-chemistry/molrep/molrep-11.0.02.ebuild index 237be9858c53..47e2b6f0773a 100644 --- a/sci-chemistry/molrep/molrep-11.0.02.ebuild +++ b/sci-chemistry/molrep/molrep-11.0.02.ebuild @@ -1,8 +1,8 @@ -# 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/molrep/molrep-11.0.02.ebuild,v 1.8 2011/07/02 08:55:01 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/molrep-11.0.02.ebuild,v 1.9 2012/10/19 09:56:23 jlec Exp $ -EAPI="3" +EAPI=4 inherit eutils fortran-2 multilib toolchain-funcs @@ -16,8 +16,6 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" - virtual/fortran - >=sci-libs/ccp4-libs-6.1.3 sci-libs/mmdb virtual/lapack" @@ -26,19 +24,19 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}" src_prepare() { - epatch "${FILESDIR}"/11.0.00-respect-FLAGS.patch - epatch "${FILESDIR}"/11.0.00-test.patch + epatch \ + "${FILESDIR}"/11.0.00-respect-FLAGS.patch \ + "${FILESDIR}"/11.0.00-test.patch } src_compile() { cd "${S}"/src - emake clean || die + emake clean emake \ MR_FORT="$(tc-getFC) ${FFLAGS}" \ FFLAGS="${FFLAGS}" \ LDFLAGS="${LDFLAGS}" \ - MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $(pkg-config --libs mmdb lapack) -lccif -lstdc++ -lm" \ - || die + MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $(pkg-config --libs mmdb lapack) -lccif -lstdc++ -lm" } src_test() { @@ -52,7 +50,7 @@ src_test() { src_install() { exeinto /usr/libexec/ccp4/bin/ - doexe bin/${PN} || die + doexe bin/${PN} dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} - dodoc readme doc/${PN}.rtf || die + dodoc readme doc/${PN}.rtf } diff --git a/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild b/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild index 57a2b3bc4513..bcac9a9dc5b1 100644 --- a/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild +++ b/sci-chemistry/molrep/molrep-11.0.03-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-chemistry/molrep/molrep-11.0.03-r1.ebuild,v 1.1 2011/10/04 15:21:19 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild,v 1.2 2012/10/19 09:56:23 jlec Exp $ EAPI=4 @@ -16,8 +16,6 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" - virtual/fortran - >=sci-libs/ccp4-libs-6.1.3 sci-libs/mmdb virtual/lapack" diff --git a/sci-chemistry/molrep/molrep-11.0.03.ebuild b/sci-chemistry/molrep/molrep-11.0.03.ebuild index d01988129d41..31920ca470b8 100644 --- a/sci-chemistry/molrep/molrep-11.0.03.ebuild +++ b/sci-chemistry/molrep/molrep-11.0.03.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/molrep/molrep-11.0.03.ebuild,v 1.1 2011/09/07 16:40:38 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/molrep-11.0.03.ebuild,v 1.2 2012/10/19 09:56:23 jlec Exp $ EAPI=4 @@ -16,8 +16,6 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" - virtual/fortran - >=sci-libs/ccp4-libs-6.1.3 sci-libs/mmdb virtual/lapack" -- cgit v1.2.3-65-gdbad