Fix automake-1.13, bug #467550; respect $AR

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 56 insertions, 11 deletions

diff --git a/app-benchmarks/spew/ChangeLog b/app-benchmarks/spew/ChangeLog
index 1da2fbba1061..3a56eb8d4477 100644
--- a/app-benchmarks/spew/ChangeLog
+++ b/app-benchmarks/spew/ChangeLog
@@ -1,4 +1,6 @@
-
+# ChangeLog for app-benchmarks/spew
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/ChangeLog,v 1.7 2013/06/21 13:19:42 blueness Exp $
 
   14 Jul 2012; Anthony G. Basile <blueness@gentoo.org> spew-1.0.8.ebuild:
   Keyword ~arm ~mips
@@ -20,4 +22,3 @@
   06 Apr 2011; Anthony G. Basile <blueness@gentoo.org> +spew-1.0.8.ebuild,
   +files/remove-symlinks-makefile.patch, +metadata.xml:
   Initial commit.
-
diff --git a/app-benchmarks/spew/Manifest b/app-benchmarks/spew/Manifest
index ae6b3e58b37d..c51f5dd12f6f 100644
--- a/app-benchmarks/spew/Manifest
+++ b/app-benchmarks/spew/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fix-automake-1.13.patch 738 SHA256 b2ef8dfd2e1cd6d6b0e2dde2c87f17c62781b5844d3c64f69e8e1a6b901c61dc SHA512 d901296e786de378c669bf0e5303ccd1825d29ffa2116aba301250577abdef4a79b28e7e7a31587b373819cf940392b72b1cf0352ab4ec5d81861c72c70c76fb WHIRLPOOL 2cc08a143eb1ed793c981436aaf24390de5a696345c0af6bf32ee46da957c1d0aa8924a1d07df164fa791e682ead2a595ca0aa6c2624fe849f4b3e74ee2349c7
 AUX remove-symlinks-makefile.patch 1125 SHA256 06e591faefec55e12d52576f7ac4972dc4e4d0ba550f20bac3c089c7df1253a1 SHA512 4cedf0afe234089cced001bc5f491d49c836fc3acdf2264eecdc6d5621e9130efe9b4b24ce2198ed3edd9a4ec413bb5cbf45a2803650f8525acf3a903511cccc WHIRLPOOL 45406c8d36368e8f90e6aa16b6b4adb9a8193c963f1745fe59cb3b2e7a4887985bfc60c74cffcb7a6869bcfe630401568b06023fa8d365a46f750cb9f29e4299
 DIST spew-1.0.8.tgz 162091 SHA256 200da1b4390a5e4bf91cb7278b3ad813194f0e395abc0da6296ac415e11a76cb SHA512 ec76a1e681bbaabef6cdc63ced5114a856a312e91c5ff3e0d1536221583a1c939f9308139863670695121c8c720123a6d0697491867ccafc091607888cc81b56 WHIRLPOOL 9aac2fec8b514271fcaf3e72eb6affa505fcaae274e1966e67371c7671aa8e46cf9c0ab7345b83de4ce60a6a51b72cb9e17c692839a4eb810762bc8b851bc20a
-EBUILD spew-1.0.8.ebuild 994 SHA256 3f8df540d71d71e650ba88c03cca23be3893db794b7e0387a84263bbc7e82312 SHA512 5b613475fe3407806ac5684d3c4c0865cdcd896ba2be5740488bcf888ba350bcf697d1fabe615312e78d9efdc52a854813176054575ce5735a45b6e96022a948 WHIRLPOOL e07a7612d83bd1376f492c1a51d3f4057fb9f24ae4e24565e118888d8e0d6dc6c2faf70aafdb349118007b3d848692618b3614fa42b04a1c4760da1dd88f9c22
-MISC ChangeLog 692 SHA256 96fc6b3e20f50bd7e9b73669ff80b455ed70f32c9bbb1969b9c17dce1c04c4bc SHA512 f74a88750148c6e59fefadd544d72b4514d9ee0717ea24d29c46e6469e437d358035c5e58b0c36497926b9bffc2508fddb66104e49a202476b50f15598934ef7 WHIRLPOOL b6d433c9cb1c744e8030764633b757bfa2fb531057eb5e0dc383cf9999a431525405dc91d3af6a7d43c0e150f49b7eb8c79b82efa89dbaf873c7c02d52ab1400
+EBUILD spew-1.0.8.ebuild 1097 SHA256 ca9d385c95dd2b365074a850d2f3a5b1b3175a1b0ccaf1c99497061ce9837df3 SHA512 e591fb380d1a640ddf30f13145ca5cec54148fded2e5ac18c4848faf093ac4c3570460f2c2d71c2bad748f3b1663b4c20595b1ccf3c63d23409a5c7bde728e24 WHIRLPOOL d7049354e71ca18ff9327bde6fa1600fc863d1e67bf7ea457b2b354c5a797b9a5e571bfe570df281a9034e9f5e0381bc89e45314d0b46ffbf490261dff600341
+MISC ChangeLog 902 SHA256 ae620b3199dba6f43780e9a9818647cf8d4ea089fcfa9761c71fc8f7ef1252fe SHA512 9b39c207862dc718d36ff51703d6fb2711b3bbe36a3accc426323a5c6d23aceb052d0de4c7d66d1682a310c77b292ad2fcec69683dc3dd0f06bf2aa3194b4ac1 WHIRLPOOL 929b382ce8b9b3d9729e6b90a2a65125d2cdb2a83d25c3b8cc7654dd1e99d25cdc3cec85af7457d2b15b3ed0cb9261ae40289daee913abb361b66962cda3ad65
 MISC metadata.xml 447 SHA256 364f375c7dadcede1d8384f71bf2ad059cbcfea4efc486e9e8e3f7a3ef78c037 SHA512 f62d684526c5cff32c9a2dce169019e3a0765f806edb22604e12443295081682126503a11d508fbc59730cf8a005b079e948bd8f7f73c63982febe554ad12256 WHIRLPOOL 1f42f7839ea0ad69a375c464d51c18b3c3108a3e478fc4cd9245618baedfe89a2a16d25d206ba016ace3793e58021998fecc57f83397378883886b7d855fefe3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlABZ+IACgkQl5yvQNBFVTUP9wCgn/QCkTpolRNW+NhMhks6Nttf
-rPkAnRKMfddqssgVneSebf8ECikd4zKt
-=6GeN
+iQIcBAEBCAAGBQJRxFNHAAoJEJOE+m71LUu65MoP/R6TbF7ELy5ozIXr4+DZSCcC
+2UUQW+hhoRSspXhOFEPXFkNowqvwqRxKlmC+W81vMUPjSFXdL6dTOZjwMsFGhC80
+rzxF4Bvf5JWo3Rjx97xxoLHi5SoALKyVJwTwmaYair3wuDUEHbAkWpD/IqghkK5o
+3lV/LI/jqRgpwTDaQFOCI/PoJrb2obUtpjECAVNzh5Pm5i4FizGdUqHLCh2PqqPh
+RaKrmFQ8vUaqrId3T8qPbTvfAZ/1GMPZ0+LBOiCYvl4u+7yN/ShbVebn6rlnOBk4
+VNeVVx57HRzIpTVgaADZSTxOorj65dfHLmw+rLmfIaBW4L1duHMEUYFKdLY0W5Io
+b2h2MQdEAlk8P5XkoWAkvLC5UTOF4gkxacSzYfQaDL8X3cBNojXEbaMl/JA7h2ou
+vZwCicQGJkn9vpDFrKqDDUApPr0RF9ONyEHKh3qfg4kwQF31gu3X7TTTLXNvWji2
+jvf2QSsEGsMkLFEVQpF2FkJdH3Wj221y9kLgWEQbfd3YAarbIiNmt2RWcja/HG0k
+C7EgmIcF+y9QTD58xuJSnIdFnWR4OD8gfMnJLp+GBVIz++CprKPUftI1/S44Fi0m
+x6SWnL2SCEPu8GSdAd3is6I4vi1AmzD/M0SCz1Awsw+ubtZH1JYhvkoDYYkeeoYT
+jp+xsZ5IPAcJfqsurrVf
+=OxmO
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/spew/files/fix-automake-1.13.patch b/app-benchmarks/spew/files/fix-automake-1.13.patch
new file mode 100644
index 000000000000..c046c1b955eb
--- /dev/null
+++ b/app-benchmarks/spew/files/fix-automake-1.13.patch
@@ -0,0 +1,28 @@
+diff -Naur spew-1.0.8.orig/configure.ac spew-1.0.8/configure.ac
+--- spew-1.0.8.orig/configure.ac	2010-05-14 01:17:52.000000000 -0400
++++ spew-1.0.8/configure.ac	2013-06-21 09:06:42.000000000 -0400
+@@ -2,20 +2,13 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ(2.57)
+-AC_INIT(src/spew.cpp)
++AC_INIT(spew, 1.0.8)
++AC_CONFIG_SRCDIR(src/spew.cpp)
+ AC_CONFIG_AUX_DIR(config)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+-SPEW_AGE=1
+-SPEW_REVISION=0
+-SPEW_CURRENT=8
+-AC_SUBST(SPEW_AGE)
+-AC_SUBST(SPEW_REVISION)
+-AC_SUBST(SPEW_CURRENT)
+-VERSION=$SPEW_AGE.$SPEW_REVISION.$SPEW_CURRENT
+-
+-AM_INIT_AUTOMAKE(spew, $VERSION)
++AM_INIT_AUTOMAKE
+ 
+ # Checks for programs.
+ AC_PROG_CXX
diff --git a/app-benchmarks/spew/spew-1.0.8.ebuild b/app-benchmarks/spew/spew-1.0.8.ebuild
index 8c32d6eafe3f..d20e38e5c41d 100644
--- a/app-benchmarks/spew/spew-1.0.8.ebuild
+++ b/app-benchmarks/spew/spew-1.0.8.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/app-benchmarks/spew/spew-1.0.8.ebuild,v 1.6 2012/07/14 12:36:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/spew-1.0.8.ebuild,v 1.7 2013/06/21 13:19:42 blueness Exp $
 
 EAPI=4
 
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Measures I/O performance and/or generates I/O load"
 HOMEPAGE="http://spew.berlios.de/"
@@ -20,6 +20,7 @@ DEPEND="static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/fix-automake-1.13.patch
 	epatch "${FILESDIR}"/remove-symlinks-makefile.patch
 	eautoreconf
 }
@@ -28,6 +29,10 @@ src_configure() {
 	econf $(use_enable static static-link)
 }
 
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	dosym ${PN} /usr/bin/gorge