add icc/clang support (bug #484772)

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 30 insertions, 20 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index b6fe7b37c217..1bbd63d3b4db 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ccache
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.124 2013/09/13 14:25:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.125 2013/09/28 22:44:47 ottxor Exp $
+
+*ccache-3.1.9-r2 (28 Sep 2013)
+
+  28 Sep 2013; Christoph Junghans <ottxor@gentoo.org> +ccache-3.1.9-r2.ebuild,
+  -ccache-3.1.9-r1.ebuild, files/ccache-config-2:
+  add icc/clang support (bug #484772)
 
 *ccache-3.1.9-r1 (13 Sep 2013)
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 35516e181e7f..4a3306bca2a6 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -8,7 +8,7 @@ AUX ccache-2.4-xrealloc.patch 742 SHA256 119c8fb7f3ec725444e416e42d690fdf8147021
 AUX ccache-3.1.7-no-perl.patch 400 SHA256 5784419b79e89bda1bf0a8d053c26c9d798dc88ef0756f19c0b0d40f93c3aef8 SHA512 bd529e4ec577a458e5933d2f55ab54fc783eb00a14f4f6879e1cf4f20d058816651b80bed7141e1fac6863f1ed34cfc65658d42ad728b2dcb9cf4ceab7f6318a WHIRLPOOL 8299d984e66d3328166bf4a4e676f963bbd7203bacde6ac5b1d74a98da589239efa03946431b43f026e45eaf5b922e7792a89fc905c17a591304c86c1af9ddbc
 AUX ccache-3.1.9-test-gcc-4.8.patch 5157 SHA256 da673ec98db54c2fee09585ffe4ac4fde3d9867a9a66f0064f8de4d7409644c1 SHA512 44cb88357b1fece0869463c4819422823d8025be577dc50eaeb435a3675c033c56e1dc0474b505830b229de7f8bd92cd6833eae72830d89a2e4a89b8a46aed6f WHIRLPOOL 88d61b411367808e0239a949e01742ed2204e8212a4af8dd919f4d6335a040769d9b33ea2e1c1b71eba69c25b81f1417d717bcb6dd4799a9d276a0ec7bfe00ff
 AUX ccache-config 2094 SHA256 c330108e2b5d364a4b5f63518d38af4a0e2d47fb7626ae85f8341ca222f04995 SHA512 c30bdf6d337822e459df2d1f5fbd76654b7c450ab29898326185dd5bae14a6d800457134a135592b5ecae640efd688bdc2c985505673ccd4212ecb05e39ee912 WHIRLPOOL 9947203339da5bd422d5c2b29cd0e9492c2f4ccc1afe48e491a21dbfc8d655e4692da93904b4c745d3e6a3ac2be6e38a6a60ced5d8d697384323b8e6209bd211
-AUX ccache-config-2 2175 SHA256 f05a135afceb1fcda4b286c774e1042ef4f5fdfca5639c0c10a622f5d625877c SHA512 b592cb977ea25a8bb54caac528f969bd5eb95899e4b510feef133fca9a9adf791a059ae3cbeaf4e5bb6338aa1e29f1f8e77a8142789adf5bd46c62a2420c20cb WHIRLPOOL 4999624dd2ac99fedac8e635499500032d980ceb00dfb57589a2a79e3d5e7e1edda6606c2cf882bec4677b6e609c98fa336530311ce34174b8eefc0d7731fa1e
+AUX ccache-config-2 2023 SHA256 01cfe4341578839133c5bafb17c0cdfada5bd736ce02e6cd3c38c3edf43f989e SHA512 1869666255f92c6abf1dbc1bb36f532da26008bd143af14c55959bb3183bc70309d17ec7c52c4ec8d88ff2231509d85521f2814533dc8d68bcaac86fefab3481 WHIRLPOOL 910263c61e790b9e3dea98bf4d86657d7cee03cf210ba2c34fd0ee5fd9c173e2afca5afe153079919666ed710c9d09cc2ef5472596926620addabe53b3804204
 DIST ccache-2.4.tar.gz 86363 SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 SHA512 6ab05f74eba5c0a7472a3d53cfa6c24e45f421f2c773776f713a46121eda21213deb34fcef214d4f8d2e756cd375637e4639a9bdfeb6b9a44455c5bcca246b19 WHIRLPOOL eb308222713d17f52f88ac97a5c63add454b350d60259d1d2238e3b54f1e80ad8c8700e0e045b40aa5be64b1db54846a86da600436778a64d2270efff7763380
 DIST ccache-3.1.1.tar.gz 324042 SHA256 eb0b37e25ecfdf1262e0da7fc5f01d986923589803c230dcb7213ecbead3aed1 SHA512 de1d3b6d32df08db28a6ef99ec6ce7c5d5957d7c54a0cfc6df303979eedcc198c09ca7bdd0dd1546350f83cbd87a08fa734d6f6a04272926741ef2efbf2a596f WHIRLPOOL acf700b1ede0cbf312dcfd825191aa5a16dd8a1e18669eac6a9cdc4805d92e024bf5811c5fe77dc51a9311cff2a52c72dd16ea0b81656aa554e027abda5b00c9
 DIST ccache-3.1.2.tar.gz 325243 SHA256 1c690993fe8408c190657c0a308574c947defbf38c3fa0e94d8f32a10f765714 SHA512 a8fc9125825f860e3e9f67513771e5b4819d6fc77b6281b1d4b05094a95fd30a758d91690f8f393bf5b018fff984c152fd1c2baa6fca0e81a62713e6d832d1ec WHIRLPOOL df57cce0de24ddebd46f296ffecbf80ddf797d82a83aa40ea639bb360f4e101da4d83455cb0ace602ca25adff2ec33ad3ba6162b216fbfb2fef3faafe4b8a7c8
@@ -31,18 +31,18 @@ EBUILD ccache-3.1.5.ebuild 1841 SHA256 831bcc798698934d8d1dee38e8a9170721a85861f
 EBUILD ccache-3.1.6.ebuild 1829 SHA256 289838680ac3fd1b477882273318ac78101ea8806724053f543f4ebe6f965a4d SHA512 ea5d8f403244b792f4c1d190720484df201453b1cad616c51dd73ff1df77b0a174f69873bb74a2ba83d42a6f5daf9955949b1d5936dd8ba663224195126624ec WHIRLPOOL 4ef2c1adb806b4edf3d3d2d6ea792481afc773d527774c2c222cee4c36a998d259f6a7aa0e8817f0b15dc70fabf594f5c25626415590fa11469f40c2680740af
 EBUILD ccache-3.1.7.ebuild 1868 SHA256 91c6bac92477d375382baea491d86ceb4c9e722c581f60e618377dcb7d8ddcc4 SHA512 be1f3207f3ebb13e19a9a03ea5a065ec811ddc466b9a00f5048a6f4f58df727ffa2af33519275ee075ac5f76681314ae89f896b853ce54cb5944cc1d6642920a WHIRLPOOL 4aa5e587c8a526774805204c09d9a37298f1561bdab262c33b0f50082de4ecb306602baf43c90f49b6a74133a1ef8c5454bf9cdc47161d3a74a4035580453f35
 EBUILD ccache-3.1.8.ebuild 1828 SHA256 c8cb4b4b93ad0e34cbcd2cb53da63f2c0856c5ed729d8bc7b5385a518f2fa0c9 SHA512 c258db009169e10408d5e12b6f6e111666df1d3f6a8024d3f519529a43bd0c67a915bcf36ed6951e7953c049f2009c2165a1f2f029a94d757cddff237d35531d WHIRLPOOL 8041198c0861f7f430bbd0f7837201d6aa56cf3dd4effef75be70c5f72c3e665a68c40b70c41a93df6862a7b42d208a4bf3206c0132a820edc4cee6fbb81983b
-EBUILD ccache-3.1.9-r1.ebuild 2116 SHA256 f07211727682c09c1925b39ad141371a6de1cebbccde02f34c900c62771df390 SHA512 c00cd0471a107da92af54c1a72b2813beeba9865042f3cb877298ff880fbd9104ad2fc499da7d9abbd078045db0dbef60ff60e049b31b3a341886995b5628499 WHIRLPOOL 2c0d779229355c1714aa1f2263c00aa737b8da977a414c1930a2233c2104c073e44df5fafe2106112405cde6b35b39fc898c4044c31b76094cf5523cbf79e479
+EBUILD ccache-3.1.9-r2.ebuild 2414 SHA256 8ce6c043db2f19f2e02793cc0a7d96d638eac980f5010b0ebf787a701199feff SHA512 4b42ccdaf4e6af712185cad5d4976d0f78ef77b6a3d7f7dc676181bc7a1ebf60a49d4b51cbb18f53d802b537a17f633bef03c90513342293b318dc21c7b06474 WHIRLPOOL a1a6da113df674fec5da42d8febc6d79755cf3b5570c36644139dac3c016ba7f531b42e082f0b1d4ad585c3a6cde00471857d17684afdbf189f8fc7e95746cf3
 EBUILD ccache-3.1.9.ebuild 1930 SHA256 10c374f8e0896172880bf9a7e93351c8f5676e20a9d050b9e3b1a93e76bf1411 SHA512 4a2f148cfe8526fb9fa70b0b9339810af2811ba7d077a90fdc8b8b2280ea80a4790c9e475344f88bde4e01dbeb93ffa429d8e2d417537006201abd1eb2057284 WHIRLPOOL 104505aaf61b01fc384ff8e6118dfe51fd29b50f4c541a8cf31168a661f8216735368ea280b7e1e9bde640bf5f853e45d12cb321cde648f61578ee82a08e1721
-MISC ChangeLog 15812 SHA256 9c3eb939646cd89f557624ccdabc279196608c907c0e0d1773960a4f2d8608a9 SHA512 99d4145ec548aebd00ad5d5729842d446982e8475af3dd907463355bbb0ef968636902be8f776ed774f02df1f7fa65e902a5241c38e8e15bdf850dde57132cd8 WHIRLPOOL 2c2d675d0d84215e585ab3f6a1e344d09ff420fd64833f149ebe80ae30e82aee58473c43ac5addcc3eab000d0a578d5b7840b24c3a199295f0a5c4b945427c55
+MISC ChangeLog 16012 SHA256 b7bf5f189662755bfae5615c2bc2943bafcee50d39157e978b73bcdad993de27 SHA512 137be085645e94320ef6fec33bf55d5a7b75e8a56a34f8d35d859dafbbc28dfb47d6660635eb29aff97b847f4c4a4a7207b74e077ec2e195ef6ac860444e65ca WHIRLPOOL 7499023c678c4126e038ca93cb2c5efdc3dfec972b8f65f57153713b098162d80f49df33c440f1b588c84a6e633ff2608ff982bf18f03992917315c85f3fb914
 MISC metadata.xml 412 SHA256 c54d1b5f225e3a82754a2550d3875b7211249572a9372abdeff5fccda469aada SHA512 63219b00d64d67e2ff11ac39f667be3ad110df35259d79267985e05ba6f0c932fd5b11dd78deb3fd062c963b6cd218db0a05958b54d323b86950991b80939899 WHIRLPOOL 329af87aff780d16300e5832dec6bec923b1cf54bd14f52db08e3fea7ef506ad85f627dc8005ec2f88f62f6dee27d7600eb558d4f66bc08011d23dee61bac297
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSMyBgAAoJEOeBhlrCAAWGj+YH/22/p41xAMIUVUfHmEYK8s9Y
-BC3eAGezrW35FnTH+2NMlaZPMO8/IrfOW9FoYQwh0Q0jRK2q7Sul4Ny2IgtaV3R5
-A3dXjgDt6giJh6YHUr9+A5Uu3yB0ldzumk7w4Ks720aHUM2Naocnyb367DYY0q3z
-Db0EDRHV3WzZOLxc0AuJN83wagk5DWhOydDHTbPnWpCTdaboFeU1HPo8g34gdGym
-90b8zTs2tpiiBKbFaLvV5KgJu9MbRqz2S7bNnNvmdTFgnw4ax6Nt+ixA4JxF7ujB
-wxjgBdljuthf0WsKabKct1bosttBmRCIIGjVXBgaQdylWfQTXC3glP0Hyjc14hg=
-=7mIj
+iQEcBAEBCAAGBQJSR1vmAAoJEOeBhlrCAAWGjBYH/2uQWySBNUW3orhrmVez00Mp
+fuOuQ9kaVsKCl7SHGuz3jmjEFgRcE0bq56Bfdgu96rb14Qb0GMh2xuCk0K+aUFSJ
+anSDWtRr5VUeDzD+fDV9xBkmmQ9ppon7k432tQ4jXhVykuCSdTnGdmQ6L/gWvBhP
+Zb/4A/+eDdhJ8qIrf3+YdyXHTjJCD+2Y0oJ5SHR5e+K+4Z6S31F7WVgQl5zzMy9e
++q6CJ9DHx8OfAH7Nj2qguzUBmF/SSKSuWYpGTtAKQN8xxA7jNrGw8KThtNewNzmn
+fASU1FvHsJsJOZm0u2oaJfnnh3LNnKgP2eQgd6nydpUOtBU5LFj4M0TaNuIkX80=
+=wYVL
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/ccache-3.1.9-r1.ebuild b/dev-util/ccache/ccache-3.1.9-r2.ebuild
index 531727144b00..ccf98d4fa3ee 100644
--- a/dev-util/ccache/ccache-3.1.9-r1.ebuild
+++ b/dev-util/ccache/ccache-3.1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9-r1.ebuild,v 1.1 2013/09/13 14:25:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9-r2.ebuild,v 1.1 2013/09/28 22:44:47 ottxor Exp $
 
 EAPI="4"
 
@@ -37,6 +37,13 @@ src_install() {
 	dobin ccache-config
 }
 
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		"${EROOT}"/usr/bin/ccache-config --remove-links
+		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+	fi
+}
+
 pkg_postinst() {
 	"${EROOT}"/usr/bin/ccache-config --install-links
 	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
@@ -60,4 +67,7 @@ pkg_postinst() {
 		elog "all of your caches like so:"
 		elog "# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C"
 	fi
+	if has_version "<${CATEGORY}/${PN}-3.1.9-r2" ; then
+		elog "ccache now supports sys-devel/clang and dev-lang/icc, too!"
+	fi
 }
diff --git a/dev-util/ccache/files/ccache-config-2 b/dev-util/ccache/files/ccache-config-2
index 406405662458..e00e7b6c88fd 100644
--- a/dev-util/ccache/files/ccache-config-2
+++ b/dev-util/ccache/files/ccache-config-2
@@ -69,14 +69,8 @@ cc_install_link() {
 }
 cc_links() {
 	local a
-	for a in gcc cc c++ g++ ; do
-		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}"
+	for a in gcc cc c++ g++ icc icpc clang clang++ ; do
+		eval "cc_${1}_link" "${2}${2:+-}${a}"
 	done
 }