sci-chemistry/gsim: 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: 0x70EB7916

6 files changed, 27 insertions, 136 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/Manifest b/sci-chemistry/gsim/Manifest
index fecb409afdf1..b1a3a6b12aff 100644
--- a/sci-chemistry/gsim/Manifest
+++ b/sci-chemistry/gsim/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX 0.19.1-build.conf.patch 2248 RMD160 02bd4a029e59bdd1d932154b6dded8e1946972ba SHA1 228d604619fe146a3609dcc7dc22359c71b1431e SHA256 3ffbcdf837737f18292b31a865c7836cc2ef9aaf5d8e6653e5e76bd5ad657531
-AUX 0.20.1-build.conf.patch 1890 RMD160 aae6909aeba16dde57503d7557e8c2c2f2c8dcac SHA1 5aa34cc8c46d076949a8566c090d5d32b3bb85cd SHA256 e5949f23eeab361149b4455b14d492f7e6f2c65f9ae6b816935c64e91aaa668b
-DIST gsim-0.19.1.tar.gz 3374301 RMD160 abd1c2402073584498a219e9195381f327efece5 SHA1 1e2640c139061c71fcf10bdadbda00eb1485d4ed SHA256 487c67869e561a334a0030392156b1bcb5663624e764b55cc4ca5a086c05a6a2
-DIST gsim-0.20.1.tar.gz 6088362 RMD160 a30863c2cae9ba019abea7e9a9aa926100b8ee19 SHA1 37250d624dbc84bb38b3e22b38f4d114019ec1db SHA256 0a63c52e3dc14450a3c58fb59f8dd51dfd5c685d2c7ef8f5448760c0b571fe7c
-EBUILD gsim-0.19.1.ebuild 1656 RMD160 aa4dc91ae8a34ccf068210669f22a4608f966079 SHA1 cee75279ccdcfc7b3de5420f61eff4c8e641189b SHA256 cc5fa4da5ce3c4fe1b06cf9dfce8913ea9ec8af7e8cb5ca1cb7f1d5ecb5fde0c
-EBUILD gsim-0.20.1.ebuild 1656 RMD160 479a46ee22a0fb2303572b95f803407a5ea31fd4 SHA1 37ba4b166701d93867869a27ed59dad486632ef5 SHA256 eb8611aff38581af7b7958fdaef8bd7af2cd7f7ba929964feecbf567b2af8786
-MISC ChangeLog 876 RMD160 36f9eb5f67dab56e867e63db887702b6e64b8e5f SHA1 cc4c679fa21cf266f639eeb1cce14b13c4ac8516 SHA256 3687c3378cd9f9c11a86fa258ecdbae922af18267901572d9ff7f4a6a182f9ba
-MISC metadata.xml 284 RMD160 480f282753b645f32a269e3171b2997e26ee78d1 SHA1 8dc2f602d3b58cb2b70443464c7b104b8e670d4c SHA256 346c39bfb62e65ca1e8f4c4ad4fa484457d1f08b1946a36fc6dd0f04fd1f23a4
+AUX 0.20.1-build.conf.patch 1890 SHA256 e5949f23eeab361149b4455b14d492f7e6f2c65f9ae6b816935c64e91aaa668b SHA512 98518d85fb45cc72a99d0e2dd6776aedb98183d89c96aa0bf029800c61d956d4720d97b42af53f12b5430200d508a1b4c85b427c849438d97f96a3d726d7b9a9 WHIRLPOOL 5da45c5bd7c38a6040117743f1e54234cf5b78879b6543d3d7c2286e7a084cdff0ac8e4a73ffe828c0b152f3be903713a40212f6edb6c863efaab4ac6eba0306
+DIST gsim-0.20.1.tar.gz 6088362 SHA256 0a63c52e3dc14450a3c58fb59f8dd51dfd5c685d2c7ef8f5448760c0b571fe7c
+EBUILD gsim-0.20.1.ebuild 1681 SHA256 7b205399544936fbd2a292ce4b86e99a0bb1a87d6f07fd3cb1df8bcad4ba3a68 SHA512 27e7f5d62e98e33171f3984383504eeda3be415b4838940d296101a065a79ba16c6b7844efaade9fd190c420311b4a8309ff639987771fea3dec409d62e515b6 WHIRLPOOL fd874ec89337f3d504d5b394071ed8960d1bc4cc66a02b8f32ef94edbb8276be7cdd05df4dc5399344d8b1f48302e3df3fe030f78032f04cfdd2e836c08db306
+MISC ChangeLog 1104 SHA256 adfa67b02a70194758bfcf3423c672b7922826d284f9ecb6965d44fd3e0ceafe SHA512 c16c883d1dd365b6b6eafd8546ac8a5e0de951c9c58b89869c22e1dd2788b7d3f10053bd9b9ddf10a29b4f15c82348547225347cb2f92a43f7a9f04873b0e312 WHIRLPOOL 7f4fcec99c25ffbfa2e4215f09043943ae45c9b48a535efb78c7d3b921654847eb01ee9af0a1bc0095ffc2a2e328e5bd6338b2c8cb2896e0407f6b011746f2bd
+MISC metadata.xml 293 SHA256 e41963c5d7720dc7c10bedbf68833132c373a5042d0f077461c755e2571e0eb8 SHA512 7056aba0f8343f4bf5e92b2139e197de0ef93cec0cbef23b873c2db158a8617bbee2bd5fcf862994b2fe299246b59805e613fe7c91b6ca5cbe4c38acb30fb30b WHIRLPOOL 96296377646144701e7f14d6dc6ae7791da6c5e5bd0b3ac7d0f94ad89e14a6b8cec315bc932927cfa21fd558162a7c6c95d2545b2d1aa20abaf55fcb77122554
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+6WnAACgkQgAnW8HDreRYYQQCeI7npGaITQQSM6k1/5e1cHFNf
-Nu8AoM4dVLyUvl5hR5MZXW010wOdVh3R
-=xCtG
+iEYEAREIAAYFAlEjp4EACgkQgAnW8HDreRb0kACeOrqahNgfMge9LQ/irOC0vgyG
+YD0AoK2hUdupC4o6nUHIpml59tlmR1TE
+=cw2T
 -----END PGP SIGNATURE-----
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>