Version bump, removed old. Closes bug #241218

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 26 insertions, 49 deletions

diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog
index 3001984650f1..0c30d44103d1 100644
--- a/dev-python/nose/ChangeLog
+++ b/dev-python/nose/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/nose
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.18 2008/10/04 16:59:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.19 2008/10/11 17:05:27 pythonhead Exp $
+
+*nose-0.10.4 (11 Oct 2008)
+
+  11 Oct 2008; Rob Cakebread <pythonhead@gentoo.org> -nose-0.10.0.ebuild,
+  -nose-0.10.1.ebuild, +nose-0.10.4.ebuild:
+  Version bump, removed old. Closes bug #241218
 
   04 Oct 2008; Brent Baude <ranger@gentoo.org> nose-0.9.3-r1.ebuild,
   nose-0.10.3.ebuild:
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 453304b05569..66ae78a58f5b 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,12 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nose-0.10.0-tests-nonetwork.patch 1127 RMD160 17d928c8f05676d653ed2ab9022d5c63e7929b8c SHA1 f79a86c8b1d42f8d6dd079e22caee4621315c44c SHA256 1eccfdde4ef59292e1bb517a28556c35ea4b899ab29b92cff4ea968219db3168
 AUX nose-0.9.3-tests-nonetwork.patch 1073 RMD160 42166ba47fc916e50c913d6d062b7cb21c1c7ede SHA1 14e952c1ac472f7c3e8975e3c09c5316ec3189ee SHA256 b9191506e0f7875cda28e62ee26c90963b2a464d18df98d40350f4cdd6772f60
-DIST nose-0.10.0.tar.gz 248803 RMD160 c98073b62f2251fc055d1d367125ba169e992cc9 SHA1 8f2f39297980820061552068efd10c2d25c1f6f6 SHA256 7f96c99063480dbf2655c9dea28f4ebe7154001cc52f00709c9bab589cdac941
-DIST nose-0.10.1.tar.gz 251787 RMD160 3eb7e10b2db7aff4cca651abb59777d1406f7c4a SHA1 c4d7fe3b3ae8f881bcb250e3068323fa84e3ac2e SHA256 a2b050de7352fdb592c67830b14eed1e16763ca7c2ccbabb71730cc05b6c9157
 DIST nose-0.10.3.tar.gz 271775 RMD160 ab06299c7106a1b318799cae5ac60be2e924ce2d SHA1 31a47c2b59d0cb513ca5ef8476a94c9194a34ff7 SHA256 78c15d680ed7165673487b71d434cf22f801085bcf8b20e9f4984dee03b30b52
+DIST nose-0.10.4.tar.gz 284311 RMD160 0a855579c2401f7a353d915b5ce21a7aa3dd5197 SHA1 e0235c0d4dad211357c073df2376f1d9775d342c SHA256 0c76fd1f8ef4a888cad8da3f0b426406dee030070bb2845316eabf1d8f4a1d36
 DIST nose-0.9.3.tar.gz 141603 RMD160 5419cb1f9750e4c13780b7ad0735ef1350b2beb8 SHA1 de05448508c9a227e7da885d50744410615d96de SHA256 3093e91694e6bfab7b3d4aa58e1c6cd1550d83d932db4f3ab3ad8c28c7b78da8
-EBUILD nose-0.10.0.ebuild 1035 RMD160 7536ddcbdfd0e1aee8c6be3c3bf3fc38bad52aec SHA1 60a30f91846af6431fbd01ba1496e76b23cfa57e SHA256 c0cba75f204eb7e29e8898e3e66ae53201b1137c21af9ec22adcbd1813fa46fb
-EBUILD nose-0.10.1.ebuild 1043 RMD160 e76f46ef0299a3fc38795b6b9d930660964af175 SHA1 0083e8ec8c0f6b2c3cf4872d94fad76b9ebebc64 SHA256 5d942f6cfc305a7c3939525c0aeae84737dc457b0cffabf89c50a0795e8ce6c3
 EBUILD nose-0.10.3.ebuild 1262 RMD160 6d06313168b91f03a2b356c3cf6119cfa73cba05 SHA1 78c749003d75a667b0b725c5adae4afee412f193 SHA256 95a9ef411b0f1bfc5f5db147b419e53398141bb53041904903239b27bf70fc95
+EBUILD nose-0.10.4.ebuild 1266 RMD160 834f705e1e10426eedf60fd73d002adeceafad2d SHA1 048dceaf91cba7c6dc91dd27f4634177740762ad SHA256 8c1329693587903ab105d9ccd2cc2338c33cbb5e0400d13e14dc314a2479657f
 EBUILD nose-0.9.3-r1.ebuild 1360 RMD160 6bfc5f57ef889c8c6a28911ff0e6ef7584a39b4d SHA1 becb9db48609723807136739d996f3a2a5952688 SHA256 01ee7d49de00fe72f9e4bab447b90571d3c4e8353dbbdc0506ff89584eed293f
-MISC ChangeLog 2966 RMD160 346fc4ba1ecf6c129383b24a08f9141d1e4ef1cf SHA1 b1dde8f8979a9504344811fa3bb2848a5c3890e7 SHA256 58cd58e66a95d7059297e12d4e6284659472ce046b826b5db55da6e9a9d325d9
+MISC ChangeLog 3165 RMD160 69aa5eb7ed2fb22f93f6f1f8719111874d2ba888 SHA1 fb9dad19364ffc3790e95f778ec4a5c1308ba19d SHA256 d794f08798aa0357f4c3dccaf00e07cbc5c7641327cd3eb62cbb07d7fffb14ef
 MISC metadata.xml 260 RMD160 9b94655ec2ecf067468e018cc1e59301d32438fe SHA1 85b2103b36cf8b9d8d7ed6d158f3ad09fb878dfa SHA256 4c805a4ea3fadc43fdc844aa0e0fb43bbea5bd057a2d6d144407e73eb3a445ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjw3NsACgkQ8aihIaC/zgBbdQCgkqvcl6sBMkKs6/L+yfDlbsVz
+pLEAniDawDdZXYUdO1W+eHP/E94PvMV3
+=cEi+
+-----END PGP SIGNATURE-----
diff --git a/dev-python/nose/nose-0.10.0.ebuild b/dev-python/nose/nose-0.10.0.ebuild
deleted file mode 100644
index e568436db840..000000000000
--- a/dev-python/nose/nose-0.10.0.ebuild
+++ /dev/null
@@ -1,41 +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.ebuild,v 1.1 2007/10/14 11:53:59 hawking Exp $
-
-inherit distutils eutils
-
-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/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}
-	test? ( dev-python/twisted )"
-
-src_unpack() {
-	distutils_src_unpack
-
-	# Disable tests that access the network
-	epatch "${FILESDIR}/${P}-tests-nonetwork.patch"
-}
-
-src_install() {
-	DOCS="AUTHORS"
-	distutils_src_install --install-data /usr/share
-
-	use doc && dohtml doc/*
-
-	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.1.ebuild b/dev-python/nose/nose-0.10.4.ebuild
index 08a933ff7fb2..a2ef27c00212 100644
--- a/dev-python/nose/nose-0.10.1.ebuild
+++ b/dev-python/nose/nose-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.10.1.ebuild,v 1.1 2008/01/31 16:38:56 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.10.4.ebuild,v 1.1 2008/10/11 17:05:27 pythonhead Exp $
 
 inherit distutils eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://somethingaboutorange.com/mrl/projects/nose/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND="dev-python/setuptools"
@@ -37,5 +37,9 @@ src_install() {
 }
 
 src_test() {
+	# Create the missing empty directory, that's required for tests to pass
+	if [[ ! -e "${S}"/functional_tests/support/empty ]]; then
+		mkdir "${S}"/functional_tests/support/empty
+	fi
 	PYTHONPATH=. "${python}" setup.py test || die "test failed"
 }