bump, test /issues/227 in progress

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

3 files changed, 82 insertions, 15 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 61dd8af1bd8b..ca96765135a2 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.22 2013/03/26 06:24:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.23 2013/04/24 06:54:40 idella4 Exp $
+
+*kombu-2.5.10 (24 Apr 2013)
+
+  24 Apr 2013; Ian Delaney <idella4@gentoo.org> +kombu-2.5.10.ebuild,
+  kombu-2.4.10.ebuild:
+  bump, test /issues/227 in progress
 
   26 Mar 2013; Matthew Thode <prometheanfire@gentoo.org> kombu-1.0.4-r1.ebuild:
   fixing kombu's 1.0.4 deps (anyjson was versioned and should not have been)
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index c5a6150a8626..2d7c66ca6566 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -4,30 +4,22 @@ Hash: SHA256
 AUX kombu-2.1.1-add-assertIsInstance-with-unittest.patch 467 SHA256 a38902c382dbf9b062751f69bf1cabe0807144c597c1c3ccb770f48618e9852c SHA512 cc4764547a267b7573a0f6b58ee5cd6b7967f688d4dadf6a082cfe4a257f0b6f0ad645a50e1887727d14b0b61487b0b888c5f6f6782c2cac1663cc668d49a24a WHIRLPOOL 0a8a94eb5e2a951f932548f47777017d8e9543bbfc1dc97351e750ab7a620f79f13b67d783eeb16d28eb3d54b7c2fda6b65c753e6226e91ec738dabb8262f23b
 DIST kombu-1.0.4.tar.gz 201925 SHA256 a876b9dd923e2d719afa7491e6d7a90829ebc9d836d8c4f71332984042693140 SHA512 fd321400c8b28d445f7665322671f2311b336d8ef94ca26ebcaf2d30b02a81d312564b863a873cda2df9b5f0f62a28bfe10b52fc21ffa89b3e66a4caa9fb1df7 WHIRLPOOL 0f1d4e918d194860798292d28e6f9a21b5ee6939a5ad2bd6966aaa2d77c171d5531006ba206fcef8fdd264e53799a7aa2ff7958158b69076796f9cd4489ae5a5
 DIST kombu-2.4.10.tar.gz 291204 SHA256 211cb68b133578338aac0990d31d9255ed54b5f1861fb2cd54c1bb28bdbc8a6e SHA512 e2d10d2d3c13072b079e29f12094b9a88e55f58e1368da1ebc0eedface3c1e0bdd5d3d7ac00469027051b61c3285a30f7b6d47a0fe8345d8bf04cb2a7b1f8748 WHIRLPOOL 6e4324dbabc1a61c7f4596e6bd54d750fc6f39f28e364c13213f130149a070153bd36fd76e2fef3ceaea4ded4cd79b3cc1c3708a2da20be4c5f1d06a2fa3bc6c
+DIST kombu-2.5.10.tar.gz 304810 SHA256 01c1e56fe88053b6e7801682277c4cc8318c485d8bd47c830c08567bfac680e2 SHA512 f42c8b1dc2e5b39c5a6bad4e69d4cd532bac978d7f9ec6e6337032228aada3c4fc2d6f434c6d2ac6b2f4e0a806223b24bb592d8ddaee20ab723bb7b6db6cfe0f WHIRLPOOL 05b0057775e1fd2b34b10e46950ba3455b5d1716a6d50f5fdff0d2b8f343e34517b65611a21eb15936deeb9d9324c878bbc2959344230e1d0111f3a5ebc5bb4f
 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
 EBUILD kombu-1.0.4-r1.ebuild 1637 SHA256 8089c359e02b23a64639865ffb4d155afd6b5cfdedf43885140fa56d60b6dd9e SHA512 2938aceef9e36f5acd57e914f6a722ba23f160f98d4e479ef47cf9481a627be659b85ce310f8ab3b196805d6a6b1dd99d02501dcd73d3993fdd3b5b20cb97cbc WHIRLPOOL df40cb2821cb13e1cf5eaccc440b5af0cff0fc4f575e5cb0a983e2c71da4884d0a2f8c47fcf1ef7f35db6b4327c10247f004503e3b2bcc72d2384fea7230f72b
 EBUILD kombu-1.0.4.ebuild 1720 SHA256 07500957aab20081f7869e98faa5eb66b38a238534a7d6948dffe22f0cd114d4 SHA512 71310681131f66dd2c00965c5bd8e3e853bfdb8340c15e5856087ba23a0e2f4ada78132f09cf8eb1d987f401c9818da7c7cc313923d8c3c39a09f57a4c33d552 WHIRLPOOL 1e457496d005ad94b514e8b97d1c8d4df6eaf503635bbcc2fac4f269c3f0536820ebe1d505997165e17c6df3421f44cf4fdc991e4538f3930b3c84c0fe1b41e2
 EBUILD kombu-2.4.10.ebuild 1715 SHA256 37a80da2922453deeb6c3cf390a8e06f116044480aa1f4fd5f3072f80fe2941b SHA512 d6120508d00395133937902690e8157bec9c54f8ca694f4a5ba71f98f9417ee320f7287979addbb03dc8a9858209acdb7d98cd964524f54843c10662350c8fb2 WHIRLPOOL 92595c85039176a899ea037d712f6016b03cff64fa38611fdba9009d437afa103ba1a364d823e526a1fe40c88c143d6a778e9550337b1347e31e4c591bc05c28
+EBUILD kombu-2.5.10.ebuild 2376 SHA256 974e30d453aefbfc9ed80b6992104dabe1cef4c774857b20a813f986305ea31c SHA512 343bd5b3e2d69829cb4ecf74290d8ede7e4414d5260410b36c638f03fede1c4137f26a29dba0ede0d6775cd8a6930020be7461ac353d8612af40a3a20e57250f WHIRLPOOL c8914bfa778ae13b48bd7e44a38040c272cbbde7e63986d33a97dd332f3d1ded376d4363eff0ca7b48c236255185151b1bf00c0d9bfde6b3b91c7ba28c0a6a8f
 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
-MISC ChangeLog 3600 SHA256 ae633d5912b434133d278dff64f0f3ebe9b9bca16db9bfe7c44202b67a01da3e SHA512 35142fb94b008026cef5d131250c85375bca32f9b3e56ecb070a3baa34e53dded07a74eea96e593e56758937ffe47fb448c58c9be665826dd1a270a52cb0431e WHIRLPOOL 11cefa2e0cfd89c66962284c308fa22b4a085af981453a4ebab1f7d116b2ea39351f80a63f6614395c9e6d93a869ecc80e1e4733a3441d4ad185c59b7736cf5a
+MISC ChangeLog 3753 SHA256 31c51bf54a6457a055bbe3ef9414d7e760c67c55d95aa84efdbca0b41b80092d SHA512 cfeb5e5133f4c82adb255c45b49f8b517c858c21212b4c82b53c77966a538d504ce26a75783a577e5da798223f0735ddd23692950a6ad7766496dd9b8634b8d8 WHIRLPOOL 8d9144473f0e59f3d077044506b554bccd4526a76eafb90a797e05b371f919260ac42ce1c023c63a869ee107a55906fb7c228eeaf0dd5e3553c1f97999b71ee9
 MISC metadata.xml 442 SHA256 db2c85a2a5fc522803bb17e2bf90be7267379e3dd3c8e39d7c7b85037ca38d49 SHA512 eb393fdc027ca9963457582caec128c33beddefcf2fcb3c0367bd87d41dd7d99c5a5af523ce669d5b26d741695d86d8407642e5b8144ccbddb238d84ca646e1d WHIRLPOOL 02dc4dd964d585336151f31c2ba620bc277863e7b36bf1b45c8a197fd9397ef8ae0bf5f7c68b9476c4adf6bc9ecd1cc73779ba816d80110db5780ff333cf363f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRUT9BAAoJECRx6z5ArFrDPT4P/Re1PIpcQ6MvtzhExAcnC5bP
-Z6GLv4I6DoQDi3tBBDwI35iS/4yntMA0t3XuKCPV2YDLOXJKijLcOBePImgr2D5k
-cY7jCR5jZRMeyJlhzU5Xu0+T3PTrFibaCLbzbwjItMGChjweCAOW+kHSz8FPyRl0
-2CH9/y/x9gmepImb77vI3X0jDNfTJSLkLNcPAuMi6f+U4sGYi/rfhNlA3caiKMSH
-Say8yePQWtocWNr93uCZe0xe8haAnhc8X4VwYEBrsWYN2uE2RXAkX1kR4Dnh88SC
-R2MDcqvfnQmMJ+aZchBQIjjzqXtuoIatM6OaSv2oQLdIo3m7PXduuqFTlskgehRn
-ieRRWBXnZ6etC0Kmh8DXLLWNFI2lKzb8x/kKBKgeU6OqHpKQ57dVfs6/ENICTwY3
-0DBFtVpunrq/JO0+kQfjfkwUPXTR/HOTT6IqYRFSdUq2Zcq+4W0dxDMkmfGbQZHD
-CxKtsuJWSFT6ZdqGqnbsAX1g76tMczZ7TmEk9011iVi95v/5RE1mKx3a2B6iKyz4
-irFR3RGNRCjElIuqaVnruzFtLEsIcchYVAY1m/x06dp0OBgAy+e4HA3d8uV2NhUz
-SxoMeHb8bgk+l449pydW1xwbzfGHmnNJyw6h++no1EaMod3HrXc1nuxmBUzoHP5a
-iiuFYZH2f/PpbH7TrzJ7
-=txY/
+iEYEAREIAAYFAlF3gb8ACgkQso7CE7gHKw2mbACfV4HIVQgHK0ZBvOBm7m5LCda3
+RfkAoKVlctxbS3xHpnsB9es9ZG3iN46h
+=FI/X
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kombu/kombu-2.5.10.ebuild b/dev-python/kombu/kombu-2.5.10.ebuild
new file mode 100644
index 000000000000..29d0a7cc01aa
--- /dev/null
+++ b/dev-python/kombu/kombu-2.5.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.10.ebuild,v 1.1 2013/04/24 06:54:40 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_1,3_2} pypy{1_9,2_0} )
+
+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 test"
+
+RDEPEND=">=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
+	>=dev-python/py-amqp-1.0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose-cover3[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/simplejson[$(python_gen_usedep python2_7),$(python_gen_usedep pypy{1_9,2_0})]
+	dev-python/anyjson[${PYTHON_USEDEP}]
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/pymongo[$(python_gen_usedep python2_7),$(python_gen_usedep pypy{1_9,2_0})]
+	dev-python/msgpack[$(python_gen_usedep python2_7),$(python_gen_usedep python{3_1,3_2})] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/django[$(python_gen_usedep python{2_7,3_2})]
+	dev-python/beanstalkc[$(python_gen_usedep python2_7)]
+	dev-python/couchdb-python[$(python_gen_usedep python2_7)] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RESTRICT="test"
+
+python_compile() {
+	local SPHINXBUILD
+	# This will force sphinx-build to use python2.7
+	if use doc; then
+		if [[ "${EPYTHON}" == 'python2.7' ]]; then
+			local EPYTHON="python2.7"
+			export EPYTHON
+			einfo "building docs for kombu with python2.7"
+			PYTHONPATH="${S}" emake -C docs html || die "kombu docs failed installation"
+		fi
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+# wip; https://github.com/celery/kombu/issues/227
+#	if [[ "${EPYTHON}" != python3* ]]; then
+		nosetests -e 'test_basic_consume_registers_ack_status*' -e 'test_close_resolves_connection_cycle*' \
+			-e 'test_init*' -e 'test_message_to_python*' -e 'test_prepare_message*' \
+			|| die "Tests failed under ${EPYTHON}"
+#	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docompress -x usr/share/doc/${P}/examples/
+		insinto usr/share/doc/${PF}/
+		doins -r examples/
+	fi
+	use doc && dohtml -r docs/.build/html/
+}