Revert unnecessary and problematic revbump. Add pypy2.0 to the old ebuild.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)

3 files changed, 7 insertions, 31 deletions

diff --git a/dev-python/pyparsing/ChangeLog b/dev-python/pyparsing/ChangeLog
index 31fda74f0c6a..260071d6a2e3 100644
--- a/dev-python/pyparsing/ChangeLog
+++ b/dev-python/pyparsing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyparsing
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.88 2013/01/27 06:40:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.89 2013/01/29 14:56:38 mgorny Exp $
+
+  29 Jan 2013; Michał Górny <mgorny@gentoo.org> -pyparsing-1.5.7-r1.ebuild,
+  pyparsing-1.5.7.ebuild:
+  Revert unnecessary and problematic revbump. Add pypy2.0 to the old ebuild.
 
 *pyparsing-1.5.7-r1 (27 Jan 2013)
 
diff --git a/dev-python/pyparsing/pyparsing-1.5.7-r1.ebuild b/dev-python/pyparsing/pyparsing-1.5.7-r1.ebuild
deleted file mode 100644
index 0de0f52e089c..000000000000
--- a/dev-python/pyparsing/pyparsing-1.5.7-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.7-r1.ebuild,v 1.1 2013/01/27 06:40:51 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
-
-inherit distutils-r1
-
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="py2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-RDEPEND="!dev-python/pyparsing:0"
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.pdf
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pyparsing/pyparsing-1.5.7.ebuild b/dev-python/pyparsing/pyparsing-1.5.7.ebuild
index c0b081c44a13..5e272168f379 100644
--- a/dev-python/pyparsing/pyparsing-1.5.7.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.5.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.7.ebuild,v 1.1 2013/01/01 14:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.7.ebuild,v 1.2 2013/01/29 14:56:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_8,1_9} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_8,1_9,2_0} )
 
 inherit distutils-r1