[gentoo-commits] gentoo-x86 commit in net-proxy/squid: squid-3.3.3-r1.ebuild ChangeLog

["Eray Aslan (eras)" <eras@gentoo.org>]

eras        13/04/26 09:18:16

  Modified:             squid-3.3.3-r1.ebuild ChangeLog
  Log:
  Fix and work around build failures with automake-1.13
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

Revision  Changes    Path
1.2                  net-proxy/squid/squid-3.3.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild?r1=1.1&r2=1.2

Index: squid-3.3.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squid-3.3.3-r1.ebuild	16 Apr 2013 05:02:02 -0000	1.1
+++ squid-3.3.3-r1.ebuild	26 Apr 2013 09:18:16 -0000	1.2
@@ -1,8 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild,v 1.1 2013/04/16 05:02:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild,v 1.2 2013/04/26 09:18:16 eras Exp $
 
 EAPI=5
+
+# Workaround to avoid failing make check until we have a proper fix
+WANT_AUTOMAKE="1.12"
+
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
 
 DESCRIPTION="A full-featured web proxy cache"
@@ -61,6 +65,8 @@
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
 	epatch "${FILESDIR}/${PN}-3.3.3-ncsa_auth.patch"
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		lib/libTrie/configure.ac || die
 	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
 		INSTALL QUICKSTART \
 		helpers/basic_auth/MSNT/README.html \



1.408                net-proxy/squid/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.408&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.408&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.407&r2=1.408

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- ChangeLog	16 Apr 2013 05:02:02 -0000	1.407
+++ ChangeLog	26 Apr 2013 09:18:16 -0000	1.408
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.407 2013/04/16 05:02:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.408 2013/04/26 09:18:16 eras Exp $
+
+  26 Apr 2013; Eray Aslan <eras@gentoo.org> squid-3.3.3-r1.ebuild:
+  Fix and work around build failures with automake-1.13
 
 *squid-3.3.3-r1 (16 Apr 2013)
 *squid-3.2.9-r1 (16 Apr 2013)