From: David Seifert <soap@gentoo.org>
Date: Thu, 30 May 2019 16:50:55 +0000 (+0200)
Subject: dev-python/graph-tool: Sync live ebuild
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=82815d81dfc4a3ed2ab6fdf981123143d7000337;p=gentoo.git

dev-python/graph-tool: Sync live ebuild

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: David Seifert <soap@gentoo.org>
---

diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index b3cff09874f7..722d8632350d 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
@@ -25,19 +25,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat
+	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat:=
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-4.9
+	sci-mathematics/cgal:=
 	cairo? (
 		dev-cpp/cairomm
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	)
 	dev-python/matplotlib[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-cpp/sparsehash
-	virtual/pkgconfig"
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
 
 # bug 453544
 CHECKREQS_DISK_BUILD="6G"
@@ -58,15 +58,12 @@ src_prepare() {
 }
 
 src_configure() {
-	local threads
-	has_version 'dev-libs/boost[threads]' && threads="-mt"
-
 	configure() {
 		econf \
 			--disable-static \
 			$(use_enable openmp) \
 			$(use_enable cairo) \
-			--with-boost-python="${EPYTHON: -3}${threads}"
+			--with-boost-python="boost_${EPYTHON/./}"
 	}
 	python_foreach_impl run_in_build_dir configure
 }
diff --git a/profiles/package.mask b/profiles/package.mask
index a4bb98e0b24a..6cd6edfe868c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -373,6 +373,7 @@ sys-boot/systemrescuecd-x86-grub
 >=net-mail/libpst-0.6.66-r2
 >=net-proxy/trojan-1.12.2
 >=dev-python/graph-tool-2.27
+=dev-python/graph-tool-9999
 
 # Robin H. Johnson <robbat2@gentoo.org> (25 Mar 2019)
 # Requires >=dev-lang/lua-5.3 which is masked