Version bump. Add support for Python <2.6 (bug #302890).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-python/pyparsing/ChangeLog b/dev-python/pyparsing/ChangeLog
index 0d45b0283751ef2629293d2ee9f280c5e8e808c6..48a485068cf854907c12d167cc872d97446be202 100644 (file)
--- a/dev-python/pyparsing/ChangeLog
+++ b/dev-python/pyparsing/ChangeLog
@@ -1,6 +1,12 @@
 # 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.52 2010/06/29 04:49:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.53 2010/06/29 05:43:09 arfrever Exp $
+
+*pyparsing-1.5.3 (29 Jun 2010)
+
+  29 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +pyparsing-1.5.3.ebuild, +files/pyparsing-1.5.3-python-3.patch:
+  Version bump. Add support for Python <2.6 (bug #302890).
 
   29 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pyparsing-1.5.2.ebuild:

diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index a80c0329f7ff19b50936b5993d0f0ab59ffe74c7..0da39057c465e7849ae2e83c137bf4d3af02c4ff 100644 (file)
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,4 +1,7 @@
+AUX pyparsing-1.5.3-python-3.patch 856 RMD160 673a8095867e22eb07cc23e3c42291335b30ad5a SHA1 707dfde99efe8c64b5711fb004d2958b9f81bffc SHA256 1dbbb94277305beaed5dc3d89d85f8e37ccb4b6d977148cd3dceb6f1d35513a0
 DIST pyparsing-1.5.2.tar.gz 790616 RMD160 cf564cc42951e134b8ed29e97d680d9df0b61545 SHA1 298ec7c4df5f188088be21b5feda35752fa46507 SHA256 1021fd2cfdf9c3b6ac0191b018c15d591501b77d977baded59d8ef76d375f21c
+DIST pyparsing-1.5.3.tar.gz 1297284 RMD160 1f1c104e956d7003ad159027be88bebbd7e33572 SHA1 94448212e02b341b756b3f84adf946be6acfad48 SHA256 8ddbe1ffc7d11be3a006422bcf0e93b737c31c6e2e5668a8fa19de548b547b06
 EBUILD pyparsing-1.5.2.ebuild 1254 RMD160 1b6b2f8e20e9ce9b58c06ac67e96d96a312cb9ae SHA1 5013f09caf01952dc155db5a4d346fab7b3ca34a SHA256 e459eb26363125cf756c444deb8257aa37895b14d8cf0698e3951aaa01c16a63
-MISC ChangeLog 6777 RMD160 62a63028fb50dafc6dfe63745cac9ae19ecec405 SHA1 f122c4bbdb39c7ba58c861a578f65b4250a23817 SHA256 6f0eb4b881c167648ee42b02f5f1922dabce0e14ac6844bae09d167db6c7faa9
+EBUILD pyparsing-1.5.3.ebuild 1219 RMD160 d1072ff7b034eeedf0dce69a432ede7c36504f91 SHA1 5f3485d7d87c0884b57a85cfeb700d1b888886be SHA256 b04fb090f66f2b449ac06f98e4a08279da283a0de2d997dae4f5b3d7f266abcb
+MISC ChangeLog 7008 RMD160 56de102ef9c4b75a23edcfb38cb71808e25d8306 SHA1 ae831300a10d9ba4c6d2980ef70ded2493e470f2 SHA256 61043a0ad590265af84a1fdbce01c1a78c542272c1c5a7bc8c4959470115edc1
 MISC metadata.xml 520 RMD160 6b57ef91eae43f9b9f64171621fe64230ed473b9 SHA1 53586af4a1fa74e4c7a75d6ed08c48b754225180 SHA256 ae0e81558a2486de0916140a0887bc2c597d767af07852759a39f9cb988e54a6

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
new file mode 100644 (file)
index 0000000..0612f35
--- /dev/null
+++ b/dev-python/pyparsing/files/pyparsing-1.5.3-python-3.patch
@@ -0,0 +1,28 @@
+--- pyparsing_py3.py
++++ pyparsing_py3.py
+@@ -138,10 +138,10 @@
+ \r
+ # build list of single arg builtins, tolerant of Python version, that can be used as parse actions\r
+ singleArgBuiltins = []\r
+-import __builtin__\r
++import builtins\r
+ for fname in "sum len enumerate sorted reversed list tuple set any all".split():\r
+     try:\r
+-        singleArgBuiltins.append(getattr(__builtin__,fname))\r
++        singleArgBuiltins.append(getattr(builtins,fname))\r
+     except AttributeError:\r
+         continue\r
+ \r
+--- setup.py
++++ setup.py
+@@ -23,8 +23,8 @@
+         return False\r
+ \r
+ def copyfile(fromname, toname):\r
+-    outf = file(toname,'w')\r
+-    outf.write(file(fromname).read())\r
++    outf = open(toname,'w')\r
++    outf.write(open(fromname).read())\r
+     outf.close()\r
+     \r
+ if "MAKING_PYPARSING_RELEASE" not in os.environ and not fileexists("pyparsing.py"):\r

diff --git a/dev-python/pyparsing/pyparsing-1.5.3.ebuild b/dev-python/pyparsing/pyparsing-1.5.3.ebuild
new file mode 100644 (file)
index 0000000..e03845c
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-1.5.3.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2010/06/29 05:43:09 arfrever 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
+}