| 1 |
commit: 82815d81dfc4a3ed2ab6fdf981123143d7000337 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 30 16:50:55 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 30 16:50:55 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82815d81 |
| 7 |
|
| 8 |
dev-python/graph-tool: Sync live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-python/graph-tool/graph-tool-9999.ebuild | 21 +++++++++------------ |
| 14 |
profiles/package.mask | 1 + |
| 15 |
2 files changed, 10 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild |
| 18 |
index b3cff09874f..722d8632350 100644 |
| 19 |
--- a/dev-python/graph-tool/graph-tool-9999.ebuild |
| 20 |
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild |
| 21 |
@@ -1,14 +1,14 @@ |
| 22 |
# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=6 |
| 26 |
+EAPI=7 |
| 27 |
|
| 28 |
-PYTHON_COMPAT=( python2_7 python3_{5,6} ) |
| 29 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
| 30 |
|
| 31 |
inherit check-reqs python-r1 toolchain-funcs |
| 32 |
|
| 33 |
if [[ ${PV} == *9999 ]]; then |
| 34 |
- EGIT_REPO_URI="https://github.com/count0/graph-tool.git" |
| 35 |
+ EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git" |
| 36 |
inherit autotools git-r3 |
| 37 |
else |
| 38 |
SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2" |
| 39 |
@@ -25,19 +25,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 40 |
|
| 41 |
RDEPEND=" |
| 42 |
${PYTHON_DEPS} |
| 43 |
- dev-libs/boost:=[context,python,${PYTHON_USEDEP}] |
| 44 |
- dev-libs/expat |
| 45 |
+ >=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}] |
| 46 |
+ dev-libs/expat:= |
| 47 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 48 |
sci-libs/scipy[${PYTHON_USEDEP}] |
| 49 |
- >=sci-mathematics/cgal-4.9 |
| 50 |
+ sci-mathematics/cgal:= |
| 51 |
cairo? ( |
| 52 |
dev-cpp/cairomm |
| 53 |
dev-python/pycairo[${PYTHON_USEDEP}] |
| 54 |
) |
| 55 |
dev-python/matplotlib[${PYTHON_USEDEP}]" |
| 56 |
DEPEND="${RDEPEND} |
| 57 |
- dev-cpp/sparsehash |
| 58 |
- virtual/pkgconfig" |
| 59 |
+ dev-cpp/sparsehash" |
| 60 |
+BDEPEND="virtual/pkgconfig" |
| 61 |
|
| 62 |
# bug 453544 |
| 63 |
CHECKREQS_DISK_BUILD="6G" |
| 64 |
@@ -58,15 +58,12 @@ src_prepare() { |
| 65 |
} |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
- local threads |
| 69 |
- has_version 'dev-libs/boost[threads]' && threads="-mt" |
| 70 |
- |
| 71 |
configure() { |
| 72 |
econf \ |
| 73 |
--disable-static \ |
| 74 |
$(use_enable openmp) \ |
| 75 |
$(use_enable cairo) \ |
| 76 |
- --with-boost-python="${EPYTHON: -3}${threads}" |
| 77 |
+ --with-boost-python="boost_${EPYTHON/./}" |
| 78 |
} |
| 79 |
python_foreach_impl run_in_build_dir configure |
| 80 |
} |
| 81 |
|
| 82 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 83 |
index a4bb98e0b24..6cd6edfe868 100644 |
| 84 |
--- a/profiles/package.mask |
| 85 |
+++ b/profiles/package.mask |
| 86 |
@@ -373,6 +373,7 @@ sys-boot/systemrescuecd-x86-grub |
| 87 |
>=net-mail/libpst-0.6.66-r2 |
| 88 |
>=net-proxy/trojan-1.12.2 |
| 89 |
>=dev-python/graph-tool-2.27 |
| 90 |
+=dev-python/graph-tool-9999 |
| 91 |
|
| 92 |
# Robin H. Johnson <robbat2@g.o> (25 Mar 2019) |
| 93 |
# Requires >=dev-lang/lua-5.3 which is masked |
Archives