bump; clean old impl, rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 25 insertions, 105 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/Manifest b/dev-python/graph-tool/Manifest
index 4db778d4afac..ec62b0432916 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST graph-tool-2.2.31.tar.bz2 29643473 SHA256 7c1fa8edcef12d14c5e7ed15057778f533f69e38edb1aa70c6e89297ba3b2f1a SHA512 ef7f7d87747b7f85d43405f718433faed447b6c692fad0137b09358aa63ca563f7f591e474b87b395f0f57b7c4814ff70a476ec5e06b438549f20984d0d17e1b WHIRLPOOL b2c38d2308afdafb5f780397374980eef8d35e2558782d47bd9fbd22305d0cd31920cd50b1e13844349d2209c5d2925756e95d2762cb270fca355d781b76bd49
-DIST graph-tool-2.2.35.tar.bz2 15031958 SHA256 af99b26da18c5175c4f12a0761d9c70164ca083b16df3bf8404f9a2ab3408989 SHA512 e4fd524e5955fb9e926677e7330d476ce903efdd18d17432f29e07ca98a31481d3f2eecb94226684698ee544122f0436e3353cb8c0a746fe40404f190f277a61 WHIRLPOOL b53a14ed0cbd98e1020687c1f9c5d3181f0229699323bd11b686cc81351efd79b5362108f25e8c3f8e7d91fe0089b01d296b414c6aac25404dc56efb5b9ec71f
-EBUILD graph-tool-2.2.31.ebuild 1910 SHA256 c3034a493eb89fc5f5ca6fc02c64996f0effa4fd521d41a55d06eb9c1e05e54a SHA512 8dbc1cfcc91ad2e93f22742ec866bffdebb72cc57a9fbe32ab0ce1672903d359cee215d19d2213d8bd6d7db1d811c1aecf13b4a2ee4cf6bef10fe17ccfb3190e WHIRLPOOL 975f6982502f5159e12dac5deb4f4b339c3be2bf09d5b79790579551b2af55a945241aa55a1627d8214041e03adb211ca43cbf0c0017b5fb465d9619de0982a5
-EBUILD graph-tool-2.2.35.ebuild 1925 SHA256 792813c8f216675c4c78c660ba7c821bae14a60f462abfc6c8e18a440f61d10f SHA512 32f2178670185b82882a89334e65fa5a97359becd78c934bcce945419af28aef0fd1ae374d6233c6452ef4b22c14b3c72603934209048f780b16d47feb11eaaa WHIRLPOOL 4c47c6dfd08aacf266dc29f01ee514188d5cb2d3ab5f99a3a2c04ec9d6658408e62bdcfd82b3a564f1860cde4c13068557531100d87a95153fc3dda96e4262f7
-EBUILD graph-tool-9999.ebuild 1910 SHA256 af60246fcfbe969e7511beccdf3709b73781f2562e8130621b6709eadb21e3cb SHA512 2673879374e6896253cea41af54b2c7188ade562567073cb30af40bf8eb13e16e1f003ae0db7b3c376b71c5a71dd123b2e7e7b6dd7c3d3269b7e5d32af55b8f3 WHIRLPOOL c0192d80ffa1257597587624334d9a78cb49b6b49835c4a3a43eaef985572d3a8d6690ec14cbca7a9949d74f731610ae04b2615b6686a14b422c90ad869e85bd
-MISC ChangeLog 2740 SHA256 26f1b1fd03493e1ff1d7c681319b2cc706911529633884dd7197d14f25bcb764 SHA512 5e508556ebebaac8692a71f398259d7c21e51d38070a4c9a564e70a13cd4e66b8010b6247c9b04b125c44cc9a3008d4e10a80cd6c0b232a31486a0e2c56de9b8 WHIRLPOOL 18623a5546934b290e3637dc2addbe302421dfa4d5d87273dfff46f4a5b2d2f3f486e3b3ec90fca174bf6f2d7a88124c8049239eb363b4e5f296955fd7d48d99
+DIST graph-tool-2.2.36.tar.bz2 15050904 SHA256 e1e030306480393464501cbcf3f3c938c2105c95fd0d67a8fe8bb4296e0be872 SHA512 3867fed367b547f28147c3234cf391d5415e5cf4594bc495abab1e1f827ba89af44d9d2bc92ee604ed184ce48f1644076aa852a0035fa2f8cdb449157d6b32bc WHIRLPOOL 741091c5504234767ed2662f69307aeaffb344ec132f708b494288d03485ff1910a967b244c35f5e7b77bad0564b249fd7b80ddb39051928f9806310c4d7843e
+EBUILD graph-tool-2.2.36.ebuild 1913 SHA256 146c46769aa15cbb27f9feb09309432d8b9d73a8ebbe68d81e548d0a290e79ea SHA512 d14c2b45ec4e58541291390d31aba815c34c66199179b368314f8f240dcb8749128370f37fce6fba016c978664d669166ddf050a96da01f3bee6058268195fda WHIRLPOOL 9443dda13994b76e2f8054a4c3d5bd2361e62e53c3ee27c5b59ca1a7bc36e9f9c37712aa9f6d14f02a61d579ccf0d5f5873364c43b395690c0a4c5f1244e3a2a
+EBUILD graph-tool-9999.ebuild 1905 SHA256 f2a761aa7f98c5d620dd83ea907bf1cde25a1bcd5cbc3218f8a3731e82b516cd SHA512 59a8d1a60570162145814dbb1507fda654ca22b64d6bc72bdd3091b8b00b66ddff3251bdb22a3716e4a01ccbdea4cbbd14d587f3be683a43fc894315edede774 WHIRLPOOL fe12c9da5062680bdb08bc307af925d855fe98d23807b9381b7ddcfb198aeb194fe242853c59c1141c12c6c25257619a7b1c81d69728c985d7a082582a5b7342
+MISC ChangeLog 2961 SHA256 cd8c104fae964c0e9979d7bf705348b6233143e39177b1e64ffdc7e20609899a SHA512 dc3548032ac3ebb20a1e175aa2684319eaf8351a4a07747b71a06b96fac3e46d237a7d8f013a842883ea96cc4fdc5ae684b57b1cb8f2beb710498693779a143a WHIRLPOOL da672ed888fa1824ea32b17f0019368d909fdd7ff76b5e710400fe0580ab156a6f05c25ba2df7e6d53229037d193e71d54793db3ff98c3f130d11c4d10ca8af1
 MISC metadata.xml 253 SHA256 9f2f51fd5d49ee6b0ef785dd7256455213e0e18e37f23b498cfee07dc1efac7f SHA512 5cb93e348b913d23ba4283ee3baf4a052658e27cbfad60ae3b80e68317909342ad3ec537724886b746f3cc1ada9db3010e41d80b615919d596df11bbe7bc7fed WHIRLPOOL e98beb144d79c5c872f1709991bd5b3ad17b63c494bcd4e9b2282957b309a888788e2b1c3ed8231a108914f76e0bfd21b5bd395236c09c25caa71df3a6063a90
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlQ8kRkACgkQso7CE7gHKw13zwCfQ17/NJj7XxxUUVITJiE1rM4l
-iTEAnji2kEuMclYHz5/KrAXPaqlarDEk
-=iDRK
+iEYEAREIAAYFAlS15fwACgkQso7CE7gHKw0j3ACgp7eB0P2VPtCnYFfb75XU1eGG
+aOUAoLBY8BMwT91gXS/uvX1Cz21hnApH
+=jwIx
 -----END PGP SIGNATURE-----
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