bump; clean old python impl, add py3.4, update deps, switch from patch to sed statements (lighter weight and easier maint.) to fix doc build, fixes Bug #530610

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

4 files changed, 74 insertions, 9 deletions

diff --git a/dev-python/testfixtures/ChangeLog b/dev-python/testfixtures/ChangeLog
index 8d804a35e224..7f27533c7b1f 100644
--- a/dev-python/testfixtures/ChangeLog
+++ b/dev-python/testfixtures/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/testfixtures
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/ChangeLog,v 1.8 2014/06/30 08:18:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/ChangeLog,v 1.9 2014/11/30 04:06:57 idella4 Exp $
+
+*testfixtures-4.1.1 (30 Nov 2014)
+
+  30 Nov 2014; Ian Delaney <idella4@gentoo.org> +testfixtures-4.1.1.ebuild,
+  testfixtures-3.0.0.ebuild:
+  bump; clean old python impl, add py3.4, update deps, switch from patch to sed
+  statements (lighter weight and easier maint.) to fix doc build, fixes Bug
+  #530610
 
   30 Jun 2014; Ian Delaney <idella4@gentoo.org> +files/docbuild.patch,
   -files/testfixtures-2.3.4-adjust_tests.patch, -testfixtures-2.3.4.ebuild,
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 484fa54edaa8..e1baca17dea4 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -3,13 +3,15 @@ Hash: SHA256
 
 AUX docbuild.patch 835 SHA256 7cfa67ab2843e0adab1d326611f1ed798b0ed7fce9e89785a57ce0912e912b7d SHA512 f135f91501b7308c9e535ed2773a4acab5ae83d8c7f3a387395a6a120ad9c1b2bc132c5b30333824d082553faa7c1152818654d9e1d7cebd9d488f02f29a82cb WHIRLPOOL ff610fe06ce611eb6b6a2ba7babd1225119e1f82d07e3962eae0483f6c9357dea73446c2183d32911ac40979cffb8c4c630b94592d9599d09f8a83818b2797a0
 DIST testfixtures-3.0.0.tar.gz 75303 SHA256 20e82e23ffc39bd7d55317f2e87e49aa33ac15142f2bd38fedde696ccaa9469f SHA512 9bc7e30cad6a0c932f23de49f9aff099cb4de824f20b4f98bf1fb4a7313d7ac8d763f7c8208bc0f5351dcd899daa3d2fbc18cdc2143c1b65cefbe0f3ba29df0c WHIRLPOOL 5d51daa288f0c31ce0547815b15f7242df4d3309f2c0845cfa36241ba6d16b151caa1924977a35ae9753c1243724d1aac74cda2b7f5e64e981c378fa6696a512
-EBUILD testfixtures-3.0.0.ebuild 1308 SHA256 ae4bb8ecad7eb8d085f5e58dc110986368e136a57601e4a7d229962ce1b4430a SHA512 8b945089c488a2492e98aefce486e7772a7ee8ba3f0b2642c427d9bbfe513ea551e01887555a455313ae470bbb1ed1db446ec3cdeb75c45c180bc3bda022d6e8 WHIRLPOOL 3aab32d47c7152aeac7558e3c02fdb7934462806c68de99a79c88529e208f182d3fcb44ad3be4667339657091366789bec4446f42bc5c01060d52a1021800113
-MISC ChangeLog 1571 SHA256 cc4250e95ca24a2b14c7ae176dd3d1903480ce967d25add756554ddf1596064b SHA512 b386e6684bb3b6de1a81b16f7e22651dfd5c82e9409297ca433ca3940452762c40260c26e5e27c9f2921b68eb2f7c001c97f17c1aa2b9dc40e93d7cc5df75b79 WHIRLPOOL f2107c4b1872d629a048f5aa1fc709036533091f57cc64c06915c224cc6a04cc964c910009def7606401b4ee7072857ee4ae58abac6eeea5ce8db473938b26d4
+DIST testfixtures-4.1.1.tar.gz 81356 SHA256 c61b13fd9cac0313e2aafd565a007860d83b218a138117ac421368d2896bc215 SHA512 08785961560218c3a06043158af8364b46b850c159a82e5fd05ccd88133786aed1a0ec9038ef0c0e36430853559e29fefca8f6bfee1b942730010cd3fb8e9ae4 WHIRLPOOL be548f4fa3bf9428cf683d229c9c4569ba2028a05aa284d803a282af293999fd38565f2b9701751c8f84d57faea6efd3a9e1e5ee5375b719957fe6dc7c4cbdf5
+EBUILD testfixtures-3.0.0.ebuild 1312 SHA256 41a5c6c145a1a3be6f3b4d3ca0a7de1014a6024b423031c24652f53f91037d21 SHA512 1b4c211b7a2a981ea3d5a17947bb581d9883e8483f5ea2d7876354ff1e6fb6fd5c92680d51c055c140d7b7499791351f191db404201a0ee8d43eabe38fede6ea WHIRLPOOL bfb0e4b48d3401a3fa70e48a06c8ac18632a44903578a20593227fecbc2bc49bbbccf5c4ec1a9866124b9ad13939dd7f9aa6494b77302b2c3777340d4b41534e
+EBUILD testfixtures-4.1.1.ebuild 1714 SHA256 26dc8b7c39871d4bd5d8b70f0539f49d262c0abdda4d7e48b11f837ccaece786 SHA512 84d287d40af9d1519e55abc4d6063e3e01060c496733f52b58dedabeebf458f884f87316cda3e4982ad060fb735e3387f3adb1f3c224d0d59ff8398f5aeb6c4e WHIRLPOOL 3e67a8d08af23308759cb3b802e706fa11921f7b3a5c7c54ae159e7d1abb5dcc34a59b1ed50824df8039cb957ac6bf78bbbfcc020d3400c6f5f757b3c039057a
+MISC ChangeLog 1878 SHA256 56b7f437ae1d0200ce5d4eefd4860a2c2fdfb2fb99edbfcc79d6a38ae97787bf SHA512 c28ce45df4716b7c291d65b040aba276c6494b193743ed945b02791c8ab6db3ecbfe1bd29b8e2b9122ffb4cabe95fe3326d280b1d660699a3b4611d57cbf0204 WHIRLPOOL 076581c06718deedbd6a86879a298b81dcd4412802c27480a4ae740e0cfc716aabaebd08ccc7ced79aad9095b7821452357b021ff5770fb2f40ce0acdb56c4d0
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOxG4IACgkQso7CE7gHKw3tHQCgoCUtBPNo/t6lrpDwKWzugQcc
-jVMAnjnpash6wwv3wbyzuKj5hvJ7KQnA
-=MCTa
+iEYEAREIAAYFAlR6mAEACgkQso7CE7gHKw3u8gCfWmO1Ar0dMNF4UC0QCKj/bY5v
+T5IAoKDiJxzXIzaPbeemEnNuoqs9o45R
+=umKF
 -----END PGP SIGNATURE-----
diff --git a/dev-python/testfixtures/testfixtures-3.0.0.ebuild b/dev-python/testfixtures/testfixtures-3.0.0.ebuild
index f3b966fd0519..b26d5b8e0a4c 100644
--- a/dev-python/testfixtures/testfixtures-3.0.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-3.0.0.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/testfixtures/testfixtures-3.0.0.ebuild,v 1.4 2014/06/30 08:18:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v 1.5 2014/11/30 04:06:57 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testfixtures/testfixtures-4.1.1.ebuild b/dev-python/testfixtures/testfixtures-4.1.1.ebuild
new file mode 100644
index 000000000000..bdbdf512ec40
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-4.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-4.1.1.ebuild,v 1.1 2014/11/30 04:06:57 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="http://pypi.python.org/pypi/testfixtures/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7 pypy ) )
+	test? ( dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/nose_fixes[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+python_prepare_all() {
+	# Makefile comes set pointing at a wrong location
+	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile || die
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests ${PN}/tests || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}