bump; generally fix broken phases, add py3.3 support and there it is to stay, remove old

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

5 files changed, 28 insertions, 153 deletions

diff --git a/dev-python/py-amqp/ChangeLog b/dev-python/py-amqp/ChangeLog
index 81a8df380015..60bb2ec9183e 100644
--- a/dev-python/py-amqp/ChangeLog
+++ b/dev-python/py-amqp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2013/04/26 16:27:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/ChangeLog,v 1.8 2013/06/27 16:16:08 idella4 Exp $
+
+*py-amqp-1.0.12 (27 Jun 2013)
+
+  27 Jun 2013; Ian Delaney <idella4@gentoo.org> +py-amqp-1.0.12.ebuild,
+  -py-amqp-1.0.6-r1.ebuild, -py-amqp-1.0.6.ebuild, -py-amqp-1.0.8.ebuild:
+  bump; generally fix broken phases, add py3.3 support and there it is to stay,
+  remove old
 
   26 Apr 2013; Ian Delaney <idella4@gentoo.org> py-amqp-1.0.9.ebuild:
   Added py3.3 support
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 4a1dfafc3765..2ff489cc7489 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -3,20 +3,17 @@ Hash: SHA256
 
 AUX py-amqp-1.0.6_disable_socket_tests.patch 574 SHA256 5d07cda6025f325a69dfd32552e96509afdd943ba6f5304772dbec404c6d7a82 SHA512 9e9372544127eb35105c6e501ff39c258fc9779c6bd5b4d01668fec574444f6898d4580a884897c3cf87dc2886eff0617e11ea526ea3ecec68aec1e846c22318 WHIRLPOOL a816455491169f39f64b8b991bb09e99636b5aad2f44b49c8fc06f365d89e416fdd98ec006c332edcca79ecaba50208de187368f2cbf93c6e97edcbc3ab9285b
 DIST amqp-1.0.11.tar.gz 70207 SHA256 e26d184024262ac93ba1177217b9a48edba55c5a0a46f3cba35d35d498ebe784 SHA512 7f7e7b4a11054949e992e91b21d1aa5507102243f604100ea121b2fcbf8a6de2ddaecf33cd170a5ce29660aed144bcaa79ffbceb5968933ae507ac0e51e2ff3a WHIRLPOOL c50189f66885ad1453ff75abf1c460209b3cb4abd2f12a489413ce3c316c8449982d39e676f5bfbe20978f777770080ecbf4989f89b7b6439bbffae4c56a0347
-DIST amqp-1.0.6.tar.gz 69511 SHA256 fcc667a4e160c770fc41bd2b9b635ba0963db3dfd277491a8a10f8ccfba13e4f SHA512 40d1b9a2e692b1a89bdf7ffd098010437ecc6c51c7c7da6271283d199d47950be3f709370deb583ee8c4d2f7396789618ffeda8903f67bdc399d0b0902a2ebd6 WHIRLPOOL 476695f1c72ffa106ba73f6e4fe2dba796feca1ad7d2f72c7c2e1e750586eefe01c083f9d422d99e2a7ecf8df0f12e14d9630a490bd2f7ec9ff32e95af69cc05
-DIST amqp-1.0.8.tar.gz 69976 SHA256 cc91d7aa03c6777454fda5e1631426952103b072c68a02c5bb7b17945e28f94b SHA512 cbe3261bf4378ccbb9bb31a72db4567654ae3f84d953bfe0c9b4443a52e05e056ff598dbf1966ef935b172ef8a655be4370f4d93fa0c591d2ca8b9ac60965396 WHIRLPOOL 9417571344673ea80e3048d3694f4fe644e33a5e5f62c3457d7d27277f8323dae36e5bc0207c7f853e40f7dd305cf77bfd14567860fe921f9fcdc9b25c83212a
+DIST amqp-1.0.12.tar.gz 70242 SHA256 c2c09d0310009efd9b19fc12efff7a085b789b841341a533451b85750be6518d SHA512 df0cd0032b2a67fc67c016370b8d1c3455330e0656056b1c110f6fc7f1becd755a58fbd72d00a437175cd376b3e7ad956557c810e31ab2c99655cea11d71243c WHIRLPOOL 200f8b7929bc4731b53c3a2da397b4ca37b01d823a8ad998e16b5dfcf80d9350863086a8affed956e93104e15b3381534d8453c95e8dcb0c685e15bb65cdd801
 DIST amqp-1.0.9.tar.gz 70180 SHA256 c31217630cbe2057b9f9c689820f950104ad1aea9cbb05df319d2bb7c916857b SHA512 4e3d38536d96cf4ac788c0a06f3a3a43d29b6b8837864d25d6b854a1d45e066935f4c465868467cc62da719c10b560c3d6170f80494328c1e408f3f1f0f5ea08 WHIRLPOOL 59637941ee2c6e4a600c9134b202e5568f2ae9fda3016f444b2a7afdee0bff2e515b8323be3ff0125d28c7d4418a13375907535a4437264c4894d62ca196b8aa
 EBUILD py-amqp-1.0.11.ebuild 1350 SHA256 05b33ac75ab06c656cc0ae6c8dc791978f56f0a3dd9264b27058b079809dc577 SHA512 6aaf35fd38bc15f0b3e0ffd985fdc76dc7000119586d779c8385549dc8c6f4170454a1eca72b04d5be255c6e4b41fec4e0a43ce2d4c581e5ab0f334b82b1c800 WHIRLPOOL dc0f124a5128895e39a5c21df44352816fddcee2a64dd3af13045b05c1f648ea8c3c226b769ddc4dfe392e3e2b0ccc5d8c7a616bd933d1c5a101f525fb0217dc
-EBUILD py-amqp-1.0.6-r1.ebuild 1407 SHA256 36ba98c75e2f369c03039b739dacffc711f7d7fe8d4a1862f57946857a2afec2 SHA512 704f3a8dc1ec3aec54b707dcc6fcae90872ceb1b143a90c699f34bc7b4a672005576ef463301491daf55b12c9b99053de3f08e91e965e2f94b34a752bb591992 WHIRLPOOL 130a62fcd53235fd8b41632ce512ff8d46ecb59e028afa8fe3c1f6528a95ae47b4d9f40d143ab6f852ff210bc35c8211f6879c360dd493625f0721a8956843b8
-EBUILD py-amqp-1.0.6.ebuild 1184 SHA256 ab9cdbd4731386596442cfa68448364fbffa823dd7ee5b50f739106fecc90160 SHA512 81b6653130a6b6604b11a23519dabab7ca5d53c432657e13356dcc9ab4f686329d9570ada23986a5a27b8a1a75c5a11f8c3c57d93ba4e98efbca1ee5627cb4de WHIRLPOOL 1998459c9706f863f855e0bb980fc5bbf85048d1aa517aa82b28baf70d339f7ac8ea2c478dad75ccd6a091144a3e88b54c0a86427b9b9fdceaf07ff946208d7f
-EBUILD py-amqp-1.0.8.ebuild 1412 SHA256 5f7bbf5d74e18dee6a015ddb88e3d167bbd64e825f59a539bba17a3d132818d6 SHA512 58b374394a1cb702c87b8fb2e15e57b9e6ac64e77507e89fa7758ef07d2cfa8d567d8347b0a112bae6bc866fa42989d979f110686fec6ac4bc4d08d7aedb30d4 WHIRLPOOL 77f26968029bbc04a4a10b2d06d020ded61f44a52f54a4311c426a1e762b8a656a392ffd539ec30129c1b3fdfbb0a4cd99f25302966a80b5d6b94eecff1607ae
+EBUILD py-amqp-1.0.12.ebuild 1422 SHA256 6ed92db11a63340f3ddd4aae387e141c65c3e8a7f1b6fbe8f421f62242ebcd1d SHA512 3207d55a10c1710e98275f92889346fdcc0133db30948094481766f4bce91f231509246eba635ba07a4047fc5a4b2fb9f2476f5f5da9907615b0f73c76cfc50c WHIRLPOOL 47a69673b316942d6e2388aefec91833eebc298127afd2802905ca552333d482d7865b83f2751bcc755d45474b3937ef3409774b2517b75d1eba73af889eea3a
 EBUILD py-amqp-1.0.9.ebuild 1353 SHA256 5e747070cef3e0bb9c02c8d7887ef6cfb1a3d6f66e3ca1110f85d8672fb55f75 SHA512 edf24f39b419e3a66607bd3b4ba9cbdc6456015af1978c0bde9001a30a0c8f4e63cde6813b84ba30f8c9e37511624b1789f83d9bd1d098f6f2f5c676391f0089 WHIRLPOOL c326b9c1911a892e413c92a5711ebd14d138ba64ebbcdd63bea371f32390ed206b9f0738d38420ff2f87418f34fc170ceba5f38717d0132575218ca67c3ec882
-MISC ChangeLog 1063 SHA256 a907552d632857fa31cd71b50728caa73ccae9cb548c3e1fe90dca8161f15049 SHA512 ec42c9cb635d8d3169ca65c0d27fac97c24a946456f4410e146592a8115e3e9ef2dc51fb4b6cf49028d5c2420ceba53d49dba9fc9ac7f7d099e072827118b8f1 WHIRLPOOL 7e4c7683abf1248c33f18c0ae3d389e36ad2535e79b7fc0c160c3853c29e6128ed0b719f16caa8fdb70c7803cb18d5931d03298f45ec91bd0cd0545528dc2574
+MISC ChangeLog 1334 SHA256 931a7409e10c763ad0b3a11610bdd5af82e38783a3f384478e3ef080f7f1be77 SHA512 f00fd031a92cf9e4cd9dab799ee92b286473438358205e5bb80f792a3036d708f5608390b5c99fffef2da0e29fca350cb9fd6273d123fcc2b92ada8bd9c7fed8 WHIRLPOOL 57a64ae9fccbc1c088b3f7fa36c0245ca5e7dcee5e49916ae4fcd6c8f814bac9b55a8633340695c10f9948718871d22845c48b3e120edd325d5f2da5ea29987d
 MISC metadata.xml 494 SHA256 ff3bcf683587958d8c286f62c913dad7d4611ea2012f1b773cecf65c9cecbbe5 SHA512 94215b3bfef565e71f8081b7b33791d5c551a474d427fdd6bc64e7f2ca2dc17c93a4997f58f7d72d9bc731c44b0745fde28b9df2b127a88c7ad57fff2583ce06 WHIRLPOOL f25a0c15134209f69d67bd110c2a6e6d94717a03b7d39da5413a3b26446254c680f72bee891b8fd9969bf890876a6f055bc0f48fb82c086d92da97887ee8e44a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF6qw8ACgkQso7CE7gHKw2CIwCg19w1DGnwBUSNmaDc9mhT/Okd
-To8An1dogs1dQUTy8oGh1yW0grfnPSwm
-=DdBy
+iEYEAREIAAYFAlHMZVEACgkQso7CE7gHKw1UMwCgw5O3NyTsPnqXJv4sNPpamZv+
+/24An0NaGFS7pc0VhpVcpxPN8QsRHzsA
+=+JRM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/py-amqp/py-amqp-1.0.6-r1.ebuild b/dev-python/py-amqp/py-amqp-1.0.12.ebuild
index 968633853954..288791dcbcce 100644
--- a/dev-python/py-amqp/py-amqp-1.0.6-r1.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.0.12.ebuild
@@ -1,10 +1,10 @@
 # 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.0.6-r1.ebuild,v 1.1 2013/02/17 12:55:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.0.12.ebuild,v 1.1 2013/06/27 16:16:08 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
 
 inherit distutils-r1
 
@@ -20,44 +20,36 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples extras"
+IUSE="doc examples extras test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}_disable_socket_tests.patch"
-	)
+PATCHES=( "${FILESDIR}"/${PN}-1.0.6_disable_socket_tests.patch )
 
-	distutils-r1_python_prepare_all
+python_compile_all() {
+	use doc && emake -C docs html
 }
 
 python_test() {
-	cp -r -l funtests "${BUILD_DIR}"/ || die
-
-	cd "${BUILD_DIR}" || die
-	if [[ ${EPYTHON} == python3.* ]]; then
+	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if [[ ${EPYTHON:6:1} == 3 ]]; then
 		# Notes:
 		#   -W is not supported by python3.1
 		#   -n causes Python to write into hardlinked files
 		2to3 --no-diffs -w funtests || die
 	fi
-
 	"${PYTHON}" funtests/run_all.py || ewarn "Tests fail with ${EPYTHON}"
+	rm -rf funtests/ || die
 }
 
 python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc -r docs/.
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	use examples && local EXAMPLES=( demo/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
 	if use extras; then
-		insinto /usr/share/${PF}
+		insinto /usr/share/${PF}/extras
 		doins -r extra
 	fi
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/py-amqp/py-amqp-1.0.6.ebuild b/dev-python/py-amqp/py-amqp-1.0.6.ebuild
deleted file mode 100644
index b0a1386b0a60..000000000000
--- a/dev-python/py-amqp/py-amqp-1.0.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.0.6.ebuild,v 1.2 2013/01/08 21:58:40 iksaif Exp $
-
-EAPI="5"
-
-PYTHON_TESTS_RESTRICTED_ABIS="3.*"
-PYTHON_DEPEND="2 3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-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="~x86 ~amd64"
-IUSE="examples extras test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	if use test; then
-		epatch "${FILESDIR}/${P}_disable_socket_tests.patch"
-	fi
-}
-
-src_test() {
-
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" python \
-			"funtests/run_all.py"
-	}
-
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	dodoc -r docs/*
-	if use examples; then
-		docinto examples
-		dodoc demo/* || die "dodoc failed"
-	fi
-	if use extras; then
-		insinto /usr/share/${PF}
-		doins -r extra || die "doins failed"
-	fi
-}
diff --git a/dev-python/py-amqp/py-amqp-1.0.8.ebuild b/dev-python/py-amqp/py-amqp-1.0.8.ebuild
deleted file mode 100644
index ea27bab98516..000000000000
--- a/dev-python/py-amqp/py-amqp-1.0.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.0.8.ebuild,v 1.1 2013/02/22 05:46:08 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_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="examples extras"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-1.0.6_disable_socket_tests.patch"
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l funtests "${BUILD_DIR}"/ || die
-
-	cd "${BUILD_DIR}" || die
-	if [[ ${EPYTHON} == python3.* ]]; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w funtests || die
-	fi
-
-	"${PYTHON}" funtests/run_all.py || ewarn "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc -r docs/.
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	if use extras; then
-		insinto /usr/share/${PF}
-		doins -r extra
-	fi
-}