From: Tim Harder Date: Wed, 21 Jan 2015 16:35:14 +0000 (+0000) Subject: Link against the right version of the boost python library (bug #536734 by Justin... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e9c2d8102c8943c061e686b2e73258a4ef8838d;p=gentoo.git Link against the right version of the boost python library (bug #536734 by Justin Keogh). Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3 --- diff --git a/dev-python/graph-tool/ChangeLog b/dev-python/graph-tool/ChangeLog index ef5e0e19b329..90de9e6cb5cc 100644 --- a/dev-python/graph-tool/ChangeLog +++ b/dev-python/graph-tool/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/graph-tool # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.21 2015/01/17 14:03:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.22 2015/01/21 16:35:09 radhermit Exp $ + +*graph-tool-2.2.36-r1 (21 Jan 2015) + + 21 Jan 2015; Tim Harder +graph-tool-2.2.36-r1.ebuild, + graph-tool-9999.ebuild: + Link against the right version of the boost python library (bug #536734 by + Justin Keogh). 17 Jan 2015; Tim Harder graph-tool-2.2.36.ebuild, graph-tool-9999.ebuild: diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest index 486907870c77..67e6c668ca08 100644 --- a/dev-python/graph-tool/Manifest +++ b/dev-python/graph-tool/Manifest @@ -2,18 +2,19 @@ Hash: SHA256 DIST graph-tool-2.2.36.tar.bz2 15050904 SHA256 e1e030306480393464501cbcf3f3c938c2105c95fd0d67a8fe8bb4296e0be872 SHA512 3867fed367b547f28147c3234cf391d5415e5cf4594bc495abab1e1f827ba89af44d9d2bc92ee604ed184ce48f1644076aa852a0035fa2f8cdb449157d6b32bc WHIRLPOOL 741091c5504234767ed2662f69307aeaffb344ec132f708b494288d03485ff1910a967b244c35f5e7b77bad0564b249fd7b80ddb39051928f9806310c4d7843e +EBUILD graph-tool-2.2.36-r1.ebuild 2095 SHA256 d47ad119ac581c4b75f5bdaad2989cf0045477b2cbeceb7036ab56564c6da75b SHA512 49ad8e8a27168a771bb5be8d2d864bba8fe782648fb76e4243111240b8f1ae08bce78b49e80931cecff2a311d2aa920b930f4eccbac65ebfe7a91727d0d4fdeb WHIRLPOOL 6b49721340309dd78d108cdca20d7e949a9a834ce6e80e457a21b915bebdddfd3fdb702133065e4fb81c078e9c19a1996376421b8b63c8d5d595cf800ca62ac2 EBUILD graph-tool-2.2.36.ebuild 1935 SHA256 5ca0dbf521e6d3b163aee977bd41d60636f94e6d163c1ea300b8d7e941f0ccc1 SHA512 31a91b1dc06b0c239271c93a6059dfdd8a240a7c080e494c05464c8f460e02ed8ab92af8ad72eeece89cda08d48004b72bc4f9743547ca61e03e77748a7b8397 WHIRLPOOL 4a78e46be4d3bd52334f7fe8ec81c33c43363e7bdb0b2e24974d8e272880efa3c40ea1108a1eaf27618c623eef94f3515b93f8702fc54d0902cc85291f95ae10 -EBUILD graph-tool-9999.ebuild 1934 SHA256 7ccd791b016986840649bba83154e164fd7ea34211fcd70a2ffaaeedd26272a6 SHA512 e9783247f0a557071444bab0d9ef99cb2821400b4243979d881480a58c2740449c89dff073ea30d07f77eb8f9788bf7211bcc5f04c89e99a8254778e34094dab WHIRLPOOL 3d6923809cd621247761291aa7dff9da3f8e6cec9065d89c143056eb0fe04c955101bb520190142719e1d42d993f9de04c8bb437bd2a582585c13d26883fe3ec -MISC ChangeLog 3148 SHA256 05eaa8c23034d8613b394f6446ff472cace7184967e5fee2a0db5e9cb5cf6cc5 SHA512 0b0f7327056a268549df9eeca37c139cddbe032e11836cb55fb2a2563ad6fd3fe1857c95d66c938f501403845e7a0df35a1aafb69d9c9b906bfc356f7a5872d4 WHIRLPOOL 377ce3012e5fd6108088cba83394c12daa7136893edadb1ee3d751d05a04f3063d6538149d371856418cc221838faee6b18aa85dbe39592db9e9260bfa119f93 +EBUILD graph-tool-9999.ebuild 2091 SHA256 0da46773fbea2b6d2d3bc3c0891098caf86d847a4b6910206bc44d04b16d11c4 SHA512 7a21d4840512f70490582d9429c84e48cc41d08350cfe290e39283d729b383531620ae2cd73805bbc9cb689ef2078a6088705f296e80aa745f679fc8a31c8db0 WHIRLPOOL ba22e048492ae2d21010fc723ca297b7182cfd5c7542090cbd5f651c2963449cd22c84a4592425552cf46462b312e30675d83be11d4635f8d40ab36e8901492f +MISC ChangeLog 3385 SHA256 e17486444ca099aeab27180cd60b009869b9b96c70db933b00d54129e9c141bf SHA512 9896cb736a40f398a5b0048bad361f8b68cb040b102ee2fedc7cd51232cf62c6a6303f0bef0abea872e818bb1fb85156bf8c3bf1965c413e624d9cfc44cdc5c8 WHIRLPOOL 97d6c7be926520c607e85ccdbb9a6e8cb83f3aabda73e0de0fa637e45d0d3931ac6f29af42fecd92e766b22984d4a4a9be71d447bbc9901f46268b7e8f27a25b MISC metadata.xml 253 SHA256 9f2f51fd5d49ee6b0ef785dd7256455213e0e18e37f23b498cfee07dc1efac7f SHA512 5cb93e348b913d23ba4283ee3baf4a052658e27cbfad60ae3b80e68317909342ad3ec537724886b746f3cc1ada9db3010e41d80b615919d596df11bbe7bc7fed WHIRLPOOL e98beb144d79c5c872f1709991bd5b3ad17b63c494bcd4e9b2282957b309a888788e2b1c3ed8231a108914f76e0bfd21b5bd395236c09c25caa71df3a6063a90 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUumugAAoJEEqz6FtPBkyjmQcH/icTfT0gsox1fSyB62ewy05U -pfgh0uuG0wtfQaGGoa2YoyiVLG/nJNns7/7rIbwKFqMea8eRDEVbRYLH3xUWSXQ1 -DNhgXURDaGPYcnUhEWQ5QpXjU15Hzc5VGNDJ4UgMmieyIYK7ekJVsiOVIk5dAH8P -SwfJW3Jl5imptnEljkBEn0BelsXAXtgnHETqbQlnpdo2nPTG9jSI/yud9qAyJVSj -R0E6Pg5F15UVupvtWMV77f8sXKBhlcpdadgECoLsgW3rLozX6Bt9/P/4LNnlXBhN -BxP84XuGCrpshEOK2aXxYZerdgAppMC6Yrc6JNnFdk4/ZZCi3YQqiiDB+RarwHE= -=JBj+ +iQEcBAEBCAAGBQJUv9VEAAoJEEqz6FtPBkyjM6EH+QGCNvqDnd4RBInMmysCzFA0 +Ybqvx2AWavnR9OGr/wb0fj0wwFsSphyOOnVokGYvnTMsYqFNVHVhTUWwFKILX7jV +EcixMYxqK3Kr0gJ0EJOm9bfULpNjazdcZo5iffgSVQW+ZKgKciUuuu5eJL5g85sj +f0m3R2333J/FUnokhWBRHC2MQhGPDLYH+1WFxaGjqqZ6koTE8rZk5JAv0hQacPzZ +z/d4gTRWhvgW22uzmcHHzdU3Zw4Qm2C31LTaNhSabeiK6w7m2x/3QJRc0o+qWi6f +fDgP8BdCZpsMFuwhZN+3hsX1Og56YmO4YgH61bzFdYKEs2hfk9S8Ojn6dN1tSu8= +=fYlo -----END PGP SIGNATURE----- diff --git a/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild b/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild new file mode 100644 index 000000000000..ffea16f23b88 --- /dev/null +++ b/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild,v 1.1 2015/01/21 16:35:09 radhermit Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit check-reqs toolchain-funcs python-r1 eutils + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/count0/graph-tool.git" + inherit autotools git-r3 +else + SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" +HOMEPAGE="http://graph-tool.skewed.de/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+cairo openmp" + +CDEPEND="${PYTHON_DEPS} + >=dev-libs/boost-1.54.0[python,${PYTHON_USEDEP}] + dev-libs/expat + dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + >=sci-mathematics/cgal-3.5 + cairo? ( + dev-cpp/cairomm + dev-python/pycairo[${PYTHON_USEDEP}] + )" +RDEPEND="${CDEPEND} + dev-python/matplotlib[${PYTHON_USEDEP}]" +DEPEND="${CDEPEND} + dev-cpp/sparsehash + virtual/pkgconfig" + +# most machines don't have enough ram for parallel builds +MAKEOPTS="${MAKEOPTS} -j1" + +# bug 453544 +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi + check-reqs_pkg_pretend +} + +src_prepare() { + [[ ${PV} == "9999" ]] && eautoreconf + >py-compile + python_copy_sources +} + +src_configure() { + local threads + built_with_use dev-libs/boost threads && threads="-mt" + + configure() { + econf \ + --disable-static \ + --disable-optimization \ + $(use_enable openmp) \ + $(use_enable cairo) \ + --with-boost-python="${EPYTHON: -3}${threads}" + } + python_foreach_impl run_in_build_dir configure +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + python_foreach_impl run_in_build_dir default + prune_libtool_files --modules + + # remove unwanted extra docs + rm -r "${ED}"/usr/share/doc/${PN} || die +} + +run_in_build_dir() { + pushd "${BUILD_DIR}" > /dev/null + "$@" + popd > /dev/null +} diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild index 9f020f3f47a4..fffecc570553 100644 --- a/dev-python/graph-tool/graph-tool-9999.ebuild +++ b/dev-python/graph-tool/graph-tool-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.10 2015/01/17 14:03:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.11 2015/01/21 16:35:09 radhermit Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit check-reqs toolchain-funcs python-r1 +inherit check-reqs toolchain-funcs python-r1 eutils if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/count0/graph-tool.git" @@ -58,12 +58,18 @@ src_prepare() { } src_configure() { - python_foreach_impl run_in_build_dir \ + local threads + built_with_use dev-libs/boost threads && threads="-mt" + + configure() { econf \ --disable-static \ --disable-optimization \ $(use_enable openmp) \ - $(use_enable cairo) + $(use_enable cairo) \ + --with-boost-python="${EPYTHON: -3}${threads}" + } + python_foreach_impl run_in_build_dir configure } src_compile() {