Moved to autotools-utils.eclass in order to handle .a/.la correctly

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 44 insertions, 33 deletions

diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog
index 23f90871b251..956bab451dd3 100644
--- a/sci-libs/itpp/ChangeLog
+++ b/sci-libs/itpp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/itpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.102 2011/08/05 22:41:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.103 2011/12/16 10:54:28 jlec Exp $
+
+  16 Dec 2011; Justin Lecher <jlec@gentoo.org> itpp-4.2-r1.ebuild:
+  Moved to autotools-utils.eclass in order to handle .a/.la correctly
 
   05 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> itpp-4.2-r1.ebuild:
   added autotools eclass
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 015d5887fe2c..b5520051d16b 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX itpp-4.0.6-gcc44.patch 2068 RMD160 62cf59be94f18f0bfe5c433540d5c2784bc8a8a0 SHA1 350c2ed54cb9d8c5f6188e703646e912e39fcb8c SHA256 ac0696b9b33a040fa4d8e670475fd8d922b6b99ece6a362ffdbad40363d65bd1
 AUX itpp-4.0.7-fastica-fix-endless-loop.patch 4009 RMD160 60c4456ca1db737669f0b6a91de9a567103af95a SHA1 8bb848e41effa3fe49ac27e1ddacb6bbfd13d16c SHA256 f433a5c762a1461065f51b1d99537f7c782bbc9190480ac509593bb23bbf4696
@@ -8,13 +8,13 @@ AUX itpp-4.2-test-fftw.patch 543 RMD160 7dbc835f990a30800d7ca882bcdfcbe25e9311d8
 DIST itpp-4.0.6.tar.bz2 976917 RMD160 25ea74e9ab718c5f689145c45a0cd2712c5e94f0 SHA1 e31c51d0469f9b485b9ef4ef4f1d33a41fdde40a SHA256 a0d5fb03149c361b98556b4736980a4eae4de14a550153f343c60fd29ac5ef94
 DIST itpp-4.2.tar.bz2 1050157 RMD160 ccf272d839f8178ac4729f48301bde771ffe3573 SHA1 3b75fbcbbc43ac6e47d80283ffd41673ccfa035e SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c
 EBUILD itpp-4.0.6.ebuild 2315 RMD160 52005625afb8df0d562871161d21c4bf95e16e93 SHA1 1d39dad14332c8959bf96ac0ddefa9065e581190 SHA256 2575568af2a0431f5a381b6f3264a06d4e31d4ce1630ef5b8dd91ba31bdb57e9
-EBUILD itpp-4.2-r1.ebuild 1701 RMD160 2e05a38610849458a69a3d94ab613d6ca782481a SHA1 b6aad1b2dfe6c38d1aa692a7ff456a5e895845ec SHA256 d13f33d12c29660f5aa95689aa58ea2d2157d7096388e070a6375b1af99b7ed2
-MISC ChangeLog 15443 RMD160 61a936304571b5149378acf705dff01478c2cbb6 SHA1 52c9badc2af7a3532fed75e5c1f977e5ac55ade6 SHA256 e72c78817305c92c661fc6f3118cac84af4a3013b142b7d5f1640389dcf408f6
+EBUILD itpp-4.2-r1.ebuild 1707 RMD160 a2571a682d8f1b2a57ff1e9aaaf331064a153c08 SHA1 07c93c95788aba3fd2aa256e03a34c5d42a591d1 SHA256 1cd813da261dbbc8417d7e04623b6aa0debd8f250f09b815b7c117a253243a92
+MISC ChangeLog 15577 RMD160 c1a5e5c70ade29da19528dfae0c720ba8f484761 SHA1 95e1169aff2e98f089ef76f88e5c60fb21d47b36 SHA256 8991e1cf4f78d213b782c49da2a7e2fa54e6d94ffa1ac28e90ccd0a308728ca4
 MISC metadata.xml 595 RMD160 514aea8e10521b6212284358d0f558374860e6bf SHA1 5993d15c5b702e8f3bb79537043a4de3d46d6871 SHA256 59f01c9e3591e28a87c6451129582b012d06c757f8567447afd02ed6f545f988
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk48cbkACgkQ1ycZbhPLE2ByUACeO7qgYPh/n/HLY/YAYAqEFzYU
-nJkAoIZpn3zoW+yTJOuhehIOwRcdNg2/
-=7rGY
+iEYEAREKAAYFAk7rI20ACgkQgAnW8HDreRZN2ACePkLOoasC1SLv4fG9boEYR+kk
+t/cAnRRAlwBS+Lm6H4W7BWrna9R0d8FB
+=krDQ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild
index 723cb371f74d..3733c28ebcfe 100644
--- a/sci-libs/itpp/itpp-4.2-r1.ebuild
+++ b/sci-libs/itpp/itpp-4.2-r1.ebuild
@@ -1,53 +1,61 @@
 # Copyright 1999-2011 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.3 2011/08/05 22:41:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r1.ebuild,v 1.4 2011/12/16 10:54:28 jlec Exp $
 
 EAPI=4
-inherit flag-o-matic eutils autotools
+
+inherit autotools-utils flag-o-matic
 
 DESCRIPTION="C++ library of mathematical, signal processing and communication"
-LICENSE="GPL-3"
 HOMEPAGE="http://itpp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
+LICENSE="GPL-3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="blas debug doc fftw lapack minimal static-libs"
 
-RDEPEND="!minimal? ( fftw? ( >=sci-libs/fftw-3 ) )
-	blas? ( virtual/blas lapack? ( virtual/lapack ) )"
+RDEPEND="
+	blas? ( virtual/blas lapack? ( virtual/lapack ) )
+	!minimal? ( fftw? ( >=sci-libs/fftw-3 ) )"
 DEPEND="${RDEPEND}
 	blas? ( dev-util/pkgconfig )
-	lapack? ( dev-util/pkgconfig )
-	doc? ( app-doc/doxygen virtual/latex-base )"
+	doc? ( app-doc/doxygen virtual/latex-base )
+	lapack? ( dev-util/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
+	"${FILESDIR}"/${PN}-4.2-fastica-correct-dim.patch
+	"${FILESDIR}"/${PN}-4.2-test-fftw.patch
+	)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
-	epatch "${FILESDIR}"/${PN}-4.2-fastica-correct-dim.patch
-	epatch "${FILESDIR}"/${PN}-4.2-test-fftw.patch
+	# turn off performance critical debug code
+	use debug || append-flags -DNDEBUG
+	autotools-utils_src_prepare
 	eautoreconf
 }
 
 src_configure() {
-	# turn off performance critical debug code
-	use debug || append-flags -DNDEBUG
 	local blasconf="no"
 	use blas && blasconf="$(pkg-config --libs blas)"
 	local lapackconf="no"
 	use lapack && lapackconf="$(pkg-config --libs blas lapack)"
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-shared \
-		$(use_enable doc html-doc) \
-		$(use_enable debug) \
-		$(use_enable !minimal comm) \
-		$(use_enable !minimal fixed) \
-		$(use_enable !minimal optim) \
-		$(use_enable !minimal protocol) \
-		$(use_enable !minimal signal) \
-		$(use_enable !minimal srccode) \
-		$(use_enable static-libs static) \
-		$(use_with fftw fft) \
-		--with-blas="${blasconf}" \
+
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-shared
+		$(use_enable doc html-doc)
+		$(use_enable debug)
+		$(use_enable !minimal comm)
+		$(use_enable !minimal fixed)
+		$(use_enable !minimal optim)
+		$(use_enable !minimal protocol)
+		$(use_enable !minimal signal)
+		$(use_enable !minimal srccode)
+		$(use_with fftw fft)
+		--with-blas="${blasconf}"
 		--with-lapack="${lapackconf}"
+	)
+	autotools-utils_src_configure
 }