revbumped 0.9.3 backporting the fix, drop old

Package-Manager: portage-2.1.3.9

9 files changed, 82 insertions, 83 deletions

diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog
index 9094b5e81f84..13cc8a649fed 100644
--- a/dev-python/nose/ChangeLog
+++ b/dev-python/nose/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/nose
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.6 2007/09/14 09:24:14 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.7 2007/09/14 09:59:11 hawking Exp $
+
+*nose-0.9.3-r1 (14 Sep 2007)
+
+  14 Sep 2007; Ali Polatel <hawking@gentoo.org>
+  +files/nose-0.9.3-tests-nonetwork.patch,
+  +files/nose-0.10.0_beta1-tests-nonetwork.patch,
+  -files/nose-tests-nonetwork.patch, -nose-0.9.3.ebuild,
+  +nose-0.9.3-r1.ebuild, -nose-0.10.0_alpha2.ebuild,
+  nose-0.10.0_beta1.ebuild:
+  revbumped 0.9.3 backporting the fix, drop old
 
 *nose-0.10.0_beta1 (14 Sep 2007)
 
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 6e9e10defa3b..9aafcc6f6e13 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,36 +1,32 @@
-AUX nose-tests-nonetwork.patch 1127 RMD160 ae22ddbc15b6b905863d2a7127ed1aa22a38425f SHA1 9816c51e0bfbbf7f90536a4d5ab4977158f47c0e SHA256 adaffe3361c1490be70b545acac40c91a85b29a307f815d7240c02bfd6fb4db3
-MD5 d58915058c5f5fb47beab2535042927d files/nose-tests-nonetwork.patch 1127
-RMD160 ae22ddbc15b6b905863d2a7127ed1aa22a38425f files/nose-tests-nonetwork.patch 1127
-SHA256 adaffe3361c1490be70b545acac40c91a85b29a307f815d7240c02bfd6fb4db3 files/nose-tests-nonetwork.patch 1127
-DIST nose-0.10.0a2.tar.gz 255471 RMD160 778e0d78da42fdd9d74c7440977a760a3a78e439 SHA1 bba9e919272cd59c6f97f1c533a35b4a30271cec SHA256 5a3d8d2a6b7683188932be8c486933e7c152b453305d207b94cd3393108ea683
+AUX nose-0.10.0_beta1-tests-nonetwork.patch 1127 RMD160 ae22ddbc15b6b905863d2a7127ed1aa22a38425f SHA1 9816c51e0bfbbf7f90536a4d5ab4977158f47c0e SHA256 adaffe3361c1490be70b545acac40c91a85b29a307f815d7240c02bfd6fb4db3
+MD5 d58915058c5f5fb47beab2535042927d files/nose-0.10.0_beta1-tests-nonetwork.patch 1127
+RMD160 ae22ddbc15b6b905863d2a7127ed1aa22a38425f files/nose-0.10.0_beta1-tests-nonetwork.patch 1127
+SHA256 adaffe3361c1490be70b545acac40c91a85b29a307f815d7240c02bfd6fb4db3 files/nose-0.10.0_beta1-tests-nonetwork.patch 1127
+AUX nose-0.9.3-tests-nonetwork.patch 1073 RMD160 42166ba47fc916e50c913d6d062b7cb21c1c7ede SHA1 14e952c1ac472f7c3e8975e3c09c5316ec3189ee SHA256 b9191506e0f7875cda28e62ee26c90963b2a464d18df98d40350f4cdd6772f60
+MD5 647e4e37532605662da27696e76ab46d files/nose-0.9.3-tests-nonetwork.patch 1073
+RMD160 42166ba47fc916e50c913d6d062b7cb21c1c7ede files/nose-0.9.3-tests-nonetwork.patch 1073
+SHA256 b9191506e0f7875cda28e62ee26c90963b2a464d18df98d40350f4cdd6772f60 files/nose-0.9.3-tests-nonetwork.patch 1073
 DIST nose-0.10.0b1.tar.gz 277581 RMD160 5cf1241e44ed46ac3ed3e012e76d325c08988bde SHA1 da1b1ee91bb000d20219d73de94cf5bbf242e0cf SHA256 c5be4c5c3c2624eb35c644ef34be3e5962cb78723a3c7c7f5731c77626f79f14
 DIST nose-0.9.3.tar.gz 141603 RMD160 5419cb1f9750e4c13780b7ad0735ef1350b2beb8 SHA1 de05448508c9a227e7da885d50744410615d96de SHA256 3093e91694e6bfab7b3d4aa58e1c6cd1550d83d932db4f3ab3ad8c28c7b78da8
-EBUILD nose-0.10.0_alpha2.ebuild 1070 RMD160 3ea280e01d0cf21687a0c8cea8a922da817ecb93 SHA1 67b905787a9dc3855a4858bc21c8e7b720402415 SHA256 cf7e107a37b3b70f71d552e4087d22cdbed1f90a20cd420cdf3a2acd48a682e5
-MD5 9517e91589b32eb5a8251dc8ea0bac31 nose-0.10.0_alpha2.ebuild 1070
-RMD160 3ea280e01d0cf21687a0c8cea8a922da817ecb93 nose-0.10.0_alpha2.ebuild 1070
-SHA256 cf7e107a37b3b70f71d552e4087d22cdbed1f90a20cd420cdf3a2acd48a682e5 nose-0.10.0_alpha2.ebuild 1070
-EBUILD nose-0.10.0_beta1.ebuild 1436 RMD160 3ec1491e04540d7a9ee0ae8f7eceda72fabaab43 SHA1 5321ab1d25f0477ff3623ee4de9565ae7103a9a8 SHA256 94351c0080ec8c1a83eb936901173ef3eb9f44bdbdfc451142d81659024beeb3
-MD5 868d721842b1df86bb975fff6aba2b98 nose-0.10.0_beta1.ebuild 1436
-RMD160 3ec1491e04540d7a9ee0ae8f7eceda72fabaab43 nose-0.10.0_beta1.ebuild 1436
-SHA256 94351c0080ec8c1a83eb936901173ef3eb9f44bdbdfc451142d81659024beeb3 nose-0.10.0_beta1.ebuild 1436
-EBUILD nose-0.9.3.ebuild 968 RMD160 8c455fc442fe25e5c895e18377b88ad1f4a7eb89 SHA1 b1c71574665f023695bda82e29b0511cafe63ff9 SHA256 87dd056f3e6fff879486139a9d9b9567d0e746c0ec452c93a1e40ed5c977a623
-MD5 c244825dbdede61617aa68487b59fc32 nose-0.9.3.ebuild 968
-RMD160 8c455fc442fe25e5c895e18377b88ad1f4a7eb89 nose-0.9.3.ebuild 968
-SHA256 87dd056f3e6fff879486139a9d9b9567d0e746c0ec452c93a1e40ed5c977a623 nose-0.9.3.ebuild 968
-MISC ChangeLog 1200 RMD160 ad3099749d61e97555d7ce0759a821845ed8ee40 SHA1 56df94ed2cea545b94fa3ba951a1230b3fb45af3 SHA256 b59140061ac3048bd6e9ba674b1b95aa7bff8712917a307772f1f2be6e6b5a8a
-MD5 bf59beb0be3d5157df3ab1aa908460a6 ChangeLog 1200
-RMD160 ad3099749d61e97555d7ce0759a821845ed8ee40 ChangeLog 1200
-SHA256 b59140061ac3048bd6e9ba674b1b95aa7bff8712917a307772f1f2be6e6b5a8a ChangeLog 1200
+EBUILD nose-0.10.0_beta1.ebuild 1435 RMD160 da324ad8ca51ec34e1f9ed6c754df080e974123d SHA1 011e4879c35e4a5a93a430be1e6da82795228b9e SHA256 b0821a39fd3bf6374d0d3f9b5152fb57440edfa58cd89d9df04d780c522be2a3
+MD5 c526e63ec926b81a83e5d707e111f3c3 nose-0.10.0_beta1.ebuild 1435
+RMD160 da324ad8ca51ec34e1f9ed6c754df080e974123d nose-0.10.0_beta1.ebuild 1435
+SHA256 b0821a39fd3bf6374d0d3f9b5152fb57440edfa58cd89d9df04d780c522be2a3 nose-0.10.0_beta1.ebuild 1435
+EBUILD nose-0.9.3-r1.ebuild 1338 RMD160 fac759470527c3add15bca1f24fa1bb68dd2fafe SHA1 7d7343fd25f4b61e9106b54ed2e53fbaf0862a9b SHA256 915157b6c850e380f6d2bfabe6fe7300c81e7f3a3b964490ca52c6c936b91053
+MD5 fc36032d8fc72838f0a8df06c135df2f nose-0.9.3-r1.ebuild 1338
+RMD160 fac759470527c3add15bca1f24fa1bb68dd2fafe nose-0.9.3-r1.ebuild 1338
+SHA256 915157b6c850e380f6d2bfabe6fe7300c81e7f3a3b964490ca52c6c936b91053 nose-0.9.3-r1.ebuild 1338
+MISC ChangeLog 1558 RMD160 1306171e851ec476efdbfe782027fc23a2aea818 SHA1 a34e3724dd02bb4a0c38183a1f69fa9eed1cbac1 SHA256 23641baff2c18d14aeb4e6df13f8e0f93bd7b875a5d2eee6394f2946805a20e6
+MD5 de8ff4a9c727660981148cadfbae8ce2 ChangeLog 1558
+RMD160 1306171e851ec476efdbfe782027fc23a2aea818 ChangeLog 1558
+SHA256 23641baff2c18d14aeb4e6df13f8e0f93bd7b875a5d2eee6394f2946805a20e6 ChangeLog 1558
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
-MD5 d9c0dd766edf786437ec3b5e5b4a11c8 files/digest-nose-0.10.0_alpha2 241
-RMD160 31a202c20bd541b89367cbc73c9dc99ff6909c56 files/digest-nose-0.10.0_alpha2 241
-SHA256 761507e98c591ce8488148b1f18fdd7d70e21dba8569f854bd819aabd929c90b files/digest-nose-0.10.0_alpha2 241
 MD5 ed1b1df48a86439f5f32e085563e2b18 files/digest-nose-0.10.0_beta1 241
 RMD160 c9410a41c90f9b2a41d14bad83d48519e4b427b1 files/digest-nose-0.10.0_beta1 241
 SHA256 fa3afe30453b96a37caed1b06f084fac59fa362fb0408c0f5720ac3ed7e674a0 files/digest-nose-0.10.0_beta1 241
-MD5 a23cc529a8c0faba6a64d8f1f03bda56 files/digest-nose-0.9.3 232
-RMD160 f4b64f902277d9b55b4ce2587629ed0f3ae34635 files/digest-nose-0.9.3 232
-SHA256 9b1a7946f46a858a979bad20ad81bdb67efdbd3353e1d40240e5c2610a59852e files/digest-nose-0.9.3 232
+MD5 a23cc529a8c0faba6a64d8f1f03bda56 files/digest-nose-0.9.3-r1 232
+RMD160 f4b64f902277d9b55b4ce2587629ed0f3ae34635 files/digest-nose-0.9.3-r1 232
+SHA256 9b1a7946f46a858a979bad20ad81bdb67efdbd3353e1d40240e5c2610a59852e files/digest-nose-0.9.3-r1 232
diff --git a/dev-python/nose/files/digest-nose-0.10.0_alpha2 b/dev-python/nose/files/digest-nose-0.10.0_alpha2
deleted file mode 100644
index 387bf765b7c2..000000000000
--- a/dev-python/nose/files/digest-nose-0.10.0_alpha2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfa4ccb9d9888011345f2b05d3ec7f54 nose-0.10.0a2.tar.gz 255471
-RMD160 778e0d78da42fdd9d74c7440977a760a3a78e439 nose-0.10.0a2.tar.gz 255471
-SHA256 5a3d8d2a6b7683188932be8c486933e7c152b453305d207b94cd3393108ea683 nose-0.10.0a2.tar.gz 255471
diff --git a/dev-python/nose/files/digest-nose-0.9.3 b/dev-python/nose/files/digest-nose-0.9.3-r1
index 8e81fd53a136..8e81fd53a136 100644
--- a/dev-python/nose/files/digest-nose-0.9.3
+++ b/dev-python/nose/files/digest-nose-0.9.3-r1
diff --git a/dev-python/nose/files/nose-tests-nonetwork.patch b/dev-python/nose/files/nose-0.10.0_beta1-tests-nonetwork.patch
index d853db93ce65..d853db93ce65 100644
--- a/dev-python/nose/files/nose-tests-nonetwork.patch
+++ b/dev-python/nose/files/nose-0.10.0_beta1-tests-nonetwork.patch
diff --git a/dev-python/nose/files/nose-0.9.3-tests-nonetwork.patch b/dev-python/nose/files/nose-0.9.3-tests-nonetwork.patch
new file mode 100644
index 000000000000..eb13d258878b
--- /dev/null
+++ b/dev-python/nose/files/nose-0.9.3-tests-nonetwork.patch
@@ -0,0 +1,31 @@
+--- unit_tests/test_twisted.py.orig	2007-04-22 01:40:41.000000000 +0300
++++ unit_tests/test_twisted.py	2007-09-14 12:42:32.000000000 +0300
+@@ -7,28 +7,6 @@
+ class CustomError(Exception):
+     pass
+ 
+-# Should succeed unless python-hosting is down
+-#@deferred
+-def test_resolve():
+-    return reactor.resolve("nose.python-hosting.com")
+-test_resolve = deferred()(test_resolve)
+-
+-# Raises TypeError because the function does not return a Deferred
+-#@raises(TypeError)
+-#@deferred()
+-def test_raises_bad_return():
+-    reactor.resolve("nose.python-hosting.com")
+-test_raises_bad_return = raises(TypeError)(deferred()(test_raises_bad_return))
+-
+-# Check we propagate twisted Failures as Exceptions
+-# (XXX this test might take some time: find something better?)
+-#@raises(DNSLookupError)
+-#@deferred()
+-def test_raises_twisted_error():
+-    return reactor.resolve("x.y.z")
+-test_raises_twisted_error = raises(DNSLookupError)(
+-    deferred()(test_raises_twisted_error))
+-
+ # Check we detect Exceptions inside the callback chain
+ #@raises(CustomError)
+ #@deferred(timeout=1.0)
diff --git a/dev-python/nose/nose-0.10.0_alpha2.ebuild b/dev-python/nose/nose-0.10.0_alpha2.ebuild
deleted file mode 100644
index b1bf006bd446..000000000000
--- a/dev-python/nose/nose-0.10.0_alpha2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.10.0_alpha2.ebuild,v 1.1 2007/07/31 08:21:43 dev-zero Exp $
-
-NEED_PYTHON=2.2
-
-inherit distutils
-
-MY_PV="${PV/_alpha/a}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
-HOMEPAGE="http://somethingaboutorange.com/mrl/projects/nose/"
-SRC_URI="http://somethingaboutorange.com/mrl/projects/nose/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-S="${WORKDIR}/${MY_P}"
-IUSE="doc examples"
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-
-src_compile() {
-	distutils_src_compile
-	if use doc ; then
-		PYTHONPATH=. scripts/mkindex.py
-	fi
-}
-
-src_install() {
-	DOCS="AUTHORS NEWS"
-	distutils_src_install
-
-	use doc && dohtml index.html
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" setup.py test || die "test failed"
-}
diff --git a/dev-python/nose/nose-0.10.0_beta1.ebuild b/dev-python/nose/nose-0.10.0_beta1.ebuild
index 8b82e8a92c0b..b45a95d00629 100644
--- a/dev-python/nose/nose-0.10.0_beta1.ebuild
+++ b/dev-python/nose/nose-0.10.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.10.0_beta1.ebuild,v 1.1 2007/09/14 09:24:14 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.10.0_beta1.ebuild,v 1.2 2007/09/14 09:59:11 hawking Exp $
 
 NEED_PYTHON=2.2
 
@@ -29,7 +29,7 @@ src_unpack() {
 
 	# If twisted is in USE, disable twisted tests that access the network
 	# else remove nose.twistedtools and related tests
-	use twisted && epatch "${FILESDIR}/${PN}-tests-nonetwork.patch"
+	use twisted && epatch "${FILESDIR}/${P}-tests-nonetwork.patch"
 	use twisted || rm nose/twistedtools.py unit_tests/test_twisted*
 }
 
diff --git a/dev-python/nose/nose-0.9.3.ebuild b/dev-python/nose/nose-0.9.3-r1.ebuild
index 1c2daed1cf02..39aa2699e628 100644
--- a/dev-python/nose/nose-0.9.3.ebuild
+++ b/dev-python/nose/nose-0.9.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.9.3.ebuild,v 1.2 2007/07/04 20:53:20 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.9.3-r1.ebuild,v 1.1 2007/09/14 09:59:11 hawking Exp $
 
 NEED_PYTHON=2.2
 
-inherit distutils
+inherit distutils eutils
 
 KEYWORDS="~amd64 ~x86"
 
@@ -13,12 +13,22 @@ HOMEPAGE="http://somethingaboutorange.com/mrl/projects/nose/"
 SRC_URI="http://somethingaboutorange.com/mrl/projects/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc examples"
+IUSE="doc examples twisted"
 
-RDEPEND="dev-python/setuptools"
+RDEPEND="dev-python/setuptools
+	twisted? ( dev-python/twisted )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/docutils )"
 
+src_unpack() {
+	distutils_src_unpack
+
+	# If twisted is in USE, disable twisted tests that access the network
+	# else remove nose.twistedtools and related tests
+	use twisted && epatch "${FILESDIR}/${P}-tests-nonetwork.patch"
+	use twisted || rm nose/twistedtools.py unit_tests/test_twisted*
+}
+
 src_compile() {
 	distutils_src_compile
 	if use doc ; then
@@ -28,7 +38,7 @@ src_compile() {
 
 src_install() {
 	DOCS="AUTHORS NEWS"
-	distutils_src_install
+	distutils_src_install --install-data /usr/share
 
 	use doc && dohtml index.html