bump; update test phase

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

3 files changed, 97 insertions, 5 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index a5f04fd0005f..ada0b68e184d 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.32 2014/03/31 09:05:43 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.33 2014/04/27 08:15:45 idella4 Exp $
+
+*kombu-3.0.15 (27 Apr 2014)
+
+  27 Apr 2014; Ian Delaney <idella4@gentoo.org> +kombu-3.0.15.ebuild:
+  bump; update test phase
 
 *kombu-3.0.14 (31 Mar 2014)
 
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 37fb97bd6232..bccbbc08ca82 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -8,18 +8,20 @@ DIST kombu-2.5.14.tar.gz 307139 SHA256 2a480d8d676f584f6b7a399514f5effa96ced2ce7
 DIST kombu-2.5.4.tar.gz 300506 SHA256 92cfb82af1d3e8753258d660003769461b75abe0f1a03d720709a211042f358b SHA512 5b6ba84de66f3b86b68778d1473cae4ddbab96f27aedb0906d258b496be3180fcd72c387bf76e46f98f899090cd1f9d25e38a8278b903759127a3e411c581604 WHIRLPOOL c94b54b35536a287ebd16b7f18634a918cba03702d38ccc70391671cce3e29e1a1ef7218bb853bad205eaa58740a3f990af80df8d71fed7f3e507f345dc358c7
 DIST kombu-2.5.6.tar.gz 301670 SHA256 01c0ba72782535df913b519d6509835f8210b4dbfde652d3a1c6f545d737beb9 SHA512 f67354d71ce5f187aa7e914e3e1336ec7b1deb2cba376784b7c9998eb5d12daf4510d0071670f4d3039e8b0b570fed772558b28a37d1680af29721e7aafa7791 WHIRLPOOL 3057c8835cab3dc6ac3ecce8cd36279c61d1b1a40b44cf506fc61d82b41d5d0c3b57cb514d33640010ca313a8d5a4efa60f4bb4a326e0e2b2effed44738d8571
 DIST kombu-3.0.14.tar.gz 340310 SHA256 e64812539ffa1d6f1c6c15aa60721203a102284e30bd8938c0bdd4da6091cf41 SHA512 f56c383230a22e3842f6ce379f385112cc5cff6bbbabe1c36a503e3fa20cb6122d28bc564c347974c79110bb45f5be0c4c469ed45b2e54be76a0d0ad99431121 WHIRLPOOL 3cf0fd5c2494fe95ce01e7d90a58520ea8f99280de27e4403d31774f5c33ddf86a7c924b5fd36b5fc7f06fb7f0f3bd0ad80faa4cefa3d371e0f4b2b11e6b57b6
+DIST kombu-3.0.15.tar.gz 342092 SHA256 8872a52e42f9e08c2c135cc67dbe8eb9f2707a714cb6719f6900c4af66bc5500 SHA512 cb8b19253cdc43d896af7b26301a9fcf0ba4c85aadcd21cffa535702ab72a56ea997e646f708b5f94a08fcdc535d4a31cb0930e82a6c55b973b0228e61cd44da WHIRLPOOL 0c8a9c366bdd2f4f8a61084799422edb80a00d97e3b9b04bc9119ad92388958127df0c0cba8fe95d92fea7d27ea800290fca6f40d536c0a1e1eb867419c0beb7
 EBUILD kombu-2.5.10.ebuild 1979 SHA256 527eb15cd9a3bf496ff86dd670c800aaaa4dc2746e3e2a99eb73f91040f1ec41 SHA512 4ba0a69fa74cb88fa434f0a9027b0964928f3111d8aa6e9844fb8320e5d644caf276c298c0a918e98654ff09258c25931cfa62ced80d6d20eb0196f88ea6b698 WHIRLPOOL 98d62750decbc224f5e6e6613bd2b13fbd496af59e1d1f53ee7e007d7f65da575e0e8750a2f8847fb8b45dc175c245416b502044992477648d8c3ea88a53fbd2
 EBUILD kombu-2.5.14.ebuild 2521 SHA256 b1648e049a4e939ee14c1797ccbe2e3d6a0596c678d70dae003f0d015b5bddb3 SHA512 e6af01d66246217e7ee802ed7e439efeda2c200a33c91121f1afd88b3cb30559a9e7f6e814078dc6709ba942f397dc6c7702f992a1a07bbd05c4c4cc1b4bd2f5 WHIRLPOOL bd6f6b4ec03705f2db1c127d50b045cb2f1ff0a93cb4bbb4aab970a0c2308b796b7f5f90d9cbde9f354b763e71cf8d861900b01f9e00c7693953061a3d9573d7
 EBUILD kombu-2.5.4-r1.ebuild 1774 SHA256 24ba8fc9901782a2b1b910aa48e5a03e8f1485e0a389c8110a84dc21d22606e2 SHA512 212277b03a906f1f60c391e96c12612b9da37a108df045807148413859078eadc7882665d8dd11f4e5ca3f75c6c48e0f651028456a48c019c933cdebf7f3e090 WHIRLPOOL ab234102e82448fd465d986950b93abb03a9795389b8e67f816f334133139bca58a54ddaccb6bec1214529f9a4996938aab66b840ff326f8a2a865fe814dee29
 EBUILD kombu-2.5.4.ebuild 1737 SHA256 3c6a5bf33457365b50bccf1ff587d0a50e6205766262b2951f49889021e93142 SHA512 77e5247696a57371280b0f2ccc906ad9ce849f612ec40475d013e1e6ce3c2bb78ba8a81f34c5eb9724a346ae2f55e08fcdac33333f9ca3af678cb30d1be36b38 WHIRLPOOL f8d5baee045b9ea09c08b686b0b0ff20bd85c152b83e1829fa867bf296c166953b0cbeb5d8d386a9970f448bfabf73c6f35d803c360fcb33d2091d89a1772098
 EBUILD kombu-2.5.6.ebuild 1771 SHA256 5453c0c46a30bedd28a85998dd19c9fd8f91129332042fb5796cfd5a06495d92 SHA512 cc36234cb74fd3ff0c5aef70159bf5b517c85d8ae97a36d7aceb584035b3246892048784b077e00911113a95c2a76bc59cc3393b343ff5841baf55de4e283759 WHIRLPOOL 0fa04938c22375d9babda0d6d0fd7ff28569f4f4d4444b540b79810b783ba8d4dcc74e03cb00f2c073ad8577ce80e3af12b71d5c083966b245667b3009613412
 EBUILD kombu-3.0.14.ebuild 2794 SHA256 1cbe231073a72c78f03481b12ccd45f8466dd363af30f090354a052004ce989f SHA512 41f1b0c014319cb9f3abf2c81779485e431f76cd70baf9038726c3f22288b2e732136d57abe99b5a2c0b599dfb033bed3859f2e1d215bec67033be61ea2a43f7 WHIRLPOOL e5a155496f34415f3925b9a403a96e5632e4ee66617c121439e5330c26f0ed49aaed3c1eb676fb2d4af114799525662b8a60919de74d06592236684918f3ab89
-MISC ChangeLog 5247 SHA256 b0169e69731af1ba77024a92d5eae0ebf35f76f09691154c13f9a51baef3eb7a SHA512 0236e1adce44f25276cffc12813009a9f3df8073d8f1c6182bf266c35ae665fc33fcdacfce1e0a188d84758b39b228a59f78254cffbb6d2fdb8f242ab573e125 WHIRLPOOL e5fa25b6ff2941862d45ab94de03e232f97abe639178b8a31d38944ad1b18a5efc5a22b5e3da9380fe3ce37312f2f55e8c2eaf41f04093f7b7914749680997b2
+EBUILD kombu-3.0.15.ebuild 2944 SHA256 5bf61e8d2e157cafb8d7126397dce09e6197a8760b1a9ec73928e62726aa1fa4 SHA512 0a377e356363e8ccbfc5347b1e037cc14c8a84a4f4a3ef976e9b7d3fa582bfd85a62a7912899fd993078183a0ddc500910c8fe027caf96ca657f0fad1c4c0e01 WHIRLPOOL 600441fc21346bc4856d57d3c6ee401305ced1ce0aef6e9f7bf6da04320f2bf81e99f063c824cc6c8c374e500b7319e1db8d25f9c3a1c74e47f079576a0bb67c
+MISC ChangeLog 5373 SHA256 eadc8bb02e776d7c587d7a102e0972a5b7f10001828eb95f18e3ea9ba36500da SHA512 5d2434bf421737e7f7ed155ea336634914ff0f1aa7759b78934508fba7d64bdef619775942177bec594c30ec58788bbbd5b3684cce9f68e8cd1f23740467e3a5 WHIRLPOOL 6c937f5d170bf0387c5709b63ffecef61b8c617a319923821f1c1140ba609b26a1c03ab1d38203fb6348aadea263080d542ac59a084c4a7d415024b5799482ac
 MISC metadata.xml 496 SHA256 a221bd2f78c6decc3f199c818a13a0c4596e0028ea119af82a1d54dec03e8410 SHA512 af2b75ead1edf44293fed821d8b113e9562a48bc66c191adcd913f265824314b667e8634fedad323dd3dd2a7205135a29f5b29596591e5c44f45ea7dd1440c7e WHIRLPOOL c74ca093c23b7152794250d67e2a74d4c48239635a03512ca5f1e3da0dc7c5dfb62c9e779f54dd7ca96cde436d8d3b390dc2e4556da2bc41cfc3482743f4fe6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM5Lj8ACgkQso7CE7gHKw0NWQCgrsQV7/pM2XpT8eSak6b2SN4J
-S/sAoL6Tiy4YZaeSuqCwU4iILXzD5Ew1
-=JUfT
+iEYEAREIAAYFAlNcuvkACgkQso7CE7gHKw3pMQCfXtxvvFVCZCY30PxzGN0zRGH3
+YsYAn02ILIRBW20izs9l0h2a1juWXdxW
+=AQWM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kombu/kombu-3.0.15.ebuild b/dev-python/kombu/kombu-3.0.15.ebuild
new file mode 100644
index 000000000000..a5cb8712964f
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.15.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.15.ebuild,v 1.1 2014/04/27 08:15:45 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="http://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amqplib doc examples msgpack sqs test"
+
+PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
+RDEPEND=">=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		>=dev-python/py-amqp-1.4.5[${PYTHON_USEDEP}]
+		<dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
+		amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
+		sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
+		msgpack? ( >=dev-python/msgpack-0.2.0[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/mock-0.7[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/pymongo[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
+		dev-python/couchdb-python[${PY27_GEN_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
+# pyyaml is an optional package for tests, refrain for now
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PY27_REQUSE="$(python_gen_useflags 'python2.7')"
+REQUIRED_USE="sqs? ( ${PY27_REQUSE} )
+		doc? ( ${PY27_REQUSE} amqplib sqs )"	# 2 deps in doc build are only py2 capable
+
+python_prepare_all() {
+	https://github.com/celery/kombu/issues/246
+	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build must be done by py2.7
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	if python_is_python3; then
+		2to3 --no-diffs -w build/lib/kombu/transport/
+		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
+	else
+		# funtests appears to be coded only for py2, a kind of 2nd tier.
+		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
+		# https://github.com/celery/kombu/issues/346
+		pushd funtests > /dev/null
+		# Disable test_redis.py for now
+		mv tests/test_redis.py tests/tredis.py || die
+		esetup.py test
+		popd > /dev/null
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}