sci-chemistry/gsim: 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 70EB7916)

5 files changed, 18 insertions, 123 deletions

diff --git a/sci-chemistry/gsim/ChangeLog b/sci-chemistry/gsim/ChangeLog
index 80a21d3e1be0..46c575af182c 100644
--- a/sci-chemistry/gsim/ChangeLog
+++ b/sci-chemistry/gsim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/gsim
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.5 2012/05/21 15:08:27 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.6 2013/02/19 16:25:36 jlec Exp $
+
+  19 Feb 2013; Justin Lecher <jlec@gentoo.org> -files/0.19.1-build.conf.patch,
+  -gsim-0.19.1.ebuild, gsim-0.20.1.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old
 
   21 May 2012; Justin Lecher <jlec@gentoo.org> gsim-0.19.1.ebuild,
   gsim-0.20.1.ebuild:
diff --git a/sci-chemistry/gsim/files/0.19.1-build.conf.patch b/sci-chemistry/gsim/files/0.19.1-build.conf.patch
deleted file mode 100644
index ed21a58d4519..000000000000
--- a/sci-chemistry/gsim/files/0.19.1-build.conf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/gsim.pro b/gsim.pro
-index 60550e9..d159b19 100755
---- a/gsim.pro
-+++ b/gsim.pro
-@@ -1,36 +1,7 @@
--###################################################################################################
--#                  	Change this part according to your system configuration                   #
--###################################################################################################
--
--#Uncomment next line if you want to have a system console running alongside GSim on Windows
--#win32: CONFIG +=console
--
--#Uncomment next line if you want to use OpenGL
--#CONFIG+=use_opengl
--
--#Uncomment next line if you want to use EMF output
--#EMF output requires libEMF or Wine on X11 systems and MAC(?)
--CONFIG+=use_emf
--
--#DO NOT UNCOMMENT NEXT LINE. The scripting possibilty won't work at the moment
--#CONFIG+=use_script
--
--# Change directories locations for libcmatrix, MinUIT and muParser libraries
--unix:INCLUDEPATH += /home/vnmr1/libcmatrixR3/include \
--		    /home/vnmr1/Minuit2/include \
--		    /home/vnmr1/muparser/include
--win32:INCLUDEPATH += "C:\Documents and Settings\vadzorin\My Documents\gsim\libcmatrixR3\include" "C:\Documents and Settings\vadzorin\My Documents\gsim\Minuit2\include" "C:\Documents and Settings\vadzorin\My Documents\gsim\muparser\include"
--
--unix:LIBS += -lcmatrix -L/home/vnmr1/libcmatrixR3  -lMinuit2Base -L/home/vnmr1/Minuit2/lib -L/home/vnmr1/muparser/lib -lmuparser
--win32:LIBS += -lcmatrix -L"C:\Documents and Settings\vadzorin\My Documents\gsim\libcmatrixR3" -lMinuit2 -L"C:\Documents and Settings\vadzorin\My Documents\gsim\Minuit2\lib" -L"C:\Documents and Settings\vadzorin\My Documents\gsim\muparser\lib" -lmuparser
--
--#Change directories location for libEMF (if used)
--use_emf {
--	DEFINES+=USE_EMF_OUTPUT
--	unix:LIBS +=-lEMF -L/usr/include/libEmf
--	win32:LIBS +=-lgdi32
-+GSIM_ROOT = .
-+!include( $$GSIM_ROOT/build.conf ) {
-+	message( "You need a build.conf file with local settings!" )
- }
--
- #################################################################################################
- #                             Don't change anything below this line                             #
- #################################################################################################
diff --git a/sci-chemistry/gsim/gsim-0.19.1.ebuild b/sci-chemistry/gsim/gsim-0.19.1.ebuild
deleted file mode 100644
index 53500e1b4f32..000000000000
--- a/sci-chemistry/gsim/gsim-0.19.1.ebuild
+++ /dev/null
@@ -1,66 +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/gsim/gsim-0.19.1.ebuild,v 1.4 2012/05/21 15:08:27 jlec Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
-HOMEPAGE="http://sourceforge.net/projects/gsim/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emf opengl"
-
-RDEPEND="
-	dev-cpp/muParser
-	media-libs/freetype
-	sci-libs/libcmatrix
-	sci-libs/minuit
-	virtual/blas
-	x11-libs/qt-svg:4
-	emf? ( media-libs/libemf )
-	opengl? ( x11-libs/qt-opengl:4 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PV}-build.conf.patch )
-DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
-
-src_prepare() {
-	edos2unix ${PN}.pro
-
-	qt4-r2_src_prepare
-
-	cat >> build.conf <<- EOF
-	INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
-		"${EPREFIX}/usr/include/Minuit2" \
-		"${EPREFIX}/usr/include"
-	LIBS += -lcmatrix  -lMinuit2 -lmuparser $(pkg-config --libs cblas)
-	EOF
-
-	use opengl && echo "CONFIG+=use_opengl" >> build.conf
-
-	if use emf; then
-		cat >> build.conf <<- EOF
-		CONFIG+=use_emf
-		DEFINES+=USE_EMF_OUTPUT
-		LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
-		EOF
-	fi
-	sed \
-		-e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
-		-e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
-		-i mainform.h || die
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r images ${PN}.ico
-	insinto /usr/share/${PN}/ui
-	doins *.ui
-}
diff --git a/sci-chemistry/gsim/gsim-0.20.1.ebuild b/sci-chemistry/gsim/gsim-0.20.1.ebuild
index 885a7b6062b3..d96f176198bb 100644
--- a/sci-chemistry/gsim/gsim-0.20.1.ebuild
+++ b/sci-chemistry/gsim/gsim-0.20.1.ebuild
@@ -1,10 +1,10 @@
-# 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/gsim/gsim-0.20.1.ebuild,v 1.2 2012/05/21 15:08:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/gsim-0.20.1.ebuild,v 1.3 2013/02/19 16:25:36 jlec Exp $
 
 EAPI=4
 
-inherit eutils qt4-r2
+inherit eutils qt4-r2 toolchain-funcs
 
 DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
 HOMEPAGE="http://sourceforge.net/projects/gsim/"
@@ -38,7 +38,7 @@ src_prepare() {
 	INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
 		"${EPREFIX}/usr/include/Minuit2" \
 		"${EPREFIX}/usr/include"
-	LIBS += -lcmatrix  -lMinuit2 -lmuparser $(pkg-config --libs cblas)
+	LIBS += -lcmatrix  -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs cblas)
 	EOF
 
 	use opengl && echo "CONFIG+=use_opengl" >> build.conf
diff --git a/sci-chemistry/gsim/metadata.xml b/sci-chemistry/gsim/metadata.xml
index 2c3fb100ce16..d84b7d1a7487 100644
--- a/sci-chemistry/gsim/metadata.xml
+++ b/sci-chemistry/gsim/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="emf">Support for .emf export</flag>
-	</use>
+  <herd>sci</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="emf">Support for .emf export</flag>
+  </use>
 </pkgmetadata>