Version bump, cleanup, fixed deps. Dropped old version.

(Portage version: 2.1.3_rc4)

4 files changed, 27 insertions, 15 deletions

diff --git a/dev-python/python-openid/ChangeLog b/dev-python/python-openid/ChangeLog
index 0c523377d988..037aed384e87 100644
--- a/dev-python/python-openid/ChangeLog
+++ b/dev-python/python-openid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-openid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/ChangeLog,v 1.5 2007/06/07 23:47:50 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/ChangeLog,v 1.6 2007/06/23 08:07:33 lucass Exp $
+
+*python-openid-2.0.1 (23 Jun 2007)
+
+  23 Jun 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -python-openid-2.0.0.ebuild, +python-openid-2.0.1.ebuild:
+  Version bump, cleanup, fixed deps. Dropped old version.
 
 *python-openid-2.0.0 (07 Jun 2007)
 
diff --git a/dev-python/python-openid/files/digest-python-openid-2.0.0 b/dev-python/python-openid/files/digest-python-openid-2.0.0
deleted file mode 100644
index fc00986b0d72..000000000000
--- a/dev-python/python-openid/files/digest-python-openid-2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1946e8d65af1e38dc659c56ede066f3d python-openid-2.0.0.tar.bz2 458261
-RMD160 36bcbb3c23cb69c27761074bd4255f02fe147066 python-openid-2.0.0.tar.bz2 458261
-SHA256 8d208e0257bc35c9d227b7660d84b53ca3ccab333d50da20e0a69d32ebad6618 python-openid-2.0.0.tar.bz2 458261
diff --git a/dev-python/python-openid/files/digest-python-openid-2.0.1 b/dev-python/python-openid/files/digest-python-openid-2.0.1
new file mode 100644
index 000000000000..c9929c768234
--- /dev/null
+++ b/dev-python/python-openid/files/digest-python-openid-2.0.1
@@ -0,0 +1,3 @@
+MD5 b04cbeb0d50b98d6af0f2c6961337037 python-openid-2.0.1.tar.bz2 462044
+RMD160 ad32ec8e3b103b3bd5636f92cfd39a6cc0ab4ed7 python-openid-2.0.1.tar.bz2 462044
+SHA256 576724cf42ea640bd4c839bfceb35524e0dcaed244dee01d8213c832448101b7 python-openid-2.0.1.tar.bz2 462044
diff --git a/dev-python/python-openid/python-openid-2.0.0.ebuild b/dev-python/python-openid/python-openid-2.0.1.ebuild
index 3a3b950fdfa0..9568c9476ee7 100644
--- a/dev-python/python-openid/python-openid-2.0.0.ebuild
+++ b/dev-python/python-openid/python-openid-2.0.1.ebuild
@@ -1,39 +1,44 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/python-openid-2.0.0.ebuild,v 1.1 2007/06/07 23:47:50 pythonhead Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/python-openid-2.0.1.ebuild,v 1.1 2007/06/23 08:07:33 lucass Exp $
 
 NEED_PYTHON=2.3
-PYTHON_MODNAME="openid"
 
 inherit distutils
 
-KEYWORDS="~amd64 ~x86"
-
 DESCRIPTION="OpenID support for servers and consumers."
 HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/"
 SRC_URI="http://www.openidenabled.com/resources/downloads/${PN}/${P}.tar.bz2"
+
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples mysql postgres sqlite"
 
-RDEPEND="|| ( <dev-lang/python-2.5 dev-python/elementtree )
-	|| ( <dev-lang/python-2.5 dev-python/pycrypto )
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/elementtree )
+	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )
+	sqlite? (
+		|| ( >=dev-lang/python-2.5 >=dev-python/pysqlite-2 )
+	)
 	postgres? ( dev-python/psycopg )
-	sqlite? ( >=dev-python/pysqlite-2.3.3 )
 	mysql? ( >=dev-python/mysql-python-1.2.2 )"
 DEPEND="${RDEPEND}"
 
+PYTHON_MODNAME="openid"
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
 	#Patch to fix confusion with localhost/127.0.0.1
-	epatch ${FILESDIR}/${P}-gentoo-test_fetchers.diff
+	epatch "${FILESDIR}"/${PN}-2.0.0-gentoo-test_fetchers.diff
 }
 
 src_install() {
 	distutils_src_install
+
 	use doc && dohtml doc/*
+
 	if use examples ; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
@@ -43,5 +48,6 @@ src_install() {
 src_test() {
 	#Remove test that requires running db server
 	sed -e '/storetest/d' -i admin/runtests
-	PYTHONPATH=. "${python}" admin/runtests || die "tests failed"
+
+	"${python}" admin/runtests || die "tests failed"
 }