Disable silent make rules. Fix building with automake-1.13.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 18 insertions, 11 deletions

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index 0cf559049050..ec924237a56b 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,7 +1,10 @@
 
 # ChangeLog for net-proxy/tinyproxy
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.39 2012/11/21 15:52:31 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.40 2013/04/24 17:47:02 jer Exp $
+
+  24 Apr 2013; Jeroen Roovers <jer@gentoo.org> tinyproxy-1.8.3.ebuild:
+  Disable silent make rules. Fix building with automake-1.13.
 
   21 Nov 2012; Jeroen Roovers <jer@gentoo.org> tinyproxy-1.8.3.ebuild:
   Remove subdir requirement in default pid config.
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index 4b8299b5ebfd..1fbf16adbdfa 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -5,13 +5,13 @@ AUX tinyproxy-1.8.1-ldflags.patch 306 SHA256 ab1377eb43902c44c44f29f82968f45852e
 AUX tinyproxy-1.8.1-minimal.patch 109 SHA256 c2ee0a0cd073f00b7ea37eff078f84eb790bf7bb478e79fad5b1731aaec8f5dc SHA512 56126f4e315dfade7983a9961ab3a30687e5fb575d9fd0964f081cb1e4be718f54b3999f69f769832717ebae1dd832aaff5e60289b465976b2f95325af48d79d WHIRLPOOL 21d98b7c45c30771917959c2603e8e5690c2e8e28e62286d3eef2b9b2e56dea43d963a2997280a24ddefd647e597c840498792a9cfc2aa2f4b7d741912e792ce
 AUX tinyproxy-1.8.2.initd 1061 SHA256 0dfef44ab70710f75ce50d265a145afb3a88ca129776154eab93f17e8e56ca32 SHA512 758eaf0adc2fb787ea8d8aa61627dabf0c6266b583f55b08097b90a7fea250ff6762d8bb298e63ac7ef712f338f6d223a2d0817474ece6000638ff72aea286ae WHIRLPOOL 88f532f18c071e6d00c5821be5e7d57d1f3426df36a80a8a7fcf20893d6e1815f950ab169fd2560d8b95a8315173189b9e4b300566113e50f9281735fe4be754
 DIST tinyproxy-1.8.3.tar.bz2 202430 SHA256 be559b54eb4772a703ad35239d1cb59d32f7cf8a739966742622d57df88b896e SHA512 69f1262b39d37f44a42621a0d25985632cdb790c8d9b49335a49a68c0f5237b97b111252856cba119895ac066770645560d2d7cd2de31f02103fa55fb4b3290c WHIRLPOOL f423b49e7cef6c98f69070e0598f4447cf8333cfc9e253dd6c459541922e5b2ed5c7604dc2e3f3de61a616d6381ff83df1625a8ad40a83d32d44f633ac98447c
-EBUILD tinyproxy-1.8.3.ebuild 1903 SHA256 0883159cea1c49ac03a0dc05ae145b6c2feb61c3312e5e63504eaf1bddd58f9f SHA512 a20dd962c35685ca8cbe66fd669208dfd2853f81109cfb4403119318188804f2c8c2ecc8a2386ca3b205a739066e6a6d89d6f7e6f684ca76f984b6f0db7f2ad1 WHIRLPOOL 4277d9380e355ddf350505d4be6973dff11442f7b19344194028735909286dae38b553f33c5ca95720043967e0b2e02955b6c7fe53e46365f238d34f80307801
-MISC ChangeLog 7419 SHA256 55ac35d631ca232f96edddfc61c67a07190057b5ebd1060a84a9f7073b3e95c3 SHA512 910eec97274c1856519785f4a8c21b4d75fac73421266643f9ff2b79b8237dbcdd4b75290a645969ad231d909da1c352afa4581dfcb0b9b9e7fcc067c9ec4664 WHIRLPOOL eb38c732839af70fdf6f961682357046dc55626d524034fe914c613ad060a3d5469088edcf2b70e26b2a840eae476cf7aebd3cc5e2bc9b103010439839125033
+EBUILD tinyproxy-1.8.3.ebuild 2010 SHA256 548134e3ddf78e35a4b9bdb24adce3b7ba99f392a6fe75aca16954f753053175 SHA512 742142381d5739a08e1a38bfda0a9538fff5c735dcea3d277461831759efdeec2ff550af38eaca3bfce3dc83fe3804a0fca1757b07e95077171e3faacbee9157 WHIRLPOOL 21dd38747b955a501789a5b6a106c74aec8a4b321b0cba24dfbb1235cad132a651947945eb8cd4d1df3872c62aa7c116aad695fbbb8f711f4700c93590a251ae
+MISC ChangeLog 7553 SHA256 94baf9ade12f6ca865502c2e6d287155b37f06f1ca797cfee1f69e5538ab3652 SHA512 084eb181f708811731a2afcaff9282e79f7c150ece0a976b3130054121a5f5b936bb3287a8f4de53b1b3525c95211c725ec6d20f69c616c03c0461acc4905a31 WHIRLPOOL 6d6c4dc07fe678482b129fe03f0d729c6461a6325fd83132c06c9d2c0c5be9c3e2d1186903e5533386674eb4404cf6284c9eeb7b93646acd5e9b5017c4ce3bf8
 MISC metadata.xml 563 SHA256 63b326ce5e3bff142dc7b16631e44c60c4c0cfe8b0abac5a3545d5d2f5903c82 SHA512 17a7d6daa5078839088950ecb108ccae8336df44a94f07166940d63c6502d50177615c2c7227ced7d7ae43c34ff6984aa0d77c4301756ce76d1f1dee2b54ca48 WHIRLPOOL 5c382b5fd504088b464896c72655d5737338e98a3c8bec0450e97a7b95d96c29ad1aec9eaa88ff42d4a5134b1f7168ff6573cd38bab67bc004e34cbecf8c5a33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCs+MEACgkQVWmRsqeSphM+QACfVic/9AsXdNsq0VYbC76AAimH
-c6QAn2kkqG2ZJA4sCi/fJlN82g0ynhA8
-=5CeW
+iEYEAREIAAYFAlF4GpgACgkQVWmRsqeSphOThQCggN6aZUuUM1kPj6YfCNYyZS0+
+3RQAnRYxvjOKiYULFGyKR9FJEjykjs18
+=kqHw
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.3.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.3.ebuild
index 70698fcc4ddc..4680d1432e6f 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.8.3.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.3.ebuild
@@ -1,6 +1,6 @@
-# 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/net-proxy/tinyproxy/tinyproxy-1.8.3.ebuild,v 1.7 2012/11/21 15:52:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.3.ebuild,v 1.8 2013/04/24 17:47:02 jer Exp $
 
 EAPI=4
 inherit autotools eutils user
@@ -32,6 +32,9 @@ src_prepare() {
 		-e "s|nobody|${PN}|g" \
 		-e 's|/run/tinyproxy/|/run/|g' \
 		etc/${PN}.conf.in || die "sed failed"
+	sed -i \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
 	eautoreconf
 }
 
@@ -41,13 +44,14 @@ src_configure() {
 		export PATH="${T}:${PATH}"
 	fi
 	econf \
-		--localstatedir=/var \
+		$(use_enable debug) \
 		$(use_enable filter-proxy filter) \
 		$(use_enable reverse-proxy reverse) \
 		$(use_enable transparent-proxy transparent) \
 		$(use_enable upstream-proxy upstream) \
 		$(use_enable xtinyproxy-header xtinyproxy) \
-		$(use_enable debug)
+		--disable-silent-rules \
+		--localstatedir=/var
 }
 
 src_test() {