summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-04-24 17:47:02 +0000
committerJeroen Roovers <jer@gentoo.org>2013-04-24 17:47:02 +0000
commit1dbf23ad200cd10da5db66ddc64070f690bdc93c (patch)
tree5ce60dd8cf70456799be665211d7d1f9adb2736f /net-proxy
parentFix building with automake-1.13 (bug #467090). (diff)
downloadgentoo-2-1dbf23ad200cd10da5db66ddc64070f690bdc93c.tar.gz
gentoo-2-1dbf23ad200cd10da5db66ddc64070f690bdc93c.tar.bz2
gentoo-2-1dbf23ad200cd10da5db66ddc64070f690bdc93c.zip
Disable silent make rules. Fix building with automake-1.13.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/tinyproxy/ChangeLog7
-rw-r--r--net-proxy/tinyproxy/tinyproxy-1.8.3.ebuild12
2 files changed, 13 insertions, 6 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/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() {