Remove symlinks created by eselect-boost.

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

3 files changed, 73 insertions, 7 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index daba9d24c347..a7acbd6353cc 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,12 @@
 # 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.256 2012/08/20 21:55:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.257 2012/08/24 09:46:08 dev-zero Exp $
+
+*boost-1.50.0-r2 (24 Aug 2012)
+
+  24 Aug 2012; Tiziano Müller <dev-zero@gentoo.org> +boost-1.50.0-r2.ebuild,
+  -boost-1.50.0-r1.ebuild:
+  Remove symlinks created by eselect-boost.
 
 *boost-1.50.0-r1 (20 Aug 2012)
 
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 3de1385221b9..387470ca7661 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-r1.ebuild 17022 SHA256 968822a740555e84b9766f842a2d71a798b17f86d4a17b2d4c22785292fe0825 SHA512 6c313bbab6db3f006f6dfeaf0e30210c9a23fd78afb788a1e5bb1a3272bf7c4432a92ffffcbbd0ddba92a3713cd07a8f602e7f27aa1a53f1bdd04effffd7af61 WHIRLPOOL ebad37717a2e4031cf0f3814a4ff2c3d644c7926f40129e47d32401fb7bd19f6f8f4ef7f3e39d904c8237b97e08e51e1be95e80bec2ddd228952f6134684e09e
+EBUILD boost-1.50.0-r2.ebuild 19081 SHA256 65b04bcd24661b65fcd44df6999f5d03249f29e966de921b64e13b63bccf1882 SHA512 0667cf9e14804bb0eb275600f5cb5ca21b2f3f082d5ffcdf31b79fffff8b72a081d85b1cf1897e12339ca39925da20d5317bcd7d96c0b6d4d03f58c9c4c18106 WHIRLPOOL 23c253d9c467056697c1d67352150738d3ed9ef1d13e5638c7f59f555a78bd647fb58a8d1e13c948cb3e341934084bd598a23df670a3ab52c6f7d2bd10ce562e
 EBUILD boost-1.50.0.ebuild 19767 SHA256 485a0d40d3195c664c8bc6e294eb36c8ffe367541ac71bc424d9dfcc640ccfbc SHA512 8305b38a044bea58c7078fb19723363b00b78e7f8379ace6afc5cd5ce35e8788fb1694bae7e51470c8b2925369e5b7bc4d5d6e9bfa19992a5bc07a6399482248 WHIRLPOOL 4c60b0e2ccb05e89ec98dbc83ad31416ce6ca01a347c02fe9a4c99d4a402eb8ce5cf916580f6294796575cdcc7779b3ad31c539abb0f35bed19139cd78237186
-MISC ChangeLog 40987 SHA256 09dacf4bc225a4fc508a0d4bab1821b3868da51baa6fbd3ad09af8bfbdffd42f SHA512 347eb7fed986a68bfd688858fd950970b8824556e739ed051ce3ce5f17d4e96fc6f715f7b3233159e1c8f4d8a502160c4521c57ee450e5c8cff00ef2f4dc10cd WHIRLPOOL 7984c8d99aa56863b852995a0b09b216f7a1ee580ac4a522dfc08896ffd150c60cfdf8c55009bde6d8f4918f551ebdbe7e1d9fb4412ec0832e55065dc3eb3f60
+MISC ChangeLog 41169 SHA256 1742991bf924cd8ee852e821469bc87717c1bc8c800329bc87f19c3b4596f055 SHA512 bc9d0a788f4f1b6b9e7446d8ebf7e14e0b3ad46cde6f64cd2ad95adadfab3787f0bde489d91cedd542a514315492b9e3761aa5b25bd493e098c84f704ebaadf4 WHIRLPOOL bdd54818defc603bf070258fe655c13109c96d8a42525ac4f7dacff1cf7afecc0f2c1d5f2f3606b54f8da1f94d7634658662c827ca46af7d844d36c06a64957d
 MISC metadata.xml 899 SHA256 1fde852e55948ef5ffb30472daeb2f1ca517cf3a4f30792c7880bf1a98e3bdae SHA512 11b6a4558eb418253fdaff5b8dfc1474ce1205a2a05fd96c71df10d63c2aa0f59293d23be384e434e8ea30d8958ae2eeafa4da843b931f60cdcbbd1986b22670 WHIRLPOOL 23fbffa77352d60a446e05d009632bf8e3351ff2fd35ce751157af2a28604f05986d0f23e24be2b12e7cc7a3fa1c2cddb41afde909e2d896da0f1af22c7a8872
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAysj0ACgkQGwVqY66cHjDNDQCfWiKr9wjiDiUGhqq9k3T9Wv7h
-UfoAoIDExBry+0jm4Cb26mGk9gCkxOML
-=jBj4
+iEYEAREIAAYFAlA3TWUACgkQGwVqY66cHjAuTQCcCNT2GgfqcBA/1tokqXsL1KaK
+QmwAn36hmTiMQgBO08Fgm0hWSAxRH7Ic
+=JQH9
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.50.0-r1.ebuild b/dev-libs/boost/boost-1.50.0-r2.ebuild
index a63a6e5f488d..4c52248b2eb4 100644
--- a/dev-libs/boost/boost-1.50.0-r1.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-r1.ebuild,v 1.1 2012/08/20 21:55:03 dev-zero Exp $
+# $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 $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -533,3 +533,63 @@ __EOF__
 		testing
 	fi
 }
+
+pkg_postinst() {
+	# mostly copy/paste from eselect-boost
+
+	_boost_tools="bcp bjam compiler_status inspect library_status process_jam_log quickbook wave"
+
+	# ... meaning: <none> and -debug:
+	_suffices="|-debug"
+
+	einfo "Removing symlinks from old version"
+
+	local link
+	for link in "${ROOT}/usr/include/boost" "${ROOT}/usr/share/boostbook" ; do
+		if [[ -L "${link}" ]] ; then
+			rm "${link}" || die -q "Couldn't remove \"${link}\" symlink"
+		else
+			[[ -e "${link}" ]] && die -q "\"${link}\" exists and isn't a symlink"
+		fi
+	done
+
+	pushd "${ROOT}/usr/lib64" 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"
+	done
+	popd 1>/dev/null
+
+	pushd "${ROOT}"/usr/bin 1>/dev/null
+	local tool
+	for tool in ${_boost_tools} ; do
+		[[ -L "${tool}" ]] && ( rm "${tool}" || die -q "Unable to remove \"/usr/bin/${tool}\" symlink" )
+	done
+	popd 1>/dev/null
+
+	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
+			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
+		done
+	done
+
+	# Deprecated code for older versions of Boost.
+	local mod="mpi.so"
+	for moddir in "${ROOT}"/usr/lib64/python*/site-packages ; do
+		if [ -L "${moddir}/${mod}" ] ; then
+			rm "${moddir}/${mod}" || die -q "Unable to remove \"${moddir}/${mod}\" symlink"
+		else
+			[[ -e "${moddir}/${mod}" ]] && die -q "\"${moddir}/${mod}\" exists and isn't a symlink"
+		fi
+	done
+
+	if [ -L "${ROOT}/etc/eselect/boost/active" ] ; then
+		rm  "${ROOT}/etc/eselect/boost/active" || die -q "Unable to remove \"${ROOT}/etc/eselect/boost/active\" symlink"
+	else
+		[[ -e "${ROOT}/etc/eselect/boost/active" ]] && die -q "\"${ROOT}/etc/eselect/boost/active\" exists and isn't a symlink"
+	fi
+}