From 213fb4779e59572c6d0819da959b63535ac4744f Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Fri, 25 Jan 2013 23:04:42 +0000 Subject: Version bump to latest beta for testing; remove non stable candidate ebuild. (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342) --- dev-libs/boost/ChangeLog | 10 +- dev-libs/boost/boost-1.52.0-r4.ebuild | 339 ------------------------------- dev-libs/boost/boost-1.53.0_beta1.ebuild | 326 +++++++++++++++++++++++++++++ 3 files changed, 334 insertions(+), 341 deletions(-) delete mode 100644 dev-libs/boost/boost-1.52.0-r4.ebuild create mode 100644 dev-libs/boost/boost-1.53.0_beta1.ebuild (limited to 'dev-libs/boost') diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog index 032afc9c164c..b0e09dfd3360 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.286 2012/12/15 14:45:27 mgorny Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.287 2013/01/25 23:04:42 flameeyes Exp $ + +*boost-1.53.0_beta1 (25 Jan 2013) + + 25 Jan 2013; Diego E. Pettenò + +boost-1.53.0_beta1.ebuild, -boost-1.52.0-r4.ebuild: + Version bump to latest beta for testing; remove non stable candidate ebuild. *boost-1.52.0-r5 (15 Dec 2012) diff --git a/dev-libs/boost/boost-1.52.0-r4.ebuild b/dev-libs/boost/boost-1.52.0-r4.ebuild deleted file mode 100644 index 86592460bf1a..000000000000 --- a/dev-libs/boost/boost-1.52.0-r4.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# 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.52.0-r4.ebuild,v 1.1 2012/11/22 03:37:58 flameeyes Exp $ - -EAPI="5" -PYTHON_DEPEND="python? *" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython *-pypy-*" - -inherit flag-o-matic multilib multiprocessing python toolchain-funcs versionator - -MY_P=${PN}_$(replace_all_version_separators _) - -DESCRIPTION="Boost Libraries for C++" -HOMEPAGE="http://www.boost.org/" -SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2" - -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 icu +nls mpi python static-libs +threads tools" - -RDEPEND="icu? ( >=dev-libs/icu-3.6:= ) - !icu? ( virtual/libiconv ) - mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) - sys-libs/zlib - !app-admin/eselect-boost" -DEPEND="${RDEPEND} - =dev-util/boost-build-${MAJOR_V}*" - -S=${WORKDIR}/${MY_P} - -create_user-config.jam() { - local compiler compiler_version compiler_executable - - if [[ ${CHOST} == *-darwin* ]]; then - compiler="darwin" - compiler_version="$(gcc-fullversion)" - compiler_executable="$(tc-getCXX)" - else - compiler="gcc" - compiler_version="$(gcc-version)" - compiler_executable="$(tc-getCXX)" - fi - local mpi_configuration python_configuration - - if use mpi; then - mpi_configuration="using mpi ;" - fi - - if use python; then - python_configuration="using python : $(python_get_version) : /usr : $(python_get_includedir) : /usr/$(get_libdir) ;" - fi - - cat > user-config.jam << __EOF__ -using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ; -${mpi_configuration} -${python_configuration} -__EOF__ -} - -pkg_setup() { - if use python; then - python_pkg_setup - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \ - "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \ - "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \ - "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \ - "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \ - "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \ - "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \ - "${FILESDIR}/remove-toolset-1.48.0.patch" \ - "${FILESDIR}/${PN}-1.52.0-tuple.patch" - - # Avoid a patch for now - for file in libs/context/src/asm/*.S; do - cat - >> $file < 4.3 ]] && append-flags -mno-altivec - fi - - # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. - append-cxxflags -std=gnu++98 - - use icu && OPTIONS+=" -sICU_PATH=/usr" - use icu || OPTIONS+=" --disable-icu boost.locale.icu=off" - use mpi || OPTIONS+=" --without-mpi" - use python || OPTIONS+=" --without-python" - use nls || OPTIONS+=" --without-locale" - - OPTIONS+=" pch=off --boost-build=/usr/share/boost-build --prefix=\"${D}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs shared,static shared) --without-context" -} - -src_compile() { - export BOOST_ROOT="${S}" - PYTHON_DIRS="" - MPI_PYTHON_MODULE="" - - building() { - create_user-config.jam - - ejam ${OPTIONS} \ - $(use python && echo --python-buildid=${PYTHON_ABI}) \ - || die "Building of Boost libraries failed" - - if use python; then - if [[ -z "${PYTHON_DIRS}" ]]; then - PYTHON_DIRS="$(find bin.v2/libs -name python | sort)" - else - if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then - die "Inconsistent structure of build directories" - fi - fi - - local dir - for dir in ${PYTHON_DIRS}; do - mv ${dir} ${dir}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed" - done - - if use mpi; then - if [[ -z "${MPI_PYTHON_MODULE}" ]]; then - MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" - if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then - die "Multiple mpi.so files found" - fi - else - if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then - die "Inconsistent structure of build directories" - fi - fi - - mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed" - fi - fi - } - if use python; then - python_execute_function building - else - building - fi - - if use tools; then - pushd tools > /dev/null || die - - ejam ${OPTIONS} \ - || die "Building of Boost tools failed" - popd > /dev/null || die - fi -} - -src_install () { - installation() { - create_user-config.jam - - if use python; then - local dir - for dir in ${PYTHON_DIRS}; do - cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed" - done - - if use mpi; then - cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed" - cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed" - fi - fi - - ejam ${OPTIONS} \ - --includedir="${D}usr/include" \ - --libdir="${D}usr/$(get_libdir)" \ - $(use python && echo --python-buildid=${PYTHON_ABI}) \ - install || die "Installation of Boost libraries failed" - - if use python; then - rm -r ${PYTHON_DIRS} || die - - # Move mpi.so Python module to Python site-packages directory. - # https://svn.boost.org/trac/boost/ticket/2838 - if use mpi; then - dodir $(python_get_sitedir)/boost - mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost" || die - cat << EOF > "${D}$(python_get_sitedir)/boost/__init__.py" || die -import sys -if sys.platform.startswith('linux'): - import DLFCN - flags = sys.getdlopenflags() - sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL) - from . import mpi - sys.setdlopenflags(flags) - del DLFCN, flags -else: - from . import mpi -del sys -EOF - fi - fi - } - if use python; then - python_execute_function installation - else - installation - fi - - if ! use python; then - rm -r "${D}"/usr/include/boost/python* || die - fi - - if ! use nls; then - rm -r "${D}"/usr/include/boost/locale || die - fi - - rm -r "${D}"/usr/include/boost/context || die - - if use doc; then - find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf - dohtml \ - -A pdf,txt,cpp,hpp \ - *.{htm,html,png,css} \ - -r doc - dohtml -A pdf,txt -r tools - insinto /usr/share/doc/${PF}/html - doins -r libs - doins -r more - - # To avoid broken links - insinto /usr/share/doc/${PF}/html - doins LICENSE_1_0.txt - - dosym /usr/include/boost /usr/share/doc/${PF}/html/boost - fi - - pushd "${D}usr/$(get_libdir)" > /dev/null || die - - local ext=$(get_libname) - if use threads; then - local f - for f in *${ext}; do - dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} - done - fi - - popd > /dev/null || die - - if use tools; then - dobin dist/bin/* - - insinto /usr/share - doins -r dist/share/boostbook - fi - - # boost's build system truely sucks for not having a destdir. Because for - # this reason we are forced to build with a prefix that includes the - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the - # DESTROOT instread of the actual EPREFIX. There is no way out of here - # but to do it the dirty way of manually setting the right install_names. - if [[ ${CHOST} == *-darwin* ]]; then - einfo "Working around completely broken build-system(tm)" - local d - for d in "${ED}"usr/lib/*.dylib; do - if [[ -f ${d} ]]; then - # fix the "soname" - ebegin " correcting install_name of ${d#${ED}}" - install_name_tool -id "/${d#${D}}" "${d}" - eend $? - # fix references to other libs - refs=$(otool -XL "${d}" | \ - sed -e '1d' -e 's/^\t//' | \ - grep "^libboost_" | \ - cut -f1 -d' ') - local r - for r in ${refs}; do - ebegin " correcting reference to ${r}" - install_name_tool -change \ - "${r}" \ - "${EPREFIX}/usr/lib/${r}" \ - "${d}" - eend $? - done - fi - done - fi -} - -pkg_preinst() { - # Yai for having symlinks that are nigh-impossible to remove without - # resorting to dirty hacks like these. Removes lingering symlinks - # from the slotted versions. - local symlink - for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do - [[ -L ${symlink} ]] && rm -f "${symlink}" - done -} - -pkg_postinst() { - if use mpi && use python; then - python_mod_optimize boost - fi -} - -pkg_postrm() { - if use mpi && use python; then - python_mod_cleanup boost - fi -} - -# the tests will never fail because these are not intended as sanity -# tests at all. They are more a way for upstream to check their own code -# on new compilers. Since they would either be completely unreliable -# (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() { :; } diff --git a/dev-libs/boost/boost-1.53.0_beta1.ebuild b/dev-libs/boost/boost-1.53.0_beta1.ebuild new file mode 100644 index 000000000000..e7d6492bdbab --- /dev/null +++ b/dev-libs/boost/boost-1.53.0_beta1.ebuild @@ -0,0 +1,326 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0_beta1.ebuild,v 1.1 2013/01/25 23:04:42 flameeyes Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) + +inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator + +MY_P=${PN}_$(replace_all_version_separators _) + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="http://www.boost.org/" +SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2" + +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 icu +nls mpi python static-libs +threads tools" + +RDEPEND="icu? ( >=dev-libs/icu-3.6:= ) + !icu? ( virtual/libiconv ) + mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) + python? ( ${PYTHON_DEPS} ) + sys-libs/zlib + !app-admin/eselect-boost" +DEPEND="${RDEPEND} + =dev-util/boost-build-${MAJOR_V}*" + +S=${WORKDIR}/${MY_P} + +create_user-config.jam() { + local compiler compiler_version compiler_executable + + if [[ ${CHOST} == *-darwin* ]]; then + compiler="darwin" + compiler_version="$(gcc-fullversion)" + compiler_executable="$(tc-getCXX)" + else + compiler="gcc" + compiler_version="$(gcc-version)" + compiler_executable="$(tc-getCXX)" + fi + local mpi_configuration python_configuration + + if use mpi; then + mpi_configuration="using mpi ;" + fi + + if use python; then + python_configuration="using python : : ${PYTHON} ;" + fi + + cat > user-config.jam << __EOF__ +using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ; +${mpi_configuration} +${python_configuration} +__EOF__ +} + +src_prepare() { + epatch \ + "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \ + "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \ + "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \ + "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \ + "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \ + "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \ + "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" + + # Avoid a patch for now + for file in libs/context/src/asm/*.S; do + cat - >> $file < 4.3 ]] && append-flags -mno-altivec + fi + + # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. + append-cxxflags -std=gnu++98 + + use icu && OPTIONS+=" -sICU_PATH=/usr" + use icu || OPTIONS+=" --disable-icu boost.locale.icu=off" + use mpi || OPTIONS+=" --without-mpi" + use python || OPTIONS+=" --without-python" + use nls || OPTIONS+=" --without-locale" + + OPTIONS+=" pch=off --boost-build=/usr/share/boost-build --prefix=\"${D}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs shared,static shared) --without-context" +} + +src_compile() { + export BOOST_ROOT="${S}" + PYTHON_DIRS="" + MPI_PYTHON_MODULE="" + + building() { + create_user-config.jam + + ejam ${OPTIONS} \ + $(use python && echo --python-buildid=${EPYTHON#python}) \ + || die "Building of Boost libraries failed" + + if use python; then + if [[ -z "${PYTHON_DIRS}" ]]; then + PYTHON_DIRS="$(find bin.v2/libs -name python | sort)" + else + if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then + die "Inconsistent structure of build directories" + fi + fi + + local dir + for dir in ${PYTHON_DIRS}; do + mv ${dir} ${dir}-${EPYTHON} \ + || die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed" + done + + if use mpi; then + if [[ -z "${MPI_PYTHON_MODULE}" ]]; then + MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" + if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then + die "Multiple mpi.so files found" + fi + else + if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then + die "Inconsistent structure of build directories" + fi + fi + + mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \ + || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed" + fi + fi + } + if use python; then + python_foreach_impl building + else + building + fi + + if use tools; then + pushd tools > /dev/null || die + + ejam ${OPTIONS} \ + || die "Building of Boost tools failed" + popd > /dev/null || die + fi +} + +src_install () { + installation() { + create_user-config.jam + + if use python; then + local dir + for dir in ${PYTHON_DIRS}; do + cp -pr ${dir}-${EPYTHON} ${dir} \ + || die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed" + done + + if use mpi; then + cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \ + || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed" + cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \ + || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed" + fi + fi + + ejam ${OPTIONS} \ + --includedir="${D}usr/include" \ + --libdir="${D}usr/$(get_libdir)" \ + $(use python && echo --python-buildid=${EPYTHON#python}) \ + install || die "Installation of Boost libraries failed" + + if use python; then + rm -r ${PYTHON_DIRS} || die + + # Move mpi.so Python module to Python site-packages directory. + # https://svn.boost.org/trac/boost/ticket/2838 + if use mpi; then + local moddir=$(python_get_sitedir)/boost + dodir "${moddir}" + mv "${D}usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die + cat << EOF > "${D}${moddir}/__init__.py" || die +import sys +if sys.platform.startswith('linux'): + import DLFCN + flags = sys.getdlopenflags() + sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL) + from . import mpi + sys.setdlopenflags(flags) + del DLFCN, flags +else: + from . import mpi +del sys +EOF + fi + + python_optimize + fi + } + if use python; then + python_foreach_impl installation + else + installation + fi + + if ! use python; then + rm -r "${D}"/usr/include/boost/python* || die + fi + + if ! use nls; then + rm -r "${D}"/usr/include/boost/locale || die + fi + + rm -r "${D}"/usr/include/boost/context || die + + if use doc; then + find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf + dohtml \ + -A pdf,txt,cpp,hpp \ + *.{htm,html,png,css} \ + -r doc + dohtml -A pdf,txt -r tools + insinto /usr/share/doc/${PF}/html + doins -r libs + doins -r more + + # To avoid broken links + insinto /usr/share/doc/${PF}/html + doins LICENSE_1_0.txt + + dosym /usr/include/boost /usr/share/doc/${PF}/html/boost + fi + + pushd "${D}usr/$(get_libdir)" > /dev/null || die + + local ext=$(get_libname) + if use threads; then + local f + for f in *${ext}; do + dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} + done + fi + + popd > /dev/null || die + + if use tools; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED}"usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "^libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + ebegin " correcting reference to ${r}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r}" \ + "${d}" + eend $? + done + fi + done + fi +} + +pkg_preinst() { + # Yai for having symlinks that are nigh-impossible to remove without + # resorting to dirty hacks like these. Removes lingering symlinks + # from the slotted versions. + local symlink + for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do + [[ -L ${symlink} ]] && rm -f "${symlink}" + done +} + +# the tests will never fail because these are not intended as sanity +# tests at all. They are more a way for upstream to check their own code +# on new compilers. Since they would either be completely unreliable +# (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() { :; } -- cgit v1.2.3-65-gdbad