[gentoo-commits] repo/gentoo:master commit in: dev-python/graph-tool/

["David Seifert" <soap@gentoo.org>]

commit:     930ebed89589c69ce62f3821d91e4c1386341c4b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:45:58 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 11:46:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930ebed8

dev-python/graph-tool: Update live ebuild

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/graph-tool/graph-tool-9999.ebuild | 58 +++++++++++++---------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index aa07c37..4c2f617 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,59 +1,61 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+EAPI=6
 
-inherit check-reqs toolchain-funcs python-r1
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
+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="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	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="http://graph-tool.skewed.de/"
+HOMEPAGE="https://graph-tool.skewed.de/"
 
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+cairo openmp"
 
-CDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.54.0[python,${PYTHON_USEDEP}]
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-3.5
+	sci-mathematics/cgal
 	cairo? (
 		dev-cpp/cairomm
 		dev-python/pycairo[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
+	)
 	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	dev-cpp/sparsehash
 	virtual/pkgconfig"
 
-# most machines don't have enough ram for parallel builds
-MAKEOPTS="${MAKEOPTS} -j1"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # bug 453544
 CHECKREQS_DISK_BUILD="6G"
 
 pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	check-reqs_pkg_pretend
 }
 
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	>py-compile
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
 	python_copy_sources
 }
 
@@ -73,19 +75,11 @@ src_configure() {
 }
 
 src_compile() {
-	python_foreach_impl run_in_build_dir default
+	# 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
-	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
+	find "${D}" -name '*.la' -delete || die
 }