summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-11-16 15:40:32 +0000
committerMichał Górny <mgorny@gentoo.org>2014-11-16 15:40:32 +0000
commitf7c389343ec9b9a3ecae393a21fc36ed3c138907 (patch)
tree55ffc757be70b6fca81f336091dcaa9c18f164b8 /dev-util
parentRemove old versions of openvpn (diff)
downloadhistorical-f7c389343ec9b9a3ecae393a21fc36ed3c138907.tar.gz
historical-f7c389343ec9b9a3ecae393a21fc36ed3c138907.tar.bz2
historical-f7c389343ec9b9a3ecae393a21fc36ed3c138907.zip
Use python-single-r1 and a run-time dependency on Python since bjam links to libpython. Backport the conversion into non-masked 1.55.0 branch.
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/boost-build/ChangeLog9
-rw-r--r--dev-util/boost-build/Manifest27
-rw-r--r--dev-util/boost-build/boost-build-1.55.0-r1.ebuild131
-rw-r--r--dev-util/boost-build/boost-build-1.56.0.ebuild17
4 files changed, 168 insertions, 16 deletions
diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 88c75fadb5d7..d46bf16a40ce 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/boost-build
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.131 2014/11/12 08:42:59 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.132 2014/11/16 15:40:30 mgorny Exp $
+
+*boost-build-1.55.0-r1 (16 Nov 2014)
+
+ 16 Nov 2014; Michał Górny <mgorny@gentoo.org> +boost-build-1.55.0-r1.ebuild,
+ boost-build-1.56.0.ebuild:
+ Use python-single-r1 and a run-time dependency on Python since bjam links to
+ libpython. Backport the conversion into non-masked 1.55.0 branch.
12 Nov 2014; Sergey Popov <pinkbyte@gentoo.org> boost-build-1.55.0.ebuild:
Stable on amd64, wrt bug #525286
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 656ac8096620..d8927afea407 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -18,18 +18,27 @@ DIST boost_1_56_0.tar.bz2 94777674 SHA256 134732acaf3a6e7eba85988118d943f0fa6b7f
EBUILD boost-build-1.52.0-r1.ebuild 3815 SHA256 761d867472338bf79308f9f8fad1deb2a9d54f9418dc895f5cf3d89bada08855 SHA512 fa7e30066b62a69834c6fc9098eb38fb7648a558c04cb717a5ea3c7a299406767d351fb586ff73a84875ec3b5dea04adcd23f0f03ffd64879967c5a9d177fc12 WHIRLPOOL b47e1fe952b2fef633df5204b87b1517c0a3099f841bf8dc015f410728bbce26c405ddc184204e364dc4e8bcc2040787b4710c5371a99eb134f3d8906083898a
EBUILD boost-build-1.53.0.ebuild 3942 SHA256 19fd87115492f0a99fd1b057dad575065a4bf24050a150c75ef444a34053fff5 SHA512 4948d036612b22d01ff1c0fbd501658a901da02775a172a284e5ecd5381eee04ab645a21f685b8e35f2c2984434ba339d7ad3595d0505158bf24e9ab224c8788 WHIRLPOOL d3b4c7a4bd9843932ec07313efe5c18faaf791173ed131171074a716d8c009319feca7bed4599c8de3fa410d2ef1ed482af907e7f31507e773accd7426179123
EBUILD boost-build-1.54.0.ebuild 3942 SHA256 87d5a41b9ca23980bb96f239a63d49114978efdfc592ab5603f2cd66a5489b8b SHA512 dffe89ce63c27ddbe6494cf6e06ef0bb4f76997b914e30612aa733698e5bee504723d9dc6af395fc036b2163f19832abc4296d58f0c697a1a307845b70885aae WHIRLPOOL e69e73d40ea4d5a087a4cb262e1ea60c1d673f7ab779b153f6e9ad899791f12fe454afac5ed4768a80a8a09793b98d38d91504abba1b7d220068d141ee08bd02
+EBUILD boost-build-1.55.0-r1.ebuild 3895 SHA256 a9c918aba72ca602349a14871ceaae2fb92b2c60504430feb6f8ca3d2a4d3820 SHA512 4a0940c677d965d8bee341f4160fa08a6103199751c82863e57eab1920101d5434b6015ca9bcf6ac7d58dc2ece48f5ae9de7ed7796d68c430f450909c5734d21 WHIRLPOOL 173ab0f8bc22fa4a10ee584e27656df2420a7129d1bdb718bb60ddfc03c1b6b9c2b6e4f8a6decf48b57085eef18aa83e1b9817a6892fda0014abcda8eaf28e29
EBUILD boost-build-1.55.0.ebuild 3941 SHA256 fe610e2b032a056206b4e55506c48b615d666a057681cca58e29ff90e1d8c520 SHA512 6b521fb2deb6b7c6fe4fd8caf27dc9f8ce42feece736d2a850cbaa77f53c367f85553f91b096969292403be8fc1d1f7c33ccbd506e441e6a1a0f5fa532775d93 WHIRLPOOL 556c2b9f6d97e863ecacbdb7d48dd474da9bcaad91fe8d4f6ee310b39b3cc079fcdf7150efc276019bf37ae78d9a45a842ba740157a7605218dc6c7a4adf6366
-EBUILD boost-build-1.56.0.ebuild 3858 SHA256 7ff7218371fd39c9e97356d54d87c0e2aebf8b94abb5e992bf9be2d973432d85 SHA512 f105584fa449506baa308732aadc53c7b5f9263b79d2737f8203c0c15cd6bd114f68c8cb8e6ec3764621033e6fecb3a682372c32a9dc51a2927b04fd4c653a25 WHIRLPOOL a7ed0a7002ebde0039574255f28fa0bd4f594e7719a6b001732d4e81da1a3af6e5000a6d972a5c207eb25faed9cf4843fe5b1012c1b6182abe8eac65fcf88d6b
-MISC ChangeLog 19368 SHA256 3be7b3f64188ac0a5e96a9f475563600f14d096a65cee16e65f27644b8d8d7bd SHA512 0eaa2b7f86729406a3fa35e4bf5d64cf3593e074f2c66966c21501b2e5bda09113634dd0734584990c82ceaeef680892d0bdeb88f422aa31db60e36cf2686b2b WHIRLPOOL 6beb8bb9e4b3e15955f713ce49be2d4d0170aa6c84538fa5c94c99035456271500ec82e1b9eae66cd770175fa411f21f458a730a8ce6ff7790bb5a3a6596b0de
+EBUILD boost-build-1.56.0.ebuild 3953 SHA256 57a5192dfd661a41554eb49a0e2767b3f24ec2d46fcd6dc21e264b7bbb5e50be SHA512 60d75db5a5cc0b5d021c7e17c5ee29a31d5c0fe0a4f35ac8b06b4d11aee7cea52da623e14fcc3e67412834e9d04064e32c804c0a0e3c062fef7d3a6fd08c6f7b WHIRLPOOL 6025184f0db2b39d127f9566d53eca6263b0ca1173a05bbd91164327d0e202639b9457d384472070358067561fb6f09c14b91dda10fd5ecf696efc01e4e5db35
+MISC ChangeLog 19662 SHA256 18fe64ef1fcfe432d36e1bd7645cd2a596f4618c62ce8d024429384aac7ebf56 SHA512 e73007af7c5a4a3b8fcd17fd976b35fb3d2cd2233ef62ba36d6ae64bd7c2e3ebf2118068e2e39d77dafb6b74ca953c3cac17bebd2ab96604706eca557b8201eb WHIRLPOOL 9c63439346648624b7fa02208df2b0e4a1856d22542d4895d81e2a9dd9d9d00f2d3a6f9a685d26cbc6af25b835b0d0119f585b51ebd268c362762aefce0daed1
MISC metadata.xml 158 SHA256 b52dff4a9d9f4eab0428972c9ee5a96df08f39325e4b491c39493da499fedf51 SHA512 5300260c2c2bad38b7a27b5c1d609b48b105034c63807958425e8f8fbcccc02a408bb5565480bb3ee3c87d368ed16859c48b447241adf15896e7508c6c442e65 WHIRLPOOL 17880f728fdb3dbd6ca582547c3c546ffe798d89d37ac717bc0be4e4764b60b867979c996ca89f4fdeedee021c419b964405b5fb674a220e582a436f653b8f30
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUYx2TAAoJECo/aRed9267xL8H/R42yeOS1t3OpajZXjmYl/QW
-RVB6Gy5NSj9ruAhZrSo4w9VVMJ4JtWBXC3RicLqJaBtzqikk6+CNGgaYRJ5yFEgx
-DkE7y/v0TZF54mrWzOsYzobWx/L7KOr78x2AZo5TYEprh8pm8Rxjppd9AR0FAIPo
-lbi9ID12X6fcBLKB2OBZU0OglL45z3oSSgfk9OetwvYiIGvZZ+a21j1tvG4jR/Iw
-kasDy1GbAjDK/i2fDu1sTVykcj37f4gx2Qg0E85PxxRsxjtmvUKtYkH2bUG3ga6p
-oJdcTdvZ3NmGEPWXOCm3fMpJTe8xWrUJXsgyTKZCezbuJTokqH7x8ItK5C4WdeI=
-=S7ew
+iQJ8BAEBCABmBQJUaMVwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTRYP/iHMk2cnMINLJS/U+O70W7SX
+a8Z5ju3bRWlxcV/Nt7RxriwqzgFxLbxUV4Z2glbeHxTOHllwyfNqGyROZI+XIxPV
+b2FlnU13WRr42wLX9xztDyCKQp32XtLFLheGzCqVF+gTRSF5MKFulkGdkvFKthsl
+DB4/KilYN3VW+Lnq/kbfA8hfMTkXosPSGWweMa8LSAgYzwGHLBtTlFvE6Rguh+gK
+aR7qSfWg+fJ74dFmLTQhOaCL08cdSbZLECyJj+MyK0eO5J8OQPvUCqM/VYeFqZ1N
+D7xZ6QsnoLphB2NxX/3uOlLzwHF+2jq/+M0NTPCZ0t5fPnHJuY6GqoSiwB7qBbe3
+llp7jGD0xnTgdzJFR8o2t1rC+0faGtoiWxn+sLf52Z9ORvM0gdRECNO4YumTzJQl
+n2AeGPVpIIc8eTWYqcbIdatYu1joi4kfN3MRzn4hfSGqFgHB7KaOV5NfI4CgXLoP
+8y84ogf25K6+X2mDXVwpijwlq2B6jAM7CLQR3LQHvfXjjGYv8494zVByZ34dsMme
+A0qI0fH3DCl7VdiamX2B+D75v+AHYBAJJ7vYak0cJtPK7JCipBJm28wDcNaAk9mA
+3GVmzBwIs2qmoTcheksYNYGplybFCO7VP3/Hx8cL0xZTcR1kYkIaAkJ/cfPRyH1R
+zaU7/AbH7qCoDDt112CI
+=ZyaA
-----END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.55.0-r1.ebuild b/dev-util/boost-build/boost-build-1.55.0-r1.ebuild
new file mode 100644
index 000000000000..7a30d5086902
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.55.0-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild,v 1.1 2014/11/16 15:40:30 mgorny Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ !<dev-libs/boost-1.34.0
+ !<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+ test? ( sys-apps/diffutils )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( python )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+ "${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+ "${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+ "${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+ "${FILESDIR}/${PN}-1.54.0-fix-test.patch" \
+ "${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
+
+ # Remove stripping option
+ # Fix python components build on multilib systems, bug #496446
+ cd "${S}/engine" || die
+ sed -i \
+ -e 's|-s\b||' \
+ -e "/libpython/s/lib ]/$(get_libdir) ]/" \
+ build.jam || die "sed failed"
+
+ # Force regeneration
+ rm jambase.c || die
+
+ # This patch allows us to fully control optimization
+ # and stripping flags when bjam is used as build-system
+ # We simply extend the optimization and debug-symbols feature
+ # with empty dummies called 'none'
+ cd "${S}" || die
+ sed -i \
+ -e 's/\(off speed space\)/\1 none/' \
+ -e 's/\(debug-symbols : on off\)/\1 none/' \
+ tools/builtin.jam || die "sed failed"
+
+ epatch_user
+}
+
+src_configure() {
+ if use python; then
+ # replace versions by user-selected one (TODO: fix this when slot-op
+ # deps are available to always match the best version available)
+ sed -i \
+ -e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON#python}|" \
+ engine/build.jam || die "sed failed"
+ fi
+}
+
+src_compile() {
+ cd engine || die
+
+ local toolset
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ toolset=darwin
+ else
+ # Using boost's generic toolset here, which respects CC and CFLAGS
+ toolset=cc
+ fi
+
+ CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+ dobin engine/bin.*/{bjam,b2}
+
+ insinto /usr/share/boost-build
+ doins -r "${FILESDIR}/site-config.jam" \
+ boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+ build kernel options tools util
+
+ rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+ if ! use python; then
+ find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+ fi
+
+ dodoc changes.txt hacking.txt release_procedure.txt \
+ notes/build_dir_option.txt notes/relative_source_paths.txt
+
+ if use examples; then
+ dodoc -r example
+ docompress -x "/usr/share/doc/${PF}/example"
+ fi
+}
+
+src_test() {
+ cd test || die
+
+ export TMP="${T}"
+
+ DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
+
+ if [[ -s test_results.txt ]]; then
+ eerror "At least one test failed: $(<test_results.txt)"
+ die "tests failed"
+ fi
+}
diff --git a/dev-util/boost-build/boost-build-1.56.0.ebuild b/dev-util/boost-build/boost-build-1.56.0.ebuild
index 1544955f3307..e4616214c3bf 100644
--- a/dev-util/boost-build/boost-build-1.56.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.56.0.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild,v 1.1 2014/08/15 07:57:24 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild,v 1.2 2014/11/16 15:40:30 mgorny Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic multilib python-any-r1 toolchain-funcs versionator
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
MY_PV="$(replace_all_version_separators _)"
@@ -18,16 +18,21 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples python test"
-RDEPEND="!<dev-libs/boost-1.34.0
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ !<dev-libs/boost-1.34.0
!<=dev-util/boost-build-1.35.0-r1"
DEPEND="${RDEPEND}
- python? ( ${PYTHON_DEPS} )
test? ( sys-apps/diffutils )"
-REQUIRED_USE="test? ( python )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( python )"
S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
src_unpack() {
tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
}
@@ -73,7 +78,7 @@ src_configure() {
# replace versions by user-selected one (TODO: fix this when slot-op
# deps are available to always match the best version available)
sed -i \
- -e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON##python}|" \
+ -e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON#python}|" \
engine/build.jam || die "sed failed"
fi
}