add herd, revbump; fix test deps, restore patch to current version, unrestrict testsuite as it should

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

5 files changed, 98 insertions, 3 deletions

diff --git a/dev-python/py-amqp/ChangeLog b/dev-python/py-amqp/ChangeLog
index 2ac3c6322238..685c38cfbdce 100644
--- a/dev-python/py-amqp/ChangeLog
+++ b/dev-python/py-amqp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/py-amqp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/ChangeLog,v 1.14 2013/11/26 06:36:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/ChangeLog,v 1.15 2013/12/18 13:21:58 idella4 Exp $
+
+*py-amqp-1.3.3-r1 (18 Dec 2013)
+
+  18 Dec 2013; Ian Delaney <idella4@gentoo.org>
+  +files/py-amqp-1.3.3-disable_socket_tests.patch, +py-amqp-1.3.3-r1.ebuild,
+  metadata.xml:
+  add herd, revbump; fix test deps, restore patch to current version, unrestrict
+  testsuite as it should
 
 *py-amqp-1.3.3 (26 Nov 2013)
 
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index e1890759514f..a62cf6f88ec1 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX py-amqp-1.0.6_disable_socket_tests.patch 574 SHA256 5d07cda6025f325a69dfd32552e96509afdd943ba6f5304772dbec404c6d7a82 SHA512 9e9372544127eb35105c6e501ff39c258fc9779c6bd5b4d01668fec574444f6898d4580a884897c3cf87dc2886eff0617e11ea526ea3ecec68aec1e846c22318 WHIRLPOOL a816455491169f39f64b8b991bb09e99636b5aad2f44b49c8fc06f365d89e416fdd98ec006c332edcca79ecaba50208de187368f2cbf93c6e97edcbc3ab9285b
+AUX py-amqp-1.3.3-disable_socket_tests.patch 405 SHA256 30c8ca445ae1fe84b44077136f101f7dbf6686013dacbc64c73326adf7bcacdb SHA512 7d801f7392edce5bb0f2b04a974f6005b58cd0e288bdf52fd76a7d63de985e7e8a2696972fdbdbf3e39fba339a3213437d490dffb573b5b52f2f67ed6dfb9e32 WHIRLPOOL ea788d81e4906d106c484783c1a6ac4d129f0c91ee2563fd952ffdc6f8e1197f7109b453c7fbdd0de9e62939e4f0bd2c533062c6effd470198718afdad514703
 DIST amqp-1.0.11.tar.gz 70207 SHA256 e26d184024262ac93ba1177217b9a48edba55c5a0a46f3cba35d35d498ebe784 SHA512 7f7e7b4a11054949e992e91b21d1aa5507102243f604100ea121b2fcbf8a6de2ddaecf33cd170a5ce29660aed144bcaa79ffbceb5968933ae507ac0e51e2ff3a WHIRLPOOL c50189f66885ad1453ff75abf1c460209b3cb4abd2f12a489413ce3c316c8449982d39e676f5bfbe20978f777770080ecbf4989f89b7b6439bbffae4c56a0347
 DIST amqp-1.0.12.tar.gz 70242 SHA256 c2c09d0310009efd9b19fc12efff7a085b789b841341a533451b85750be6518d SHA512 df0cd0032b2a67fc67c016370b8d1c3455330e0656056b1c110f6fc7f1becd755a58fbd72d00a437175cd376b3e7ad956557c810e31ab2c99655cea11d71243c WHIRLPOOL 200f8b7929bc4731b53c3a2da397b4ca37b01d823a8ad998e16b5dfcf80d9350863086a8affed956e93104e15b3381534d8453c95e8dcb0c685e15bb65cdd801
 DIST amqp-1.0.13.tar.gz 70458 SHA256 15fed1a2f0326f198a9d3d16ce1dc4296385d33859bd9f7c59705093fab8f53c SHA512 6e1476cfc625e5f2b636cbbdbc786d30fc68e99a7439039cef1a9eb1653083530572204b578bded307285611b91ba9f6f1ab9477b6adff8b97e651066253214b WHIRLPOOL ad049b23a61b2104128d5b2c67bb194bdd5cecfdad5cfed5777a564d30782b067ef9226329641ef178a970353d55dd3230c684644dacc94962e4375311e0e2fc
@@ -14,6 +18,14 @@ EBUILD py-amqp-1.0.9.ebuild 1338 SHA256 e3e1aebc4458c16fcf0c42ff4506405020d9e692
 EBUILD py-amqp-1.2.1.ebuild 1388 SHA256 1fed73dba030ddd179e47062c2173d5f2c7d3a19cd4c3b0f6fe230b5189dc631 SHA512 86cdee3149bd42f159aa1b5cf9e9525cd50e0f5aa62af478902447cf1488ee7b71375280d2ffa42425b6de49b157215df455538138d934bcb840e288bc06f43b WHIRLPOOL 1c0f851b7907335dacab295701fe361785a36c0a3c1970ca6ed718b3a8c776eb0b46fb869252c966293859e62c6111b488dcd69db9411411e20c32e1111da379
 EBUILD py-amqp-1.3.0.ebuild 1389 SHA256 6d02118aa909b37b7a2e7c193254e8012be81f0a7a1fb8a11e0a8d56e2613eae SHA512 546c3f450853a1e1c375e50155aa0c4ba0424e22f73b8e199f61e18a0fcba195dfea8ccdb15f8e0ab2eaae30052fac8d12621904d070ef873d2ccb98fc04446e WHIRLPOOL 199098d41063e3cf7d35124560fce0c33feec9f08816490c6ccc84b500346aa020a6f6e489301d593bf10cbded275f9e3ac2b5be80dcf6b024b96dc14bcb2c03
 EBUILD py-amqp-1.3.2.ebuild 1389 SHA256 0fee1b971f4c4c01fd174a4bbe9a7d050a05c134d0da0b6afcba2c620e9162ab SHA512 e58a99e4237c650a144abfa782500691b98497a31880617ecdd2389ba30430cd25369a2a9d4979f404dfd21ad8ba3e18a48cd4712447f45d0f5ffd01b1bf0537 WHIRLPOOL f53434221032f3c5ba1e28e32d37eda49fda9b964430bcb5137bc0e8d954de51e46cc1eb7696d1a3e722949b7bde944c8485c615a13aef936f7e1c49339248b2
+EBUILD py-amqp-1.3.3-r1.ebuild 1614 SHA256 46b88a3c2b10d1170efe6663b8edc2252155930db3fff26002c80afb1ef3327a SHA512 f8df592f0ed37b35bdbd0bdf8ecbba2dcc2aa2b301e946a76a51acb2f18b5248b25b876b894b69d4a99cb565ba52ce1bc5e3c98610f18454cc53148350d25324 WHIRLPOOL 30a833b9800592f0d72c5fd4d0cd1fdf88a0cfbae56efb7115a5ca57750a4e68a4992f6fd264e54f82aff70224f15e72b1e0b55fa0e8b9631639f9645ee0aac0
 EBUILD py-amqp-1.3.3.ebuild 1389 SHA256 416e32721d5054f31bc3be138d0af7dfd497a83b86035d74d43865b5492d07c9 SHA512 277c53150477bee6e5307159c3018e74393b3a98306183cefee9c87ca88120c558b7a1195852f730dd866e46182b8e9c37324cc5722fcd144a41b082013ee7e7 WHIRLPOOL e1a06f605cacb2bb3b4e208e8a7cd8c908754ddb8a5f658c17c81dec2cb1bc90343faef48fecefe3c908c214ee52666ab1bd5900d76c8aba92cfca3fa62c5fc1
-MISC ChangeLog 2111 SHA256 42163ad4543f7a87cd7528cce272993e0cf87d0f10aa3ee92e4f2ed597a94852 SHA512 b66cb2d95bebdccf7104f65e1640a74937226f3ea8e6a39548f9073afcb6e188f638dfe50b6ebb66cd8c33edc0bf443ec165925b1caf6908e12791402454f836 WHIRLPOOL c2dd09410eee4d0b70a34ee78ed791d67f98a09a4605382d40e2b48426c4fd0a31035304e991ca8874db773a28817b02531b9142dda28df7a9d26e69246a5b28
-MISC metadata.xml 494 SHA256 ff3bcf683587958d8c286f62c913dad7d4611ea2012f1b773cecf65c9cecbbe5 SHA512 94215b3bfef565e71f8081b7b33791d5c551a474d427fdd6bc64e7f2ca2dc17c93a4997f58f7d72d9bc731c44b0745fde28b9df2b127a88c7ad57fff2583ce06 WHIRLPOOL f25a0c15134209f69d67bd110c2a6e6d94717a03b7d39da5413a3b26446254c680f72bee891b8fd9969bf890876a6f055bc0f48fb82c086d92da97887ee8e44a
+MISC ChangeLog 2392 SHA256 7fee59192655bcce7e7a3870a02bf19e7535a6aa469ba0ccd5b26fdf843e6c74 SHA512 935da15644760412224053354e5d5f977b36edcb0416b1e9fa85f68488f93c9c29ebe418c6f5d7d5b135e8de2d1a9957917fdf1ef0a9adc6832f3d46466fa004 WHIRLPOOL 7d2ffd9febbeba36400ad946030d0a52aeae681a5fdd08665566b6827dd13aeb071718fc1fd57bf72f9398db48868b32985bf9b8e6324bc6d7a9e7dae4bf7c8f
+MISC metadata.xml 518 SHA256 dc10accc917c2be95fda5bde733121e456a8e025d759165ab8413a4a4b8abda0 SHA512 eca1c1abf0c5777a2593c470c80d1a20e2279edcddc0f759c6221f6fe44e9fed3828a8d1d7c4c1e542c0ce92daf1af8d22345c22579a0120a55467b70ba2be47 WHIRLPOOL f61215ca65aa19df694c382486822f39da18d798447e8ab70dbc5b62e00479822ad46de425f534d8563187cc74357d1b872a7c75ce2b7ee6f8b8bdf960b9b18b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlKxoYgACgkQso7CE7gHKw2DigCdF/7QqcFUf//5h6hNgwvaa0uN
+Xb8AoLFicEy+NsGia9bpAEuGEr6RZIYH
+=mPMy
+-----END PGP SIGNATURE-----
diff --git a/dev-python/py-amqp/files/py-amqp-1.3.3-disable_socket_tests.patch b/dev-python/py-amqp/files/py-amqp-1.3.3-disable_socket_tests.patch
new file mode 100644
index 000000000000..67353e3b8ae0
--- /dev/null
+++ b/dev-python/py-amqp/files/py-amqp-1.3.3-disable_socket_tests.patch
@@ -0,0 +1,15 @@
+diff -ur amqp-1.3.3.orig/funtests/run_all.py amqp-1.3.3/funtests/run_all.py
+--- funtests/run_all.py	2013-11-10 08:53:13.000000000 +0800
++++ funtests/run_all.py	2013-12-18 21:10:54.050283404 +0800
+@@ -23,10 +23,7 @@
+ TEST_NAMES = [
+     'test_exceptions',
+     'test_serialization',
+-    'test_basic_message',
+-    'test_connection',
+-    'test_channel',
+-    'test_with',
++    'test_basic_message'
+ ]
+ 
+ 
diff --git a/dev-python/py-amqp/metadata.xml b/dev-python/py-amqp/metadata.xml
index 531a03cde6c5..1c9b0e4ec397 100644
--- a/dev-python/py-amqp/metadata.xml
+++ b/dev-python/py-amqp/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<herd>openstack</herd>
 	<maintainer>
 		<email>iksaif@gentoo.org</email>
 		<name>Corentin Chary</name>
diff --git a/dev-python/py-amqp/py-amqp-1.3.3-r1.ebuild b/dev-python/py-amqp/py-amqp-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..a072ee82c8dc
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-1.3.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.3.3-r1.ebuild,v 1.1 2013/12/18 13:21:58 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp http://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples extras test"
+
+RDEPEND=""
+DEPEND="test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+
+# Same tests from before require a socket connection
+PATCHES=( "${FILESDIR}"/${P}-disable_socket_tests.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if [[ ${EPYTHON:6:1} == 3 ]]; then
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w funtests || die
+	fi
+	"${PYTHON}" funtests/run_all.py || ewarn "Tests failed under ${EPYTHON}"
+	rm -rf funtests/ || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}