Version bump. Drop old.

(Portage version: -svn/cvs/Linux 2.6.26-gentoo x86_64)

4 files changed, 11 insertions, 96 deletions

diff --git a/dev-python/python-openid/ChangeLog b/dev-python/python-openid/ChangeLog
index 276ca9f2fa66..70906b4ce302 100644
--- a/dev-python/python-openid/ChangeLog
+++ b/dev-python/python-openid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/python-openid
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/ChangeLog,v 1.8 2008/06/25 10:35:27 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/ChangeLog,v 1.9 2008/10/06 16:40:05 hawking Exp $
+
+*python-openid-2.2.1 (06 Oct 2008)
+
+  06 Oct 2008; Ali Polatel <hawking@gentoo.org>
+  -python-openid-1.2.0-r1.ebuild, -python-openid-2.1.1.ebuild,
+  -python-openid-2.2.0.ebuild, +python-openid-2.2.1.ebuild:
+  Version bump. Drop old.
 
 *python-openid-2.2.0 (25 Jun 2008)
 
diff --git a/dev-python/python-openid/python-openid-1.2.0-r1.ebuild b/dev-python/python-openid/python-openid-1.2.0-r1.ebuild
deleted file mode 100644
index d8018a3fffb4..000000000000
--- a/dev-python/python-openid/python-openid-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,38 +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/python-openid/python-openid-1.2.0-r1.ebuild,v 1.3 2007/06/01 01:01:47 pythonhead 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.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc examples mysql postgres sqlite"
-
-RDEPEND=">=dev-python/python-yadis-1.1.0
-	>=dev-python/python-urljr-1.0.1
-	postgres? ( dev-python/psycopg )
-	sqlite? ( >=dev-python/pysqlite-2.3.3 )
-	mysql? ( >=dev-python/mysql-python-1.2.2 )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml doc/*
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-src_test() {
-	sed -e '/storetest/d' -i admin/runtests
-	PYTHONPATH=. "${python}" admin/runtests || die "tests failed"
-}
diff --git a/dev-python/python-openid/python-openid-2.1.1.ebuild b/dev-python/python-openid/python-openid-2.1.1.ebuild
deleted file mode 100644
index d20e86ffd768..000000000000
--- a/dev-python/python-openid/python-openid-2.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 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.1.1.ebuild,v 1.2 2008/03/13 15:37:22 mr_bones_ Exp $
-
-NEED_PYTHON=2.3
-
-inherit distutils
-
-DESCRIPTION="OpenID support for servers and consumers."
-HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/"
-SRC_URI="http://www.openidenabled.com/files/${PN}/packages/${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 )
-	sqlite? (
-		|| ( >=dev-lang/python-2.5 >=dev-python/pysqlite-2 )
-	)
-	postgres? ( dev-python/psycopg )
-	mysql? ( >=dev-python/mysql-python-1.2.2 )"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="openid"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#Patch to fix confusion with localhost/127.0.0.1
-	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
-	fi
-}
-
-src_test() {
-	#Remove test that requires running db server
-	sed -e '/storetest/d' -i admin/runtests
-
-	"${python}" admin/runtests || die "tests failed"
-}
diff --git a/dev-python/python-openid/python-openid-2.2.0.ebuild b/dev-python/python-openid/python-openid-2.2.1.ebuild
index d084bbea3feb..d1d1ae0cc8c4 100644
--- a/dev-python/python-openid/python-openid-2.2.0.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.1.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/python-openid/python-openid-2.2.0.ebuild,v 1.1 2008/06/25 10:35:27 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/python-openid-2.2.1.ebuild,v 1.1 2008/10/06 16:40:05 hawking Exp $
 
 NEED_PYTHON=2.3
 
@@ -27,10 +27,9 @@ DEPEND="${RDEPEND}"
 PYTHON_MODNAME="openid"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	distutils_src_unpack
 
-	#Patch to fix confusion with localhost/127.0.0.1
+	# Patch to fix confusion with localhost/127.0.0.1
 	epatch "${FILESDIR}"/${PN}-2.0.0-gentoo-test_fetchers.diff
 }