Trim empty ccache dirs automatically #517242 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 29 insertions, 18 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index 7d186f3347e3..fc474ce90e52 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ccache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.139 2014/10/22 05:04:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.140 2014/11/01 07:54:34 vapier Exp $
+
+  01 Nov 2014; Mike Frysinger <vapier@gentoo.org> files/ccache-config:
+  Trim empty ccache dirs automatically #517242 by Arfrever Frehtes Taifersar
+  Arahesis.
 
 *ccache-3.1.10 (22 Oct 2014)
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 3a104e6e2138..bf8693fcb16f 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -7,7 +7,7 @@ AUX ccache-2.4-utimes.patch 3267 SHA256 72f617b329a68c9db57180a9940689a48acee771
 AUX ccache-2.4-xrealloc.patch 742 SHA256 119c8fb7f3ec725444e416e42d690fdf81470213a837274bc5375f659942147c SHA512 86a06cdeb9e9b7ed6bcbf57f85cfa38fe13f64d4654e225cc1b24b0dea38778fc87732362be872587ad3db02e5421a7bcb4771f56cf79ecea0b77ed4928cddfc WHIRLPOOL ded4aa06e4daf6447314e00e3ac4503b143a41385f1532672c43dea9b2033b7ca17ef4111e95efd2be87c84e176bdb9310b485f45312a2c83cee557766f31195
 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 2222 SHA256 02df1f8f5fbd07c0eab09f18a51c357525953163391adc95ed5e46c813bffdd0 SHA512 58a635bcfb1a682b36a67e70ecad29912fd1e5cca20ebbd1a89912b97f18ada204cf24f2bb88ddce985ab3423a94d34e2322a08f1dc0d8bd17a4b77bbcd66282 WHIRLPOOL 87086954357d3e09e7fa75395ef02a84d86fb1d74caa3d117c5bca80d1531f1b454ef715678972893fd82be43a3e3efbc8c81a14a3520dd3b84eb7141c06277d
 AUX ccache-config-2 2019 SHA256 f380b7b5a17147c8a03a5c3e8f36c5b59913c22f952fe84d17fa8b14abe94afb SHA512 4e4028b8fceca6c61d27d7a900640605cf397a3ad2c7b8dc697028f3e945e22e87f47c8f8dece488ae7768649fd6a61989e7882a2cef85af9b066ec4b2061719 WHIRLPOOL fc733b88312a23ef03ce603768606177f07170f5a404c46f415e46c63ee7a8ca2e7c8eb0109f99497b16bb827260581744fceb563f4435f7751c145c73c26e38
 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
@@ -36,22 +36,22 @@ EBUILD ccache-3.1.8.ebuild 1828 SHA256 c8cb4b4b93ad0e34cbcd2cb53da63f2c0856c5ed7
 EBUILD ccache-3.1.9-r2.ebuild 2414 SHA256 8ce6c043db2f19f2e02793cc0a7d96d638eac980f5010b0ebf787a701199feff SHA512 4b42ccdaf4e6af712185cad5d4976d0f78ef77b6a3d7f7dc676181bc7a1ebf60a49d4b51cbb18f53d802b537a17f633bef03c90513342293b318dc21c7b06474 WHIRLPOOL a1a6da113df674fec5da42d8febc6d79755cf3b5570c36644139dac3c016ba7f531b42e082f0b1d4ad585c3a6cde00471857d17684afdbf189f8fc7e95746cf3
 EBUILD ccache-3.1.9-r3.ebuild 2311 SHA256 a04470ec13d50277af4172058764ba0ca27ff5fc4bb601088959fd7978eca018 SHA512 293a645353e3a560d68b4ddba5d77c1a6a54fa23160559cc7465b37de601c5381aab9d44440c597dcd6cb52eb8487a56b6246c14e084808b48c154a257439e4f WHIRLPOOL 23534b4af2242cc1aa6d2c8bf0a2c6bff157f6603c0c86ffde781897af3e8d0e1d0c359d3b909b51c0fec39a7b8d3d2f231b392f5bc121800b390e4a302706e1
 EBUILD ccache-3.1.9.ebuild 1930 SHA256 10c374f8e0896172880bf9a7e93351c8f5676e20a9d050b9e3b1a93e76bf1411 SHA512 4a2f148cfe8526fb9fa70b0b9339810af2811ba7d077a90fdc8b8b2280ea80a4790c9e475344f88bde4e01dbeb93ffa429d8e2d417537006201abd1eb2057284 WHIRLPOOL 104505aaf61b01fc384ff8e6118dfe51fd29b50f4c541a8cf31168a661f8216735368ea280b7e1e9bde640bf5f853e45d12cb321cde648f61578ee82a08e1721
-MISC ChangeLog 17573 SHA256 f8c9e9ec737877f5ab01525430c6eb0793aac2a6a1744c1645e3b033ec8e2bff SHA512 6bce169ac41580e351dcc203f82f2dea12a451d5ac4a12906b7ee5467c51b728696d8b13123732fc79d30544e85e92f6b6c998ee46d8bdeed72b2bd8b1e6d08f WHIRLPOOL 87c5f5991d3547a92850b39ee429135a0155eeb95b5ab648fbdabf407838690e01b94cc2b0c0a8eb00d4ae4831985664dade096ca3793b06d9d82392cf1d3c0d
+MISC ChangeLog 17734 SHA256 2c2e0586a1a2918a70a84d6b41a2fc2e7da5c58715e1bd3f77e957c4d766cf71 SHA512 9fcf034f690949d59cc03d6bd64f7332e433f43cbcdf3b2a1737ee2ab9300c3c6458981af27ee82e9886af444cd8777f705f9905f8c5c42e1bdd22932b65b5a2 WHIRLPOOL 6cb981760792f67f35c2cab6dc1009c657e4eb7414982f6007712cf2aed283321fdde09aed216c969c8ffca51ddfe806bcdee0a586ebb21779f40eb764119ccd
 MISC metadata.xml 412 SHA256 c54d1b5f225e3a82754a2550d3875b7211249572a9372abdeff5fccda469aada SHA512 63219b00d64d67e2ff11ac39f667be3ad110df35259d79267985e05ba6f0c932fd5b11dd78deb3fd062c963b6cd218db0a05958b54d323b86950991b80939899 WHIRLPOOL 329af87aff780d16300e5832dec6bec923b1cf54bd14f52db08e3fea7ef506ad85f627dc8005ec2f88f62f6dee27d7600eb558d4f66bc08011d23dee61bac297
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJURzrwAAoJEPGu1DbS6WIAh5EP/2m4JZUU4zD9/CkbqGPFw64q
-xK7YlI/Aer4fRB7juRmTLPlhQwAmAVpIvZ4n3moedvB4GSKViNQ4bFG+4zclSRvC
-AFWNE6TFLmYVv6rriBBXrli18aAdCqFv0Lg9QYg8RbVJjqsj851olfmEoCwXJu7S
-vJx52K8BqiEG5Ud+W3ILrmbPL6cXGadcR3iLu1+z6uyWRrep8mRxIQXluTKKDf6b
-o8Gutur9xzgS+cV5yBCkqn3HVS7ds0vxRy7fV4Wyq3CXB60s/yxNtYFXiBQA36EL
-B0SiRKHVf+wUGaVCJO95Hmnt5dzu/OAHB93dqkp6LKPty+xIMmnMhjZwJbAYft8q
-a3J2SBQsFxnrE4ENDdizXmd6/c23kQNBVH2ZTZ+MplL7NkgAa4DtW5FYj+dInP8X
-napWDqGi8ajZLvcwLB6h1TRiOC+eW0WlVn1+lww5C0Le0iGh6GV2B6B3EYYbNbDr
-tDTZrWLSFdNoo55n0AqYjiUyujzm6D7fCf4yrxmN77l6+n1GRS69pIoS+Xturrcx
-1YAu4WNWsq8ZBeSudU5tAWg4D85D+i+nKgXQIbzeBu1DOHb/VevC7YKUQQ6O8AG0
-mRCrasBjlcpUX5jemYpSa/7la8zSKkD1YK2ItWgqqIVFdX2WwJkTcNv4sI/pMpo0
-zdTCpV7P4HOAPLdLA/50
-=rRSG
+iQIcBAEBCAAGBQJUVJG7AAoJEPGu1DbS6WIA0H8P/Ar1tj+pZGdYuY43whHI8YsD
+tamovCqVKvtEVPSiFkVj2rKqfTGHvZwU3OwIHWlVzewzbor6xWEgkzgVNMucCKWt
+3n36TPNaPCQS+74js9rKHi4HRQ7JOCPd12sSnB29c9MWQpd/o+nXSM2LuafjwMOG
+n3pinZwTOIcgQ2YHR6VwkvXgf8dPEKRcNHDZzFcysU1KEOtVYAVLIzgcfVzbORek
+JtLUO6oSC5HNmqC5NdCzY8LOs6+jL2jy5ynbYTbtKb9RPOU7m/S1oZD7X+rDM+ui
+LfFvkfGbxrt07gQyRDkiMIBw4Kci6IEG0/cKGMkMo5fh4G9pDdkxZh5IpcpJ26a9
+rd2OM1/XsoqqyHKx+JlVTnN0EvOW1JgehLJDRd3+F0ywEDAmWpTzqF9qeIvkUjLd
+Xuj1vsuREtjDarKBI3MvUq9URE0Q/VN/S3x8HlteFW6UzFGBBjnYKjaJAK3yyY6a
+cBPQOX1V1D6RYg2IU4Zlq2HfpHrf9FNlWZZK7hGq76uYWRPLYJBxPSzMRMht47uA
+2I4TLWONY3qckDI9Qmrsmv6nlacJVmn4t0Lsm5IoGMPeFa1DSqvqkbgnqyyu/UwT
+mnA3K26In1eY4vKgLnpyAwMl8nXgYAcwmhO2mGcgkj3HL1yWKqpeDoFtlg5sqPS9
+p9wU9jWMY1KhqdB5UJuk
+=W50p
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/files/ccache-config b/dev-util/ccache/files/ccache-config
index 8c1bcb2d3734..a7dc4a04a76e 100644
--- a/dev-util/ccache/files/ccache-config
+++ b/dev-util/ccache/files/ccache-config
@@ -2,7 +2,7 @@
 #
 # ccache-config - helper script for ccache and its ebuild
 #
-# Copyright 2003-2010 Superlucidity Services, LLC
+# Copyright 2003-2014 Superlucidity Services, LLC
 # This program licensed under the GNU GPL version 2.
 #
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
@@ -45,6 +45,13 @@ cc_remove_link() {
 		c_ebegin "Removing ${t}"
 		rm -f "${t}"
 		c_eend
+
+		# Trim the empty dir if possible. #517242
+		t=${t%/*}
+		if rmdir "${t}" 2>/dev/null; then
+			rmdir "${t%/*}" 2>/dev/null
+		fi
+		:
 	fi
 }
 cc_install_link() {
@@ -73,7 +80,7 @@ cc_links() {
 			[ "${a}" = "cc" ] && continue
 			a="${2}-${a}"
 		fi
-		eval "cc_${1}_link" "${a}"
+		"cc_${1}_link" "${a}"
 	done
 }