Also try to rmdir target bin/libexec paths when uninstalling.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 25 insertions, 20 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 021f80e3219f..6d6b518bdfe4 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/binutils-config
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.63 2012/11/18 07:54:46 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.64 2013/05/05 05:20:42 vapier Exp $
+
+  05 May 2013; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3:
+  Also try to rmdir target bin/libexec paths when uninstalling.
 
   18 Nov 2012; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3:
   Add elfedit and ld.{bfd,gold} to uninstall list.
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 0a0976ac56a7..e2f65aa644eb 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -3,27 +3,27 @@ Hash: SHA256
 
 AUX binutils-config-1.9 11043 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373 SHA512 d0366bd547d7c2adddf30975a361b2f25d008f0203db9e53cd81e635fd081e0ce13940a1df511f6edc7a11d6c4e641567cb750006cbbaa7b5bfd118bf6f87464 WHIRLPOOL d2c06206ffb351226db6db89e305042c03cf3cfa628c440fd3fd7274bf0c62c8ba61599f4997714075dc9f61b57a46709824eded2a31678bc2668e43c982ce91
 AUX binutils-config-2 11440 SHA256 5e923d1445910b9b9d1e455e52313087098689359846db0dc3fa52d33b63b192 SHA512 16b8bc2277bb50fb803377b192368a7abf7c97b5959bdd0d67fcf508220164d29ee2cfc1526ecfce7125b7492a0a5e4f094e948fa5ba9af44487229af3d91197 WHIRLPOOL 3acedb96e6c0c97e2223aa5fffcfb59f7e7b311c883e1557191db14b166a01d14ecd6eafbd4a4dbd33ceb2ca388fa7bf54d8291a24bb5e26a5634e2c8fb2a2df
-AUX binutils-config-3 13516 SHA256 3bf34ffdf21905ca632959fea2ad0ea01664e23aa767b68786b7d00477a81656 SHA512 25de2662ef4185c6fec0736db27fbe9e041ecbe02bee93b81f278331e6d73b61af95e34d5fd5721d3ac0f81d850a0426f11ab16a3555895632453960826ef5b9 WHIRLPOOL 25040a886e42d6c0e25d24c8873767766f41d56c343bbf83a658fc163f7256a7560ec500434bfc35c7e56736fef549c902b1950339d3a4fd3bd0a4452714c0e9
+AUX binutils-config-3 13599 SHA256 babf8d17c82f9ffdad83d9ddde0cf2897a21dc0d79233cf9110019ece06c321f SHA512 8ba2cf49933152bd3a8178349d691ed59c675fc8d05d6ef798d62da2cc07dd05e69ff29c07676f5bed279fa8c425c7a4260dee33d30f482911c2b3b732eaa7d8 WHIRLPOOL f639a12c04222e134fa5ae32442f4817b8b0d16cfbce8157a6143d9d0309277c8712f7704f38bb975f233b95b5ebaa0fe193a89beb5dd3f53b47851f325c70bb
 AUX binutils-config.8 4113 SHA256 ec7cb82331c80e15581e0936a5bf5edb3cde78bec3c3ede647926821086a1e6f SHA512 608e32ca64a82e0975cb247d30914db25668f637e30fd486f7322566065cc420470d237415da53ba7eb12daf4389b049b5ec8b2f8af598bf03803f48fd77f933 WHIRLPOOL d1ec82404f639718c51a1f983c1d60212ee6e943c6225c16bf4a2a24a8e7aa22093cce0fefa0f331ae7480b7b03ef10931d516e7ecf0a051415565eb583145a0
 EBUILD binutils-config-1.9-r4.ebuild 626 SHA256 4445f3282acda5b7c96146974adefc47315c437b5eb008daab9ac5f87a18d99d SHA512 82089adb1b63b386280f512a096836189bcd42995f7058cb211c7b01860788be24a4112c3345dd4042ed7b2311bc7b5a40248e55ad2e958519d6b8fd7e341d5e WHIRLPOOL b4409b6e396e42bf0dea54a1cc8aa912d7f1f215d7143d955ead38b1dea883d95b0b518fe198df72f21af8a954b148b7d18d292d6965a82417856fffccaa0ac7
 EBUILD binutils-config-2-r1.ebuild 627 SHA256 06d97c5306e671ccf55fcad8eec8dcd20e1c6c3bb8e4646771d62af5f1e1754f SHA512 856c552643f31f3df0218442c0290f7cb090c5088e0796ad03e5e07f5bdf0f8d3233b1659556e5768909a557971e5e5ebc702ba4a39658c7a862c4d5336364e6 WHIRLPOOL e5af63fd41361217f60dcfa84a605616a7bb0037fb986f00f3f866dff19bfa3fb96365b10be4854b6a27d643ccb2d682910644df5941e7f4d88f341ae2e6ad3c
 EBUILD binutils-config-3-r3.ebuild 639 SHA256 ee1def37b292183e65fc0d8af7148dc6d345ef3331e06bafd5384678538610ea SHA512 fa7171c4e9628cee0c3864e74403ca63654fac63b85159194d828678ae80c49ab8051eac90c7026d8da6fa08e2ffc3415a65c7dcb2664cbf03a6ad2fde1f43ad WHIRLPOOL 788570ed0381d82a4e1ce99aae91c13db941b3c679d6a74909b79b016d5041d2205a591d06a8544b5400b61a8b4230c47007c25c1e855dd246e753590d7096d0
-MISC ChangeLog 10499 SHA256 45368891e4652724950a49ea954a0129a0ba5a9e03be93a10da631e5b05972e8 SHA512 2df29a143af08860d40bb23bac60a8ee4aad8f5b1704b9e3b5a26838ad7150063b84ef85e5882f596aafd0d02de72ef26babccdfa1db12481e4a867e49cf1fe6 WHIRLPOOL f334d3ef0b0da7e78651e390322a9fd069da719e9ada04df8f46e37f80633b3600b7169b327105de2a51915bec37a16e220a167cacf5a4f3939448033b3d9248
+MISC ChangeLog 10639 SHA256 a8af81fa54be4a7b190f0bcda2dd76e4f0fa8a7ce378137905c6651e14812789 SHA512 5459aef57257c30e1d11d1fdbda8250212d8ed279eae39a05af0608e182dca1711587c0e9b1278300ac68124528fc76b4554d3b71c1c99d9ce623e275d89faf5 WHIRLPOOL 2789b5b110eb6332e0fc4f006c1aadd4763fd34b6deea857e9d6f399fbbbb18b1ec8819d2d7d10dd05e1565b2b42ddb32746ab8787679f6d2727676d766f0350
 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQqJR1AAoJELEHsLL7fEFWv20P/ib1Z3T5YpoKVi4JCwnDe+4c
-O+l1xXZEW3igO7okW6ZNV4cukCgI+tPWG5C7aPNaJh2M5y2uTWSs4/kUY0p4p5AA
-PNtuqLWH59OnbNQrzlvrOazE3jCDdI9sfb2yawMBga7d+ZoGAXOOAjTZDUR9Psxz
-hBgAG8DLZ6zvBcDMqs4GxAIKvR6GsUXEsJLyfYoyIu1f4rPyqXzpCkME7ORQurEO
-1xHTHONKXZngMoA2XmSC5cNTqGWVLtT4X/3zj6cJfmPTjO6EtkY6DhTnTFmCYzph
-RcyjfAovUP0b9ZdRM6w6Pn3B5tFm4gRktf9OAXPn1Ww9PH5d3meDCW2VEl21hyZ9
-Xf2LH1ZbFJQJecswpMRf5GK7vpYvnZ2HpcDgeS+lTS3+F0ZhgKxnL5YrDLcUs5nP
-vpCVgPPhUAtYcQMAj6iJwtaDCOJG+mhw2Wk3LhqQwlIAHeRKEBhRsH2DIdmFVUem
-RjPHnjOkC4KsLaBMQzZCWZrTpfNI9bgcJFHDAIu4XOVO3GHvqi55wMJRGaTE0kWk
-5xhrYIQxZc41ZRdkW5lg/IZR52NMofT/gDbXq62KKHOi6ptk/Pnn4L7YVLvLOlO5
-EIkI5APl8W6W7it8qiLySW1AMjMIl6cQNeJQVPGK10VPLo8dyK9WBMA2jatJgX7p
-sS7mloh9vL09Zqbx9dR9
-=Cgc7
+iQIcBAEBCAAGBQJRhewyAAoJELEHsLL7fEFW5vsP/jEDQg6xnnu+FsqvQW8v2XeF
+BhQAi/X9MQZ/ENULQHPfo1wHzBBJ4qRc3xeV9/KcIAzbSiYLuTiztuiDLTLhwTlb
+C5nUZeAbb0W69rsCcDjanmNzbS8ysmbiFfzUBSRoFyLJAsBeMP6eeAtfNkk6QIiG
+8yF3/YDoSbKSXwBV/aNhwjNbXinQyXIMYP+j/+BkmqhrQPBjTFWcQoGhiij8Cuu5
+Z42CLNe8p7heIYvEn9obVuDPYOTaXjrU2Ns6R2CL/xpUfOMd3jd4OXI+/ZThEBTR
+ZprpZ5yYsIUX4o1GkoIay78az917VPTyDqEPSa/wLyXkB95thh209dqHI93BRlNJ
+Q5y+P3YvOhpBiTYUfxTKO2zCHQzXSSQ9ZjpJiwmZ6G7JnGPIpMcm9GBQ6BTRE8QR
+4Wt63QC8v77xEnrGgUbVndNKkAkPEqMdSqdi44DDWQRqs7D6ZERY5Yhh4wV/9MB/
+Q0UVQWdZzvniQq86boQT5DuTuZMGrkfJkJBAiykxf8O6x46FbWPTzmnDy10OF2Qk
+1zQpg11oMUQOBVK6EueUoO+ikiq/otV2XYdoU8AcspNj88XbTGZ5KbRmVTUg4JZw
+UK1wuHN+kxgDWJq6+fj9nJv2RYB1RrVQYtz1qVJHxmumBJNo8CY0D1eyGsi2Lcf5
+Y9wvkBJu80Funm5/PO9U
+=nmbN
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 95c094e64585..5f21878f5c4b 100755
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ b/sys-devel/binutils-config/files/binutils-config-3
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.10 2012/11/18 07:54:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.11 2013/05/05 05:20:42 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -284,6 +284,8 @@ uninstall_target() {
 		"${destdir}"/{bin,include,lib,usr} \
 		"${destdir}" \
 		"${ROOT}"/var/db/pkg/cross-${TARGET} \
+		"${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \
+		"${ROOT}"/usr/libexec/gcc/${TARGET} \
 		2>/dev/null
 
 	rm -f "${ENV_D}"/${TARGET}-*
@@ -414,7 +416,7 @@ while [[ $# -gt 0 ]] ; do
 		-h|--help)                 usage 0 ;;
 		-V|--version)
 			unset Header
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.10 2012/11/18 07:54:46 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.11 2013/05/05 05:20:42 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }