Version bump #313101 (which should also fix #270062 by Diego Elio Pettenò, #296371 by Attila Stehr, and #301727 by Mariusz Kozlowski). Make ccache-config respect ROOT/multilib and fix handling of cc/chost-cc symlinks between it and the ebuild #302048 by Christoph Junghans.

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

4 files changed, 93 insertions, 14 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index f75cd463e983..258c8cdefe2b 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,15 @@
 # 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.67 2010/11/19 07:54:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.68 2010/11/19 09:46:35 vapier Exp $
+
+*ccache-3.1.1 (19 Nov 2010)
+
+  19 Nov 2010; Mike Frysinger <vapier@gentoo.org> +ccache-3.1.1.ebuild,
+  files/ccache-config:
+  Version bump #313101 (which should also fix #270062 by Diego Elio
+  Pettenò, #296371 by Attila Stehr, and #301727 by Mariusz Kozlowski). Make
+  ccache-config respect ROOT/multilib and fix handling of cc/chost-cc
+  symlinks between it and the ebuild #302048 by Christoph Junghans.
 
 *ccache-2.4-r9 (19 Nov 2010)
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index b0eb1289dfa3..b5b5133649e9 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,18 +5,20 @@ AUX ccache-2.4-profile.patch 1069 RMD160 9eaf92f401202a06ee0d0f468a2ff6e728456a2
 AUX ccache-2.4-respectflags.patch 403 RMD160 19efa0fcb27eba9fe7ec086b8d6e261e4485f275 SHA1 27fbedc4ee219ee6f9b2c17ef8fa30dd91a024f5 SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5
 AUX ccache-2.4-utimes.patch 3267 RMD160 57bf223bbc1da41e3955cf017aa5d472cf93b19f SHA1 e9d63db657ef4273e8c27ddf6ae6deb8127540d1 SHA256 72f617b329a68c9db57180a9940689a48acee771067392a2d68b8abf8cdf891a
 AUX ccache-2.4-xrealloc.patch 742 RMD160 7d800bfc937c00b51a073705815ae6ff5d4add8d SHA1 bfbf2e090a72c91417090b6dc030649b39969a16 SHA256 119c8fb7f3ec725444e416e42d690fdf81470213a837274bc5375f659942147c
-AUX ccache-config 1554 RMD160 cbcb9cf3b2313002e2a3336fb39e161c61d350a6 SHA1 919e73d840ba959ef4b32a66db62e4837611763b SHA256 da4a731fdcebe82fee0e5946cde131d35f528b69ec81bb0901f3b56441c485bb
+AUX ccache-config 1757 RMD160 3c5cf881d692ca3983d796c06f3e80ad2235781d SHA1 60b098ccd367cf3c8a19dd71cfb2b4168217b136 SHA256 83022a7c159167c2f284734bd61db6da9f4592c9ac29e95318a2a5530fc54467
 DIST ccache-2.4.tar.gz 86363 RMD160 43a0647c7faf659121a53a92ec45d245b8140124 SHA1 9833ec13de9b90d5409e60d679ac681115ef465e SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0
+DIST ccache-3.1.1.tar.gz 324042 RMD160 2996b6821c656640af95d1a95651b02d08dcd034 SHA1 41e385066bcaf87416aafa17115aef8523751bff SHA256 eb0b37e25ecfdf1262e0da7fc5f01d986923589803c230dcb7213ecbead3aed1
 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-r8.ebuild 2452 RMD160 c6ea12d3222e8ea4df1eb6698a510089dd5e47e1 SHA1 6ef767669947fa05167c2911faca92da9318fecb SHA256 0ce327aec9ef58522618d1fae858bde33f4f83d18e7fc601ed300318245b277e
 EBUILD ccache-2.4-r9.ebuild 2507 RMD160 82aa85b625b3a969b5de6c257adeafc3fe062414 SHA1 2d3d6fbce85685191807967131eade82d48fdbae SHA256 e92c3e519f8aafd1a940f89ade71e7c766f0289ed84e517caa470e20cf4c588a
-MISC ChangeLog 8850 RMD160 76f37d26406d8368a2ce2710c258c762e6c29702 SHA1 d5a7240aa1cf91513e171bc6295de7879a292fa5 SHA256 ed7a06446221bec1b79c372256ae4461800b5aaeef89faa1d5b773ba617d20f2
+EBUILD ccache-3.1.1.ebuild 1881 RMD160 c850850bc945a7099e3fbe8a24ef3183b8ad7d94 SHA1 e6fd0854cba7d5de0c9620f57f57f32d5461d138 SHA256 8c46a74aeaaf0a7b04eae87cd5308d4e11af42c8a5c7bfa690af9bd3e1eae9dd
+MISC ChangeLog 9258 RMD160 65f867caccfa2920061848b705fc9cfc2eff29fe SHA1 a38eb83e18e223c9e872b61cb63440af12f644a3 SHA256 77c02abc665a1bca9bcd3424b992fe5660982bd65115497c9906a4a912ecedec
 MISC metadata.xml 412 RMD160 964ade3959d81af2c5a0a88758db6ed87d80dba5 SHA1 0a38f42c23434ad993bf2d9bfd0b73552c50eb5b SHA256 c54d1b5f225e3a82754a2550d3875b7211249572a9372abdeff5fccda469aada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzmLOAACgkQTwhj9JtAlp6MeQEAla7DXJzhHpd3wx8wTDwS5TBO
-aFt7jqzHYsLIYy2r2nsA/AgQurex5ebT33SwxoEpQvTiRxuPxordfsUUrz4c43Ni
-=i/i7
+iF4EAREIAAYFAkzmRxkACgkQTwhj9JtAlp7/zQD/etQeCzqsJshAzxrhwppzUc8c
+BJxffCD+/WwEZfIlvmgA+wenAKX+MA6VPq8HNBYwTlH4AC9p8yDnMFWwMy75l+DF
+=c3um
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/ccache-3.1.1.ebuild b/dev-util/ccache/ccache-3.1.1.ebuild
new file mode 100644
index 000000000000..561cd703f85b
--- /dev/null
+++ b/dev-util/ccache/ccache-3.1.1.ebuild
@@ -0,0 +1,59 @@
+# 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-3.1.1.ebuild,v 1.1 2010/11/19 09:46:35 vapier Exp $
+
+inherit multilib
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# make sure we always use system zlib
+	rm -rf zlib
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
+
+	keepdir /usr/$(get_libdir)/ccache/bin
+
+	dobin "${FILESDIR}"/ccache-config || die
+	dosed "/^LIBDIR=/s:lib:$(get_libdir):" /usr/bin/ccache-config
+
+	diropts -m0700
+	dodir /root/.ccache
+	keepdir /root/.ccache
+}
+
+pkg_postinst() {
+	"${ROOT}"/usr/bin/ccache-config --install-links
+	"${ROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -f "${ROOT}/usr/$(get_libdir)/ccache/bin/${CHOST}-cc"
+	[[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
+		rm -fr "${ROOT}/usr/$(get_libdir)/ccache.backup"
+
+	elog "To use ccache with **non-Portage** C compiling, add"
+	elog "/usr/$(get_libdir)/ccache/bin to the beginning of your path, before /usr/bin."
+	elog "Portage 2.0.46-r11+ will automatically take advantage of ccache with"
+	elog "no additional steps.  If this is your first install of ccache, type"
+	elog "something like this to set a maximum cache size of 2GB:"
+	elog "# ccache -M 2G"
+	elog
+	elog "If you are upgrading from an older version than 3.x you should clear"
+	elog "all of your caches like so:"
+	elog "# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C"
+}
diff --git a/dev-util/ccache/files/ccache-config b/dev-util/ccache/files/ccache-config
index 0a4318258a2d..1cd2b37810ec 100644
--- a/dev-util/ccache/files/ccache-config
+++ b/dev-util/ccache/files/ccache-config
@@ -2,17 +2,19 @@
 #
 # ccache-config - helper script for ccache and its ebuild
 #
-# Copyright 2003 Superlucidity Services, LLC 
+# Copyright 2003-2010 Superlucidity Services, LLC
 # This program licensed under the GNU GPL version 2.
 #
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
 #  it was cloned from the distcc-config script
-# 
+#
 # Additional features to come; this provides a starting point
 
 # this should be getopt'd someday (override with CC_QUIET=1)
 CC_VERBOSE=1
 
+LIBDIR="lib"
+
 cc_echo() {
 	[ -z "${CC_QUIET}" -a -n "${CC_VERBOSE}" ] && echo "$*"
 }
@@ -22,8 +24,11 @@ cc_echo() {
 #  they allow the user or other scripts (namely gcc-config) to
 #  automatically update ccache's links when upgrading toolchains
 #
+cc_path() {
+	echo ${ROOT%/}/usr/${LIBDIR}/ccache/bin/$1
+}
 cc_remove_link() {
-	local t="/usr/lib/ccache/bin/${1}"
+	local t=$(cc_path "$1")
 	if [ -L ${t} ]; then
 		cc_echo "Removing ${t}..."
 		rm -f "${t}"
@@ -32,13 +37,13 @@ cc_remove_link() {
 cc_install_link() {
 	# Search the PATH for the specified compiler
 	#  then create shadow link in /usr/lib/ccache/bin to ccache
-	
-	if [ -n "$(type -p ${1})" ]; then 
+
+	if [ -n "$(type -p ${1})" ]; then
 		# first be sure any old link is removed
 		CC_QUIET=1 cc_remove_link "${1}"
 
 		# then create the new link
-		local t="/usr/lib/ccache/bin/${1}"
+		local t=$(cc_path "$1")
 		cc_echo "Creating ccache shadow link: ${t}..."
 		ln -s /usr/bin/ccache "${t}"
 	fi
@@ -46,7 +51,12 @@ cc_install_link() {
 cc_links() {
 	local a
 	for a in gcc cc c++ g++ ; do
-		[ -n "${2}" ] && a="${2}-${a}"
+		if [ -n "${2}" ] ; then
+			# gcc-config doesnt install ${CHOST}-cc, so until
+			# it does, don't install a ccache symlink for it
+			[ "${a}" = "cc" ] && continue
+			a="${2}-${a}"
+		fi
 		eval "cc_${1}_link" "${a}"
 	done
 }
@@ -65,4 +75,3 @@ case "${1}" in
 		echo "usage: ${0} {--install-links|--remove-links} [ CHOST ]"
 		;;
 esac
-