Bump squashfs-tools, ccache (add USE=colorgcc). Remove eix

4 files changed, 50 insertions, 12 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index 05a5a9bf..102248c0 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2002-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+*ccache-3.1 (25 Sep 2010)
+
+  25 Sep 2010; Martin Väth <martin@mvath.de>
+  revbump to 3.1 and remove old. Add support for colorgcc and html doc.
+
   06 Aug 2010; Martin Väth <martin@mvath.de>
   Support EPREFIX and minor bugfixes. Introduce IUSE=defaults.
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 768cdae9..90f7cfe8 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,5 @@
 AUX ccache-config 1627 RMD160 b5e6a9f509130abd657fd6ec297d7fcbdb094f9d SHA1 698c3235f0685e03f346e4b155897862560974ee SHA256 d438b7d266e17bf95d6c45e619ea8d9040217e70f34eac5cf6fae010f25bb72f
-DIST ccache-3.0.1.tar.bz2 217171 RMD160 521641df0602bafb82eddb5790e9ef72cb1493ab SHA1 0f74da3a972879f078ff052922df76dea5f80f8e SHA256 9eac4d17d15fcc5ad79c84ee62c844c80aeab4407623e019fa32842ecdae0346
-EBUILD ccache-3.0.1.ebuild 2683 RMD160 c137e368ee4e3ca707782efb6df4bb10559caf2d SHA1 e3c0bcf0d0a64c3521b00e7dda13cc0c602bc378 SHA256 bcde764588c34e6f1e0fe633c9861a5e3002709e202e2d7498bafae500aa570e
-MISC ChangeLog 1115 RMD160 45e920db425c0f9a35ad879769ac105990b5dba6 SHA1 54cc62e921f9f557a82df32648613f91479580a1 SHA256 6f9d97e2f9c387ad80eb1a0ceecb52cb295c0f6b673dafe08861281a6248eee6
-MISC metadata.xml 549 RMD160 c146a271a011e7110fb02fd28a93bbc9acc2f252 SHA1 8e5d8a060178767f7ca89a16c78be22bf469013f SHA256 756db2fcb47885364e2b581013ca7eb0ebc412a00fa4a81e04512bfb75808fda
+DIST ccache-3.1.tar.bz2 250668 RMD160 dc5d99f412d15ca4160ce0f0bd4d4b525a6de8e5 SHA1 40c872cbfa3de04b94405167665ef5685ed8b310 SHA256 b8a4cc2321325488307d894ed1c39deef138e0d5e073ed3e265085fe6a5d7c59
+EBUILD ccache-3.1.ebuild 3758 RMD160 f95d37ccd81fb8c2419309c9bf0420627372a387 SHA1 df21384d8e8e087a822b93729fd1539994d9fb8f SHA256 036cde983b99503d63d3e9d6c68c3c83e798536f445861d99658f958ddefad00
+MISC ChangeLog 1279 RMD160 5be8e3d00eb94b7d488767fbc5218392ee4d113d SHA1 efd099bfa7725cdc3964c1bfbfcf0bc3dfdad4b0 SHA256 bb97bd2ae57731c63165d99640f424f5db69ed0fcd63c71b032be625fa4a1792
+MISC metadata.xml 627 RMD160 bb4a7b1841590483ad944265749d240249aaaa07 SHA1 ea09fe4bbe7e903cad111818b57118f07be54884 SHA256 99fcc094e02f75e56ebf23265a90df40bd31079ac787dcbed52b868b933d409a
diff --git a/dev-util/ccache/ccache-3.0.1.ebuild b/dev-util/ccache/ccache-3.1.ebuild
index 61668c7f..a590907e 100644
--- a/dev-util/ccache/ccache-3.0.1.ebuild
+++ b/dev-util/ccache/ccache-3.1.ebuild
@@ -16,10 +16,11 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+defaults"
+IUSE="colorgcc +defaults doc"
 
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}
+	colorgcc? ( dev-util/colorgcc )"
 
 do_links() {
 	local a b
@@ -31,15 +32,41 @@ do_links() {
 	done
 }
 
+src_prepare() {
+	# The "ar" test is broken in ccache-3.1 (this is fixed in later versions)
+	sed -i -e \
+		's/^if test -z "$ac_ct_AR"; then/if test -z "$AR"; then/' \
+		"${S}"/configure || die
+}
+
 src_install() {
+	local colorgcc_config
+	colorgcc_config=''
+	if use colorgcc
+	then	echo "#!${EPREFIX}/usr/bin/perl
+\$0=\$ARGV[0];shift(@ARGV);require('${EPREFIX}/usr/bin/colorgcc');" \
+			>color-gcc
+		dobin color-gcc || die
+		colorgcc_config="
+# CCACHE_PREFIX=\"${EPREFIX}/usr/bin/color-gcc\""
+	fi
 	if use defaults
-	then	echo 'CCACHE_SLOPPINESS="file_macro,time_macros,include_file_mtime"
-CCACHE_COMPRESS=1' >"${S}/98ccache"
-		doenvd "${S}/98ccache"
+	then	echo '# Do not edit this file.
+# If you want to remove a variable, you should remove this whole file by
+# reemerging ccache with USE=-defaults
+# If you want to set (additional) variables, do that in /etc/env.d/99ccache
+CCACHE_SLOPPINESS="file_macro,time_macros,include_file_mtime"
+CCACHE_COMPRESS=1'"${colorgcc_config}" >98ccache
+		doenvd 98ccache || die
 	fi
 	dobin ccache || die
-	doman ccache.1
-	dodoc README.txt NEWS.txt
+	doman ccache.1 || die
+	dodoc README.txt NEWS.txt AUTHORS.txt || die
+	if use doc
+	then	# Manual.{txt,html} is the same content as the manpage
+		dodoc MANUAL.txt
+		dohtml README.html NEWS.html AUTHORS.html MANUAL.html
+	fi
 
 	diropts -m0755
 	dodir "${EPREFIX%/}/usr/$(get_libdir)/ccache/bin"
@@ -83,6 +110,11 @@ pkg_postinst() {
 	then	elog
 		elog "Observe that some default choices are made in /etc/env.d/98ccache"
 	fi
+	if use colorgcc
+	then	elog
+		elog "To use dev-util/colorgcc with ccache you can"
+		elog "	export CCACHE_PREFIX=\"${EPREFIX}/usr/bin/color-gcc\""
+	fi
 
 	case "${PORTAGE_TMPDIR}/portage/*" in
 		"${CCACHE_BASEDIR:-none}"/*) :;;
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index 7b4b3ceb..906b51bb 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/metadata.xml
@@ -12,5 +12,6 @@
 </longdescription>
 <use>
 	<flag name="defaults">Set some default environment variables in /etc/env.d/98ccache</flag>
+	<flag name="colorgcc">Add the wrapper color-gcc for dev-util/colorgcc</flag>
 </use>
 </pkgmetadata>