From: Sergey Popov Date: Wed, 24 Dec 2014 12:36:27 +0000 (+0000) Subject: Build auto_index tool when USE tools is enabled, wrt bug #529066. Drop old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e255f16b4a27189df4e709e5a8b66d43d04ec3cb;p=gentoo.git Build auto_index tool when USE tools is enabled, wrt bug #529066. Drop old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x1F357D42 --- diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog index 24d0e8ad3f26..7a795d6d361a 100644 --- a/dev-libs/boost/ChangeLog +++ b/dev-libs/boost/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/boost # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.338 2014/11/12 08:44:52 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.339 2014/12/24 12:36:25 pinkbyte Exp $ + +*boost-1.56.0-r1 (24 Dec 2014) + + 24 Dec 2014; Sergey Popov -boost-1.55.0-r1.ebuild, + -boost-1.56.0.ebuild, +boost-1.56.0-r1.ebuild, + +files/boost-1.56.0-build-auto_index-tool.patch: + Build auto_index tool when USE tools is enabled, wrt bug #529066. Drop old 12 Nov 2014; Sergey Popov boost-1.55.0-r2.ebuild: Stable on amd64, wrt bug #525286 diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index fa0e8283097c..cf237c5d6a6e 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -15,6 +15,7 @@ AUX boost-1.53.0-glibc-2.18-compat.patch 949 SHA256 54e5e0000bcfb249a14cee584e37 AUX boost-1.53.0-library_status.patch 1907 SHA256 21a3137fcac21f734c7160264523f8699eb242a84a79dcc88cc937f0b1f87e67 SHA512 f5579a8650c24d2ace95e8d9aaff94325090577fa27fd7122309f5197373ff22352092671153c6e35057757fa07ef9c21ea5e0234fe1d5b467ef65cf5f2901c5 WHIRLPOOL 5a0962b007adbbfe85c33f03b9542d9ebf1ef649bf1d97f483cba5b0229cea0630c0ed7912bab8f04d8dd791b99cfd6e33e222d3a983e30852d7a10fd66a3dc7 AUX boost-1.55.0-context-x32.patch 1077 SHA256 1da4ff48b98416cac601c52594d4c4da3fb89d0a3e8908f119f05cc8ae76f9c7 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73 WHIRLPOOL 0b7a3521a8ec513b833d0292fa3e3bcafc8232fa96d2e41afd25da8dc30bdb49ee4319c7c8555d95e7d3de55fc704d83e443ba49bf89d6961a3f5af73c024a71 AUX boost-1.55.0-tools-c98-compat.patch 680 SHA256 08192ebf36a3087d3bce31d7b78c29c6e38bca6e5164744878783f648024beec SHA512 fc132898d9ef1a9fab607f277003f86080306fd0f30f89ab0916eb4c3217b390f15cfa00d1e410e79080d469714866a417ba72a3c0727189e8425cd72a1d6a47 WHIRLPOOL 17eb9e80ae33ef9fa8e4c442c511e35d1f5c2ac5251462931e9fbbd53bb29ef5adf699680729af71ef4c12ec87c6d83c821a8e30a03f7f1abedc2207c3125c1c +AUX boost-1.56.0-build-auto_index-tool.patch 408 SHA256 36bbd2652654b48c27eb4297d06968c8bdcdf78eec34127d775fad2b9689ac2a SHA512 916d7060003bceb6ee345de5fad9a4f44ec43473b119bab4cc057360d07b7be89bdab5e9d393df28171a4d1679ac0a3089f2096d5a6554ee2e00bc0805d2cbe2 WHIRLPOOL 172059b31b9128cda03e9119f6deac1a0fde373542e96493156f6e3527c65c7ec8fe16611568b0aed07b2f5ffc3440462386d47557ef7e84d855c8df2acbbea8 AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746 @@ -25,19 +26,18 @@ EBUILD boost-1.52.0-r6.ebuild 9801 SHA256 3f6216bd3ae5554331b9f14c28be75ce6f32f9 EBUILD boost-1.52.0-r7.ebuild 10077 SHA256 da03d3d18d7a8429494bbc7ab0add547b62664b01fdff48b3ec5a7d1cb1499ed SHA512 b4f0dfbce5aae400f68f6d50e9685b1f9bf63761189fb3ac4d2219bac0c9fd8252d4fb94467204a75e1cb6f2e88960a11e97c9771050170db7da991e08270272 WHIRLPOOL ad2ec593b6244a0ee3840dd0902dc13e89ff4f262d7fd75b190efa8812c4bca3d770665b74ba4d4636b795187d3924ecd97f137221704242c8973ddc1e5b544e EBUILD boost-1.53.0-r1.ebuild 10588 SHA256 1d5cd902ff34fe5890540808067428800c11d7b6b4d5eda46254160656d52415 SHA512 1843af3cb168794d3433eac2f1911f5a801bdf7671de8c9f519e554214948bf0b1ba497cd17cbee78463646bad382de56cbd769bc3b642e834ceaf7e5b04a654 WHIRLPOOL 8f47d266e8f1fa10683108ff35374b62b9c14c4749f89190b46477e67fa841abdb8da4c1a2878f7431e3e1bf85749fb522e73f28c9e3f626934bfc64284bb8dd EBUILD boost-1.54.0-r1.ebuild 10608 SHA256 c7d6a302db0e70d49369b52fd5393d45e691881c656b46bdc0e6133add5c31d6 SHA512 483833cea572bfc5a8356ef1a8b18355f175f1f4e37aa5441f5c1e10a92156eaa92658a8804dd258525f03d075e1b74a1358657ce1fda3875e72ec834e752f83 WHIRLPOOL 4f0c3e3097ec9aa0a8de7f073f67552104d24bdda74647529830eb626f0c6c1ff8c25dfabf2faa36f9cb6ad57edd65c68e975cbc60a72c84cce24cd77bc3de3c -EBUILD boost-1.55.0-r1.ebuild 10464 SHA256 0d898a54e4b287d5a7ff7192058436e6d39f4dd43fa9810cdacf88a0da4cf2d0 SHA512 07d76133a86b99ac24e4f3f1bce18eadddc9ea6e246a90b28a980b3745910d9fb0004cddb0657a76b59328ac03a37e3000dfbf13f20a70209cb307f904c3c7f8 WHIRLPOOL 6646314c1d6c3bb81d3efbadf0b9a4c6c4453a59c7d94f954386d515f812c1e68055a142c53dbf8eafbf25de403648898fc6b3b30e90a716ea06f97f0ac994f8 EBUILD boost-1.55.0-r2.ebuild 11355 SHA256 a9583ff5b9fd3110a8ae77af35dd3033ff11c7f140d7b8b090b6bbe0c411a9d2 SHA512 21bf3934e8c8527aed5dadb4b25729f9824320d9e4d1532c8194e2d7c2164875b6f414445ab6d57e47186e69774b94f8edaa53d1f1a891436fae879768d98565 WHIRLPOOL 06b47c7979a1aa1ffbf13f1148284f60909b1ddb1e4eb55fc857c788d40b8d16b0c205422f1e5c1ee4c37b1bdd8b0c26a8084a684e96c5c6b90d0062524e8bc3 -EBUILD boost-1.56.0.ebuild 11540 SHA256 024e336bd979151f14b8f41e059237c8e094f3bab0c8e207b5cbcc7768e97be1 SHA512 ad68b592d8bea36f003897b9a3204124949279f16f3e7a3e134ded763cbf405e501519acf28c9d2fcbde0f383e259835ffa4e04374b8f6d8e9a02120289aae67 WHIRLPOOL 1985312d8173dac92109d366006368342323ad0ed5c8a9a27a0a0b6dcc5162af4995ce812ca27f1c73a05dfa9e72652d0dbf4fd7aa7a83767f742f74e4b3c3ee -MISC ChangeLog 57090 SHA256 6914032f8190d494e4561b06b075dda8e769405e84714b30359ec2b1b07de94f SHA512 d2129d9c923a83808134eb8444649426154b724e334491d0efbd8f86df4fb757cf91d36030cb189c731fab5a81db0efe4cbbc5ec41a6515cd4fbc4fb93ede4d1 WHIRLPOOL cac87f2c10cd53b94a5542a570b19cd820333ecfe6da90cb97d80aa2cec30ba18742e470016fb9a86d5145cd66cebd28e7c5c1dc4c66428171221a5eafa7a43f +EBUILD boost-1.56.0-r1.ebuild 11602 SHA256 b468fc7c20ec29a5e836dcad626adb479507efe36c8d8aaac47636b7be23483f SHA512 ab0f08eddbc770c22d22528a5dcc7f25105ce2712ced4e1439ad3becbcf3353c6bc1c59f49967548dadd2d9f48dbf78f415cbe3c34697f3a6d14feffa5427cd6 WHIRLPOOL 708ac1b021ced8b5b85771d442957cb496ec3baf53b936ba8572428a758e1ea69d5610ea6e213c1783c71f332767b47540aa1c0170c5912404bb25bfa5397969 +MISC ChangeLog 57375 SHA256 ea52156e64df1709df02fa47f563ddfc96a0836a99b9ef15421a6ed8bb3aee79 SHA512 ea40c683bfea23694f938f9fe6e3a2a0916662b91cc182a522a1e24e2e42c0013133fd837f62bbc5838a17c5963de25ab2f3f72c5d9be4e4a3d0c08c2a53658d WHIRLPOOL 2a86aeeb48384196aa9aec8c841d7bfbb67443a0b6b2b2456d1e6702bae18ce66007a13124349c1ed4ae795fe25c68348f1eadc2cfb2c3f46640d01fc01cc8df MISC metadata.xml 1363 SHA256 81717d0ffd5ebadbe4b12d4a38b332f3128da205a46e3cfd201e91f6ad474d68 SHA512 162040a40e83cceacea3605d45bc846cbd721446949c66bd836ab54e113ada77f1f462c7e61d7e544bc073920475db6b81c104390d6c83aba7228d65ff270419 WHIRLPOOL be141d041846a3a79efb7579c3f842960afe27a6e29659bad88ae8e999aef30074d2ab23c9eb295152d88f75d80efc86fed1c08c11b4f3f0d5e866b6d3c4802c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUYx4EAAoJECo/aRed9267FvkH/11tn2fHz2yLi8A6o3DXR2IU -Iq/lkQrFSnKzPdX/3GC09X/weX5pAdi6dKl+g5V0WUn5T2gMVN7wY8XDl5M2RwfD -xzb5nmxRRmzFfFKO6jtobU38N9BjZPqktTt8zi/4JMM+KCcRhh5TM0aNuH2OoF11 -PF2HPxp1X4lJzSy2j3LMvOtgUOhL/awDlka+/3B6w5ykK6aHOOjO0AQJC8wdriGR -3myELCXaiBImjfmgtfazsAcd+dNE3bUdDt8UyFvotVXhCMmUGiUoijNq0vGWQ8pI -EyZXAonqQTndlVf0mzlVPnNYIge59DGCAn5bFmhMOo7+5oiUl1BcPUG0hes1uHk= -=yirN +iQEcBAEBCAAGBQJUmrNJAAoJECo/aRed9267VscH/AuxAq9QSsap8BJUqgMAfEgV +f/naAaoAPfLpesVt/E5to0tkm4HuxZAyoqw82G0tflRU1SmqFSrZNWARh0AVAgTP +Zw2eS+nVwrBJ/K9Iuek8pzeM/94liBrwppAfHDDwXTkMMwl4snITbs4qZXvBly5E +pFOk5t3k5/16XDMGsGSN98Hd2ADTHtHjZfor+39X1YD7fbNx+VnK5xGbdbUC61Gi +HHxh54Thm9wAmYeye3AX5JrSetGBTDORaTznvd4Q/lY2vx6FfYPGaG5nhNjlGkhG +mg1MN7ZJTnKuyxvYJJZwQtawzuTi+T8N8ntUx093nhzCbPcMf1AU6ZqF1sg49ys= +=1+rl -----END PGP SIGNATURE----- diff --git a/dev-libs/boost/boost-1.55.0-r1.ebuild b/dev-libs/boost/boost-1.55.0-r1.ebuild deleted file mode 100644 index 57a42d24df40..000000000000 --- a/dev-libs/boost/boost-1.55.0-r1.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.9 2014/10/14 09:57:35 pinkbyte Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) - -inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator - -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="mirror://sourceforge/boost/${MY_P}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux" - -IUSE="context 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} ) - app-arch/bzip2 - sys-libs/zlib - !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" - -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__ -} - -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() { - epatch \ - "${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}/${PN}-1.55.0-context-x32.patch" \ - "${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \ - "${FILESDIR}/${PN}-1.52.0-threads.patch" - - epatch_user -} - -ejam() { - echo b2 "$@" - b2 "$@" -} - -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 --user-config=${S}/user-config.jam" - - 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 - - # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. - append-cxxflags -std=gnu++98 - - use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/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" - use context || OPTIONS+=" --without-context --without-coroutine" - - OPTIONS+=" pch=off" - OPTIONS+=" --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\"" - OPTIONS+=" --layout=system" - OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)" - - [[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1" -} - -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="${ED}usr/include" \ - --libdir="${ED}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 - # 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 use python; then - python_foreach_impl installation - else - installation - fi - - 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 || die - fi - - 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 "${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 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 -} diff --git a/dev-libs/boost/boost-1.56.0.ebuild b/dev-libs/boost/boost-1.56.0-r1.ebuild similarity index 98% rename from dev-libs/boost/boost-1.56.0.ebuild rename to dev-libs/boost/boost-1.56.0-r1.ebuild index ef8d52f675f1..ef39d25a5e3a 100644 --- a/dev-libs/boost/boost-1.56.0.ebuild +++ b/dev-libs/boost/boost-1.56.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0.ebuild,v 1.3 2014/10/14 09:57:35 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.1 2014/12/24 12:36:25 pinkbyte Exp $ EAPI="5" PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) @@ -108,7 +108,8 @@ src_prepare() { "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \ "${FILESDIR}/${PN}-1.55.0-context-x32.patch" \ "${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \ - "${FILESDIR}/${PN}-1.52.0-threads.patch" + "${FILESDIR}/${PN}-1.52.0-threads.patch" \ + "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" # Do not try to build missing 'wave' tool, bug #522682 # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507 diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch new file mode 100644 index 000000000000..5175800e3f49 --- /dev/null +++ b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch @@ -0,0 +1,13 @@ +Build auto_index tool with USE="tools" +Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066 + +--- tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300 ++++ tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300 +@@ -20,6 +20,7 @@ + use-project /boost/regression : regression/build ; + + TOOLS = ++ auto_index/build//auto_index + bcp//bcp + inspect/build//inspect + quickbook//quickbook