Version bump.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 99 insertions, 8 deletions

diff --git a/dev-python/graph-tool/ChangeLog b/dev-python/graph-tool/ChangeLog
index eb56e2e56096..51d2ada20489 100644
--- a/dev-python/graph-tool/ChangeLog
+++ b/dev-python/graph-tool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/graph-tool
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.7 2013/03/23 17:51:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.8 2013/06/04 21:13:27 radhermit Exp $
+
+*graph-tool-2.2.24 (04 Jun 2013)
+
+  04 Jun 2013; Tim Harder <radhermit@gentoo.org> +graph-tool-2.2.24.ebuild,
+  graph-tool-9999.ebuild:
+  Version bump.
 
 *graph-tool-2.2.23 (23 Mar 2013)
 
diff --git a/dev-python/graph-tool/graph-tool-2.2.24.ebuild b/dev-python/graph-tool/graph-tool-2.2.24.ebuild
new file mode 100644
index 000000000000..09f15f3809d1
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.2.24.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.24.ebuild,v 1.1 2013/06/04 21:13:27 radhermit Exp $
+
+EAPI=5
+# python3 missing from graphviz
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs eutils toolchain-funcs python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.skewed.de/graph-tool"
+	inherit git-2
+else
+	SRC_URI="http://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/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+
+CDEPEND=">=dev-libs/boost-1.46.0[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}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	media-gfx/graphviz[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# most machines don't have enough ram for parallel builds
+MAKEOPTS="${MAKEOPTS} -j1"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	>py-compile
+	python_copy_sources
+}
+
+src_configure() {
+	python_parallel_foreach_impl run_in_build_dir \
+		econf \
+			--disable-static \
+			--disable-optimization \
+			$(use_enable openmp) \
+			$(use_enable cairo)
+}
+
+src_compile() {
+	python_parallel_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_parallel_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
+}
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index e77574845477..ff80c900bb2e 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.4 2013/02/10 11:06:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.5 2013/06/04 21:13:27 radhermit Exp $
 
 EAPI=5
-# python3 dropped until scipy reinstates support
+# python3 missing from graphviz
 PYTHON_COMPAT=( python2_7 )
 
 inherit check-reqs eutils toolchain-funcs python-r1
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="+cairo openmp"
 
-CDEPEND=">=dev-libs/boost-1.46.0[python]
+CDEPEND=">=dev-libs/boost-1.46.0[python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
@@ -34,7 +34,7 @@ CDEPEND=">=dev-libs/boost-1.46.0[python]
 	)"
 RDEPEND="${CDEPEND}
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python]"
+	media-gfx/graphviz[python,${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
 	dev-cpp/sparsehash
 	virtual/pkgconfig"
@@ -58,7 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	python_foreach_impl run_in_build_dir \
+	python_parallel_foreach_impl run_in_build_dir \
 		econf \
 			--disable-static \
 			--disable-optimization \
@@ -67,11 +67,11 @@ src_configure() {
 }
 
 src_compile() {
-	python_foreach_impl run_in_build_dir default
+	python_parallel_foreach_impl run_in_build_dir default
 }
 
 src_install() {
-	python_foreach_impl run_in_build_dir default
+	python_parallel_foreach_impl run_in_build_dir default
 	prune_libtool_files --modules
 
 	# remove unwanted extra docs