bump, rm old

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

3 files changed, 13 insertions, 56 deletions

diff --git a/dev-python/pyzmq/ChangeLog b/dev-python/pyzmq/ChangeLog
index ca1f83e5f42f..d833b118da81 100644
--- a/dev-python/pyzmq/ChangeLog
+++ b/dev-python/pyzmq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyzmq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.72 2015/04/08 08:05:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.73 2015/05/12 14:55:14 idella4 Exp $
+
+  12 May 2015; Ian Delaney <idella4@gentoo.org> -pyzmq-14.3.1.ebuild,
+  pyzmq-14.5.0.ebuild:
+  bump, rm old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> pyzmq-2.2.0.1-r1.ebuild:
   Drop old Python implementations
diff --git a/dev-python/pyzmq/pyzmq-14.3.1.ebuild b/dev-python/pyzmq/pyzmq-14.3.1.ebuild
deleted file mode 100644
index b834afd19603..000000000000
--- a/dev-python/pyzmq/pyzmq-14.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.3.1.ebuild,v 1.8 2014/12/30 16:58:13 floppym Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples green test"
-
-PY2_USEDEP=$(python_gen_usedep python2_7)
-RDEPEND=">=net-libs/zeromq-2.1.9
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/cffi[${PYTHON_USEDEP}]
-	green? ( dev-python/gevent[${PY2_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_configure_all() {
-	tc-export CC
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	if python_is_python3; then
-		einfo "Skipping python3 due to lack of support by gevent"
-	else
-		nosetests -svw "${BUILD_DIR}/lib/"
-	fi
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyzmq/pyzmq-14.5.0.ebuild b/dev-python/pyzmq/pyzmq-14.5.0.ebuild
index 293477dacb6f..cd5ca8d03bd5 100644
--- a/dev-python/pyzmq/pyzmq-14.5.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.5.0.ebuild,v 1.3 2015/02/17 12:04:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.5.0.ebuild,v 1.4 2015/05/12 14:55:14 idella4 Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ PY2_USEDEP=$(python_gen_usedep python2_7)
 RDEPEND="
 	>=net-libs/zeromq-4.0.5:=
 	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/cffi[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? (
@@ -34,6 +34,12 @@ DEPEND="${RDEPEND}
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 	)"
 
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	tc-export CC
 }