sci-libs/itpp: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config

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

6 files changed, 26 insertions, 112 deletions

diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog
index 1b3a0b8ca7e0..d502381a8db5 100644
--- a/sci-libs/itpp/ChangeLog
+++ b/sci-libs/itpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/itpp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.116 2012/08/03 19:24:33 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.117 2013/02/21 21:30:40 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> -itpp-4.0.6.ebuild,
+  itpp-4.2-r1.ebuild, itpp-4.2-r2.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
 
   03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> itpp-4.2-r2.ebuild:
   Keyword amd64-linux x86-linux
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 68b27d60de05..8aabfd7dfbeb 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX itpp-4.0.6-gcc44.patch 2068 SHA256 ac0696b9b33a040fa4d8e670475fd8d922b6b99ece6a362ffdbad40363d65bd1 SHA512 39f5a285f27f2cda92208597934a3e4e9eabdc2d4729376758c81a7c337f30c9f423b9c5ac13eedfb7cff521556d3bbf1ee6685cdfef5dea0ecd33ea593133b1 WHIRLPOOL 4395e934e019c1db8642ae81bdee22a576da0ec8bcad97be68d5785da4405fd7e1685504c132400e205d4207af17915cf5fdcae6aaa10bec8b21f9e5fa9e3c37
 AUX itpp-4.0.7-fastica-fix-endless-loop.patch 4009 SHA256 f433a5c762a1461065f51b1d99537f7c782bbc9190480ac509593bb23bbf4696 SHA512 f5724b84bff3474f5d8ebaabd5eb8c42b2f2842cd14282510c4d8554b31fd493c9a08647a035dff81ae8ff8f385c280ba2735a95a7f06ab4cc448c945bd78877 WHIRLPOOL 33b7e3bc5ac62ce7988957f62fa0bb797d38bce8d2241b4effd7cade4c217dcb915162f2f73442604ee962899a5eba922404507304f4a1e90396bc051d469f31
@@ -7,17 +7,15 @@ AUX itpp-4.2-automake-1.12.patch 405 SHA256 e7540d79d4fa907777b8826f29d66f49819c
 AUX itpp-4.2-fastica-correct-dim.patch 932 SHA256 922f9f4c1780b98f06959f72d423b5820cc03607e34d98aff8e426f473c3bebe SHA512 16ea7f251623a1454925858e598fc90e8beb365c7776a81cdaaecc58cb9ce687cfed5bc859dc3ffbed8f9380c394b8adcab6ecfface7fd789d58657749b0fda1 WHIRLPOOL dce36eb93bd4efdb5d0c9a75009bca772e26bfa324b5a5efa9b7849705d401ca264d241499f4c818203694b1610e5aa1771f96573f16d00f508f684eaf862fab
 AUX itpp-4.2-pkg-config.patch 1057 SHA256 32185a1b0b8f71b29933613a3c0d4cfc8e6ec99f7551667a6c3dd5b4c232a9f0 SHA512 d19fd64fa9d346a72a9745e9dead5e563c7348eefba69e3dffe8ba252919b4ca2b1e2039263b73147ff04ae0eedb29d3875b3081b04c140085102833e772e0d3 WHIRLPOOL 55776afa13fe61ecf3a8f546fff5e887593409774ef71ca69fb7522f5c208df32904fd2a03f0ce11c9fe06f443e303ddf96410e0c0a5174297b4189a3b1713e0
 AUX itpp-4.2-test-fftw.patch 543 SHA256 bd02d0d9de2d559ac4317d1bfc9faa5f81a6056a44040859cebe955471f442d2 SHA512 e4a5c7ecf1ff0bc6a14d8a9658cd0f0610db5652e7515dddad0579ea5fccdd083360755c9acf51073973b7540176d5eca6a1cdf0da48c9df08aaf9278a1149c9 WHIRLPOOL ed3191d1011756537694560323ab95cb34e2f4d2fe9ab502044fba3aaf28ca7b8b5343995165f6d8fb616fdcbb4e6b949d765f7d04d9b623f3549434c21e8800
-DIST itpp-4.0.6.tar.bz2 976917 SHA256 a0d5fb03149c361b98556b4736980a4eae4de14a550153f343c60fd29ac5ef94
 DIST itpp-4.2.tar.bz2 1050157 SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c SHA512 319296c5d929201fcdfb32ad59b3304d3620d921c1d08feb1d138fecb37305f71f825b4fc45d563ba817eb6ac92fb9223c32d4260013ef1d30a2e1e8edf52a2f WHIRLPOOL 4af9e5326b9a94013c173d650ac5c92105e21731ef6398e707808219831158bd995060a860d31d6874a56b96123bb5e646600f45ee6f4fb185d3e9c1b349ddc7
-EBUILD itpp-4.0.6.ebuild 2269 SHA256 95a24f5d97cf818d7eafd6f7c970a74beb88cc8dc5645cb824ad93c0db17c8b0 SHA512 0d05b36ee6030e6838b9913dc39512780e0d13d8f491f0b27b2c54f0ee4b14aa82ebb6698094a68198ddeb5b4771e6b0af9f6c5c5985d24f92a71b887379ce9e WHIRLPOOL e5193b55189bca92310805864db9c8d747227deb50ef6e76f0f6bc223813a6588eef6c8b6abcd16fe7625456fb2d8f06263cf5863295cff8c21af32a0a44f1fc
-EBUILD itpp-4.2-r1.ebuild 1773 SHA256 dc1a339cf7a83abbd81dc83071d2d94a2ad95a78951b186606a071450434931a SHA512 80a640c508de708bcb76b896ecf2ca4bbd36c48c3cf1d41b0809d144866375bccc15727350354fe51b71bfd06714ede6f3269ed09eda0191a1e6ac9a50dbd23d WHIRLPOOL 5ead4454b2c43595b8562c02c38bb4b47f2e53572431c2a062e623cbd033a7965f8b3c875ba0ba6e70a3cee0888582ca999898440feea57144862e6166742b61
-EBUILD itpp-4.2-r2.ebuild 1910 SHA256 7bed545e109b193a8e13be2b46a4faa7c66496ecfd838788221efc821a5190e0 SHA512 076538f3503a12ada9157d185e2931699fbc2f26c5aac2359b45e111cd26047b8c1fd17808c1cf53ff1e3c919c9a3ee41ce9899640d41ed962c6985354fa39f5 WHIRLPOOL 2ec4e7888ca7cb3ad46880227568c2522a4645942967cf1246980f939fec31f0c17bd7c5a4da97e24c2a802326706582c7424bb7ad33c01a5e4380f5acf29f7a
-MISC ChangeLog 17246 SHA256 639702917e963abf39594c16a4f4d32a7d1da8068902e186f4b2ae9dada040ab SHA512 1688f4260153830b6117e3dc760b5b9264237da5168055863d908a46b289d457f3d78312a0e95bb51d371927284f55d3642b3af7b591fc8e6ddcc510c16bd98d WHIRLPOOL b2a8d4761d3045b5f8d6689306967b5c5244a867c15d04105feca91c70390f36812ab75efe32d1ccac13c741e3e2967d7ad309025e09c09c266af9948b46ca38
-MISC metadata.xml 597 SHA256 a287a436e3d5911736b3243805159a86e981617cf8375cf52fad438deac044f5 SHA512 2ab7f64f589bb34db82ef347da6b621de1ee91e32a13a0a7dec0df64ff102a1246bcdf59d89f468c6499aa7c1600736509757818397a2d647df857a6a8b00db0 WHIRLPOOL 3e81d40451c2a402f1cbbd847f3567c17dd1e2731f5e83524bcd646835413d8430bbea0b6c201006979379941d7bf12c52a3c5b0d7d9aa3f24f97f88efd2cdd4
+EBUILD itpp-4.2-r1.ebuild 1807 SHA256 1440c72e5069fc386e7ae6f585f1041988984656bf73e6d4ca5fa35aa8ee5af6 SHA512 0171e3bd3b96d54d7f21587f58c74846c207dcb88fa37b048ad9bdf4b6dbae56e28d7d79c56e3cadde93319e30e98282837c6e3a65c4bf856ca9c229ec612fd5 WHIRLPOOL 3c9554e1bf85b7b010aa43c98a86768a900d25f8721ba831548fedd58a32f51e01bc6448e587ec830206c197614a5bc1b2cb75c7fa3de6539b62607ca5e9c367
+EBUILD itpp-4.2-r2.ebuild 1940 SHA256 2cdbfcf220233191c959de6c0e35cbe43183cece83818706536e897af846b97c SHA512 9633c13c4081ed91365bc692abfa8fe7009fa66549656dcbd99a1dbf29c91b572fc90b5c66d8f6be2b19d8d843601fb4f79ce6a873037ed37ba5c872e5b2ea34 WHIRLPOOL b5ca88611c88192f8b67c6a7e5bf048f2ddcfb9554a079f18fcdf4358626aa51012f780bd14b0a78860d1c9d68b2cd0a42aa0dd784188776753e78cd3cbf3810
+MISC ChangeLog 17445 SHA256 bc8cc0e0677030b08114cefa5cfb837ea655a56d2e7ceb406b4445ac93038ba8 SHA512 485e5ad4025e1a4514998b9f9f40a58779ac00530af2c46caa78fa5656dffb3bcaacb43fba45e1bff5837991bc47e88de9a9d9726b0445d561e2c4f42f43ea3c WHIRLPOOL 0220a37555e3a16ad2980d2238fe25e98d3616b8b97e862f979066dce0cb3f18dc0fc669cb9283638cb7cf45d6ab49f1234bffb59eb234f740b786d2090534da
+MISC metadata.xml 599 SHA256 588d110a1f4ce9ddac936bd96252c4076eacad1d1abf8a8d379f902e01f63e79 SHA512 087445360f34b0fbb48438589cb36a20e3e58c1ef1d8e7ae61dcf1fb03dba2415cc6e75207daa9e4c950df75ec6780525d8a432be326d9c546e63d16ab19384e WHIRLPOOL 822a108df4470318946056d20c7d768f32dd7f1a29b82cd8bd9af611c0d8acc290a1f349b7cfc3fc2c3e80590581d6b9e3981c7e627963a4d5ef28059b432e4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEUEAREIAAYFAlAcJXcACgkQ1ycZbhPLE2BEXACfYDWn/ONbPr7g5uwTwvZSpJ0Z
-KrcAmNp2rPRV5cDg0w6Jh3m/U7cFRVI=
-=MO7z
+iEYEAREKAAYFAlEmki8ACgkQgAnW8HDreRaRFACgsNjozQnEgM/3KL5V7R0f5MQD
+OI4AoIadoRk1sQ5qNXZqJE36JIEUXebb
+=SN2U
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/itpp/itpp-4.0.6.ebuild b/sci-libs/itpp/itpp-4.0.6.ebuild
deleted file mode 100644
index fb4d5b5a36ec..000000000000
--- a/sci-libs/itpp/itpp-4.0.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.0.6.ebuild,v 1.11 2012/07/06 07:45:01 jlec Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="blas debug doc fftw lapack minimal"
-
-RDEPEND="
-	!minimal? ( fftw? ( >=sci-libs/fftw-3.0.0 ) )
-	blas? (
-		virtual/blas
-		lapack? ( virtual/lapack ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base )"
-
-# we need this to prevent itpp's specialized debug lib
-# (built with USE="debug" set) from being stripped
-RESTRICT="strip"
-
-pkg_setup() {
-	# lapack can only be used in conjunction with blas
-	if use lapack && ! use blas; then
-		die "USE=lapack requires USE=blas to be set"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_compile() {
-	# turn off performance critical debug code
-	append-flags -DNDEBUG
-
-	# make sure that -g is stripped always since we use
-	# RESTRICT=strip. If debug info is needed please enable
-	# the debug use flag and link against the debug *.so
-	filter-flags -g
-
-	local blas_conf="--without-blas"
-	local lapack_conf="--without-lapack"
-	if use blas; then
-		if use lapack; then
-			blas_conf="--with-blas=$(pkg-config lapack --libs)"
-			lapack_conf="--with-lapack"
-		else
-			blas_conf="--with-blas=$(pkg-config blas --libs)"
-		fi
-	fi
-
-	local fftw_conf="--without-fft";
-	if use fftw;
-	then
-		fftw_conf="--with-fft=-lfftw3"
-	fi
-
-	local myconf="--docdir=/usr/share/doc/${P}"
-	if use minimal; then
-		myconf="${myconf} --disable-comm --disable-fixed --disable-optim --disable-protocol --disable-signal --disable-srccode"
-	fi
-
-	econf $(use_enable doc html-doc) \
-		$(use_enable debug) \
-		"${blas_conf}" \
-		"${lapack_conf}" \
-		"${fftw_conf}" \
-		${myconf}
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog ChangeLog-2007 ChangeLog-2006 \
-		ChangeLog-2005 INSTALL NEWS NEWS-3.10 NEWS-3.99 README TODO \
-		|| die "failed to install docs"
-}
diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild
index 624efcf71397..9e671220655c 100644
--- a/sci-libs/itpp/itpp-4.2-r1.ebuild
+++ b/sci-libs/itpp/itpp-4.2-r1.ebuild
@@ -1,12 +1,12 @@
-# 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-libs/itpp/itpp-4.2-r1.ebuild,v 1.14 2012/07/17 08:11:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r1.ebuild,v 1.15 2013/02/21 21:30:40 jlec Exp $
 
 EAPI=4
 
 AUTOTOOLS_AUTORECONF=yes
 
-inherit autotools-utils flag-o-matic
+inherit autotools-utils flag-o-matic toolchain-funcs
 
 DESCRIPTION="C++ library of mathematical, signal processing and communication"
 HOMEPAGE="http://itpp.sourceforge.net/"
@@ -43,9 +43,9 @@ src_prepare() {
 
 src_configure() {
 	local blasconf="no"
-	use blas && blasconf="$(pkg-config --libs blas)"
+	use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
 	local lapackconf="no"
-	use lapack && lapackconf="$(pkg-config --libs blas lapack)"
+	use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
 
 	local myeconfargs=(
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/sci-libs/itpp/itpp-4.2-r2.ebuild b/sci-libs/itpp/itpp-4.2-r2.ebuild
index f7d283973167..ca322e542aba 100644
--- a/sci-libs/itpp/itpp-4.2-r2.ebuild
+++ b/sci-libs/itpp/itpp-4.2-r2.ebuild
@@ -1,12 +1,12 @@
-# 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-libs/itpp/itpp-4.2-r2.ebuild,v 1.3 2012/08/03 19:24:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r2.ebuild,v 1.4 2013/02/21 21:30:40 jlec Exp $
 
 EAPI=4
 
 AUTOTOOLS_AUTORECONF=yes
 
-inherit autotools-utils flag-o-matic
+inherit autotools-utils flag-o-matic toolchain-funcs
 
 DESCRIPTION="C++ library of mathematical, signal processing and communication"
 HOMEPAGE="http://itpp.sourceforge.net/"
@@ -46,9 +46,9 @@ src_prepare() {
 
 src_configure() {
 	local blasconf="no"
-	use blas && blasconf="$(pkg-config --libs blas)"
+	use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
 	local lapackconf="no"
-	use lapack && lapackconf="$(pkg-config --libs blas lapack)"
+	use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
 
 	local myeconfargs=(
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/sci-libs/itpp/metadata.xml b/sci-libs/itpp/metadata.xml
index 44d71c60f368..8d93511d9b03 100644
--- a/sci-libs/itpp/metadata.xml
+++ b/sci-libs/itpp/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</herd>
-	<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   IT++ is a C++ library of mathematical, signal processing and
   communication classes and functions. Its main use is in simulation
   of communication systems and for performing research in the area of