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

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

5 files changed, 21 insertions, 71 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/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
-}