add bordering required for unittest2, rm old

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

5 files changed, 19 insertions, 107 deletions

diff --git a/dev-python/testtools/ChangeLog b/dev-python/testtools/ChangeLog
index 6fd87a0e921d..0f04670a7542 100644
--- a/dev-python/testtools/ChangeLog
+++ b/dev-python/testtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/testtools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.114 2014/12/24 08:51:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.115 2014/12/26 07:52:43 idella4 Exp $
+
+  26 Dec 2014; Ian Delaney <idella4@gentoo.org> -testtools-1.1.0.ebuild,
+  -testtools-1.2.0.ebuild, testtools-1.3.0.ebuild:
+  add bordering required for unittest2, rm old
 
 *testtools-1.3.0 (24 Dec 2014)
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index c10a804448ea..75a546e72205 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,12 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST testtools-0.9.36.tar.gz 201717 SHA256 20a1b0d6325f1303ff8112a272047057b73217aac85424aa4065b87641a04499 SHA512 1cb29deb2fb7cd0eebd9affb06e877487989163d0c4452db8051d75b936b0c4ac6443649d52f83cd3695421b361af7dc75507b037528ac0f7cfde9b4b201ad08 WHIRLPOOL 5561c4ef316c31f5c0099beb93eba307328669e43bef36e8da6b1856bf3f75c6b4d81fc0cb777e8397cb246512203c7951c93a52b2a5877e4764cf2e0a749e22
-DIST testtools-1.1.0.tar.gz 206864 SHA256 61f237050738995d43cbda9f6073afed8ee5c287f38080510a8d8dfe0b6cfc53 SHA512 39699335cc99630d6cdc47a76eb2089e1bba4a93196f5e645d847e68649a0630485e440ff3b09605553b662e3b93520fd319e3c68f0c10cc5cd0af6aa53289c4 WHIRLPOOL 98fdc17e4856a9664f0ca8ce409a1db560c8d2441052bf3013c450a0cf5171ff51d844c4434b03d96de00a6cdab5ab5c196c10688ea51c864460c78a6be58a67
-DIST testtools-1.2.0.tar.gz 204140 SHA256 09fc5d0835cce4931e480d965cea247981307b962d8a9dcb428e68169ad2c092 SHA512 b4dd8c70d237bbe3712e2d00bb0fc8fa6cf17ad3142ee88e0f42b75def5cc78a26c9fd5f0ed4dea501b882bab5e5ee1208edb7da29cb32c16100d449496435a4 WHIRLPOOL 19bdd7b4f54f8ca6f39b2d2a8494bd5212177855292b1d5fd07fa355345864a685760763a092d521e3095db30176302f68beb708d4a5457303d9ed5f98756003
 DIST testtools-1.2.1.tar.gz 204223 SHA256 83dde6f4d986fc8941906d373543246c84b935a54e9b2db520ae4676857cecfc SHA512 64669b44891bd9203f869fdf08ef06604b93bed519ca0afe38fa0cadf03fdb0dd129de34dedca847e6b416889aa53eba0a50d025660b273fe228821db11dc65e WHIRLPOOL 480c8500b159942e5797567d6c124abff6b87ef668a298a40b97c04aa0001003fd5dea1f5b9903bb008ddc52d7be8e70aaea0818a09bd0ba6b35543f53d773e5
 DIST testtools-1.3.0.tar.gz 204755 SHA256 3bf0be7c76587e8318936462438124ffb74372f3718def71fe8bd5ba28e1e394 SHA512 319cb0630bfd63c5d87061073358be7b0270bb30c5d94156b7c84ad6563a6ac0267503f6c3b31ab18f45b523719ed9dc69a89b175763225fdf6857989f4340fe WHIRLPOOL 41271a1edfa7ed71cab28fc6a766909f49bf4a810302a7d7137d92fcb1b9ec13b4fe5083ff561b9993f42bfa2ce28ef884bffcb432b032f3c14bf1dacb2de599
 EBUILD testtools-0.9.36.ebuild 1616 SHA256 492a07d74359a6e44313c5878b63e97a63fd7740430d17af2d2ef7685f7689bc SHA512 1a080e65a721aa8248646f43a5520eeaa35c8115caa5f0bcb45d1fc6aadc2bac3a06efd03bc4d68ab4a186a8e645bb6596a59d38e51b6736edd72d3487a377f6 WHIRLPOOL fad0dd1a2eaf4b8cd39f4c3625f7e2ae455ed9e7572f5b2c1a7ee3db85c7421ea4013ce2fa5fc866af55cd346af6c4e26f30d07459c090dd3e68ae60c7d73127
-EBUILD testtools-1.1.0.ebuild 1622 SHA256 ae37fde880d633cafcc05c048014e03fd0c24be0be0f985189e56f9f30d0dfda SHA512 bc499a71adde4e607631b463b9b54b36225c01d31debdfa6a82acde4886e66c229d5694ffc6e8a103a23c139a5ad778c011e4db14b52551797a6f10c86ec9b17 WHIRLPOOL 4f11a588dee456c048084c6a00e556bc9501e90e2857169535980a9e42da4b7994a1f8f9b32e857710848788a03c8abf293217369c66bbe5cec7f4ed23307f8d
-EBUILD testtools-1.2.0.ebuild 1272 SHA256 aeae27133faa79359cfd7a90f049da51055aa5d1383cba3888cd08da4a3d1f38 SHA512 cd7b9bfad32d06c2ee19900184199e8503ad31de45f423a8085e1538c0f8a6386bfd293fcc5d7c9ba727b628388b8b903a70ddbd4fe26044e4333bdfaecc9baa WHIRLPOOL b26a727552dcc36f8beba13a012df8903621dd332e2f0dfb4fb39580ae1e8a37743c4692ef4e80222b1c71f35a537726735661d1668793871c4695ba963b7b8f
 EBUILD testtools-1.2.1.ebuild 1272 SHA256 a9307ca0f9da5f840980fffda3573778bdbedf24c94710b52fc07881d019e227 SHA512 56466e645bf507e4f99d76b18714dec2705888db62d503c46cc767c9a30b18c0fba35c96d29945e41773d49df0e5d8cb185c43863300f3802043d10d9e73d312 WHIRLPOOL d263c2d1e0f52c8a8c83c3b68f1da74f0c4afd4c68482cb95aa95555eb884feaa4f8e5db0330b49422003b1c11e8fda0f611d8193dced0f4efe66b074c55b880
-EBUILD testtools-1.3.0.ebuild 1272 SHA256 6fd85b10258b3f0228f329485348ceaa0c5e23de121305b4a6337438bcae3ea1 SHA512 fa880a9ff89043d0fc4dafaea8f3c5c7bb733c24d088233e4965439d8ee9ee88a28c5513f82ebf544e5d9a75a0f5447bd1966bafd105799be8d1d11862879607 WHIRLPOOL b430caf28d8b5472a64fa0f9754e87d01a19e6062d82a3a685a9c543ea33648246497082aadfbb1968c81731f5feb3586d77c942c6379ead98866f64e6b19143
-MISC ChangeLog 14249 SHA256 8aca9a8dd8b87c0f16d12b684de45840117025a365f5f4ec2b7e01f19bbc9598 SHA512 775a727edd9c6d6ed209acbdcf874583ea607323666b46ef29836cee2553a108d12141d3cd3db490d6efc2e66b8809210937b6ce1842e933e049ef9adc1065f7 WHIRLPOOL c95761b17eb4bd1ed17597bbc7e060fad5c780b5dc0b1991ac6e22c936c8a31621a95f2e190b83888bd0cc5973b66bbdbe7f0cbaa5e245411e481b537a3d68d2
+EBUILD testtools-1.3.0.ebuild 1280 SHA256 2b4f635e052d83a2d79dd9b74936dedf2a39af9a8e467f175704ce1ff59f6050 SHA512 d6a9f19cdfe1b39655b1ebe239bc07d304f290999c8cbb9c2feb7d996c581ccd6016921f13338ff1b3e3dc3ced3b33091f3f2a7deb5c51f9295816bdf01842f9 WHIRLPOOL 653021c601bbc13e92e10aea792a7cf86bf86cad0c2453b21e2134de6f3da8760956b226cac234f22547ffeb99ad250780e4c94f48412f5b3b93374a2ff86387
+MISC ChangeLog 14421 SHA256 0602dccc0ec38b7b1ad7db6f9d8e17796db3318f81bd7c55fb743e9cc81bcb5d SHA512 9079d1af6b6f4705519015f77c27430aa8b15d4bd4e26185a290c6f52702023065d11f854d1349ae77dfdc0759b3c315530b6ccf7f0d878b10c9ea88ea366d7f WHIRLPOOL a711e71d0e825680a58b179a9bb49a9a4b23cb37153e26c66c969ff3f863095f51865852fb9545a32d07bbf5ec521450003d088900aeba0bd4587e5b00e27f6a
 MISC metadata.xml 214 SHA256 98d0eb31b6b097fe81a1f0e0af40f17d4b4c024d57861b935618b4df9f184a64 SHA512 9e55d24c684b01b9973636bef71b2dbbd1d0fb98c388e3ec54309239adee108c411dd871044cf0f8a5b62318b6c95bc449ef2984d141f13d2778d14cad7f3484 WHIRLPOOL 4f2f7a64b6bf835fa086c048f3e7c86d9934431dfa51566e295f5c5079d80af315367e43e281e4199d792eb6d2cc4d8bd57c51960047adbea5a523c2ce00a582
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlSdE9oACgkQso7CE7gHKw3F9ACgpE9HG+pNtT3TqqRVCDcnf7i3
+mpsAoIAKolDfz99u3kjJMIGZ2iuBHJXR
+=+XVW
+-----END PGP SIGNATURE-----
diff --git a/dev-python/testtools/testtools-1.1.0.ebuild b/dev-python/testtools/testtools-1.1.0.ebuild
deleted file mode 100644
index 39490804db40..000000000000
--- a/dev-python/testtools/testtools-1.1.0.ebuild
+++ /dev/null
@@ -1,56 +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/testtools/testtools-1.1.0.ebuild,v 1.1 2014/10/15 11:53:56 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 versionator
-
-#SERIES="$(get_version_component_range 1-2)"
-SERIES="trunk"
-
-DESCRIPTION="Extensions to the Python unittest library"
-HOMEPAGE="https://launchpad.net/testtools http://pypi.python.org/pypi/testtools"
-SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
-		dev-python/extras[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_prepare_all() {
-	# Take out failing tests
-	# https://bugs.launchpad.net/testtools/+bug/1380918
-	sed -e 's:test_test_module:_&:' -e 's:test_test_suite:_&:' \
-		-i testtools/tests/test_distutilscmd.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# Required to allow / ensure all impls to pass run of testsuite
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testtools/testtools-1.2.0.ebuild b/dev-python/testtools/testtools-1.2.0.ebuild
deleted file mode 100644
index 65aec6411102..000000000000
--- a/dev-python/testtools/testtools-1.2.0.ebuild
+++ /dev/null
@@ -1,42 +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/testtools/testtools-1.2.0.ebuild,v 1.3 2014/12/19 19:45:22 floppym Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 versionator
-
-#SERIES="$(get_version_component_range 1-2)"
-SERIES="trunk"
-
-DESCRIPTION="Extensions to the Python unittest library"
-HOMEPAGE="https://launchpad.net/testtools http://pypi.python.org/pypi/testtools"
-SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
-		dev-python/extras[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testtools/testtools-1.3.0.ebuild b/dev-python/testtools/testtools-1.3.0.ebuild
index e2366ae5fb58..4848152d77cc 100644
--- a/dev-python/testtools/testtools-1.3.0.ebuild
+++ b/dev-python/testtools/testtools-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.3.0.ebuild,v 1.1 2014/12/24 08:51:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.3.0.ebuild,v 1.2 2014/12/26 07:52:43 idella4 Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ IUSE="doc test"
 
 RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
 		dev-python/extras[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]"
+		>=dev-python/unittest2-0.8.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )