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

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 22 insertions, 144 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/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
-}