Force a rebuild for everybodu and get rid of eselect boost altogether. This is unfortunate but eselect boost behaves differently depending on whether boost was already installed or if it's a fresh install.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 31 insertions, 106 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index c954b0360d2d..e951ca53d543 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,14 @@
 # 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.270 2012/10/31 18:27:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.271 2012/10/31 21:36:31 flameeyes Exp $
+
+*boost-1.49.0-r2 (31 Oct 2012)
+
+  31 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> +boost-1.49.0-r2.ebuild,
+  -boost-1.49.0-r1.ebuild:
+  Force a rebuild for everybodu and get rid of eselect boost altogether. This is
+  unfortunate but eselect boost behaves differently depending on whether boost
+  was already installed or if it's a fresh install.
 
   31 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> boost-1.49.0-r1.ebuild:
   Remove test support from 1.49 as well, since it's not supposed to work and the
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index f0ddbd4c0ad9..47edddbfe2e2 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -21,18 +21,18 @@ DIST boost_1_46_1.tar.bz2 42001335 SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d044
 DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
 DIST boost_1_51_0.tar.bz2 50811407 SHA256 fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696 SHA512 43a45ff34879328c57e1694e199b895d7535df7cdf78b127ec2649841ac5973f2dddbc0b00a1ed71f2347def6d44f1d8cc5c0deea120f60f53714ebe28046478 WHIRLPOOL 2cfe8ff8b1b812f1a2d02cad25a06fe2a824ef319d95e113fc307d432ff54f2367ac86d922517ce63fce2335b14a9d86ec0c9858b10466b4bf76d28c1ceca828
 EBUILD boost-1.46.1-r1.ebuild 16243 SHA256 350b5c02aae79efa594b969f50032c4088da6aaffbfcd8337ce774ea728a53a6 SHA512 77b5311a59a0dd0fac7653e3f74d53a30bf350f9c2eb83bd28fb1075918cfea95d3fe0fa89f68b015524e4540ef7b1b9a27a48f7b058b187afd5c4e52d941dc8 WHIRLPOOL c3f1a1eea091ce68e77a29524df9ea789e4a62f8e9ff21082a091823aaefd28f15c0bd39c243fa891b79de01bfa09f71df373ab92c9fa444516245b0badcb3ad
-EBUILD boost-1.49.0-r1.ebuild 17180 SHA256 52cc767da1c904de02b41636edb8ba1024986f1d9e847c814ca67f4db240461d SHA512 b9a0b5da5ced1cd8afdda49040f2ef4b3b0692844880052ebd1d2acf8e57f9cc02b896db8789d4572c2058441c2d40d310b7fd5996e8a8a6dfed57db01dab441 WHIRLPOOL e87843cac8d305658ed5fd0e760bd7d2da7765983cbfb74c215d9082bd1c8be596a766a2b44f62b1f80686a127f417e990331f5f4166cf5bb1b335982606e923
+EBUILD boost-1.49.0-r2.ebuild 14373 SHA256 7d471e5d800b624c66de74a0d6ba2d749f4dee3899240557cae8fc4f4f61719e SHA512 82d60d1cb4db893cbf082ba7d700d393b492f65011b6789bd567609a37fcdfcc824415c5d69d71004af2e643a10e9b630aebacce2837c9f104f62433d8e588bc WHIRLPOOL b7eaa4b89b97b302ddf64e452922d44cd9e84cb6d6b6b6dbe3bb2ecef185c7c379ecb2314bcd0f6daaa6fb6a1085cff1e759a7bbc85c216a2263094ea29cbee3
 EBUILD boost-1.51.0-r1.ebuild 13444 SHA256 ec0507edadc7b70251f13d07b224a061927c3aa8dfeb8c110f33999981a06317 SHA512 7be7e0893e3dddf4c05c2c761ef3771e9e2dc4ec480599de57b4185a7efe6963f46f593abe8ff63de1966cfa2b4f1b5bb031dcf552fcca75880eedc8048d335e WHIRLPOOL 8cca78f9e06a125b022e3fb5f758581be8fa6e07ecff5562009c271b66405590e9205c15fdf9f335f9dff9b1233db726e072ecfad8fb989623ff93fbf095a7a9
-MISC ChangeLog 44816 SHA256 e67b4ffb00a01ac862d783491156adac5bedc9e53ed64ff23d11b2e6ff7d44e2 SHA512 5a0457ebdfff2843752b72fb82f1bb43759a06df7d7a9943ea44f318902a5658fa9df603d4defcf5c9e5b4502622580b0e2066eb8de5baccfb071a7f5ec0138a WHIRLPOOL 8c6855a8bbe7df56f9944fed5f082212cf9c3a8efa994112ece49b8e9c627a4df0c2a6921a9353980c1126c2eb2d5f21b98137ba5e985e888c484b14a8de5764
+MISC ChangeLog 45169 SHA256 7c4b890117c1c16633e4eb048f5c60859c732ab083e1b62b563241d262c87662 SHA512 d8e9da4ffa8cc0c6b49f9c59b306f6a12bf48e184f0d9bca8d8d0417244accef6b6d4c7a4a86cd90cb7f3cf1221bfb77d2663f6c9618141c5d45f45257a33405 WHIRLPOOL 9951fd0a98919ac113f4bea22f70e353f227e32c5b5c68990a21b427baf84e8230148eede456b5ad5068d2f6dfc36451459b813ce41574d6e11cb42c2e67296a
 MISC metadata.xml 651 SHA256 9b609678862591de34025983a4353ab3bf6b2f79527988c33379487197db848f SHA512 c923bf7e9075458e555f7f7f1f805c25c163167881bd216e049be8121f655857f8096d89c8f441eba19b80aa9536afe29d8c7651ad341dc6a3cf17b02b7d1c0a WHIRLPOOL fa8ac80464f7464702f607a261ff4b4086c0904db37986d0419058b4713837c5cf474868ca2d6f9d4618507887b412ed2536d0f9a9006db8be8b756a650e6c2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQkW4ZAAoJEBzRPIrUMBNCFFsH+wdQoqXp0RcoSFvhP5cheIbT
-Lv1OGdofcewaTo75TTbnW4uKx9HEwaVLzz8oPkhFIKmVWABVPlGAQ+a33q1LHZSf
-Fv8gZejlmXG0gZp8CgPK/VQoWFlNfHsapCGSt7wfv5+I8YpxjXnkCvb8Q4DadlTe
-d1vsHvr44JefDKdbeFsq3b3s8L51dCBNc49bFBITfjntBxJu2vGZ8nqFeiUsv1KH
-yBGLhZn6gQ26SY5mPQuCea7UlJsmV3/N9SYWcZfPmoq91vU5atkPSXbro/TxKCzO
-lK/4wT7rSnfakxCQqod7Bn2AZgqAnECOck6iKbA6uKMHS96JikUEjcePYtgyTwI=
-=Iz2W
+iQEcBAEBCAAGBQJQkZnkAAoJEBzRPIrUMBNCkdgH/juNdQhcQydvJNhbjocj1lM5
+LjQg0UcAcmRkW0+7FC2SjBHItTcr1J3OXxEl7Ghps5+ua5/y6nNWlO9dJ6cnoYka
+hAs9XIVW/08GgrtJX+o+8N/ZWNCyalWTYK6V27Gi1s/7IAdUG+u8mLyNZIbdM/N6
+GITU3DvYZwITmPOfJssRm5CzHe7tTWLTly44SDXnHOlTFz2n+5gCzQ+LJuJmxna0
+2U8UkUPsZvtLmE4W+r5v5Pw/cZ1yo9KH5kuOAz9URe/gNdNhsEPS9982jEYGeEYN
+d37nauEavAr1hIh9PVyQsp6Yent5zlqqrdBALUxHU/EAutdWBj39ITH4k5ebdvU=
+=/WZy
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.49.0-r1.ebuild b/dev-libs/boost/boost-1.49.0-r2.ebuild
index 09f802e34ac2..351e409dad43 100644
--- a/dev-libs/boost/boost-1.49.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.49.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.49.0-r1.ebuild,v 1.12 2012/10/31 18:27:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.49.0-r2.ebuild,v 1.1 2012/10/31 21:36:31 flameeyes Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -19,13 +19,12 @@ LICENSE="Boost-1.0"
 SLOT=0
 MAJOR_V="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc +eselect icu mpi python static-libs tools"
+IUSE="debug doc icu mpi python static-libs tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
 	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
 	sys-libs/zlib
-	!!<=dev-libs/boost-1.35.0-r2
-	>=app-admin/eselect-boost-0.4"
+	!app-admin/eselect-boost"
 DEPEND="${RDEPEND}
 	=dev-util/boost-build-${MAJOR_V}*"
 
@@ -34,24 +33,6 @@ S=${WORKDIR}/${MY_P}
 MAJOR_PV=$(replace_all_version_separators _ ${MAJOR_V})
 BJAM="b2-${MAJOR_PV}"
 
-# Usage:
-# _add_line <line-to-add> <profile>
-# ... to add to specific profile
-# or
-# _add_line <line-to-add>
-# ... to add to all profiles for which the use flag set
-
-_add_line() {
-	if [[ -z "$2" ]]; then
-		echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/default"
-		if use debug; then
-			echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/debug"
-		fi
-	else
-		echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/${2}"
-	fi
-}
-
 create_user-config.jam() {
 	local compiler compiler_version compiler_executable
 
@@ -92,15 +73,6 @@ pkg_setup() {
 	if use python; then
 		python_pkg_setup
 	fi
-
-	if use debug; then
-		ewarn "The debug USE flag means that a second set of the boost libraries"
-		ewarn "will be built containing debug symbols. You'll be able to select them"
-		ewarn "using the boost-eselect module. But even though the optimization flags"
-		ewarn "you might have set are not stripped, there will be a performance"
-		ewarn "penalty and linking other packages against the debug version"
-		ewarn "of boost is _not_ recommended."
-	fi
 }
 
 src_prepare() {
@@ -243,16 +215,6 @@ src_compile() {
 }
 
 src_install () {
-	dodir /usr/share/boost-eselect/profiles/${SLOT}
-	touch "${D}usr/share/boost-eselect/profiles/${SLOT}/default" || die
-	if use debug; then
-		 touch "${D}usr/share/boost-eselect/profiles/${SLOT}/debug" || die
-	fi
-
-	if use mpi && use python; then
-		_add_line "python_modules=\""
-	fi
-
 	installation() {
 		create_user-config.jam
 
@@ -317,7 +279,6 @@ else:
 	from . import mpi
 del sys
 EOF
-				_add_line "$(python_get_sitedir)/mpi.py:boost_${MAJOR_PV}.mpi"
 			fi
 		fi
 	}
@@ -327,10 +288,6 @@ EOF
 		installation
 	fi
 
-	if use mpi && use python; then
-		_add_line "\""
-	fi
-
 	use python || rm -rf "${D}usr/include/boost-${MAJOR_PV}/boost"/python* || die
 
 	if use doc; then
@@ -350,22 +307,12 @@ EOF
 		insinto /usr/share/doc/${PF}/html
 		doins LICENSE_1_0.txt
 
-		dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost
+		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
 	fi
 
-	pushd "${D}usr/$(get_libdir)" > /dev/null || die
+	dosym boost-${MAJOR_PV}/boost /usr/include/boost
 
-	# Remove (unversioned) symlinks
-	# And check for what we remove to catch bugs
-	# got a better idea how to do it? tell me!
-	local f
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}"); do
-		if [[ ! -h "${f}" ]]; then
-			eerror "Tried to remove '${f}' which is a regular file instead of a symlink"
-			die "Slotting/naming of the libraries broken!"
-		fi
-		rm "${f}" || die
-	done
+	pushd "${D}usr/$(get_libdir)" > /dev/null || die
 
 	# The threading libs obviously always gets the "-mt" (multithreading) tag
 	# some packages seem to have a problem with it. Creating symlinks...
@@ -377,7 +324,7 @@ EOF
 	fi
 	local lib
 	for lib in ${THREAD_LIBS}; do
-		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+		dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
 	done
 
 	# The same goes for the mpi libs
@@ -389,7 +336,7 @@ EOF
 		fi
 		local lib
 		for lib in ${MPI_LIBS}; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+			dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
 		done
 	fi
 
@@ -402,7 +349,7 @@ EOF
 
 		local lib
 		for lib in ${THREAD_DEBUG_LIBS}; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+			dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
 		done
 
 		if use mpi; then
@@ -414,51 +361,33 @@ EOF
 
 			local lib
 			for lib in ${MPI_DEBUG_LIBS}; do
-				dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+				dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
 			done
 		fi
 	fi
 
-	# Create a subdirectory with completely unversioned symlinks
-	# and store the names in the profiles-file for eselect
-	dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
-
-	_add_line "libs=\"" default
 	local f
 	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug); do
-		dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}}
-		_add_line "/usr/$(get_libdir)/${f}" default
+		dosym ${f} /usr/$(get_libdir)/${f/-${MAJOR_PV}}
 	done
-	_add_line "\"" default
 
 	if use debug; then
-		_add_line "libs=\"" debug
-		dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug
+		dodir /usr/$(get_libdir)/boost-debug
 		local f
 		for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug); do
-			dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug}
-			_add_line "/usr/$(get_libdir)/${f}" debug
+			dosym ../${f} /usr/$(get_libdir)/boost-debug/${f/-${MAJOR_PV}-debug}
 		done
-		_add_line "\"" debug
-
-		_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
-		_add_line "suffix=\"-debug\"" debug
 	fi
 
-	_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
-
 	popd > /dev/null || die
 
 	if use tools; then
 		pushd dist/bin > /dev/null || die
 		# Append version postfix to binaries for slotting
-		_add_line "bins=\""
 		local b
 		for b in *; do
 			newbin "${b}" "${b}-${MAJOR_PV}"
-			_add_line "/usr/bin/${b}-${MAJOR_PV}"
 		done
-		_add_line "\""
 		popd > /dev/null || die
 
 		pushd dist > /dev/null || die
@@ -466,7 +395,6 @@ EOF
 		doins -r share/boostbook
 		# Append version postfix for slotting
 		mv "${D}usr/share/boostbook" "${D}usr/share/boostbook-${MAJOR_PV}" || die
-		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
 		popd > /dev/null || die
 	fi
 
@@ -517,14 +445,3 @@ EOF
 # (failing for no good reason) or completely useless (never failing)
 # there is no point in having them in the ebuild to begin with.
 src_test() { :; }
-
-pkg_postinst() {
-	if use eselect; then
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-
-	if [[ ! -h "${ROOT}etc/eselect/boost/active" ]]; then
-		elog "No active boost version found. Calling eselect to select one..."
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-}