Roll back stable mock-1.0.1-r1 to original state, create new keyworded mock-1.0.1-r2 with python3.4 fixes

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 3C472B56)

3 files changed, 51 insertions, 7 deletions

diff --git a/dev-python/mock/ChangeLog b/dev-python/mock/ChangeLog
index fe8cccacba94..4e647fdf14e1 100644
--- a/dev-python/mock/ChangeLog
+++ b/dev-python/mock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/mock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.74 2014/04/11 00:41:54 sdamashek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.75 2014/04/11 02:00:05 sdamashek Exp $
+
+*mock-1.0.1-r2 (11 Apr 2014)
+
+  11 Apr 2014; Samuel Damashek <sdamashek@gentoo.org> +mock-1.0.1-r2.ebuild,
+  mock-1.0.1-r1.ebuild:
+  Roll back stable mock-1.0.1-r1 to original state, create new keyworded
+  mock-1.0.1-r2 with python3.4 fixes
 
   11 Apr 2014; Samuel Damashek <sdamashek@gentoo.org>
   +files/mock-1.0.1-fix-python3.4.patch, mock-1.0.1-r1.ebuild:
diff --git a/dev-python/mock/mock-1.0.1-r1.ebuild b/dev-python/mock/mock-1.0.1-r1.ebuild
index 3f3f825c2e26..3e68fdb49953 100644
--- a/dev-python/mock/mock-1.0.1-r1.ebuild
+++ b/dev-python/mock/mock-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r1.ebuild,v 1.18 2014/04/11 00:41:54 sdamashek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r1.ebuild,v 1.19 2014/04/11 02:00:05 sdamashek Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
 
 inherit distutils-r1
 
@@ -22,10 +22,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		virtual/python-unittest2[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-python3.4.patch
-}
-
 python_test() {
 	nosetests || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..d2ee79f0f2ec
--- /dev/null
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r2.ebuild,v 1.1 2014/04/11 02:00:05 sdamashek Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Mocking and Patching Library for Testing"
+HOMEPAGE="http://www.voidspace.org.uk/python/mock/ http://pypi.python.org/pypi/mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc test"
+
+# dev-python/unittest2 is not required with Python >=3.2.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		virtual/python-unittest2[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-python3.4.patch
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( docs/*.txt )
+
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dohtml -r html/ -x html/objects.inv -x html/output.txt -x html/_sources
+	fi
+}