Disable ccache and distcc autodetection, bug 346009

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 64 insertions, 20 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 39e82e2b4951..77e81ab67060 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.102 2011/05/29 16:21:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.103 2011/05/29 17:06:15 dilfridge Exp $
+
+  29 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  fwbuilder-4.2.2.3541.ebuild, +files/fwbuilder-4.2.2.3541-ccache.patch:
+  Disable ccache and distcc autodetection, bug 346009
 
   29 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   fwbuilder-3.0.7.ebuild:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 416e417c6e5e..164b04ff2eac 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
 
 AUX 3.0.7-secure-mktemp.patch 987 RMD160 612e42ee68253b7d248afd8b039d97e25db0713d SHA1 cb68c5339e28fd13aa3f1b8ca11a2ca76ebf0162 SHA256 02c0811786b268d609b9ecac5b78135c53d32752c1846c63f23716b5de2617a8
 AUX 4.x-qmake-use-LDFLAGS.patch 460 RMD160 e2ca41d40105ff63611019af3e9b15b5468fe5e6 SHA1 7b8d2482a00c5d109249815a3ae9f068cd27ece5 SHA256 56c62f025b01f6ecf6c298909c4f64f5890524f8688199187139e354e801ce30
+AUX fwbuilder-4.2.2.3541-ccache.patch 930 RMD160 c0dcb60e659c3dc055dc45cb57d8091979654d1e SHA1 c9ae9432a59d56162009374e15d2defd86bf186b SHA256 869dc70d8a63b819e275d93be615f88df5d1bd7b0427ecfb29d766738f55bc4e
 AUX fwbuilder-4.2.2.3541-ldflags.patch 456 RMD160 12ec2ea7f5b0b1ff63b07e726d0f3ed17e8005ea SHA1 f327ff39251edc9efda702fca4acc77ae6e1c8d8 SHA256 f0d5093eb2cd116dd6e65bf60584e9d31a21b80f65d1d40649fd8be7c464a970
 DIST fwbuilder-3.0.7.tar.gz 2486382 RMD160 c57150a3de136add28a48fbc3b79aa1006b46963 SHA1 c08411bcf5b686ef86e1da6f0954d8685bf49d61 SHA256 bb827f54a77c0f8a9b471200eda3801c9ff3f2a576647ca6a576e546e20ac254
 DIST fwbuilder-4.1.2.tar.gz 5872728 RMD160 47918905e36f587194d0cfee27c5d7fd0e1c3023 SHA1 823c1e7b0947db7bd713e076bb47dd9cf816ca58 SHA256 3eae607b06bc47f85241d952c3c9bce422625aaff7ec1d632ca0fae1c977b15c
@@ -11,23 +12,23 @@ DIST fwbuilder-4.2.2.3541.tar.gz 6830864 RMD160 8c79580460d7d6a93d7c0e620e39685a
 EBUILD fwbuilder-3.0.7.ebuild 1835 RMD160 77fea53ba44fc9d26f8f8a35ea96035cfcaad1d5 SHA1 591e62bbf5dbacf8082f47aac32296b8d3921db4 SHA256 72bc754228dbcd6b0b83048867e23cc124dd1e8829828f20ae49fb60251efa9a
 EBUILD fwbuilder-4.1.2.ebuild 1276 RMD160 fa3f31fc5bf3a0e2ac858f8d7defa24ec1d131fe SHA1 b2a719cdfd00a5eebc2ba6ec7e49b171cfedb7db SHA256 eaaa907c784d47efda46589194bcb3d58d69a7e7ca8e8bade5b1fec3e5a3c7d0
 EBUILD fwbuilder-4.1.3.ebuild 1276 RMD160 41f2e54a356e7096c38c0be1d966e067794934af SHA1 dd232702d6556036037b0a4276f0f0616784c81b SHA256 fe1091892926afdd2af7fd46a23cd98b4a4b07c81ade0063b499b4c30403f2c9
-EBUILD fwbuilder-4.2.2.3541.ebuild 1175 RMD160 77dbdcd844d891d651c44b2bdacab6d3089a45cb SHA1 b78a3fb1fd6b50011a38fb88e8ba034483e9ac50 SHA256 472bdb7945a9cdbd5c6ed19cf2b3edcd0171194dcff27010e3c3bed8534ea3bd
-MISC ChangeLog 16814 RMD160 1348fb59b06eb03ecc0822e39fc641f7a4b02d88 SHA1 3e79b7678bb2db5279947c0f37bc7ec3919a42cc SHA256 2a3639f8de89c81a8bdf7e8a841ffd5624065f9d44a777241cd1a6799fe19ed5
+EBUILD fwbuilder-4.2.2.3541.ebuild 1253 RMD160 1e13095af5beaff084bbec4e3a8c4405be684416 SHA1 5154e012b2d9e4c9d0f3ca174066f671752cd371 SHA256 47d1a516f53f5e620eeceb2d9b8d7a2c1a195d579c38e560fc3b1aa02b83eb0c
+MISC ChangeLog 16999 RMD160 a0a80c2baa2fa1837b57ecac2705817a4e5a76f6 SHA1 19e12934ed4bd1c35532bf36f35806cf7e0b6d2d SHA256 9618e07adaad1f0a9a9c972238e1552a1eed3c0e3f5d9bc09c418ddbd005aae5
 MISC metadata.xml 228 RMD160 e49b64024365c32abf0972afab4491d6e7b5b678 SHA1 8481262578cdf1afa7e9054def19f0a00b328ac9 SHA256 c1d05a4723b93939d65fa0ac2fd857ab1282763036921e56e3dd49911063b218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN4nKhAAoJENwGBM22xffe0/4P/jc9BuYvJxKrbR6snpLIcfjq
-wshasnywD5saBdvovHoJuk2Lh6KCLBTBm8XiSz8TYnnxDqLBalR4UBFVFZ7D9AiQ
-AwPFvaQY7ZNLNURCYxuKIjOM0QV6qgP+hHvPe4+6k3dcHeOvbM7jChG2K74JvIpf
-8j1mbVLYwR1sL5VnmLs2nQwjP+UkQqJFuHDzTdHprqTtRfXlhbZQq2brnAvSHF9W
-Uhaz+1ZFFTr8Da5BiV61uJpp58aZ6fVBFNNBhbL09RncuiH4hIYl5F4AuzbU/W6j
-xd+PzQWar0PTI3yeo7ylXA/8QksluVb9EX5nW+n4Zyw+8asCgBuy91AUUtCuVdSr
-+CTZ9kghU0lbsVpi0bSdq2ilA6BctBlEbqHkg/5eFqQI1p4JAUq29MSTB11GmcGf
-wPRr9mMt2aEq7MTALEt09OEzXbiV6Vn8GqES7Sy+eE4+3wqGlQLRqfjhsKofHC2e
-d+72yGzP/x3wMrhbYxMpYoP2WzalfpuMEHcCn1LnPtH8QQjSfeqlMYBuEjnSbRSz
-uwVxkDw+Rjn5WEArgSxyKvgYXonNkKq7XcjueI6b108QGFPXtoJoXT9/e36nOxbQ
-Ay/RifRk9OdhlK+nQQ+I1kjBPfEmqYSJwf9DFM9yx+wV8CmjVUMuHPYt93t5yQAg
-8A3LeL1ie2l0/DkEbzW/
-=rGdL
+iQIcBAEBCgAGBQJN4n0NAAoJENwGBM22xffetZYP/iwjsCdQad0f7XPiugW/ZkOl
+dCpd+PO8DB9MtnpuxK5MMfSaBNWyPAKeJA7WajGxDSqJsl5y/yeRyXdVP2hnc4mv
+TNIN3kB5hGe87bx6E4bkXs8jjuxOjqPBDN5lT7tYaWQuZJssKMtz4v3XwigeZQhG
+KbnOsRmbbGTk2OVqOKghV2IGrmBsP5UpbZVj1/0x3Z5op8owy0w19G3HDDAgW1J+
+0/1fcGdbv81tXhlmMiIbmV1ZRJw3HW+wfAr9bpJp9Q2bv6E7jhVypA9uG1T7qFva
+PhtPN94QTqOlD3Ex7JpOSPdgRJQyJUUg3olrO2aNJZ/TGXW8jQs30rU1OghmDWoX
++M41UVvTu+9cqrhPNIiVnv1DdCb86+a5w/uS/J9SoKjuaLgG33A9HDo1EFEjob1e
+VXnYC0P7NtP+5DQgXqamkr+LV4cydlJkJdIOnt64v7hj4wIJ3DNEwj34WsXllzL7
+Rj8UyTqiou6A2jozi4mjzIb5rfXu45B0BhlLS/YyQWD8WLwuVZMVP8GPxR979/Hx
+6XrQnDmVd2anyENA9YSi1P85XLckE5RvyyS3iL23HJ65KY081LSoGJFyXen45jAU
++4dGYux7kBt9WVrbj1U0OeLMIy8nL8QS0BgsOK852UdN60aPbidypn7JsjlLiptz
+mGuFDeCEG9IUt7WZffbe
+=Zkci
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch
new file mode 100644
index 000000000000..807d9ac488fa
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch
@@ -0,0 +1,35 @@
+diff -ruN fwbuilder-4.2.2.3541.orig/configure.in fwbuilder-4.2.2.3541/configure.in
+--- fwbuilder-4.2.2.3541.orig/configure.in	2011-05-11 23:02:03.000000000 +0200
++++ fwbuilder-4.2.2.3541/configure.in	2011-05-29 18:53:06.624998022 +0200
+@@ -638,12 +638,27 @@
+ AC_SUBST(MANDIR)
+ AC_SUBST(ICONSDIR)
+ 
+-AC_PATH_PROG(CCACHE, ccache, , )
+-AC_SUBST(CCACHE)
++AC_ARG_WITH(ccache,[  --with-ccache=yes      Use ccache to speed up repeated compilation])
+ 
+-if test -n "$CCACHE"
+-then
++if test -n "$with_ccache"; then
++  if test "x$with_ccache" != "xno"; then
++    AC_PATH_PROG(CCACHE, ccache, , )
++    AC_SUBST(CCACHE)
++    if test -n "$CCACHE"
++    then
++      ccache -s
++    fi
++  else
++    CCACHE=""
++    AC_SUBST(CCACHE)
++  fi
++else
++  AC_PATH_PROG(CCACHE, ccache, , )
++  AC_SUBST(CCACHE)
++  if test -n "$CCACHE"
++  then
+         ccache -s
++  fi
+ fi
+ 
+ AC_ARG_WITH(distcc,[  --with-distcc=N        Use distcc with N parallel make count])
diff --git a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
index 837ae648b80b..8cc4b12d531a 100644
--- a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.1 2011/05/15 17:25:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.2 2011/05/29 17:06:15 dilfridge Exp $
 
 EAPI=4
 
-inherit eutils qt4-r2 multilib autotools
+inherit eutils base qt4-r2 multilib autotools
 
 DESCRIPTION="A firewall GUI"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -21,9 +21,13 @@ DEPEND=">=x11-libs/qt-gui-4.3
 	!net-libs/libfwbuilder"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-ccache.patch"
+)
+
 src_prepare() {
 	qt4-r2_src_prepare
-	epatch "${FILESDIR}/${P}-ldflags.patch"
 	eautoreconf
 
 	# This package fundamentally changed its build system.  We have to
@@ -33,7 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf
+	econf --with-ccache=no --with-distcc=no
 }
 
 src_install() {