Remove symlinks in platform-specific libdirs and not only lib64 (thanks to Freundlich).

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 15 insertions, 11 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index a7acbd6353cc..8ce50b0f6d49 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.257 2012/08/24 09:46:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.258 2012/08/27 08:11:30 dev-zero Exp $
+
+  27 Aug 2012; Tiziano Müller <dev-zero@gentoo.org> boost-1.50.0-r2.ebuild:
+  Remove symlinks in platform-specific libdirs and not only lib64 (thanks to
+  Freundlich).
 
 *boost-1.50.0-r2 (24 Aug 2012)
 
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 387470ca7661..e10b4554d6ea 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -65,14 +65,14 @@ EBUILD boost-1.47.0-r1.ebuild 15910 SHA256 f29520bcbd74fa8d75acfc6a1cd7f30329b40
 EBUILD boost-1.47.0.ebuild 15907 SHA256 e79d396d32d06b5e3353664d3c95de05448b935d5a36a6df83d32b01047b7c46 SHA512 4ddc6f2cbac138e5f4a12359a945da7c70536d8580a2cddd5f0271d5a8de69080843eb9bc547f6726ca5016e01b504a175e1de55854074ff7c4131f5138eda95 WHIRLPOOL 86c566793087c5a4e3ceaa94744715bd118126019212ad4a0d596ec0373e3354e449272d5902a44d8a824d2ef1f738c17038e17bd69a33b07719475da688bb10
 EBUILD boost-1.48.0-r2.ebuild 19807 SHA256 f9df74868d1fa5eafe831ce5ffa59fd6454a674a275cd99409630bdab6dbc8ac SHA512 ab41d728c1ae2512c7f173e07f61dc2cea7528ed2a115196f25b6fca07b220ba199aa1b3446f89c32c1aa35766bf97d56880f82231b612af4614e6829920055f WHIRLPOOL 7b23624b86bfd06f3a18385c54a0740a77b7da7070cd0312ae40fd5274f8c237749b0e84572f567b135fc2730ff5dc1ace43a1ae4085be1c18e4c08242aa9029
 EBUILD boost-1.49.0-r1.ebuild 19764 SHA256 2c53eae0bf8f039152151bfb36cd05fd95d4aed50a68f18eba6d60571dfa30ed SHA512 2bbd59058db4418a76c15530df6ad455a1e2649717d3322874e13979025ad91ee9ebbe789e13018c02455fd2144bf6ffe04a0969db84c7a9efe6a8055833f1e7 WHIRLPOOL bd4f5c6061649b4f1ed8609baf9cbf58be511b78ea439daf93a0c219643c58e4ce32a0320e08195fd29929436a647544c2fe2c200b1739d26dfb45e7ffc87062
-EBUILD boost-1.50.0-r2.ebuild 19081 SHA256 65b04bcd24661b65fcd44df6999f5d03249f29e966de921b64e13b63bccf1882 SHA512 0667cf9e14804bb0eb275600f5cb5ca21b2f3f082d5ffcdf31b79fffff8b72a081d85b1cf1897e12339ca39925da20d5317bcd7d96c0b6d4d03f58c9c4c18106 WHIRLPOOL 23c253d9c467056697c1d67352150738d3ed9ef1d13e5638c7f59f555a78bd647fb58a8d1e13c948cb3e341934084bd598a23df670a3ab52c6f7d2bd10ce562e
+EBUILD boost-1.50.0-r2.ebuild 19113 SHA256 d8a268006f46d44dd26c7bbd448cf97a2614637bf8b5f8b7469d101c903f8b85 SHA512 49a598f960b09f9c6e9c62b904a6485c9fd0797519b3d9904f0db04e74711c3f802514e0e2655ad226d829587b427d6c103825304f821e3b8fd560d6f1bf6fe3 WHIRLPOOL e5f9b44e0fccdcf53dc8058e478b392e0b2dabd1d7f3da8dd543b63137f0f0f15dccabefac89d9a8c4593ac58ad09039713d3caa0e8b6a926d9eeb8afe556a8e
 EBUILD boost-1.50.0.ebuild 19767 SHA256 485a0d40d3195c664c8bc6e294eb36c8ffe367541ac71bc424d9dfcc640ccfbc SHA512 8305b38a044bea58c7078fb19723363b00b78e7f8379ace6afc5cd5ce35e8788fb1694bae7e51470c8b2925369e5b7bc4d5d6e9bfa19992a5bc07a6399482248 WHIRLPOOL 4c60b0e2ccb05e89ec98dbc83ad31416ce6ca01a347c02fe9a4c99d4a402eb8ce5cf916580f6294796575cdcc7779b3ad31c539abb0f35bed19139cd78237186
-MISC ChangeLog 41169 SHA256 1742991bf924cd8ee852e821469bc87717c1bc8c800329bc87f19c3b4596f055 SHA512 bc9d0a788f4f1b6b9e7446d8ebf7e14e0b3ad46cde6f64cd2ad95adadfab3787f0bde489d91cedd542a514315492b9e3761aa5b25bd493e098c84f704ebaadf4 WHIRLPOOL bdd54818defc603bf070258fe655c13109c96d8a42525ac4f7dacff1cf7afecc0f2c1d5f2f3606b54f8da1f94d7634658662c827ca46af7d844d36c06a64957d
+MISC ChangeLog 41339 SHA256 bebd43d299f0c5e2f49833e585fdb457565a79ebc9b64e5821e4e7abcb6dd8e1 SHA512 09e709b28a624297a3c4ce9bfb549bf5bacb2b0ce725d0001b0db65bbd699abe59ed7385efe0c7f89af7f399d7814882117cd03be08d3bdec3a924cd4e9ba585 WHIRLPOOL aea69428e7b23d7b9bc5ffa7bdeb9de2887d05232d5de61b6464d54f3ba0cf630ebbd355357dc48ff86f5eba0dd166e3b048add903b9d0e863bcfeb9bcbcc744
 MISC metadata.xml 899 SHA256 1fde852e55948ef5ffb30472daeb2f1ca517cf3a4f30792c7880bf1a98e3bdae SHA512 11b6a4558eb418253fdaff5b8dfc1474ce1205a2a05fd96c71df10d63c2aa0f59293d23be384e434e8ea30d8958ae2eeafa4da843b931f60cdcbbd1986b22670 WHIRLPOOL 23fbffa77352d60a446e05d009632bf8e3351ff2fd35ce751157af2a28604f05986d0f23e24be2b12e7cc7a3fa1c2cddb41afde909e2d896da0f1af22c7a8872
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlA3TWUACgkQGwVqY66cHjAuTQCcCNT2GgfqcBA/1tokqXsL1KaK
-QmwAn36hmTiMQgBO08Fgm0hWSAxRH7Ic
-=JQH9
+iEYEAREIAAYFAlA7K7YACgkQGwVqY66cHjAkrwCfR+DRKRI3Cd7eHFsVGJD1z4y2
+kFMAn2sgOE9gUBOwb5TUOlbVGdjiLMaH
+=XkoC
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.50.0-r2.ebuild b/dev-libs/boost/boost-1.50.0-r2.ebuild
index 4c52248b2eb4..e936858e78e3 100644
--- a/dev-libs/boost/boost-1.50.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.50.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.50.0-r2.ebuild,v 1.1 2012/08/24 09:46:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.50.0-r2.ebuild,v 1.2 2012/08/27 08:11:30 dev-zero Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -553,11 +553,11 @@ pkg_postinst() {
 		fi
 	done
 
-	pushd "${ROOT}/usr/lib64" 1>/dev/null
+	pushd "${ROOT}/usr/$(get_libdir)" 1>/dev/null
 	local lib
 	for lib in libboost_*.{a,so} ; do
 		[[ -L "${lib}" && "${lib}" != libboost_*[[:digit:]]_[[:digit:]][[:digit:]]@(${_suffices}).@(a|so) ]] || continue
-		rm "${lib}" || die -q "Unable to remove \"/usr/lib64/${lib}\" symlink"
+		rm "${lib}" || die -q "Unable to remove \"/usr/$(get_libdir)/${lib}\" symlink"
 	done
 	popd 1>/dev/null
 
@@ -570,7 +570,7 @@ pkg_postinst() {
 
 	local python_module python_module_dir
 	for python_module in mpi.py mpi_debug.py ; do
-		for python_module_dir in "${ROOT}"usr/lib64/python*/site-packages ; do
+		for python_module_dir in "${ROOT}"usr/$(get_libdir)/python*/site-packages ; do
 			if [[ -e "${python_module_dir}/${python_module}" ]] ; then
 				rm "${python_module_dir}/${python_module}" || die -q "Unable to remove \"${python_module_dir}/${python_module}\""
 			fi
@@ -579,7 +579,7 @@ pkg_postinst() {
 
 	# Deprecated code for older versions of Boost.
 	local mod="mpi.so"
-	for moddir in "${ROOT}"/usr/lib64/python*/site-packages ; do
+	for moddir in "${ROOT}"/usr/$(get_libdir)/python*/site-packages ; do
 		if [ -L "${moddir}/${mod}" ] ; then
 			rm "${moddir}/${mod}" || die -q "Unable to remove \"${moddir}/${mod}\" symlink"
 		else