gentoo resync : 02.06.2019

6 files changed, 97 insertions, 19 deletions

diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 3b2aa3e3aa2e..7eeb445b2059 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,8 +1,10 @@
 DIST graph-tool-2.19.tar.bz2 15147961 BLAKE2B 93f4220d6f86ed5e18619a4300272185673d54418b6b73eb9cf2264d698b9f66589f22fe9906082c5b6360e037115c6df7c52871e33c1dcb8ec64c3596b76bda SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84
 DIST graph-tool-2.23.tar.bz2 14998733 BLAKE2B 5eef201f9751ba0ee64d3f3d0694631b23b8ee7799d0e0a1a52125b3b355ee30bb59400665404cd040df29ab2534dc0fdf940d2f3abdb1ddfff0894fb150ed3b SHA512 bd7e493806152d004ed8fcd5cd93f8a27200b0acacde07026ad6f83e8b9a0cdbdedfee79f5ff4c41de179ea3293a1d100571501e8791dad2ff608ecb424a9e36
 DIST graph-tool-2.26.tar.bz2 15000764 BLAKE2B eb4db3d6753b4af8e38cbd9a71e5e5a6368e30556b83f8b9b9a67d8ede2fea9789bb959eb405eb1896c69c487915f18849146bc5fbd95bea1b7910c7c871d577 SHA512 97f51f777f45383780f765277d1af6ae4879ec39243e9b5c11a5c8f58e952e34c301d51e4ce86a0de1bb7b86bf7150d85ef182693e99f319a19a36d2cc25742a
-EBUILD graph-tool-2.19.ebuild 1841 BLAKE2B f13e4b7c6964ecc45ea006c704f951d9d8f8c26e3a31590f4752964439de34cedf08d2c9475dccbd2a513b9385ac1bcf0f3e5d66e4ad4ab0ab196827683c0dd5 SHA512 a48d35efe8a4334cd68ee4e8b50b979c26a28eb22c93fba77773fba7d71132f6a42f7d8cc400c8814147a54eec28dd804325893d71c27dfec1d64bcc9e9fbf21
-EBUILD graph-tool-2.23.ebuild 1826 BLAKE2B b5d2945c8a72c143fb8f14b0276c1c87e84ae54b44688db2a76e25c90d64d429f6def85accd5ae633dfcc070f73a4249dbd6d2c6f795aa6f9bce0161bbeb985d SHA512 79f24d5b86153d62a91ba440a9809202e251daccb63f6053290308aa3d31d395be9270aa78878f8238497b590eb93a5ae86accb504daef15c20cddb01b2feeaf
-EBUILD graph-tool-2.26.ebuild 1827 BLAKE2B ab12d6856d360d2154525866986087a5e1fc673c901f1fbb93908f6d17af2b17ae1f418ec2e17932b0fa498858115874f0e4aac058d7afeedf1eee4a8842fabc SHA512 336f4ddc81de2746678360f6be8d0ff594550c13919da72cd24ef5d7084c64d657dcd05c390f09d017bb4821b6c5060b68e5b66c02db5052a26e77537da85abb
-EBUILD graph-tool-9999.ebuild 1827 BLAKE2B ab12d6856d360d2154525866986087a5e1fc673c901f1fbb93908f6d17af2b17ae1f418ec2e17932b0fa498858115874f0e4aac058d7afeedf1eee4a8842fabc SHA512 336f4ddc81de2746678360f6be8d0ff594550c13919da72cd24ef5d7084c64d657dcd05c390f09d017bb4821b6c5060b68e5b66c02db5052a26e77537da85abb
+DIST graph-tool-2.27.tar.bz2 14989318 BLAKE2B 1fc307f33fc3e4642e91c20cc4988915cae61306ac445be070f19c263e2d2a74a241d651dd9c4b6b78d5f28fc8cde00789cf90db53cbae6db0583cf216824301 SHA512 39ea5e76a91f03bc2475d80df6001c87fc47517d279e27fdab413aec8982146993d3c4a370f85cb28a53e5c974b0e90b0fb22538f3d66ef9cb635abf6188d434
+EBUILD graph-tool-2.19.ebuild 1847 BLAKE2B 586f2f7ea0af6a41ef67ed1717c914b6f54978b1e28dbb01fe272fbef49d73747f352ee73eb5ff3c6e7a3ba9d83afbb920ae433ee489a0ea0051128f596f317d SHA512 2fd9c982640b48cb13d198bf9b29bc14b9de9c4145d80c585903b4744a00a00a6f4d619938c0b40a2432516fae1fd1a1115599d63fbd22f5c28bab8658f33f54
+EBUILD graph-tool-2.23.ebuild 1832 BLAKE2B 39d685863139deba4614e2279f71b8ba74db7950fb4ebeed35dc334ca7d1b57fbb69d031fd1350625f4f29fc07eac7e7d723a102340871aa3be2202bff49d399 SHA512 2a5986c429a9aa2ed1c1470bc2dd71a5485e80b19063b0f9862a1cfffc265d3ead53eb76126202923782ef5c95a327fcf98dc60d8a21ff2f75a5f4efd9bee762
+EBUILD graph-tool-2.26.ebuild 1833 BLAKE2B 0a6bac1cf32f545ccaf626f00726e8053958aa026bf6f9ca7d12f62fc9e44b45af85e8c4071751f6b4473196b7fa0c8e8250b2535078b5fecadd938bc05c5458 SHA512 bebc147f099d820e1c5c3c4916e20915ad9612b442a82762c2a7c644258c096d37624c5b62d20bdf5dc79b1522b9cc8a6b5bd2a26b714de82da6d15e23d4c100
+EBUILD graph-tool-2.27.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
+EBUILD graph-tool-9999.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
 MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
diff --git a/dev-python/graph-tool/graph-tool-2.19.ebuild b/dev-python/graph-tool/graph-tool-2.19.ebuild
index 25260b09ba80..23f0806166cf 100644
--- a/dev-python/graph-tool/graph-tool-2.19.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.19.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.23.ebuild b/dev-python/graph-tool/graph-tool-2.23.ebuild
index b42f702c4c8b..68411e981641 100644
--- a/dev-python/graph-tool/graph-tool-2.23.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.23.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.26.ebuild b/dev-python/graph-tool/graph-tool-2.26.ebuild
index b3cff09874f7..70694fddaf91 100644
--- a/dev-python/graph-tool/graph-tool-2.26.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.26.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.27.ebuild b/dev-python/graph-tool/graph-tool-2.27.ebuild
new file mode 100644
index 000000000000..722d8632350d
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.27.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	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"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=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:=
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="boost_${EPYTHON/./}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	# most machines don't have enough ram for parallel builds
+	python_foreach_impl run_in_build_dir emake -j1
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -delete || die
+}
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
 }