summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/pyparsing/ChangeLog7
-rw-r--r--dev-python/pyparsing/files/pyparsing-1.5.3-python-3.patch28
-rw-r--r--dev-python/pyparsing/pyparsing-1.5.2.ebuild50
-rw-r--r--dev-python/pyparsing/pyparsing-1.5.3.ebuild52
4 files changed, 6 insertions, 131 deletions
diff --git a/dev-python/pyparsing/ChangeLog b/dev-python/pyparsing/ChangeLog
index eeb6929ae76d..9a329e2c923a 100644
--- a/dev-python/pyparsing/ChangeLog
+++ b/dev-python/pyparsing/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/pyparsing
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.64 2010/12/27 21:03:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.65 2010/12/27 21:41:35 arfrever Exp $
+
+ 27 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ -pyparsing-1.5.2.ebuild, -pyparsing-1.5.3.ebuild,
+ -files/pyparsing-1.5.3-python-3.patch:
+ Delete.
27 Dec 2010; Brent Baude <ranger@gentoo.org> pyparsing-1.5.5.ebuild:
Marking pyparsing-1.5.5 ppc64 for bug 339532
diff --git a/dev-python/pyparsing/files/pyparsing-1.5.3-python-3.patch b/dev-python/pyparsing/files/pyparsing-1.5.3-python-3.patch
deleted file mode 100644
index 0612f356fe8e..000000000000
--- a/dev-python/pyparsing/files/pyparsing-1.5.3-python-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- pyparsing_py3.py
-+++ pyparsing_py3.py
-@@ -138,10 +138,10 @@
-
- # build list of single arg builtins, tolerant of Python version, that can be used as parse actions
- singleArgBuiltins = []
--import __builtin__
-+import builtins
- for fname in "sum len enumerate sorted reversed list tuple set any all".split():
- try:
-- singleArgBuiltins.append(getattr(__builtin__,fname))
-+ singleArgBuiltins.append(getattr(builtins,fname))
- except AttributeError:
- continue
-
---- setup.py
-+++ setup.py
-@@ -23,8 +23,8 @@
- return False
-
- def copyfile(fromname, toname):
-- outf = file(toname,'w')
-- outf.write(file(fromname).read())
-+ outf = open(toname,'w')
-+ outf.write(open(fromname).read())
- outf.close()
-
- if "MAKING_PYPARSING_RELEASE" not in os.environ and not fileexists("pyparsing.py"):
diff --git a/dev-python/pyparsing/pyparsing-1.5.2.ebuild b/dev-python/pyparsing/pyparsing-1.5.2.ebuild
deleted file mode 100644
index c3cbd32a68aa..000000000000
--- a/dev-python/pyparsing/pyparsing-1.5.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.2.ebuild,v 1.13 2010/06/29 04:49:49 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5"
-
-inherit distutils
-
-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="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_MODNAME="pyparsing.py"
-
-src_prepare() {
- distutils_src_prepare
-
- mv -f pyparsing_py3.py pyparsing.py || die "mv failed"
- sed -e 's/, "pyparsing_py3"//' -i setup.py || die "sed failed"
- sed -e "s/pyparsing_py3 as pyparsing/pyparsing/" -e "s/pyparsing_py3/pyparsing/" -i pyparsing.py
-}
-
-src_install() {
- distutils_src_install
-
- dohtml HowToUsePyparsing.html
- dodoc CHANGES
-
- if use doc; then
- dohtml -r htmldoc/*
- insinto /usr/share/doc/${PF}
- doins docs/*.pdf
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/pyparsing/pyparsing-1.5.3.ebuild b/dev-python/pyparsing/pyparsing-1.5.3.ebuild
deleted file mode 100644
index 541f27f48c15..000000000000
--- a/dev-python/pyparsing/pyparsing-1.5.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.3.ebuild,v 1.5 2010/09/28 15:42:13 ranger Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-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="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-PYTHON_MODNAME="pyparsing.py"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-python-3.patch"
-
- sed \
- -e "s/pyparsing_py3 as pyparsing/pyparsing/" \
- -e "s/pyparsing_py3/pyparsing/" \
- -i pyparsing_py3.py || die "sed failed"
-
- distutils_src_prepare
-}
-
-src_install() {
- distutils_src_install
-
- dohtml HowToUsePyparsing.html
- dodoc CHANGES
-
- if use doc; then
- dohtml -r htmldoc/*
- insinto /usr/share/doc/${PF}
- doins docs/*.pdf
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}