gentoo resync : 30.06.2018

3 files changed, 87 insertions, 3 deletions

diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 0ce23046149b..076ff2392bcc 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,6 +1,8 @@
 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 1848 BLAKE2B 9da9a76345adb0d3efc94ff27603634f73397f758a255c16dd84f57ae94bcfbe092878e6f72a4d7dca818de45c75768be853048db6e4fcef163c2074c4a772b1 SHA512 344223b9db341f944a0ece4c94b9fec1dba2bfa0e61389fa991401eb1132db418f1547dd89904a8de9cf9cbfeaa050b8e9c1c15ed4f0455a2d440b19389a282b
-EBUILD graph-tool-2.23.ebuild 1832 BLAKE2B 0c41c1cf6a811ae3fda42f479074f940ff3c90dfb51ac82d9d7504bd8bac17500783d76f380359eb74936afe1e7b5e66a8c61b99fbf019e55cd8e2799357387f SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127
+EBUILD graph-tool-2.23.ebuild 1831 BLAKE2B 4cd53d8c90ff890a82fbd97d58bb519097d51065d4786e27b832bb2220791c550959fb5bdefda400f15ac11b28080329607d742378d2a71052ad6b93f6a0c68a SHA512 36a6f657ddc2e6248f3e0918a869f70f8b6db423f803bc7b10c97127e40e615de3aafe5b4d6ef2902800d7e75844f6a73664597ff2cf21f450d1329cfe94f4bf
+EBUILD graph-tool-2.26.ebuild 1832 BLAKE2B 5cb905359fb030560de7295934c766de05e044733876a7c7397f98ae3e42f0da8c7cc5a84876d047ab8903aa51d8bd6bf37d6322f553adeb4975498af24de5a3 SHA512 939c4160cf8d58d7eefc55d64c3512702deabb847599ee66851e67abde7e3318e87287cce7033756ce98d0b68a171dcccbc85fd99778465a25b27178b3d6fb4e
 EBUILD graph-tool-9999.ebuild 1832 BLAKE2B 0c41c1cf6a811ae3fda42f479074f940ff3c90dfb51ac82d9d7504bd8bac17500783d76f380359eb74936afe1e7b5e66a8c61b99fbf019e55cd8e2799357387f SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127
 MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
diff --git a/dev-python/graph-tool/graph-tool-2.23.ebuild b/dev-python/graph-tool/graph-tool-2.23.ebuild
index cf9f4302985a..f712753ab80c 100644
--- a/dev-python/graph-tool/graph-tool-2.23.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
diff --git a/dev-python/graph-tool/graph-tool-2.26.ebuild b/dev-python/graph-tool/graph-tool-2.26.ebuild
new file mode 100644
index 000000000000..0a0666dfb18c
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.26.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/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:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-mathematics/cgal-4.9
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash
+	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() {
+	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}"
+	}
+	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
+}