fixes upstream issues #364, update test phase(s)

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

5 files changed, 39 insertions, 19 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index b7923118fa3d..47c46da95285 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,10 @@
 # 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.36 2014/06/16 02:43:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.37 2014/06/22 08:32:46 idella4 Exp $
+
+  22 Jun 2014; Ian Delaney <idella4@gentoo.org> +files/kombu-NA-tests-fix.patch,
+  kombu-3.0.18.ebuild, kombu-3.0.19.ebuild:
+  fixes upstream issues #364, update test phase(s)
 
 *kombu-3.0.18 (07 Jun 2014)
 
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 4884b75b67c6..c7ae161f2ea5 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kombu-NA-tests-fix.patch 495 SHA256 e83b9ca823d1a972a203fc02cce2cf1ab740e65957e89be50fc4343def926ac4 SHA512 0399ddcd6992182577a09e5892b042ab2c232a6f86fda46a8ac4b6254ad73fd2fc342b863d59154371a266dd0927ae72c299c4ad16bc1c8cad557d26865ff264 WHIRLPOOL 55ba444b7607fa169cf53463965520c82bdf74ce2781a127c844d496a4f9c208ff366c24a3832839ddea14bff3ee3b545d8ed960cde524688cc916ca114282e9
 DIST kombu-2.5.14.tar.gz 307139 SHA256 2a480d8d676f584f6b7a399514f5effa96ced2ce7b37ff975f2c8d16e154e5b4 SHA512 a9aea1902d1a83855b144db10374c7206420d3451671cd7a60f15a196266146af9f102de1e0eb8675655dc93b8113ed34b4fc1547b8e34ceae18d4d68f10ac2f WHIRLPOOL ef071b427ee48ff6e81947fbd69cf4c7bab1a1aa237f6878a2e88eafa7e4a2df803711041f3f3e2f1ae23af45c08143a0ee1ca2963d3ab76c25329953d0d6e5e
 DIST kombu-3.0.16.tar.gz 342440 SHA256 c1e0a1146ef109b85a35cc5f7f8e4b652211aa4d666efba5d727c554e25e2957 SHA512 3d7a7f960a95376e59cf1040924aa3cfbf538e5bb57524b7172e253b20ee7829e81c881f21476a80a9a47dfd6b9c6a23b8731e21f5d47f9fa8a1e19591a70a59 WHIRLPOOL 575f69f54296e208a206f0cd060e3d6d26f01ac62c921f1ff92bde5050c5bb781e0c7d35d830099d2ad84b162d175405afaca6633d51ba1a4ba541333fc09c60
 DIST kombu-3.0.18.tar.gz 343083 SHA256 a6efb207c19ff64fb52af074d079611c53548e7f75f59a40422a1d0034dd8256 SHA512 f8b409f26f42e7f4e057b37cda12bdd7909f2ec698912c2cb39ebc8fc39fab6875f50f74e5449678f55051983d697b5debb56728b138ca74cf2d462f97c22a4f WHIRLPOOL 0f21a7bc9127efde41baff0a1efb9aabfb272356980a7c665fa2a0157d1878d9c7dfa0099fec45a8b6f6205112a590b72de2fdea2c53be5f14c477832eae792a
 DIST kombu-3.0.19.tar.gz 343272 SHA256 26a0ccb2bbca5ef27733ad1d3f05e0f69bc9fc93ff6aeaef55f8a94609c835b7 SHA512 ad649e037c045078d1315b65d2d2101202c9c163bdaefb2a7dcc4882e0c7bb1038f27924fdf5b3529ba703b43d78d16c6eade67b9d244f856c345fb8f8e5dea9 WHIRLPOOL 57d780c02dec39e81bcd9e4ea7e7d3e371c265f342b5e6d3f2226eecbf7fe25139ab74b91da68e87f6ae197c185d55be03b00f061fe9ffddf146d43eb2f5c86d
 EBUILD kombu-2.5.14.ebuild 2521 SHA256 b1648e049a4e939ee14c1797ccbe2e3d6a0596c678d70dae003f0d015b5bddb3 SHA512 e6af01d66246217e7ee802ed7e439efeda2c200a33c91121f1afd88b3cb30559a9e7f6e814078dc6709ba942f397dc6c7702f992a1a07bbd05c4c4cc1b4bd2f5 WHIRLPOOL bd6f6b4ec03705f2db1c127d50b045cb2f1ff0a93cb4bbb4aab970a0c2308b796b7f5f90d9cbde9f354b763e71cf8d861900b01f9e00c7693953061a3d9573d7
 EBUILD kombu-3.0.16.ebuild 2815 SHA256 cceaf71aca92ec4fb4af063fdfb66e8af2dd48536057d4c709c662a70570894e SHA512 f667ebc19487e5918e8e02cc1bad5dddf295c2870c2103dcdc9b11add5dc9860e284e6851de5e59a62c70ac6be87035334ac2801a8b00c98ee01aed424e94c6f WHIRLPOOL 6ecba41e1008dd683399ec69c630a7d53799aeb31478cbbb1babb83d6f456f1499b07f592a3576e42001161a36d715db70679a772af88c8b08bd226523b2c8db
-EBUILD kombu-3.0.18.ebuild 3082 SHA256 c0c16ed812d197cc9682e7fe5e9afc83fcadeb14d257e35e91be93acb6298240 SHA512 9009fd872eaef14eeaf01f7bf77d971deaedb6c2da6fd39001562708dcbe73257d7c54c430150618301757158282e26376287ce26054258cd7dfa36031291303 WHIRLPOOL 779150ba7289ea7c96e8203cce36434f9519d3280466fbdfe90e9cf7ee72c43a84f53f136aecd048e1a8ad61a9e5c158bf11c838e57f7722ffab726089393dda
-EBUILD kombu-3.0.19.ebuild 3153 SHA256 724a20195eb9e0fae1e86e06b79344d6028f816b8614747811414160257982dc SHA512 d1f2f0e465d95ffab041a41ed66dd1f3c736e81d63dccb94a2cea93cb4350bbef6495b97d34fd46913cdfc2760c111b1077be039b45cbd57773d8225170f8a9d WHIRLPOOL fc23c19458c28590a16039fb4f844898be8367dca16bfe09fb151b404085673df79415ae6eaa85e6a795c3936a0ed1564f5bb7abbb6325293a0e02f64d5fd00a
-MISC ChangeLog 5681 SHA256 6fbbbdf7a0537ef73ac4a1d2a420246f9e78b96bb13cf4b3ef8dc93caf0ab7eb SHA512 cc7a738fa435b368820c6e5c69faeb29199e707adb4688de24c7f37c2a3423d759cfe33c4ba9fa7cb89c82f32f141fdbffa1e36fcf1ca1366f30c355069e1b65 WHIRLPOOL 879dbe9de6a64a4ca98e022ba8566156ab091bbd2a6dd096d86044cbc29e9e637fc7c200311f95350ca7783ea9fb223825888121b1c6a1d11a077c068e6a1047
+EBUILD kombu-3.0.18.ebuild 2867 SHA256 ded37b9313eef8baec4787c6f8282d2e352d410df5e46bb30d637ff871d3efbb SHA512 9e39f428adc8e0a973af4dcc12daf92efc61a4ea7a44d747f18c06e690a750d99a0f7bd848886743a5e21990b4fa11a2b3bd6f648443f4bd2bbf4139cfdd66fb WHIRLPOOL 5ce5d7c8ba4878d5c787f6e529a6f244f649a1118e2fd441d09ce301983b025b44493c3f28206ff5c835bf905d47a878b5f4aea94dd52258dde9a89bd48c446f
+EBUILD kombu-3.0.19.ebuild 2938 SHA256 9382e644b30c7dd4e6ee50bc035a16a7f0d5744be2409872548f10bdfc2c9ee5 SHA512 7c160aa95071cfe057511ad5d485294cb1f8816dd65c8189c5a17dd49d9e6e95ee7d05811c8f87cced81b345b1423fc1f6609d89ce5e4c8b33ec6433fd6ea126 WHIRLPOOL 95ada61373061b8ac9edc182270fa2546994967f3a98a51a0db08d71b54f9af59ab2d003b7acc49f252daa1579b6140c59c75d59a27e26515485d93f29b3cf0d
+MISC ChangeLog 5858 SHA256 33c558d74614f1f2abe25c266579d7ef6aff74ab55a890b6001abaceb7c2d56a SHA512 0832666226f135937808e4726ee71203d9a556985288d67a5577eea1d7ee8f06b85abb8cac33eaeaa049bec65409e06ebe9e6de46601b05073ae89df9f6e71cb WHIRLPOOL 5194af139469879858c416c1d980097527e490eab7750b65c774cbb532f3d1563bb1294fc41a78d6f8663827774f8455e0db59323cca0ee7edb114324c4bd02c
 MISC metadata.xml 496 SHA256 a221bd2f78c6decc3f199c818a13a0c4596e0028ea119af82a1d54dec03e8410 SHA512 af2b75ead1edf44293fed821d8b113e9562a48bc66c191adcd913f265824314b667e8634fedad323dd3dd2a7205135a29f5b29596591e5c44f45ea7dd1440c7e WHIRLPOOL c74ca093c23b7152794250d67e2a74d4c48239635a03512ca5f1e3da0dc7c5dfb62c9e779f54dd7ca96cde436d8d3b390dc2e4556da2bc41cfc3482743f4fe6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOeV/sACgkQso7CE7gHKw2ysQCg3d/kwZ9V5q8SYR0MHM6U973t
-husAoMyQowCmHgys8kvHiYIbObkwLrT1
-=1S/w
+iEYEAREIAAYFAlOmkscACgkQso7CE7gHKw3aGQCffda4SvaDpUCJt+8B49n3463q
+rUYAoKHZoBeG5125jmo5qyXqX+Q34QA1
+=Kum4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kombu/files/kombu-NA-tests-fix.patch b/dev-python/kombu/files/kombu-NA-tests-fix.patch
new file mode 100644
index 000000000000..a4bcda6e292d
--- /dev/null
+++ b/dev-python/kombu/files/kombu-NA-tests-fix.patch
@@ -0,0 +1,16 @@
+https://github.com/celery/kombu/commit/828ba134105eeb4c6df52cb4441cf90c297b77e3
+Fixes NA bug with amqplib.
+diff --git a/kombu/transport/amqplib.py b/kombu/transport/amqplib.py
+index feedee7..f57e28c 100644
+--- a/kombu/transport/amqplib.py
++++ b/kombu/transport/amqplib.py
+@@ -17,6 +17,9 @@ class SSLError(Exception):  # noqa
+         pass
+ from struct import unpack
+ 
++class NA(object):
++    pass
++
+ try:
+     from amqplib import client_0_8 as amqp
+     from amqplib.client_0_8 import transport
diff --git a/dev-python/kombu/kombu-3.0.18.ebuild b/dev-python/kombu/kombu-3.0.18.ebuild
index 77007f0ae392..0ca143ef6676 100644
--- a/dev-python/kombu/kombu-3.0.18.ebuild
+++ b/dev-python/kombu/kombu-3.0.18.ebuild
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.1 2014/06/07 12:27:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild,v 1.2 2014/06/22 08:32:46 idella4 Exp $
 
 EAPI=5
 
@@ -47,6 +47,7 @@ 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
+PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch )
 
 python_prepare_all() {
 	https://github.com/celery/kombu/issues/246
@@ -64,16 +65,14 @@ python_compile_all() {
 
 python_test() {
 	export DJANGO_SETTINGS_MODULE="django.conf"
-	# https://github.com/celery/kombu/issues/364. Cleaner for now to ignore the whole test_ file
 	if python_is_python3; then
 		2to3 --no-diffs -w build/lib/kombu/transport/
-		nosetests --py3where=build/lib kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+		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 -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
 		pushd funtests > /dev/null
-		# For now, use nosetests manually, return to esetup.py on fixing of issues/364
-		nosetests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+		esetup.py test
 		popd > /dev/null
 	fi
 }
diff --git a/dev-python/kombu/kombu-3.0.19.ebuild b/dev-python/kombu/kombu-3.0.19.ebuild
index 26bacfb1ccec..5d888fffe97f 100644
--- a/dev-python/kombu/kombu-3.0.19.ebuild
+++ b/dev-python/kombu/kombu-3.0.19.ebuild
@@ -1,6 +1,6 @@
 # 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.19.ebuild,v 1.1 2014/06/16 02:43:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v 1.2 2014/06/22 08:32:46 idella4 Exp $
 
 EAPI=5
 
@@ -48,6 +48,8 @@ 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
 
+PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch )
+
 python_prepare_all() {
 	https://github.com/celery/kombu/issues/246
 	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
@@ -64,17 +66,15 @@ python_compile_all() {
 
 python_test() {
 	export DJANGO_SETTINGS_MODULE="django.conf"
-	# https://github.com/celery/kombu/issues/364. Cleaner for now to ignore the whole test_ file
 	if python_is_python3; then
 		2to3 --no-diffs -w build/lib/kombu/transport/
-		nosetests --py3where=build/lib kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
 	else
-		nosetests "${S}"/kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
 		# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
 		if [[ "${EPYTHON}" == python2.7 ]]; then
 			pushd funtests > /dev/null
-			# For now, use nosetests manually, return to esetup.py on fixing of issues/364
-			nosetests -I test_amqplib.py || die "Tests failed under ${EPYTHON}"
+			esetup.py test
 			popd > /dev/null
 		fi
 	fi