5 files changed, 16 insertions, 26 deletions
diff --git a/dev-python/urwid/ChangeLog b/dev-python/urwid/ChangeLog
index bb29ed325b3d..1eab64432da4 100644
--- a/dev-python/urwid/ChangeLog
+++ b/dev-python/urwid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/urwid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/ChangeLog,v 1.22 2007/03/26 09:12:55 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/ChangeLog,v 1.23 2007/06/24 19:11:17 lucass Exp $
+
+*urwid-0.9.8.1 (24 Jun 2007)
+
+  24 Jun 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/urwid-0.9.8-nosetuptools.diff, -urwid-0.9.8.ebuild,
+  +urwid-0.9.8.1.ebuild:
+  Version bump, added dep on setuptools. Dropped old version.
 
 *urwid-0.9.8 (26 Mar 2007)
 
diff --git a/dev-python/urwid/files/digest-urwid-0.9.8 b/dev-python/urwid/files/digest-urwid-0.9.8
deleted file mode 100644
index 33a804c184fc..000000000000
--- a/dev-python/urwid/files/digest-urwid-0.9.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cef1c0d492c939c819dc6e4978b58239 urwid-0.9.8.tar.gz 179472
-RMD160 6cbbea8c97e57b37909d39a8bdb0418b15ccb6c4 urwid-0.9.8.tar.gz 179472
-SHA256 b334f9fca77f1bc0fee462d3f5aa852be637197f04fcf51e99f3a9618fb5ed2d urwid-0.9.8.tar.gz 179472
diff --git a/dev-python/urwid/files/digest-urwid-0.9.8.1 b/dev-python/urwid/files/digest-urwid-0.9.8.1
new file mode 100644
index 000000000000..6d9d4e347841
--- /dev/null
+++ b/dev-python/urwid/files/digest-urwid-0.9.8.1
@@ -0,0 +1,3 @@
+MD5 5a033bcafa4eb8c6e76636112bc3de98 urwid-0.9.8.1.tar.gz 179464
+RMD160 47e408879e9908764efd31104cebdf3ba6b10ff5 urwid-0.9.8.1.tar.gz 179464
+SHA256 d0fb637d27f2aacdb116683970d915656bdfb68fa20affe68fffc52d5ab379a3 urwid-0.9.8.1.tar.gz 179464
diff --git a/dev-python/urwid/files/urwid-0.9.8-nosetuptools.diff b/dev-python/urwid/files/urwid-0.9.8-nosetuptools.diff
deleted file mode 100644
index 2ae672a80dd6..000000000000
--- a/dev-python/urwid/files/urwid-0.9.8-nosetuptools.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py.orig	2007-03-26 11:06:56.000000000 +0200
-+++ setup.py	2007-03-26 11:07:23.000000000 +0200
-@@ -19,10 +19,7 @@
- #
- # Urwid web site: http://excess.org/urwid/
- 
--try:
--	from setuptools import setup, Extension
--except ImportError:
--	from distutils.core import setup, Extension
-+from distutils.core import setup, Extension
- 
- import os
- 
diff --git a/dev-python/urwid/urwid-0.9.8.ebuild b/dev-python/urwid/urwid-0.9.8.1.ebuild
index 89e495efae46..dd33c68c4096 100644
--- a/dev-python/urwid/urwid-0.9.8.ebuild
+++ b/dev-python/urwid/urwid-0.9.8.1.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/urwid/urwid-0.9.8.ebuild,v 1.1 2007/03/26 09:12:55 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.9.8.1.ebuild,v 1.1 2007/06/24 19:11:17 lucass Exp $
 
 NEED_PYTHON=2.2
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="Urwid is a curses-based user interface library for Python."
 HOMEPAGE="http://excess.org/urwid/"
@@ -13,14 +13,10 @@ SRC_URI="http://excess.org/urwid/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-
 IUSE="examples"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-nosetuptools.diff"
-}
+DEPEND="dev-python/setuptools"
+RDEPEND=""
 
 src_test() {
 	"${python}" test_urwid.py || die "unit tests failed"
@@ -30,6 +26,7 @@ src_install() {
 	distutils_src_install
 
 	dohtml tutorial.html reference.html
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins bigtext.py browse.py calc.py dialog.py edit.py