sci-chemistry/molrep: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; drop old

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 30 insertions, 82 deletions

diff --git a/sci-chemistry/molrep/ChangeLog b/sci-chemistry/molrep/ChangeLog
index 4a6a2babca08..9c82b40aa3da 100644
--- a/sci-chemistry/molrep/ChangeLog
+++ b/sci-chemistry/molrep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/molrep
-# 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 $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/ChangeLog,v 1.22 2013/02/21 22:00:47 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> molrep-11.0.02.ebuild,
+  -molrep-11.0.03.ebuild, molrep-11.0.03-r1.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old
 
   19 Oct 2012; Justin Lecher <jlec@gentoo.org> molrep-11.0.02.ebuild,
   molrep-11.0.03.ebuild, molrep-11.0.03-r1.ebuild:
diff --git a/sci-chemistry/molrep/Manifest b/sci-chemistry/molrep/Manifest
index a0247f5f0baf..de6a071b53c1 100644
--- a/sci-chemistry/molrep/Manifest
+++ b/sci-chemistry/molrep/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
+DIST molrep-11.0.03.tar.gz 3643087 SHA256 f4c317713b0dddf0ca883734f0bfe27600b50f8d4dd354ea8ae8245e21ce4392 SHA512 d9ff351e3754871d100c41aa9b8af48e3588768320f5ed92e536fac5e24114ca5df6497103d0b077455fc4e30e2d3d085aeb63854eb88dc8e74259b4e1683dc8 WHIRLPOOL b16e128e3ca7f1734ca79f70decab3e262d47b6a37c49e46c4c7d51f3fd8093cd3a0f20e487caeb5e9aa0a37a9fd050588cad3e99ad46e1866d05ff4a8ed0bb6
+EBUILD molrep-11.0.02.ebuild 1298 SHA256 11139af8fc677f80071423bcb5c38ad3ebfc452a68b933a905ea5842895c8c5e SHA512 b093ab9955a7def32c8a68a32feb94438c6bfa35a97c43b5e5fa425738ebeef4654654831830c5594bcc6371ff7c169e9cca8dde6ebfde2f0d02f7e0d4ea0a50 WHIRLPOOL 9984a7366a383defc9d87e8b668f9d536925d16d37669546249e300f5b12d605a3662741def8953b05dc993bc23f6e219025f8a93bc08f472678f90020f469d3
+EBUILD molrep-11.0.03-r1.ebuild 1443 SHA256 758393b4caac88ae57f9c1b46de29efe8195de9d610c2d1d712b5180c4fea1c8 SHA512 22b93114964b9176de12e37ca07fedf9b6fa27f19c1a5b296e8bcd18fda70bd56bfd96573d12708c0a0631feffe668e828fd5f612a47b9d89e244d7d5ed4edb2 WHIRLPOOL 4c2aca9d6da97f8309b093609575986e558a1977aaa1bc0385c3fcd7f0cd44724233123f35a1bbce7380e5cc65ec6df8ba0100be33088f162a90fad0c120af76
+MISC ChangeLog 3247 SHA256 e7d1ad03c5f4e682afa7ffb584f6d1b621b49ed53fcbab2fca5e5b9696a84512 SHA512 ff1fd255c4f591f2e13feab4eecfd30e8161224cd77125823f9ebf3b894e582a3e3b26c68605399c0a02c3dd64226aa1d42bda90a84a833f15e1e06d7efd35a0 WHIRLPOOL abd37348bbdf7d5abd7551d4728ee87c9f7505fe710f13cfb2d3074a48d8c38720eee1cf2a38c03404456ede98c1f2491ac0ccd85ef340fe2faf0510e49e6870
+MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlCBI8gACgkQgAnW8HDreRZQNQCgh2LIOSUFzutpCKrh2PIsgsij
-xqMAoJ5NFWqtZiwAeq8dZmHxTIriIzpM
-=LPV2
+iEYEAREKAAYFAlEmmT0ACgkQgAnW8HDreRYmTACgzJS/DskNoGf307i3C4mWKS7F
+3L4AnjxUY1/O270St0InLRLcKSE2BXZY
+=xbBE
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molrep/metadata.xml b/sci-chemistry/molrep/metadata.xml
index 1837bbc07a6e..ae9ec7c5f6a4 100644
--- a/sci-chemistry/molrep/metadata.xml
+++ b/sci-chemistry/molrep/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/molrep/molrep-11.0.02.ebuild b/sci-chemistry/molrep/molrep-11.0.02.ebuild
index 47e2b6f0773a..c9148066ee39 100644
--- a/sci-chemistry/molrep/molrep-11.0.02.ebuild
+++ b/sci-chemistry/molrep/molrep-11.0.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.9 2012/10/19 09:56:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/molrep-11.0.02.ebuild,v 1.10 2013/02/21 22:00:47 jlec Exp $
 
 EAPI=4
 
@@ -19,7 +19,8 @@ RDEPEND="
 	>=sci-libs/ccp4-libs-6.1.3
 	sci-libs/mmdb
 	virtual/lapack"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
@@ -36,7 +37,7 @@ src_compile() {
 		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"
+		MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb lapack) -lccif -lstdc++ -lm"
 }
 
 src_test() {
diff --git a/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild b/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild
index bcac9a9dc5b1..517574395924 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-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/10/19 09:56:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild,v 1.3 2013/02/21 22:00:47 jlec Exp $
 
 EAPI=4
 
@@ -19,7 +19,8 @@ RDEPEND="
 	>=sci-libs/ccp4-libs-6.1.3
 	sci-libs/mmdb
 	virtual/lapack"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
@@ -38,7 +39,7 @@ src_compile() {
 		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"
+		MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb lapack) -lccif -lstdc++ -lm"
 }
 
 src_test() {
diff --git a/sci-chemistry/molrep/molrep-11.0.03.ebuild b/sci-chemistry/molrep/molrep-11.0.03.ebuild
deleted file mode 100644
index 31920ca470b8..000000000000
--- a/sci-chemistry/molrep/molrep-11.0.03.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.2 2012/10/19 09:56:23 jlec Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="molecular replacement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/molrep.html"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-libs/ccp4-libs-6.1.3
-	sci-libs/mmdb
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/11.0.00-respect-FLAGS.patch \
-		"${FILESDIR}"/11.0.00-test.patch
-	[[ $(tc-getFC) =~ gfortran ]] && append-fflags -fno-second-underscore
-}
-
-src_compile() {
-	cd "${S}"/src
-	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"
-}
-
-src_test() {
-	export MR_TEST="${S}/bin/"
-	cd "${S}"/molrep_check/work
-	mkdir out scr
-	cp ../*.bat .
-	bash em.bat || die
-	bash mr.bat || die
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe bin/${PN}
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
-	dodoc readme doc/${PN}.rtf
-}