Bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 101 insertions, 12 deletions

diff --git a/dev-python/graph-tool/ChangeLog b/dev-python/graph-tool/ChangeLog
index 4b37207624c7..99cc4b5a9019 100644
--- a/dev-python/graph-tool/ChangeLog
+++ b/dev-python/graph-tool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/graph-tool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.29 2015/04/18 07:54:02 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.30 2015/04/27 09:20:56 patrick Exp $
+
+*graph-tool-2.2.42 (27 Apr 2015)
+
+  27 Apr 2015; Patrick Lauer <patrick@gentoo.org> +graph-tool-2.2.42.ebuild:
+  Bump
 
 *graph-tool-2.2.40 (18 Apr 2015)
 
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index d9dcf030a826..c7fea49a4030 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST graph-tool-2.2.36.tar.bz2 15050904 SHA256 e1e030306480393464501cbcf3f3c938c2105c95fd0d67a8fe8bb4296e0be872 SHA512 3867fed367b547f28147c3234cf391d5415e5cf4594bc495abab1e1f827ba89af44d9d2bc92ee604ed184ce48f1644076aa852a0035fa2f8cdb449157d6b32bc WHIRLPOOL 741091c5504234767ed2662f69307aeaffb344ec132f708b494288d03485ff1910a967b244c35f5e7b77bad0564b249fd7b80ddb39051928f9806310c4d7843e
 DIST graph-tool-2.2.38.tar.bz2 15050391 SHA256 7b4181184acb28e02e0c013858d69f42af4d7a6ed3327521f8eccc0be538012c SHA512 d6a4299dc0df4dbf1485656f9c2bdc3c00f37d342b313af4116f00bfbf31c7d425873aa98e4361115985b87695080fcac6cc97e7930e6903d50a9d61ccf81e60 WHIRLPOOL c03f82fe6b151361c4b6f6979117dd35e2fe4913caacc1e3ca0749c38a7e8a3c6034a7dbd676294a3e23926e2b42c7ead9ab38b19f5d37b278a773971d8e1fc1
 DIST graph-tool-2.2.40.tar.bz2 15058030 SHA256 5ccf2f174663c02d0d8548254d29dbc7f652655d13c1902dafc587c9a1c156e7 SHA512 db3bcbc49d724185d2da8c636c9c7f0aaae39fcae8ca6454bbad1c893dd77ea96eca5512f338d1f06f6ea4ef181f88a8095c5b40493d63b22174fb0fde8bfe83 WHIRLPOOL eeb8eaa1fae59de3d4d1c360a465bdb5e443823e3c0b703e7edee82c81992f443a8a744fd41c83516ea025de5b72c6bf89032d5a458bb112e2e3ea34393f9e74
+DIST graph-tool-2.2.42.tar.bz2 15058831 SHA256 e975c0836a06d07aff2d4c54472de710566f061a97e9775085a7aa5741ab9888 SHA512 921f5c81a34a3ad0a83c2bc7c2c90befe220bbdfcf5ea005fa43bc1cc45dd66660b73b792ba8826f7b536ba4d446f9aeaa8ca721fcc6b7c4686e369f7b27f936 WHIRLPOOL ef598ba8751a2975cca053f89e8abf78461344c790e1b99849a1ca209af0c05e2d913d5fbd3e105422fa90eea77a874403da597689f11f17e4b37a1781871be8
 EBUILD graph-tool-2.2.36-r1.ebuild 2080 SHA256 111dc1cc4c5d78fc0f380d863517aaeb9dd4b04367df8be37514864130f7db81 SHA512 88d4c5231213ae03387d9d8a6437ee0101689765c065d772a21af3208d983365b7e833b8f9d1faf413b9bb9a5474104cef3f95e80146ba2e3537d4ae68aae9cc WHIRLPOOL 8307d0a11547d84ab0057c4e871aa99e1c33855ce15073df4f5e66b9ec5b9438abc381fbaea04af6f3c9aa1bfe8bafef0b968d673cc8a5a318ec4b88114d4f1c
 EBUILD graph-tool-2.2.36.ebuild 1935 SHA256 5ca0dbf521e6d3b163aee977bd41d60636f94e6d163c1ea300b8d7e941f0ccc1 SHA512 31a91b1dc06b0c239271c93a6059dfdd8a240a7c080e494c05464c8f460e02ed8ab92af8ad72eeece89cda08d48004b72bc4f9743547ca61e03e77748a7b8397 WHIRLPOOL 4a78e46be4d3bd52334f7fe8ec81c33c43363e7bdb0b2e24974d8e272880efa3c40ea1108a1eaf27618c623eef94f3515b93f8702fc54d0902cc85291f95ae10
 EBUILD graph-tool-2.2.38.ebuild 2081 SHA256 81af7574fdaf2e46582f88e879e8765de45348678a2ac0f3f31b6f06046e414d SHA512 c8fc32c47c605d4d9e627928da6edcc2122fcf828af109b8adb3a3a79acc8f7b2f490a001ac1bad9dcb89ddfa3f13fa15a26bc863530e85ce28c48acaef253ed WHIRLPOOL 6fa7106ce4ec7b5df54aded34e3a83a5153c1859fc26bab482767f4385bc8da2661ce8c89ac027b77dfb5345929743aa4e2f51e8b07b9285155655f5e5c40cbe
 EBUILD graph-tool-2.2.40.ebuild 2151 SHA256 316a79426d2fed119d89ea211ae0e044fee37f4779d0fda1ac14203780edf894 SHA512 5ac20cf3911ab351e7184b14cbd543438afb2fd8c966fdae9109b7555897409b4c692a21729d3d49f0cb9ffe8018a6792f33d631d58ac7190b32674b08952cb7 WHIRLPOOL b646af5e7c3bc54a54cb2c8723ef09fa1da967adb5be9e3fdad7b9d62ec8f07bfc4154e5376ff9d19e69ae0d364d25ef40fb04d1b666a8f400c4205c0aafbe54
+EBUILD graph-tool-2.2.42.ebuild 2151 SHA256 28088d415cf724633b2a4124479637adc00336ddc69b89f9d0d111d134c6091f SHA512 c8cb2eb36c32b14ed63dc50d4e63d2e839384a840639b486bc3999b283340b0cf28b472d349da967a999694cae3eae826cf11a02e405c0b04a8dc632bc19e349 WHIRLPOOL f8db61ae3fa063a78fed1fa62a9f2497ee4ce87ff120aa4badced75d166d4fc672208b0527108d09701e838e627e97be15a8013074c60324e51a70519a18cf79
 EBUILD graph-tool-9999.ebuild 2085 SHA256 e509b6a288d2ee4ffbdaab1b800a52a8d2633e176dfe5b6b8b03425013c67bfb SHA512 4fe0157bb3e1ec1b7365d5f711aeebdb6d603667ee7a17071bc86e014c368bb627d94e18bc4ad0666983586f990a518cb9fe9d601d1728cb549bc8605db0a31e WHIRLPOOL 83e0def47e7d4c9b8e396f7efb7a51f452fd8042c344623303eb4e44cf83caaaa9ed161c7ce9e255642bda4b5a9b87cab1d87f3c45df87703090e80e90f14818
-MISC ChangeLog 4229 SHA256 31376c54386a9d760409114cbc5bcc242e21ec29fefdb520c53234a8a356d247 SHA512 cd5aa5f9d6a9a4d8896c298a5ce968bbc32ab226fb650625d380595b1341c29df43223a9e362d7195e4840593b236c738b7f5214e8a2489527b154a551b4b0c6 WHIRLPOOL e5d4ed9f3fbe6af2e7ebfec1bb587ea0ae96a897eed4e001b2e2a3dacb37c155067911e5e09e68044ae880285cc99972fcd90ae7d26998fb187884cdbbc2e4ab
+MISC ChangeLog 4348 SHA256 8187c64323cb42f5b94f47c80852702567244e8921f9e48217d8b87f501395af SHA512 16fc0e24e35a745154fd4a09814ba669287b02ff507295c9d518bba261d5cee235dd41e60f44e091e75f6a77215ecde48830e6bcfa48f0c147a069f61d21e7b3 WHIRLPOOL 381487731589cc7fc165b4489d122d95322dfa117d90f2e4382a85c30fbe8e19d7a787ec30780c2ac4c12c5ed6125ac35abdc93b51336e64c2f0a808710449b0
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlUyDbMACgkQso7CE7gHKw28WACfWYxxOUKZjeQCQ3dONlaKFQjQ
-xYIAnjaVbztLcVcNE3IY42TtZhcvISOF
-=ZiVk
------END PGP SIGNATURE-----
diff --git a/dev-python/graph-tool/graph-tool-2.2.42.ebuild b/dev-python/graph-tool/graph-tool-2.2.42.ebuild
new file mode 100644
index 000000000000..436e3a6e83d5
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.2.42.ebuild
@@ -0,0 +1,92 @@
+# 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.42.ebuild,v 1.1 2015/04/27 09:20:56 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit check-reqs toolchain-funcs python-r1
+
+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"
+	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"
+
+# Bug #536734; configure sets boostlib 1.53.0 but 1.54.0 is required 
+CDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.54.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() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	>py-compile
+	python_copy_sources
+}
+
+src_configure() {
+	local threads
+	has_version dev-libs/boost[threads] && threads="-mt"
+
+	configure() {
+		econf \
+			--disable-static \
+			--disable-optimization \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="${EPYTHON: -3}${threads}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+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
+}