Make sure not to look for automake since the package does not use automake to begin with.

Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64

3 files changed, 22 insertions, 16 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index b4006d875cc5..d24cd8f47e54 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ccache
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.70 2010/11/28 18:05:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.71 2010/12/16 12:19:44 flameeyes Exp $
+
+  16 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> ccache-2.4-r7.ebuild:
+  Make sure not to look for automake since the package does not use automake to
+  begin with.
 
 *ccache-3.1.3 (28 Nov 2010)
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0f3c35046d20..b0c5b1c767e7 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ccache-2.4-profile.patch 1069 RMD160 9eaf92f401202a06ee0d0f468a2ff6e728456a24 SHA1 9177ae6bb8c7a95079a045eff3b7d0a1f33f427e SHA256 7cd6e8fcd2fc90aac484ff83c1181c82eca4ec3e2d568c10025f67ac751a6794
 AUX ccache-2.4-respectflags.patch 403 RMD160 19efa0fcb27eba9fe7ec086b8d6e261e4485f275 SHA1 27fbedc4ee219ee6f9b2c17ef8fa30dd91a024f5 SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5
@@ -11,18 +11,18 @@ DIST ccache-3.1.1.tar.gz 324042 RMD160 2996b6821c656640af95d1a95651b02d08dcd034
 DIST ccache-3.1.2.tar.gz 325243 RMD160 9516799993bba436fe3c96b031a7ad9a30e0138e SHA1 3a90a7bfacfb89a3b6e0db22c207f322a1066acb SHA256 1c690993fe8408c190657c0a308574c947defbf38c3fa0e94d8f32a10f765714
 DIST ccache-3.1.3.tar.gz 337854 RMD160 9167780f41c83f5bd5fde8693b8453b0dbb2f877 SHA1 5782f7815a6eeb1a432d8e25793ad246d8ca40fa SHA256 549a7b082d38dae368b3b3023c2e96a81a46047c96dd0999225e4e16b0746420
 EBUILD ccache-2.4-r6.ebuild 2283 RMD160 5f567792bd72ac46b0ec1858adb9940cbb0c6e63 SHA1 183e97737b438c36818e309c58a9739779927251 SHA256 e3b2747d69fc3371a8496139134114f99d16e0612ba040f96e92cede06a8f219
-EBUILD ccache-2.4-r7.ebuild 2390 RMD160 d48da0092a3780d564b9615ac1b6739fc179a38c SHA1 2ece090cff1bc3a53e2205a7646229aa29f2dd0f SHA256 8222e8059726a41553899ed0107bd14994c0b08151e9859801adee5208aec88e
+EBUILD ccache-2.4-r7.ebuild 2412 RMD160 71467014ce09f64440348dded2018bfac32724be SHA1 3d1083d547231c057112efc6c2a3cb20215e92a7 SHA256 2a49abd73c7dc5a1464c3842f0f261aa3be666e6598aa96bcad4b8892373c9da
 EBUILD ccache-2.4-r8.ebuild 2452 RMD160 c6ea12d3222e8ea4df1eb6698a510089dd5e47e1 SHA1 6ef767669947fa05167c2911faca92da9318fecb SHA256 0ce327aec9ef58522618d1fae858bde33f4f83d18e7fc601ed300318245b277e
 EBUILD ccache-2.4-r9.ebuild 2507 RMD160 82aa85b625b3a969b5de6c257adeafc3fe062414 SHA1 2d3d6fbce85685191807967131eade82d48fdbae SHA256 e92c3e519f8aafd1a940f89ade71e7c766f0289ed84e517caa470e20cf4c588a
 EBUILD ccache-3.1.1.ebuild 1881 RMD160 c850850bc945a7099e3fbe8a24ef3183b8ad7d94 SHA1 e6fd0854cba7d5de0c9620f57f57f32d5461d138 SHA256 8c46a74aeaaf0a7b04eae87cd5308d4e11af42c8a5c7bfa690af9bd3e1eae9dd
 EBUILD ccache-3.1.2.ebuild 1841 RMD160 929959c1c05537e533f32561e99396488071ffcc SHA1 641007a31f3c4eb06723d8ca83b7071facb2d4f7 SHA256 a82766e6582602ca249b4b4432e3f399f2ad6d0db6af860b2d7c7134251f40c6
 EBUILD ccache-3.1.3.ebuild 1841 RMD160 00bf2370ea5c603bb37f0ca2c58bfd841b7e3a81 SHA1 37de58263675829d052a426df15aa710af4b130f SHA256 ff190eba38b8f5f253106780fe36ed979241ee0ce521bc4d7248ea9a2747ad4a
-MISC ChangeLog 9494 RMD160 a417261e238f9a4cfa2c47a0ca4e21922b6716a3 SHA1 cd4cf451f718a8964bc6d6236fbc191f1088c039 SHA256 c6e35212d9f218d5c4af4cedf896b89070ec0efc67263378cf2f8e387a209dcc
+MISC ChangeLog 9670 RMD160 039a5bcd44412e1fb1058888b7601f776e83caea SHA1 c1644092315c414fa24559610162cd7ec126c7bc SHA256 786ae05a06b2712ec7f3f9c7b5dd34b12da1f4a2c6e9de7094533005289ef97e
 MISC metadata.xml 412 RMD160 964ade3959d81af2c5a0a88758db6ed87d80dba5 SHA1 0a38f42c23434ad993bf2d9bfd0b73552c50eb5b SHA256 c54d1b5f225e3a82754a2550d3875b7211249572a9372abdeff5fccda469aada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzymRMACgkQTwhj9JtAlp6axwD/UdSRfPlXRYQrhwU1AcaE2U8R
-xfDD2T89v7dSkXU0VDgA/jPetkmeopSFaRH00y5oOujl58h5W1Bn0eKRl3GSsbT1
-=y3oj
+iEYEARECAAYFAk0KBCgACgkQAiZjviIA2XjhpgCcCMmAZq1+gEXRxWAe9UYtZ/O3
+ErYAn29yBHvJd1Uxwm+YzAxZiUz/Qgni
+=AKQp
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/ccache-2.4-r7.ebuild b/dev-util/ccache/ccache-2.4-r7.ebuild
index e5fbf3e9270a..d13d5ab415bc 100644
--- a/dev-util/ccache/ccache-2.4-r7.ebuild
+++ b/dev-util/ccache/ccache-2.4-r7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-2.4-r7.ebuild,v 1.4 2010/10/19 05:27:48 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-2.4-r7.ebuild,v 1.5 2010/12/16 12:19:44 flameeyes Exp $
+
+WANT_AUTOMAKE=none # not using automake
 
 inherit eutils autotools multilib
 
@@ -27,7 +29,7 @@ src_unpack() {
 do_links() {
 	insinto /usr/$(get_libdir)/ccache/bin
 	for a in ${CHOST}-{gcc,g++,c++} gcc c++ g++; do
-	    dosym /usr/bin/ccache /usr/$(get_libdir)/ccache/bin/${a}
+		dosym /usr/bin/ccache /usr/$(get_libdir)/ccache/bin/${a}
 	done
 }
 
@@ -51,20 +53,20 @@ src_install() {
 pkg_preinst() {
 	# Do NOT duplicate this in your ebuilds or phear of the wrath!!!
 	if [[ ${ROOT} = "/" ]] ; then
-	    einfo "Scanning for compiler front-ends..."
-	    do_links
+		einfo "Scanning for compiler front-ends..."
+		do_links
 	else
-	    ewarn "Install is incomplete; you must run the following commands:"
-	    ewarn " # ccache-config --install-links"
-	    ewarn " # ccache-config --install-links ${CHOST}"
-	    ewarn "after booting or chrooting to ${ROOT} to complete installation."
+		ewarn "Install is incomplete; you must run the following commands:"
+		ewarn " # ccache-config --install-links"
+		ewarn " # ccache-config --install-links ${CHOST}"
+		ewarn "after booting or chrooting to ${ROOT} to complete installation."
 	fi
 }
 
 pkg_postinst() {
 	# nuke broken symlinks from previous versions that shouldn't exist
 	for i in cc ${CHOST}-cc ; do
-	    [[ -L "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" ]] && \
+		[[ -L "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" ]] && \
 			rm -rf "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}"
 	done
 	[[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \