bump; clean old impl, rm old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 17 insertions, 95 deletions

diff --git a/dev-python/graph-tool/ChangeLog b/dev-python/graph-tool/ChangeLog
index d21db3f15953..2ab0c83fac7a 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.19 2014/10/14 02:57:16 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.20 2015/01/14 03:43:42 idella4 Exp $
+
+*graph-tool-2.2.36 (14 Jan 2015)
+
+  14 Jan 2015; Ian Delaney <idella4@gentoo.org> +graph-tool-2.2.36.ebuild,
+  -graph-tool-2.2.31.ebuild, -graph-tool-2.2.35.ebuild, graph-tool-9999.ebuild:
+  bump; clean old impl, rm old
 
   14 Oct 2014; Ian Delaney <idella4@gentoo.org> graph-tool-2.2.35.ebuild,
   graph-tool-9999.ebuild:
diff --git a/dev-python/graph-tool/graph-tool-2.2.31.ebuild b/dev-python/graph-tool/graph-tool-2.2.31.ebuild
deleted file mode 100644
index cd2e0c9a2dce..000000000000
--- a/dev-python/graph-tool/graph-tool-2.2.31.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 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.31.ebuild,v 1.1 2014/04/01 07:41:41 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-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="${PYTHON_DEPS}
-	>=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-3.5
-	cairo? (
-		dev-cpp/cairomm
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-python/matplotlib[${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-2.2.35.ebuild b/dev-python/graph-tool/graph-tool-2.2.36.ebuild
index 4caa02ae467c..6537038d64d1 100644
--- a/dev-python/graph-tool/graph-tool-2.2.35.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.2.36.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.35.ebuild,v 1.2 2014/10/14 02:52:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.36.ebuild,v 1.1 2015/01/14 03:43:42 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit check-reqs eutils toolchain-funcs python-r1
+inherit check-reqs toolchain-funcs python-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.skewed.de/graph-tool"
@@ -46,7 +46,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 CHECKREQS_DISK_BUILD="6G"
 
 pkg_pretend() {
-	if use openmp ; then
+	if use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
 	check-reqs_pkg_pretend
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index e2bc16420be6..9086fa954808 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-2014 Gentoo Foundation
+# Copyright 1999-2015 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.8 2014/10/14 02:54:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.9 2015/01/14 03:43:42 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit check-reqs eutils toolchain-funcs python-r1
 
@@ -45,7 +45,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 CHECKREQS_DISK_BUILD="6G"
 
 pkg_pretend() {
-	if use openmp ; then
+	if use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
 	check-reqs_pkg_pretend