Dropped old version. Fixed some darwin-related bugs.

Package-Manager: portage-2.1.2-r7

5 files changed, 38 insertions, 272 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 86bb9203ab89..1639ed615863 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/boost
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.104 2006/12/30 22:48:13 kloeri Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.105 2007/02/06 23:54:38 dev-zero Exp $
+
+  06 Feb 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -boost-1.34_pre20060930.ebuild, boost-1.34_pre20061214.ebuild:
+  Dropped old version. Fixed some darwin-related bugs.
 
   30 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> boost-1.33.1-r1.ebuild:
   Stable on Alpha, bug 158770.
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 81a8614127fe..7b3006e8d8da 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -11,7 +11,6 @@ MD5 1d43f6ee1fc426f1ddcb4aafc6b77b9b files/random-Jamfile 355
 RMD160 478b592e9d33d371b07e5364e63512c8208263bf files/random-Jamfile 355
 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096 files/random-Jamfile 355
 DIST boost_1_33_1.tar.bz2 11507161 RMD160 3d5999d321b558f74d786bec52ee1b1fcd7e7152 SHA1 22682f75ff0d1ea548688e78c8cca83d599ca576 SHA256 6232e93205acbc8c705f44f15977aae158550c99a384f41606cff26c16393be0
-DIST boost_1_34_pre20060930.tar.bz2 12465498 RMD160 ddf4c22efe379c3f620aca4d75012587f237b207 SHA1 a84edda31b94406325db27a5611cce237dadc1ef SHA256 5f98f27309994f2d660bc763efef177c76954421f308748f732b2d62e35753ad
 DIST boost_1_34_pre20061214.tar.bz2 12357020 RMD160 51a96ef3dc28b4bd1d5fc3c295a4a3f874fe59fa SHA1 62e6fc5ea23aec68e26282068e950c0ca035f846 SHA256 4c88805afe6b47366d960d878eec8a6e0e7f40a7f9122a7d877020e9102d0e49
 EBUILD boost-1.33.1-r1.ebuild 5486 RMD160 fdc1ec642bff69f555a8302b2081717d2a9b16db SHA1 6fb089d807382e306bd2b658d2b95549c4ec89f0 SHA256 9ac9f3b0c44e98d1a3d8a8234895004cf4e6a1a850f2b4cf3507e6f33b572b63
 MD5 1ca0569140037dfbb330150c8ddc17b6 boost-1.33.1-r1.ebuild 5486
@@ -21,18 +20,14 @@ EBUILD boost-1.33.1.ebuild 5698 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e
 MD5 85e241bdaa449cd9fd1f1dfd99915f64 boost-1.33.1.ebuild 5698
 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e boost-1.33.1.ebuild 5698
 SHA256 40ca99406b69fc646969eade68e3363279218df5fce358ec9d7ad98b289dc0f5 boost-1.33.1.ebuild 5698
-EBUILD boost-1.34_pre20060930.ebuild 6413 RMD160 a27fb80c02f5934c56114a0255471eb6441c8e78 SHA1 c4ea2d93820f44cb6f76c9b4379578741346f6c9 SHA256 f4b9c991c7c7622da98e4add8c4dee6485bf27da13ec3107defea829815229e1
-MD5 62003e12d13292538a10a9cfe7f5d36b boost-1.34_pre20060930.ebuild 6413
-RMD160 a27fb80c02f5934c56114a0255471eb6441c8e78 boost-1.34_pre20060930.ebuild 6413
-SHA256 f4b9c991c7c7622da98e4add8c4dee6485bf27da13ec3107defea829815229e1 boost-1.34_pre20060930.ebuild 6413
-EBUILD boost-1.34_pre20061214.ebuild 4023 RMD160 9738766390156e31e808754abc1432161cdc3225 SHA1 afaa044d1187ab6a68cddebb70be2be1ed14036d SHA256 5a229be753d9b90f72179ea13e02525579ded81608939babd74afdfd809bf6d7
-MD5 33837bc255ea05a290ef56183e65f9c3 boost-1.34_pre20061214.ebuild 4023
-RMD160 9738766390156e31e808754abc1432161cdc3225 boost-1.34_pre20061214.ebuild 4023
-SHA256 5a229be753d9b90f72179ea13e02525579ded81608939babd74afdfd809bf6d7 boost-1.34_pre20061214.ebuild 4023
-MISC ChangeLog 14060 RMD160 d1eace87dfc6bf4450aaec69e7db8ee521c62f04 SHA1 a7db781a63d9111d229448b8d20c26e7c2850af4 SHA256 75d569f45ce26d3f351ef03f0e79e29450391f120c70c13b7076235459ce6b3b
-MD5 1e7fdfd3687b05be4cb29483c1f4bdeb ChangeLog 14060
-RMD160 d1eace87dfc6bf4450aaec69e7db8ee521c62f04 ChangeLog 14060
-SHA256 75d569f45ce26d3f351ef03f0e79e29450391f120c70c13b7076235459ce6b3b ChangeLog 14060
+EBUILD boost-1.34_pre20061214.ebuild 4312 RMD160 8105d3d27a48660ffa45065e111f5abd1bfb234e SHA1 e12b78c0b1283a7ec2c78a0be21d8390b4963f8e SHA256 071d93f7f08d3c3b19d36f37527e22adfeca69bebb80edc9ad34c7def06a7ee4
+MD5 83bd755545b47a8e1da745873e21d47e boost-1.34_pre20061214.ebuild 4312
+RMD160 8105d3d27a48660ffa45065e111f5abd1bfb234e boost-1.34_pre20061214.ebuild 4312
+SHA256 071d93f7f08d3c3b19d36f37527e22adfeca69bebb80edc9ad34c7def06a7ee4 boost-1.34_pre20061214.ebuild 4312
+MISC ChangeLog 14236 RMD160 2d9eef3e2fd747a0bf994763e35be9b4e25ca176 SHA1 fe735bf0ca6e8a9260e0c54abdda7687532acd3d SHA256 c15b274d3d104be13488dd1f3ac9fd453162e0e5ad0c9830bf81063cf1af03a4
+MD5 22187539ab926a5a2b9fbae9d493854c ChangeLog 14236
+RMD160 2d9eef3e2fd747a0bf994763e35be9b4e25ca176 ChangeLog 14236
+SHA256 c15b274d3d104be13488dd1f3ac9fd453162e0e5ad0c9830bf81063cf1af03a4 ChangeLog 14236
 MISC metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd SHA1 042144f72d878c355a55ad72a5212b2c2db88b9a SHA256 17524a0d3400af3c713289c5cf1f713cf63619264b9c6b535be3e2d543512cf6
 MD5 b0f631e883fed00f233ff27ce7ceb93d metadata.xml 349
 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd metadata.xml 349
@@ -43,9 +38,6 @@ SHA256 81d215f8a743fe6c248ca79c782decf96967f883a5e015840cdea311556a278b files/di
 MD5 afef39b54f8c7050345e448b9cfef207 files/digest-boost-1.33.1-r1 247
 RMD160 be54469c475e8d818c7af17b21f0d6bfc8bb328e files/digest-boost-1.33.1-r1 247
 SHA256 81d215f8a743fe6c248ca79c782decf96967f883a5e015840cdea311556a278b files/digest-boost-1.33.1-r1 247
-MD5 6fe4006c9c09440c4342f0ad3f13fbd3 files/digest-boost-1.34_pre20060930 277
-RMD160 e0aa05d6a4abd8c316fa1e8f3751d9ae46d6f303 files/digest-boost-1.34_pre20060930 277
-SHA256 0336896df45c00f19d39b9fffb08047888534b353780efb1f91a55c862b27ac0 files/digest-boost-1.34_pre20060930 277
 MD5 4d2c7622840a8822a22de0b6b476a878 files/digest-boost-1.34_pre20061214 277
 RMD160 9a9df1d0836e4228bb0555168feaec083d916c49 files/digest-boost-1.34_pre20061214 277
 SHA256 06642f8f05261ead16839bb8350548064c469dba0f16992c748e9a3c2b0b0f46 files/digest-boost-1.34_pre20061214 277
diff --git a/dev-libs/boost/boost-1.34_pre20060930.ebuild b/dev-libs/boost/boost-1.34_pre20060930.ebuild
deleted file mode 100644
index b7b9c056b953..000000000000
--- a/dev-libs/boost/boost-1.34_pre20060930.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20060930.ebuild,v 1.4 2006/10/29 20:17:09 dev-zero Exp $
-
-inherit distutils multilib python versionator
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-LICENSE="freedist Boost-1.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="bcp bjam debug doc icu pyste static threads threadsonly"
-
-DEPEND="icu? ( >=dev-libs/icu-3.2 )"
-RDEPEND="${DEPEND}
-		pyste? ( dev-cpp/gccxml dev-python/elementtree )"
-
-S=${WORKDIR}/${MY_P}
-
-# NOTE: Before unmasking this release, there are some unresolved issues:
-# - pre-stripped files
-# - Check whether the threading-patch for alpha is still needed
-# - Check the LICENSE, upstream updated a lot and changed licenses
-# - possibility to add a separate boost-build package and depend on it
-# - gccxml which is needed by pyste is broken with gcc-4.1.1, bug #147976
-#   Testing gccxml-snapshot with this version of boost/pyste
-# - Remove boost-jam and remove the blocker
-# - Find a better way to do set the options than in pkg_setup (check whether they are really needed for installation)
-# - Eventually split-out boost.python and spirit (second one has it's own release-cycle)
-# - Do a 'slotmove'
-
-pkg_setup() {
-	BOOSTJAM="${S}/tools/jam/src/bin.*/bjam"
-
-	# FIXME: Until we have a better way to do that
-	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/' <<< ${MAKEOPTS})
-
-	python_version
-
-	if [ "${ARCH}" == "amd64" ]; then
-		arch=
-	else
-		arch=${ARCH}
-	fi
-
-	if [ "${ARCH}" == "ppc-macos" ] ; then
-		BOOST_TOOLSET="darwin"
-		TOOLSET_NAME="darwin"
-		SOSUFFIX="dylib"
-	else
-		BOOST_TOOLSET="gcc"
-		TOOLSET_NAME="gcc"
-		SOSUFFIX="so"
-	fi
-
-	if use static ; then
-		BUILD="release <runtime-link>static"
-	else
-		BUILD="release <runtime-link>dynamic"
-	fi
-
-	if use debug ; then
-		BUILD="${BUILD} debug"
-	fi
-
-	if use threads && use threadsonly ; then
-		BUILD="${BUILD} <threading>multi"
-	fi
-
-	if use threads && ! use threadsonly ; then
-		BUILD="${BUILD} <threading>single/multi"
-	fi
-
-	if ! use threads ; then
-		BUILD="${BUILD} <threading>single"
-	fi
-
-	if use icu ; then
-		ADDITIONAL_OPTIONS="-sHAVE_ICU=1 -sICU_PATH=/usr"
-	fi
-
-}
-
-src_compile() {
-	cd "${S}/tools/jam/src"
-	./build.sh ${BOOST_TOOLSET} || die "Failed to build bjam"
-
-	cd "${S}"
-	#Fixing boost with threads on alpha. Thanks to ibm <imirkin@mit.edu>
-	#if use threads && [ "${ARCH}" == "alpha" ]; then
-	#	epatch ${FILESDIR}/boost-alpha-threads.patch
-	#fi
-
-	${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
-		-sPYTHON_ROOT=/usr \
-		-sPYTHON_VERSION=${PYVER} \
-		-sTOOLS=${BOOST_TOOLSET} \
-		-sBUILD="${BUILD}" \
-		${ADDITIONAL_OPTIONS} \
-		--prefix=${D}/usr \
-		--layout=system
-
-	${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
-		-sPYTHON_ROOT=/usr \
-		-sPYTHON_VERSION=${PYVER} \
-		-sTOOLS=${BOOST_TOOLSET} \
-		-sBUILD="${BUILD}" \
-		${ADDITIONAL_OPTIONS} \
-		--prefix=${D}/usr \
-		--layout=system
-
-	if use pyste; then
-		cd "${S}/libs/python/pyste/install"
-		distutils_src_compile
-	fi
-
-	if use bcp; then
-		cd "${S}/tools/bcp/"
-		${BOOSTJAM} || die "Building bcp failed"
-	fi
-}
-
-src_install () {
-
-	cd "${S}/tools/build"
-	dodir /usr/share/boost-build
-	insinto /usr/share/boost-build
-	cp -pPR index.html v1/ v2/ "${D}/usr/share/boost-build" || die "failed to install docs"
-
-	cd "${S}"
-	${BOOSTJAM}	${NUMJOBS} -sBOOST_ROOT="${S}" \
-		-sPYTHON_ROOT=/usr \
-		-sPYTHON_VERSION=${PYVER} \
-		-sTOOLS=${BOOST_TOOLSET} \
-		-sBUILD="${BUILD}" \
-		${ADDITIONAL_OPTIONS} \
-		--prefix="${D}/usr" \
-		--layout=system \
-		install || die "Install failed"
-
-	dodoc README
-
-	if use doc ; then
-		dohtml 	index.htm google_logo_40wht.gif c++boost.gif boost.css \
-			-A pdf -r more-r people -r doc
-
-		find libs -type f -not -regex '^libs/[^/]*/build/.*' \
-			-and -not -regex '^libs/.*/test[^/]?/.*' \
-			-and -not -regex '^libs/.*/bench[^/]?/.*' \
-			-and -not -regex '^libs/[^/]*/tools/.*' \
-			-and -not -name \*.bat \
-			-and -not -name Jamfile\* \
-			-and -not -regex '^libs/[^/]*/src/.*' \
-			-and -not -iname makefile \
-			-and -not -name \*.mak \
-			-and -not -name .\* \
-			-and -not -name \*.dsw \
-			-and -not -name \*.dsp \
-			-exec \
-				install -D -m0644 \{\} "${D}/usr/share/doc/${PF}/html/{}" \;
-	fi
-
-	#and finally set "default" links to -gcc-mt versions
-	cd "${D}/usr/lib"
-
-	for fn in $(ls -1 *.${SOSUFFIX}| cut -d- -f1 | sort -u) ; do
-		if [ -f "$fn.${SOSUFFIX}" ] ; then
-			dosym "$fn.${SOSUFFIX}" "/usr/lib/$fn-${TOOLSET_NAME}.${SOSUFFIX}"
-		fi
-		if [ -f "$fn-mt.${SOSUFFIX}" ] ; then
-			dosym "$fn-mt.${SOSUFFIX}" "/usr/lib/$fn-${TOOLSET_NAME}-mt.${SOSUFFIX}"
-		fi
-		if [ -f "$fn-d.${SOSUFFIX}" ] ; then
-			dosym "$fn-d.${SOSUFFIX}" "/usr/lib/$fn-${TOOLSET_NAME}-d.${SOSUFFIX}"
-		fi
-		if [ -f "$fn-mt-d.${SOSUFFIX}" ] ; then
-			dosym "$fn-mt-d.${SOSUFFIX}" "/usr/lib/$fn-${TOOLSET_NAME}-mt-d.${SOSUFFIX}"
-		fi
-	done
-
-	for fn in $(ls -1 *.a| cut -d- -f1 | sort -u) ; do
-		if [ -f "$fn.a" ] ; then
-			dosym "$fn.a" "/usr/lib/$fn-${TOOLSET_NAME}.a"
-		fi
-		if [ -f "$fn-mt.a" ] ; then
-			dosym "$fn-mt.a" "/usr/lib/$fn-${TOOLSET_NAME}-mt.a"
-		fi
-		if [ -f "$fn-d.a" ] ; then
-			dosym "$fn-d.a" "/usr/lib/$fn-${TOOLSET_NAME}-d.a"
-		fi
-		if [ -f "$fn-mt-d.a" ] ; then
-			dosym "$fn-mt-d.a" "/usr/lib/$fn-${TOOLSET_NAME}-mt-d.a"
-		fi
-	done
-
-	if use threads ; then
-		dosym "libboost_thread-mt.a" "/usr/lib/libboost_thread.a"
-		if ! use static ; then
-			dosym "libboost_thread-mt.so" "/usr/lib/libboost_thread.so"
-		fi
-	fi
-
-	[[ $(get_libdir) == "lib" ]] || mv "${D}/usr/lib" "${D}/usr/$(get_libdir)"
-
-	if use pyste; then
-		cd "${S}/libs/python/pyste/install"
-		distutils_src_install
-	fi
-
-	if use bcp; then
-		dobin "${S}/tools/bcp/run/bcp" || die "bcp install failed"
-	fi
-
-	if use bjam; then
-		cd "${S}"/tools/jam/src/bin.*/
-		dobin bjam || die "bjam install failed"
-	fi
-}
-
-src_test() {
-	cd "${S}/tools/regression"
-
-	sed -i \
-		-e "s#^\(boost_root\)=.*#\1=\"${S}\"#" \
-		-e "s#^\(bjam\)=.*#\1=\"$(ls ${BOOSTJAM})\"#" \
-		-e 's#tools/build/jam_src#tools/jam/src#' \
-		-e 's#--comment "$comment_path" ##' \
-		run_tests.sh || die "sed'ing run_tests.sh failed"
-	chmod +x run_tests.sh
-	./run_tests.sh || die "regression tests failed"
-
-	elog "Please check the files in "${S}/status" for results and/or more information."
-	elog "If it failed, you might want to attach the regression.log to the bug."
-}
diff --git a/dev-libs/boost/boost-1.34_pre20061214.ebuild b/dev-libs/boost/boost-1.34_pre20061214.ebuild
index ed99b33a4984..c01a54935dd4 100644
--- a/dev-libs/boost/boost-1.34_pre20061214.ebuild
+++ b/dev-libs/boost/boost-1.34_pre20061214.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20061214.ebuild,v 1.1 2006/12/18 23:17:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20061214.ebuild,v 1.2 2007/02/06 23:54:38 dev-zero Exp $
 
-inherit distutils flag-o-matic multilib python toolchain-funcs versionator
+inherit distutils flag-o-matic multilib toolchain-funcs versionator
 
 KEYWORDS="~amd64 ~x86"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.boost.org/"
 SRC_URI="http://dev.gentoo.org/~dev-zero/distfiles/${MY_P}.tar.bz2"
 LICENSE="freedist Boost-1.0"
 SLOT="0"
-IUSE="debug doc icc icu pyste static threads threadsonly tools"
+IUSE="debug doc icc icu pyste static threads threadsonly tools userland_Darwin"
 
 DEPEND="icu? ( >=dev-libs/icu-3.2 )
 		sys-libs/zlib
@@ -23,14 +23,23 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	if ! built_with_use dev-lang/python ucs2 ; then
+		eerror "dev-lang/python has to be built with the ucs2 USE-flag enabled"
+		die "missing USE-flag for dev-lang/python"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
 	rm boost-build.jam
 
-	mkdir -p libs/random/build
-	cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
+	if ! use userland_Darwin ; then
+		mkdir -p libs/random/build
+		cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
+	fi
 }
 
 generate_options() {
@@ -61,15 +70,16 @@ generate_options() {
 
 generate_userconfig() {
 	einfo "Writing new user-config.jam"
-	python_version
+	distutils python_version
 
 	local compiler compilerVersion compilerExecutable
 	if use icc ; then
 		compiler=intel-linux
 		compilerExecutable=icc
-	elif [ "${ARCH}" == "ppc-macos" ] ; then
+	elif use userland_Darwin ; then
 		compiler=darwin
-		compilerExecutable=cc
+		compilerExecutable=c++
+		append-ldflags -ldl
 	else
 		compiler=gcc
 		compilerVersion=$(gcc-version)
@@ -92,8 +102,8 @@ src_compile() {
 	generate_userconfig
 	generate_options
 
-	BOOST_ROOT=${S}
-	BOOST_BUILD_PATH=${ROOT}/usr/share/boost-build
+	export BOOST_ROOT=${S}
+	export BOOST_BUILD_PATH=${ROOT}/usr/share/boost-build
 
 	# Note: The line "debug-symbols=on" only adds '-g' to compiler and linker invocation
 	# and prevents boost-build from stripping the libraries/binaries
@@ -114,7 +124,7 @@ src_compile() {
 
 	if use tools; then
 		cd "${S}/tools/"
-		# We have to set optimization to -O0 or -O1 to work aroudn a gcc-bug
+		# We have to set optimization to -O0 or -O1 to work around a gcc-bug
 		# optimization=off adds -O0 to the compiler call and overwrites our settings.
 		bjam ${NUMJOBS} \
 			release \
@@ -129,8 +139,8 @@ src_install () {
 
 	generate_options
 
-	BOOST_ROOT=${S}
-	BOOST_BUILD_PATH=${ROOT}/usr/share/boost-build
+	export BOOST_ROOT=${S}
+	export BOOST_BUILD_PATH=${ROOT}/usr/share/boost-build
 
 	for linkoption in ${LINK_OPTIONS} ; do
 		bjam \
diff --git a/dev-libs/boost/files/digest-boost-1.34_pre20060930 b/dev-libs/boost/files/digest-boost-1.34_pre20060930
deleted file mode 100644
index 423035c277b1..000000000000
--- a/dev-libs/boost/files/digest-boost-1.34_pre20060930
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6c403a683e08b93945ac7fef5e089e85 boost_1_34_pre20060930.tar.bz2 12465498
-RMD160 ddf4c22efe379c3f620aca4d75012587f237b207 boost_1_34_pre20060930.tar.bz2 12465498
-SHA256 5f98f27309994f2d660bc763efef177c76954421f308748f732b2d62e35753ad boost_1_34_pre20060930.tar.bz2 12465498