commit:     510865f5e037bc46eaf839bca3f4174db23e49ce
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 19:32:05 2018 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 19:32:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510865f5

dev-libs/boost: Unkeyworded version bump to 1.66 (bug 630754)

Unkeyworded pending testing and review from boost project team.

Bug: https://bugs.gentoo.org/630754
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-libs/boost/Manifest            |   1 +
 dev-libs/boost/boost-1.66.0.ebuild | 439 +++++++++++++++++++++++++++++++++++++
 2 files changed, 440 insertions(+)

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index c81be6cd8e0..f5513e8c136 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,2 +1,3 @@
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 
227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f
 SHA512 
c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 
0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b
 SHA512 
7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
+DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 
9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765
 SHA512 
0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b

diff --git a/dev-libs/boost/boost-1.66.0.ebuild 
b/dev-libs/boost/boost-1.66.0.ebuild
new file mode 100644
index 00000000000..4f28b76a848
--- /dev/null
+++ b/dev-libs/boost/boost-1.66.0.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs 
versionator multilib-minimal
+
+MY_P="${PN}_$(replace_all_version_separators _)"
+MAJOR_V="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="http://www.boost.org/";
+SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2";
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+
+IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+       !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+       mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+       python? ( ${PYTHON_DEPS} )
+       app-arch/bzip2[${MULTILIB_USEDEP}]
+       sys-libs/zlib[${MULTILIB_USEDEP}]
+       !app-admin/eselect-boost"
+DEPEND="${RDEPEND}
+       =dev-util/boost-build-${MAJOR_V}*"
+REQUIRED_USE="
+       mpi? ( threads )
+       python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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.
+RESTRICT="test"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
+       "${FILESDIR}/${PN}-1.55.0-context-x32.patch"
+       "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
+       "${FILESDIR}/${PN}-1.65.0-fix-python.patch"
+)
+
+python_bindings_needed() {
+       multilib_is_native_abi && use python
+}
+
+tools_needed() {
+       multilib_is_native_abi && use tools
+}
+
+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 python_bindings_needed; then
+               # boost expects libpython$(pyver) and doesn't allow overrides
+               # and the build system is so creepy that it's easier just to
+               # provide a symlink (linker's going to use SONAME anyway)
+               # TODO: replace it with proper override one day
+               ln -f -s "$(python_get_library_path)" 
"${T}/lib${EPYTHON}$(get_libname)" || die
+
+               if tc-is-cross-compiler; then
+                       python_configuration="using python : ${EPYTHON#python} 
: : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : 
${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
+               else
+                       # note: we need to provide version explicitly because of
+                       # a bug in the build system:
+                       # https://github.com/boostorg/build/pull/104
+                       python_configuration="using python : ${EPYTHON#python} 
: ${PYTHON} : $(python_get_includedir) : ${T} ;"
+               fi
+       fi
+
+       cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
+using ${compiler} : ${compiler_version} : ${compiler_executable} : 
<cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+pkg_setup() {
+       # Bail out on unsupported build configuration, bug #456792
+       if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
+               grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep 
-q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
+               (
+                       eerror "You are using custom 
${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug 
targets."
+                       eerror "Boost can not be built in such configuration."
+                       eerror "Please, either remove this file or add targets 
from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
+                       die
+               )
+       fi
+}
+
+src_prepare() {
+       default
+
+       # Do not try to build missing 'wave' tool, bug #522682
+       # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
+       sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
+
+       multilib_copy_sources
+}
+
+ejam() {
+       local b2_opts=(
+               "--user-config=${BOOST_ROOT}/user-config.jam"
+               "$@"
+       )
+       echo b2 "${b2_opts[@]}"
+       b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+       # Workaround for too many parallel processes requested, bug #506064
+       [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+       OPTIONS=(
+               $(usex debug gentoodebug gentoorelease)
+               "-j$(makeopts_jobs)"
+               -q
+               -d+2
+       )
+
+       if [[ ${CHOST} == *-darwin* ]]; then
+               # We need to add the prefix, and in two cases this exceeds, so 
prepare
+               # for the largest possible space allocation.
+               append-ldflags -Wl,-headerpad_max_install_names
+       elif [[ ${CHOST} == *-winnt* ]]; then
+               compiler=parity
+               if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
+                       compilerVersion=trunk
+               else
+                       compilerVersion=$($(tc-getCXX) -v | sed '1q' \
+                               | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ 
\t]*\) .*,\2,')
+               fi
+               compilerExecutable=$(tc-getCXX)
+       fi
+
+       # bug 298489
+       if use ppc || use ppc64; then
+               [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+       fi
+
+       # Use C++14 globally as of 1.62
+       append-cxxflags -std=c++14
+
+       use icu && OPTIONS+=(
+                       "-sICU_PATH=${EPREFIX}/usr"
+               )
+       use icu || OPTIONS+=(
+                       --disable-icu
+                       boost.locale.icu=off
+               )
+       use mpi || OPTIONS+=(
+                       --without-mpi
+               )
+       use nls || OPTIONS+=(
+                       --without-locale
+               )
+       use context || OPTIONS+=(
+                       --without-context
+                       --without-coroutine
+                       --without-fiber
+               )
+       use threads || OPTIONS+=(
+                       --without-thread
+               )
+
+       OPTIONS+=(
+               pch=off
+               --boost-build="${EPREFIX}"/usr/share/boost-build
+               --prefix="${ED%/}/usr"
+               --layout=system
+               # building with threading=single is currently not possible
+               # https://svn.boost.org/trac/boost/ticket/7105
+               threading=multi
+               link=$(usex static-libs shared,static shared)
+       )
+
+       [[ ${CHOST} == *-winnt* ]] && OPTIONS+=(
+                       -sNO_BZIP2=1
+               )
+}
+
+multilib_src_compile() {
+       local -x BOOST_ROOT="${BUILD_DIR}"
+       PYTHON_DIRS=""
+       MPI_PYTHON_MODULE=""
+
+       building() {
+               create_user-config.jam
+
+               local PYTHON_OPTIONS
+               if python_bindings_needed; then
+                       PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+               else
+                       PYTHON_OPTIONS=" --without-python"
+               fi
+
+               ejam \
+                       "${OPTIONS[@]}" \
+                       ${PYTHON_OPTIONS} \
+                       || die "Building of Boost libraries failed"
+
+               if python_bindings_needed; 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 python_bindings_needed; then
+               python_foreach_impl building
+       else
+               building
+       fi
+
+       if tools_needed; then
+               pushd tools >/dev/null || die
+
+               ejam \
+                       "${OPTIONS[@]}" \
+                       ${PYTHON_OPTIONS} \
+                       || die "Building of Boost tools failed"
+               popd >/dev/null || die
+       fi
+}
+
+multilib_src_install_all() {
+       if ! use python; then
+               rm -r "${ED%/}"/usr/include/boost/python* || die
+       fi
+
+       if ! use nls; then
+               rm -r "${ED%/}"/usr/include/boost/locale || die
+       fi
+
+       if ! use context; then
+               rm -r "${ED%/}"/usr/include/boost/context || die
+               rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
+               rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
+       fi
+
+       if use doc; then
+               # find extraneous files that shouldn't be installed
+               # as part of the documentation and remove them.
+               find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf 
'{}' + || die
+               find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name 
'*.manifest' \) -exec rm -rf '{}' + || die
+               find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name 
'*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+               docinto html
+               dodoc *.{htm,html,png,css}
+               dodoc -r doc libs more tools
+
+               # To avoid broken links
+               dodoc LICENSE_1_0.txt
+
+               dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+       fi
+}
+
+multilib_src_install() {
+       local -x BOOST_ROOT="${BUILD_DIR}"
+       installation() {
+               create_user-config.jam
+
+               local PYTHON_OPTIONS
+               if python_bindings_needed; 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
+                       PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+               else
+                       PYTHON_OPTIONS=" --without-python"
+               fi
+
+               ejam \
+                       "${OPTIONS[@]}" \
+                       ${PYTHON_OPTIONS} \
+                       --includedir="${ED%/}/usr/include" \
+                       --libdir="${ED%/}/usr/$(get_libdir)" \
+                       install || die "Installation of Boost libraries failed"
+
+               if python_bindings_needed; 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
+                               # moddir already includes eprefix
+                               mkdir -p "${D}${moddir}" || die
+                               mv "${ED%/}/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 python_bindings_needed; then
+               python_foreach_impl installation
+       else
+               installation
+       fi
+
+       pushd "${ED%/}/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 tools_needed; 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
+               if [[ -L ${symlink} ]]; then
+                       rm -f "${symlink}" || die
+               fi
+       done
+
+       # some ancient installs still have boost cruft lying around
+       # for unknown reasons, causing havoc for reverse dependencies
+       # Bug: 607734
+       rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
+}

Reply via email to