sci-libs/itpp: Add fix for automake-1.12, #317328; add missing eclass; don't run elibtoolize twice

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

5 files changed, 52 insertions, 17 deletions

diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog
index c02fe6f74639..bdd4f10892c6 100644
--- a/sci-libs/itpp/ChangeLog
+++ b/sci-libs/itpp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.111 2012/05/04 08:22:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.112 2012/07/06 07:45:00 jlec Exp $
+
+  06 Jul 2012; Justin Lecher <jlec@gentoo.org> itpp-4.0.6.ebuild,
+  itpp-4.2-r1.ebuild, +files/itpp-4.2-automake-1.12.patch:
+  Add fix for automake-1.12, #317328; add missing eclass; don't run elibtoolize
+  twice
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> itpp-4.2-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 112d550a714c..027484044638 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,10 +1,22 @@
-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
-AUX itpp-4.2-fastica-correct-dim.patch 932 RMD160 b879c83b4c8fde1abb2e5e75745bccf14cd4ee25 SHA1 8a4eff7f9939cf8a3dcdb1dadf2085630f638dcd SHA256 922f9f4c1780b98f06959f72d423b5820cc03607e34d98aff8e426f473c3bebe
-AUX itpp-4.2-test-fftw.patch 543 RMD160 7dbc835f990a30800d7ca882bcdfcbe25e9311d8 SHA1 916ce82cb81ffec1d6f865a5c40dc2abab8d8232 SHA256 bd02d0d9de2d559ac4317d1bfc9faa5f81a6056a44040859cebe955471f442d2
-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 2262 RMD160 ceb307da136753a44edf89fb6921cf26a0512412 SHA1 6f65ea9f72554ad334b47fc9126d769715663749 SHA256 8c35c183f557bcd20c4257af34101606118ce27931f430d7c7e0c999134db30e
-EBUILD itpp-4.2-r1.ebuild 1747 RMD160 c2d4b2198398f53ad4dbec85ba944755d2c00a64 SHA1 223d46cd6f6cc14cac6ac28dc7dd213f509795b6 SHA256 52d4aa475215f58a6e736a670fdfdaa5d991c9c09a7f9006a6cefaf27f593779
-MISC ChangeLog 16457 RMD160 6c61805cc1bc7cdb4603df3b7978504666f55c1e SHA1 676e6a1c53946c7083d0c1eb912f4062e02fbb77 SHA256 509c28120b4f34f8aa66861845ad7ff29860c89a228d0a1258d85ca21759ab28
-MISC metadata.xml 597 RMD160 6acf244ae87a9eb0bb2283b3ab601aba50d356e1 SHA1 3dc70b42aed367ca56d468217a9ad8d7a4a68a23 SHA256 a287a436e3d5911736b3243805159a86e981617cf8375cf52fad438deac044f5
+-----BEGIN PGP SIGNED MESSAGE-----
+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
+AUX itpp-4.2-automake-1.12.patch 343 SHA256 fcce94f9b1aac5d6c19e5920f4d5c23a56f0487a086d1e7d851e1b0663d9ced8 SHA512 23d0a2d4f01fd4e7083486cb07d3fa4ed89c4bc062b1b139a3c7c398bf29ee7cc7c399bd824fdba9d1fb5423d57681721fae7060cb268baf97d71d9f07839471 WHIRLPOOL 1babc0c43fea78c00c694e6ae2297ad28f8e47041e4d0cee801376c2b999c56f77d080f976ba55a2a4eb8973da6e95adb973227adafaba0bead4485815fdae84
+AUX itpp-4.2-fastica-correct-dim.patch 932 SHA256 922f9f4c1780b98f06959f72d423b5820cc03607e34d98aff8e426f473c3bebe SHA512 16ea7f251623a1454925858e598fc90e8beb365c7776a81cdaaecc58cb9ce687cfed5bc859dc3ffbed8f9380c394b8adcab6ecfface7fd789d58657749b0fda1 WHIRLPOOL dce36eb93bd4efdb5d0c9a75009bca772e26bfa324b5a5efa9b7849705d401ca264d241499f4c818203694b1610e5aa1771f96573f16d00f508f684eaf862fab
+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 1818 SHA256 2f3c08cff1f5057587e3b145ee2ca447379dde73fb2b50d879ce5a8e997cf78d SHA512 50e208262450dae1d56f1e3a5e4124c6b190e3158c9b439cd1bcdbcb51d94e8b27589541bf65eb5c31d494261e3f5663403cbc3f5d6378445531a4fddd9a691d WHIRLPOOL 696b7f1ada24b34fb5b5976961e0042f07b980cf93753aa54a7609169cc0f2806583f2d5b10fac4d7ee2a21e1f77d8d5c14ebe4547f7a4204cd31030df67c0f4
+MISC ChangeLog 16669 SHA256 7fdce5826654db8e75b0ef2a3a9316ef188cbdb96a67902ba0869db256d8e8ff SHA512 1b2bf772340ae5f3b41c9bd5751bbff0fc82758a641d4565677c09058c05838cb9d38a2f52293ffdb1451976ddf34e381e6ff0ca15b344d792af3c4fef7204ce WHIRLPOOL 440505b1f2ebbe34cdb0d3bd76d25c10424ea58575453bed711d63e5dcbee94e6bb76a8ba0bc4ca2e73905116caf19de57458dd16b421f7130cef5af3d565fb9
+MISC metadata.xml 597 SHA256 a287a436e3d5911736b3243805159a86e981617cf8375cf52fad438deac044f5 SHA512 2ab7f64f589bb34db82ef347da6b621de1ee91e32a13a0a7dec0df64ff102a1246bcdf59d89f468c6499aa7c1600736509757818397a2d647df857a6a8b00db0 WHIRLPOOL 3e81d40451c2a402f1cbbd847f3567c17dd1e2731f5e83524bcd646835413d8430bbea0b6c201006979379941d7bf12c52a3c5b0d7d9aa3f24f97f88efd2cdd4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/2l4IACgkQgAnW8HDreRYo0ACgkbifNZH/pDNH9vDc0D/J2Yv9
+MYoAn2J7EdvTT3h9p+JuAewWdkiCXpRy
+=Dp7l
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch b/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch
new file mode 100644
index 000000000000..aa8723b215a5
--- /dev/null
+++ b/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch
@@ -0,0 +1,16 @@
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4f06171..84044ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,6 +104,8 @@ case $enable_explicit_deps in
+ esac
+ AC_MSG_RESULT($enable_explicit_deps)
+ 
++AM_PROG_AR
++
+ # Set default language to C++
+ AC_LANG([C++])
+ 
diff --git a/sci-libs/itpp/itpp-4.0.6.ebuild b/sci-libs/itpp/itpp-4.0.6.ebuild
index ee0ba1b01598..fb4d5b5a36ec 100644
--- a/sci-libs/itpp/itpp-4.0.6.ebuild
+++ b/sci-libs/itpp/itpp-4.0.6.ebuild
@@ -1,8 +1,8 @@
 # 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.10 2012/04/26 15:23:43 jlec Exp $
+# $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 flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="C++ library of mathematical, signal processing and communication"
 HOMEPAGE="http://itpp.sourceforge.net/"
diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild
index 9209ee7f8256..041e4d32c0ed 100644
--- a/sci-libs/itpp/itpp-4.2-r1.ebuild
+++ b/sci-libs/itpp/itpp-4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.11 2012/05/04 08:22:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r1.ebuild,v 1.12 2012/07/06 07:45:00 jlec Exp $
 
 EAPI=4
 
@@ -25,8 +25,9 @@ DEPEND="${RDEPEND}
 
 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
+	"${FILESDIR}"/${P}-fastica-correct-dim.patch
+	"${FILESDIR}"/${P}-test-fftw.patch
+	"${FILESDIR}"/${P}-automake-1.12.patch
 	)
 
 src_prepare() {
@@ -34,9 +35,10 @@ src_prepare() {
 	use debug || append-flags -DNDEBUG
 	sed \
 		-e 's:-pipe::g' \
+		-e 's:-Werror::g' \
 		-i configure* || die
 	autotools-utils_src_prepare
-	eautoreconf
+	AT_NOELIBTOOLIZE=yes eautoreconf
 }
 
 src_configure() {