committing boost-1.33.0-r1 to get some additions started

Package-Manager: portage-2.0.52-r1

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index dc930b3ab469e334dee96e7cce7ff3ba34240135..310890977c7304532be6ee1d4ef5bbda3476b282 100644 (file)
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.63 2005/09/19 22:22:05 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.64 2005/10/16 04:38:56 morfic Exp $
+
+  12 Oct 2005; Daniel Goller <morfic@gentoo.org>
+  +files/boost-alpha-threads.patch, boost-1.33.0.ebuild:
+  Fixing USE=threads on alpha and stopping to have icc path be hardcoded,
+  credits for users in the ebuild
 
   19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
   Adding to cpp herd

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 6c2e9fc02dc1677d4957f90162fecc614729301e..7c43a31bd37cd686b975d869d3be8e7e0e2e4084 100644 (file)
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3f1907fb669869309b59199a2069cd15 ChangeLog 8717
+MD5 b44568a4f0f1f0b3bf7302951c325a02 ChangeLog 8931
 MD5 d259ae434e176df207cba3deab973f61 boost-1.29.0.ebuild 1426
 MD5 34d13e0eeb58e13e1992908d04d51b45 boost-1.30.0.ebuild 2973
 MD5 4759f9391ad73c487d4f6b3dbf8632a8 boost-1.30.2.ebuild 2960
@@ -9,10 +9,11 @@ MD5 381dce1d7696860d54bb6d5f26ce7dd6 boost-1.31.0.ebuild 3974
 MD5 7403141309dea4e7a191766eba147299 boost-1.32.0-r1.ebuild 5379
 MD5 37f8eb8b22a26f2bc30b6101d14cb9d0 boost-1.32.0-r2.ebuild 5690
 MD5 76f87ddbbddd80f054d8d005d4d66d92 boost-1.32.0-r3.ebuild 6183
-MD5 9f4b3bf1104d681375b01af831179ee8 boost-1.32.0-r4.ebuild 6263
 MD5 8d4eca3eb59bc23e2d53b3d0cfd06c97 boost-1.32.0.ebuild 2294
-MD5 421fe3be35fd6d405bf2b3381d51867f boost-1.33.0.ebuild 6259
 MD5 16a0704d7282649d4c5920e3c8b39bee metadata.xml 343
+MD5 8f040e4c6d6b49c2065005fbc533eeef boost-1.33.0-r1.ebuild 6755
+MD5 421fe3be35fd6d405bf2b3381d51867f boost-1.33.0.ebuild 6259
+MD5 9f4b3bf1104d681375b01af831179ee8 boost-1.32.0-r4.ebuild 6263
 MD5 ed187a2b2048776a7e5b27060d96938c files/digest-boost-1.29.0 65
 MD5 2b36d47323b021671d391600501685cc files/digest-boost-1.30.0 66
 MD5 a09c431deb3a25504525921685cd0e57 files/digest-boost-1.30.2 66
@@ -23,10 +24,12 @@ MD5 1d06245b53e5677556ae22e5f60f0df3 files/digest-boost-1.32.0-r2 67
 MD5 1d06245b53e5677556ae22e5f60f0df3 files/digest-boost-1.32.0-r3 67
 MD5 1d06245b53e5677556ae22e5f60f0df3 files/digest-boost-1.32.0-r4 67
 MD5 612f486fa190f86f9be3a17465036dd0 files/digest-boost-1.33.0 67
+MD5 238bb8043f0cdc8bd91f81bd0b55f92a files/boost-alpha-threads.patch 1111
+MD5 612f486fa190f86f9be3a17465036dd0 files/digest-boost-1.33.0-r1 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDLzoZCRZPokWLroQRAmr4AKCDW3VEu4gzWqzKxtwiGrJP2wHPjgCfcie7
-YjPyVvUdvvK0uXXkew8p+/M=
-=8xf3
+iD8DBQFDUdmt/aM9DdBw91cRAn+sAKCHmtn9CUypNdPdy7pVwsc7ld2/6gCeJS5v
+4rwd8KjVfoTtApa+qyXNAJ0=
+=YyQ9
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/boost/boost-1.33.0-r1.ebuild b/dev-libs/boost/boost-1.33.0-r1.ebuild
new file mode 100644 (file)
index 0000000..51727f6
--- /dev/null
+++ b/dev-libs/boost/boost-1.33.0-r1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.33.0-r1.ebuild,v 1.1 2005/10/16 04:38:56 morfic Exp $
+
+# This ebuild was generated by Ebuilder v0.4.
+inherit python distutils multilib eutils
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="http://www.boost.org/"
+BOOST_PV1=${PV/./_}
+BOOST_PV=${BOOST_PV1/./_}
+SRC_URI="mirror://sourceforge/boost/${PN}_${BOOST_PV}.tar.bz2"
+LICENSE="freedist Boost-1.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc icc pyste static threads threadsonly"
+
+DEPEND="!icc? ( sys-devel/gcc )
+       icc? (  >=dev-lang/icc-8.0.055 )
+       dev-lang/python"
+
+RDEPEND="pyste? ( dev-cpp/gccxml dev-python/elementtree ) ${DEPEND}"
+
+S="${WORKDIR}/${PN}_${BOOST_PV}"
+
+pkg_setup() {
+
+       if [ "${ARCH}" == "amd64" ]; then
+               arch=
+       else
+               arch=${ARCH}
+       fi
+
+       if use icc ; then
+               BOOST_TOOLSET="intel-linux"
+               TOOLSET_NAME="icc"
+               SOSUFFIX="so"
+       elif use ppc-macos ; then
+               BOOST_TOOLSET="darwin"
+               TOOLSET_NAME="darwin"
+               SOSUFFIX="dylib"
+       else
+               BOOST_TOOLSET="gcc"
+               TOOLSET_NAME="gcc"
+               SOSUFFIX="so"
+       fi
+       #Check ICC path and use this instead of hardcoding it, thanks to Peter Koeleman
+       if [ "X${IA32ROOT}" == "X" ]; then
+               # try IA64ROOT
+               if [ "X${IA64ROOT}" == "X" ]; then
+                       # this shouldn't happen when icc is properly installed
+                       eerror "Could not find path to Intel compiler"
+               else
+                       INTEL_PATH="${IA64ROOT}"
+               fi
+       else
+               INTEL_PATH="${IA32ROOT}"
+       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
+
+       BOOSTJAM=./tools/build/jam_src/bin.*/bjam
+
+       # we dont like what get_number_of_jobs does, so we borrow what counts to us,
+       # thanks H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565
+
+       if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]; then
+               ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
+               ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
+               NUMJOBS="${ADMINPARAM}"
+       fi
+
+       python_version
+
+}
+
+src_compile() {
+               # Build bjam, a jam variant, which is used instead of make
+               cd "${S}/tools/build/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
+
+               if use icc ; then
+                               export CPLUS_INCLUDE_PATH="${INTEL_PATH}/include/c++"
+                               export GXX_INCLUDE="/usr/include"
+                               ${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
+                               -sPYTHON_ROOT=/usr \
+                               -sPYTHON_VERSION=${PYVER} \
+                               -sTOOLS=${BOOST_TOOLSET} \
+                               -sINTEL_PATH="${INTEL_PATH}/" \
+                               -sBUILD="${BUILD}" \
+                               --prefix=${D}/usr \
+                               --layout=system
+
+                               ${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
+                               -sPYTHON_ROOT=/usr \
+                               -sPYTHON_VERSION=${PYVER} \
+                               -sTOOLS=${BOOST_TOOLSET} \
+                               -sINTEL_PATH="${INTEL_PATH}/" \
+                               -sBUILD="${BUILD}" \
+                               --prefix=${D}/usr \
+                               --layout=system
+
+               else
+                               ${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
+                               -sPYTHON_ROOT=/usr \
+                               -sPYTHON_VERSION=${PYVER} \
+                               -sTOOLS=${BOOST_TOOLSET} \
+                               -sBUILD="${BUILD}" \
+                               --prefix=${D}/usr \
+                               --layout=system
+
+                               ${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
+                               -sPYTHON_ROOT=/usr \
+                               -sPYTHON_VERSION=${PYVER} \
+                               -sTOOLS=${BOOST_TOOLSET} \
+                               -sBUILD="${BUILD}" \
+                               --prefix=${D}/usr \
+                               --layout=system
+
+               fi
+
+               if use pyste; then
+                       cd ${S}/libs/python/pyste/install
+                       distutils_src_compile
+               fi
+}
+
+src_install () {
+               # install build tools
+               cd "${S}/tools/build"
+               #do_whatever is too limiting here, need to move bunch of different stuff recursively
+               insinto /usr/share/${PN}
+               doins -a b* index.html v1/ v2/ ${D}/usr/share/${PN} || die "failed to install docs"
+               cd "${S}"
+
+               if use icc ; then
+                       export CPLUS_INCLUDE_PATH="${INTEL_PATH}/include/c++"
+                       export GXX_INCLUDE="/usr/include"
+                       ${BOOSTJAM} ${NUMJOBS} -sBOOST_ROOT="${S}" \
+                       -sPYTHON_ROOT=/usr \
+                       -sPYTHON_VERSION=${PYVER} \
+                       -sTOOLS=${BOOST_TOOLSET} \
+                       -sBUILD="${BUILD}" \
+                       -sINTEL_PATH="${INTEL_PATH}/" \
+                       --prefix=${D}/usr \
+                       --layout=system \
+                       install || die "Install failed"
+               else
+                       ${BOOSTJAM}     ${NUMJOBS} -sBOOST_ROOT="${S}" \
+                       -sPYTHON_ROOT=/usr \
+                       -sPYTHON_VERSION=${PYVER} \
+                       -sTOOLS=${BOOST_TOOLSET} \
+                       -sBUILD="${BUILD}" \
+                       --prefix=${D}/usr \
+                       --layout=system \
+                       install || die "Install failed"
+               fi
+
+       # Install documentation; seems to be mostly under ${S}/lib
+
+       if use doc ; then
+               dodoc README
+               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 | uniq`; 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 | uniq`; 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
+
+       [[ $(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
+}

diff --git a/dev-libs/boost/files/boost-alpha-threads.patch b/dev-libs/boost/files/boost-alpha-threads.patch
new file mode 100644 (file)
index 0000000..5e3d5b0
--- /dev/null
+++ b/dev-libs/boost/files/boost-alpha-threads.patch
@@ -0,0 +1,24 @@
+diff -urN boost_1_33_0-pristine/tools/build/v1/gcc-tools.jam boost_1_33_0/tools/build/v1/gcc-tools.jam
+--- boost_1_33_0-pristine/tools/build/v1/gcc-tools.jam 2005-09-12 00:31:23.000000000 -0400
++++ boost_1_33_0/tools/build/v1/gcc-tools.jam  2005-09-12 00:32:45.000000000 -0400
+@@ -146,7 +146,7 @@
+         }
+     case * :
+         {
+-        flags gcc CFLAGS <threading>multi : -pthread ;
++        flags gcc CFLAGS <threading>multi : -D_REENTRANT -pthread ;
+         flags gcc LINKFLAGS <threading>multi : -pthread ;
+         flags gcc FINDLIBS <threading>multi : rt ;
+         }
+diff -urN boost_1_33_0-pristine/tools/build/v2/tools/gcc.jam boost_1_33_0/tools/build/v2/tools/gcc.jam
+--- boost_1_33_0-pristine/tools/build/v2/tools/gcc.jam 2005-09-12 00:31:23.000000000 -0400
++++ boost_1_33_0/tools/build/v2/tools/gcc.jam  2005-09-12 00:33:04.000000000 -0400
+@@ -368,7 +368,7 @@
+         }
+     case * :
+         {
+-        flags gcc OPTIONS <threading>multi : -pthread ;
++        flags gcc OPTIONS <threading>multi : -D_REENTRANT -pthread ;
+         flags gcc FINDLIBS-SA <threading>multi : rt ;
+         }
+     }

diff --git a/dev-libs/boost/files/digest-boost-1.33.0-r1 b/dev-libs/boost/files/digest-boost-1.33.0-r1
new file mode 100644 (file)
index 0000000..654f699
--- /dev/null
+++ b/dev-libs/boost/files/digest-boost-1.33.0-r1
@@ -0,0 +1 @@
+MD5 43d87bbd827a8299f408df5efe5f0fd8 boost_1_33_0.tar.bz2 11356417